This is an automated email from the ASF dual-hosted git repository.

luckychen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-weex.git


The following commit(s) were added to refs/heads/master by this push:
     new 8922b1e  Merge Release/0.28 into master (#2968)
8922b1e is described below

commit 8922b1e0549e2b6ffd09a7352755f4b3be24a2ba
Author: YorkShen <[email protected]>
AuthorDate: Thu Oct 24 16:16:31 2019 +0800

    Merge Release/0.28 into master (#2968)
    
    * Remove possible-notices-for-bin-dist
    
    * Update changelog
    
    * Update setting.gradle
    
    * Remove .iml fiie
    
    * Update publish_release_candiate.
    
    * Update HOW-TO-BUILD.md
    
    * Update build.gradle
    
    * Add the ability of unbundling JSC from weex_sdk.aar.
    
    * Update playground
    
    * Update readme.
    
    * Update readme
    
    * Update playground
    
    * Update Readme
    
    * Update apache release.
    
    * Update build script
    
    * Update build.gradle for Jcenter publication.
    
    * Update playground version
    
    * Update version for jCenter publication.
    
    * Update build.gradle
    
    * Update build.gradle
    
    * Update build.gradle
    
    * Update playground
    
    * Update documentation
---
 .rat-excludes                            | 29 ++++++----
 CHANGELOG.md                             |  4 +-
 HOW-TO-BUILD.md                          |  9 ++-
 LICENSE                                  |  2 +-
 NOTICE                                   |  2 +-
 POSSIBLE-NOTICES-FOR-BIN-DIST            | 98 --------------------------------
 README.md                                | 14 +++--
 android/README.md                        |  7 ++-
 android/build.gradle                     |  8 ++-
 android/sdk/build.gradle                 | 14 +++--
 android/sdk/buildSrc/download_jsc.gradle |  5 +-
 android/sdk/buildSrc/jcenter.gradle      | 64 ++++++++++++++++-----
 android/settings.gradle                  |  4 +-
 scripts/publish_release_candidate.sh     |  4 +-
 scripts/publish_release_official.sh      | 12 ++--
 scripts/release_files.rules              |  3 +
 weex-playground                          |  2 +-
 17 files changed, 127 insertions(+), 154 deletions(-)

diff --git a/.rat-excludes b/.rat-excludes
index 45a4dce..6a131ce 100644
--- a/.rat-excludes
+++ b/.rat-excludes
@@ -1,11 +1,18 @@
-\.gitignore
-\.git/.*
-ios/playground 
-.rat-excludes
-build
-.*\.json
-Info\.plist
-.*\.xml
-.*\.pch
-main\.js
-\./ios/playground/Pods/.*
+index.js
+array.js
+dep.js
+object.js
+observer.js
+state.js
+watcher.js
+WXDataStructureUtil.java
+json11.cc
+json11.hpp
+modp_b64_data.h
+modp_b64.cc
+modp_b64.h
+icu_utf.h
+icu_utf.cpp
+jni_generator.py
+futex.h
+base64.hpp
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b0aebf5..e84c768 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,8 +4,8 @@
 * Unified C++ log system of WeexCore.
 
 ### Android
-*  Upgrade targetsdk & compilesdk to 28
-* Change Android package name from `com.taobao.weex` to `org.apache.weex`. Ref 
[link](https://github.com/apache/incubator-weex/tree/master/android) for detail.
+* Upgrade targetsdk & compilesdk to 28
+* Change Android package name from `com.taobao.weex` to `org.apache.weex`, ref 
[link](https://github.com/apache/incubator-weex/tree/master/android#build-types)
 * Switch to BSD-Licensed 
[android-jsc](https://www.npmjs.com/package/jsc-android) as the default 
JavaScript Interpreter.
 
 ## Main Bugfix
diff --git a/HOW-TO-BUILD.md b/HOW-TO-BUILD.md
index 26e36e9..ee73899 100644
--- a/HOW-TO-BUILD.md
+++ b/HOW-TO-BUILD.md
@@ -15,7 +15,7 @@ The environment required to build weex is categorized by 
platforms.
 ## Android
 * JDK `1.8+`
 * Android SDK Platform 28
-  * `$ANDROID_HOME` must be configured by using `export 
ANDROID_HOME=/path_to_sdk`
+  * `ANDROID_HOME` must be configured by using `export 
ANDROID_HOME=/path_to_sdk`
   * Normally, you should install [Android 
Studio](https://developer.android.com/studio) to get Android SDK Platform 28 
installed.
 * Gradle 4.10+
 * NDK `r18`
@@ -57,8 +57,11 @@ Build the javascript libraries:
 
 ### Before build Native SDK
 Move `min` version to Native SDK folder, which will be used by native SDK 
build.
-> `cp packages/weex-js-framework/index.min.js 
ios/sdk/WeexSDK/Resources/main.js`
-> `cp packages/weex-js-framework/index.min.js android/sdk/assets/main.js`
+
+```
+cp packages/weex-js-framework/index.min.js ios/sdk/WeexSDK/Resources/main.js
+cp packages/weex-js-framework/index.min.js android/sdk/assets/main.js
+```
 
 ## Build Android SDK
 1. Install the [Android environment](#android).
diff --git a/LICENSE b/LICENSE
index 2cb1b58..4d5db27 100644
--- a/LICENSE
+++ b/LICENSE
@@ -187,7 +187,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright [yyyy] [name of copyright owner]
+   Copyright 2019 Apache Weex (Incubating)
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/NOTICE b/NOTICE
index 81c698c..ea6b3ac 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,4 +1,4 @@
-Apache Weex
+Apache Weex (Incubating)
 Copyright 2019 The Apache Software Foundation
 
 This product includes software developed at
diff --git a/POSSIBLE-NOTICES-FOR-BIN-DIST b/POSSIBLE-NOTICES-FOR-BIN-DIST
deleted file mode 100644
index a0e2329..0000000
--- a/POSSIBLE-NOTICES-FOR-BIN-DIST
+++ /dev/null
@@ -1,98 +0,0 @@
-Apache Weex
-Copyright 2018 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-This product contains software semver(http://semver.org/) developed
-by Tom Preston-Werner , licensed under the Creative Commons - CC BY 3.0 
License.
-
-This product contains software core-js(https://github.com/zloirock/core-js) 
developed
-by Denis Pushkarev , licensed under the MIT License.
-
-This product contains software 
weex-rax-framework(https://github.com/alibaba/rax) developed
-by yuanyan  , licensed under the BSD-3-Clause License.
-
-This product contains software 
weex-vue-framework(https://github.com/vuejs/vue) developed
-by fkysly  , licensed under the MIT License.
-
-This product contains software 
weex-vue-render(https://github.com/weexteam/weex-vue-render) developed
-by MrRaindrop  , licensed under the Apache 2.0 License.
-
-This product contains software 
weex-styler(https://github.com/weexteam/weex-styler) developed
-by songsiqi  , licensed under the MIT License.
-
-This product contains software vuejs(https://github.com/vuejs/vue) developed
-by Yuxi Evan You , licensed under the MIT License.
-
-This product contains software fastjson(https://github.com/alibaba/fastjson) 
developed
-by alibaba inc.  , licensed under the Apache 2.0 License.
-
-This product contains software dexposed(https://github.com/alibaba/dexposed) 
developed
-by alibaba inc.  , licensed under the Apache 2.0 License.
-
-This product contains software 
js_engine(https://github.com/alibaba/weex_js_engine/) developed
-by alibaba inc.  , licensed under the Apache 2.0 License.
-
-This product contains software bindingX(https://github.com/alibaba/bindingx) 
developed
-by alibaba inc.  , licensed under the Apache 2.0 License.
-
-This product contains software 
loopj(https://github.com/loopj/android-async-http) developed
-by loopj , licensed under the Apache 2.0 License.
-
-This product contains software fresco(https://github.com/facebook/fresco) 
developed
-by facebook , licensed under the BSD-3-Clause License.
-
-This product contains software 
animated-gif(https://github.com/facebook/fresco) developed
-by facebook , licensed under the BSD-3-Clause License.
-
-This product contains software 
SocketRocket(https://github.com/facebook/SocketRocket) developed
-by facebook , licensed under the BSD-3-Clause License.
-
-This product contains software zxing(https://github.com/zxing/zxing) developed
-by zxing , licensed under the Apache 2.0 License.
-
-This product contains software okhttp(https://github.com/square/okhttp) 
developed
-by square , licensed under the Apache 2.0 License.
-
-This product contains software okio(https://github.com/square/okio) developed
-by square , licensed under the Apache 2.0 License.
-
-This product contains software scalpel(https://github.com/JakeWharton/scalpel) 
developed
-by Jake Wharton , licensed under the Apache 2.0 License.
-
-This product contains software 
espresso-idling-resource(https://google.github.io/android-testing-support-library/docs/espresso/idling-resource/)
 developed
-by google , licensed under the Apache 2.0 License.
-
-This product contains software AOSP(https://source.android.com/) developed
-by The Android Open Source Project , licensed under the Apache 2.0 License.
-
-This product contains software SDWebImage(https://github.com/rs/SDWebImage) 
developed
-by Olivier Poitrey  , licensed under the MIT License.
-
-This product contains software Guava(https://github.com/google/guava) developed
-by google  , licensed under the Apache License.
-
-This product contains shelljs Guava(https://github.com/shelljs/shelljs) 
developed
-by shelljs  , licensed under BSD 3-clause "New" or "Revised" License.
-
-This product contains software fpconv(https://github.com/night-shift/fpconv) 
developed
-by night-shift  , licensed under the MIT License.
-
-This product contains software rapidjson(https://github.com/Tencent/rapidjson) 
developed
-by tencent  , licensed under the MIT License.
-
-This product contains software 
flexbox-layout(https://github.com/google/flexbox-layout) developed
-by google  , licensed under the Apache License.
-
-This product contains software IPC(https://source.android.com/) developed
-by google  , licensed under the Apache License.
-
-This product contains software JNI(https://chromium.googlesource.com/) 
developed
-by google, licensed under the BSD-style License.
-
-This product contains software modp(http://modp.com/release/base64) developed
-by modp, licensed under the BSD-style License.
-
-This product contains software 
jni_generator(https://chromium.googlesource.com/) developed
-by google, licensed under the BSD-style License.
diff --git a/README.md b/README.md
index fa2f398..18fc007 100644
--- a/README.md
+++ b/README.md
@@ -4,19 +4,25 @@ A framework for building Mobile cross-platform UI.
 
 [![Build 
Status](https://travis-ci.org/apache/incubator-weex.svg?branch=master)](https://travis-ci.org/apache/incubator-weex/)
 
+## Convenience Distribution 
+**Since 0.28.0, Weex would publish two convince binary in each release for 
Android, please [read the documentation about the detail](major_change.html).**
+
+**Please take the above link seriously, otherwise you would be able to use the 
latest version of Weex.**
+
 | platform | status |
 | -------- | ------ |
-| Android | 
[![Download](https://api.bintray.com/packages/alibabaweex/maven/weex_sdk/images/download.svg)](https://bintray.com/alibabaweex/maven/weex_sdk/_latestVersion)
 |
+| Android | [sdk 
![Download](https://api.bintray.com/packages/weex/Android/sdk/images/download.svg)](https://bintray.com/weex/Android/sdk/_latestVersion)
 Or [sdk_legacy 
![Download](https://api.bintray.com/packages/weex/Android/sdk_legacy/images/download.svg)](https://bintray.com/weex/Android/sdk_legacy/_latestVersion)
 |
 | iOS | [![Pod 
version](https://badge.fury.io/co/WeexSDK.svg)](https://cocoapods.org/pods/WeexSDK)
 [![Carthage 
compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage)
 |
 | [Mobile Web](https://github.com/weexteam/weex-vue-render) | [![npm 
version](https://badge.fury.io/js/weex-html5.svg)](https://www.npmjs.com/package/weex-vue-render)
 |
 
 Support Android 4.1 (API 16), iOS 8.0+ and WebKit 534.30+.
 
-**Note: Please note the above download distribution is only for users' users' 
convenience. Weex Release is always in the format of [source 
code](https://weex.apache.org/download/download.html).**
-
 ## For Windows
+First of all, compiling or building Weex from Windows is not support 
officially.
+
+You could install [Git for Windows](https://git-scm.com/download/win) and run 
all the following commands in git-bash.
 
-Please ***INSTALL [Git for Windows](https://git-scm.com/download/win)*** and 
run all the following commands in git-bash.
+Good Luck.
 
 ## Meet Weex
 
diff --git a/android/README.md b/android/README.md
index af4d9c0..c88cff2 100644
--- a/android/README.md
+++ b/android/README.md
@@ -32,8 +32,11 @@ Double type `SHIFT` and enter `Build Variants`, will give 
you build variants win
 ### When to publish SNAPSHOT
 When some commits of  playground rely on unpublished features of weex-sdk,a 
SNAPSHOT of weex-sdk will be needed to support it.
 ### How to publish SNAPSHOT
- `cd android `  
-`./gradlew clean install ArtifactoryPublish -PweexVersion=$PUBLISH_VERSION 
-PbintrayUser=alibabaweex -PbintrayApiKey=$JCENTER_TOKEN `  
+
+```
+cd android
+./gradlew clean install ArtifactoryPublish -PgroupId="org.apache.weex" 
-PartifactName="sdk_legacy" -PapachePackageName="false" -PunbundlingJSC="true" 
-PbuildRuntimeApi=true -PweexVersion=$PUBLISH_VERSION -PbintrayUser=weex 
-PbintrayApiKey=$JCENTER_TOKEN 
+```
 
 * Explanation for variable:  
 $PUBLISH_VERSION The version of snapshot, like 0.26.1.3-SNAPSHOT  
diff --git a/android/build.gradle b/android/build.gradle
index 9b70e08..8898559 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -53,8 +53,8 @@ subprojects {
     }
     buildscript {
         dependencies {
-            classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.0'
-            classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
+            classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
+            classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
         }
         repositories {
             google()
@@ -76,6 +76,10 @@ ext {
     //Default value for disableCov is false
     disableCov = project.hasProperty("disableCov") && disableCov.equals("true")
     useApachePackageName = project.hasProperty('apachePackageName') ? 
project.property('apachePackageName').toBoolean() : false
+    unbundlingJSC = project.hasProperty('unbundlingJSC') ? 
project.property('unbundlingJSC').toBoolean() : false
+    artifactName = project.hasProperty('artifactName') ? 
project.property('artifactName') : 'weex_sdk'
+    groupId = project.hasProperty('groupId') ? project.property('groupId') : 
'com.taobao.android'
+    weexVersion = project.hasProperty('weexVersion') ? 
project.getProperty('weexVersion') : '0.28.0.1'
     implementFromWeex = true
 }
 
diff --git a/android/sdk/build.gradle b/android/sdk/build.gradle
index ecd1182..15be1de 100755
--- a/android/sdk/build.gradle
+++ b/android/sdk/build.gradle
@@ -18,7 +18,7 @@
  */
  plugins {
      id "com.github.hierynomus.license" version "0.14.0"
-     id 'com.jfrog.artifactory' version '4.9.7'
+     id 'com.jfrog.artifactory' version '4.10.0'
  }
 
 apply plugin: 'com.android.library'
@@ -33,7 +33,8 @@ apply from: 'buildSrc/download_jsc.gradle'
 apply from: 'buildSrc/packageName.gradle'
 apply from: 'buildSrc/asan.gradle'
 
-version = project.hasProperty('weexVersion') ? 
project.getProperty('weexVersion') : '0.26.0.1'
+version = project.weexVersion
+group = project.groupId
 
 //Check version, the version must have 4 sections. The leading three section 
must be number, and the last section is odd number with or without suffix 
string.
 if (!project.hasProperty('ignoreVersionCheck') || 
!project.getProperty('ignoreVersionCheck').equals("true")) {
@@ -109,8 +110,6 @@ android {
         initJSCPrivateApi = jsInterpolatorName =="JavaScriptCore"
     }
 
-    defaultPublishConfig project.useApachePackageName ? 'apacheRelease' : 
'legacyRelease'
-
     defaultConfig {
         buildConfigField "String", "buildJavascriptFrameworkVersion", 
"\"${jsfmVersion}\""
         buildConfigField "String", "buildVersion", "\"${version}\""
@@ -209,6 +208,10 @@ android {
             main.java.srcDirs = ['src/legacyRelease/java']
             main.manifest.srcFile(new 
File('src/legacyRelease/AndroidManifest.xml'))
         }
+
+        if(project.unbundlingJSC){
+            main.jniLibs.srcDirs = []
+        }
     }
 
     compileOptions.encoding = "UTF-8"
@@ -283,4 +286,5 @@ task weex_core_license(type: 
com.hierynomus.gradle.license.tasks.LicenseFormat)
                      'Source/include/JavaScriptCore/**/*.cpp'])
 }
 
-preBuild.dependsOn licenseFormat
\ No newline at end of file
+preBuild.dependsOn licenseFormat, copyJSCHeaderToWeexCore
+clean.dependsOn cleanCopyJSCHeaderToWeexCore
\ No newline at end of file
diff --git a/android/sdk/buildSrc/download_jsc.gradle 
b/android/sdk/buildSrc/download_jsc.gradle
index a83fafe..07dbe3a 100644
--- a/android/sdk/buildSrc/download_jsc.gradle
+++ b/android/sdk/buildSrc/download_jsc.gradle
@@ -81,8 +81,7 @@ task copyJSCHeaderToWeexCore(type: Copy, dependsOn: unzipJSC) 
{
     into '../../weex_core/Source/include/JSCHeaderNew/JavaScriptCore'
     includeEmptyDirs false
     inputs.dir(new File(jsc_dir, 'include'))
-    outputs.upToDateWhen {false}
 }
 
-preBuild.dependsOn copyJscToJniDir, copyJSCHeaderToWeexCore
-clean.dependsOn cleanCopyJscToJniDir, cleanCopyJSCHeaderToWeexCore
\ No newline at end of file
+preBuild.dependsOn copyJscToJniDir
+clean.dependsOn cleanCopyJscToJniDir
\ No newline at end of file
diff --git a/android/sdk/buildSrc/jcenter.gradle 
b/android/sdk/buildSrc/jcenter.gradle
index 92bc6b4..13b2424 100644
--- a/android/sdk/buildSrc/jcenter.gradle
+++ b/android/sdk/buildSrc/jcenter.gradle
@@ -16,33 +16,36 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-def siteUrl = 'https://weex.incubator.apache.org'
+def siteUrl = 'https://weex.apache.org/'
 def gitUrl = 'https://github.com/apache/incubator-weex.git'
-group = "com.taobao.android"
+def mailingList = '[email protected]'
+def description='Weex release is always under the form of source code, the 
JCenter distribuion is only used for users\' convenience. View 
https://weex.apache.org/download/download.html for all the source code release'
 install {
     repositories.mavenInstaller {
         // This generates POM.xml with proper parameters
         pom {
             project {
                 packaging 'aar'
-                name 'weex_sdk'
+                name 'Apache Incubator-Weex'
+                artifactId project.artifactName
+                groupId project.groupId
                 url siteUrl
+                version = project.weexVersion
                 licenses {
                     license {
                         name 'The Apache Software License, Version 2.0'
-                        url 'https://www.apache.org/licenses/LICENSE-2.0.txt'
+                        url 
'https://raw.githubusercontent.com/apache/incubator-weex/master/LICENSE'
                     }
                 }
                 developers {
                     developer {
-                        id 'weex alibaba'
-                        name 'weex alibaba'
-                        email '[email protected]'
+                        name 'Apache Weex(Incubating) PPMC'
+                        email mailingList
                     }
                 }
                 scm {
                     connection gitUrl
-                    developerConnection gitUrl
+                    developerConnection mailingList
                     url siteUrl
                 }
             }
@@ -55,19 +58,52 @@ bintray {
     user = project.hasProperty('bintrayUser') ? 
project.property('bintrayUser') : System.getenv('BINTRAY_USER')
     key = project.hasProperty('bintrayApiKey') ? 
project.property('bintrayApiKey') : System.getenv('BINTRAY_API_KEY')
     pkg {
-        repo = "maven"
-        name = "weex_sdk"
+        repo = 'Android'
+        name = project.artifactName
         websiteUrl = siteUrl
+        desc = description
         vcsUrl = gitUrl
         licenses = ["Apache-2.0"]
         publish = true
         version {
-            //The version to be published
-            name = project.version
-            vcsTag = project.version
+            desc = description
+            released = new Date()
+            name = project.weexVersion
+            vcsTag = project.hasProperty('vcsTag') ? 
project.property('vcsTag') :  project.weexVersion
         }
     }
 }
+
+task sourcesJar(type: Jar) {
+    from android.sourceSets.main.java.srcDirs
+    classifier = 'sources'
+}
+
+artifacts {
+    archives sourcesJar
+}
+
+if (project.gradle.startParameter.taskNames.contains('artifactoryPublish') ||
+        
project.gradle.startParameter.taskNames.contains(':weex_sdk:artifactoryPublish'))
 {
+    apply plugin: 'maven-publish'
+    publishing {
+        publications {
+            artifactorySnapthost(MavenPublication) {
+                groupId project.groupId
+                artifactId project.artifactName
+                version project.weexVersion
+                artifact bundleReleaseAar
+            }
+        }
+        repositories {
+            maven {
+                name = 'OJOSnapshot'
+                url = 'http://oss.jfrog.org/artifactory'
+            }
+        }
+    }
+}
+
 artifactory {
     contextUrl = 'http://oss.jfrog.org/artifactory'
     publish {
@@ -78,7 +114,7 @@ artifactory {
             maven = true
         }
         defaults {
-            publishConfigs('archives')
+            publications ('artifactorySnapthost')
         }
     }
 }
\ No newline at end of file
diff --git a/android/settings.gradle b/android/settings.gradle
index 45e0e56..1baeb8d 100644
--- a/android/settings.gradle
+++ b/android/settings.gradle
@@ -26,7 +26,9 @@ def updateSubmodule(){
     }
 }
 
-updateSubmodule()
+//if (new File('../.git').exists()) {
+//    updateSubmodule()
+//}
 
 include ":playground"
 project(":playground").projectDir=new 
File("../weex-playground/android/playground")
diff --git a/scripts/publish_release_candidate.sh 
b/scripts/publish_release_candidate.sh
index ef7465e..dba1748 100755
--- a/scripts/publish_release_candidate.sh
+++ b/scripts/publish_release_candidate.sh
@@ -36,5 +36,5 @@ fi
 mkdir -p "$TMPDIR""weex_release_candidate/""$1/$2"
 cp "apache-weex-incubating-$1-$2-src.tar.gz" 
"apache-weex-incubating-$1-$2-src.tar.gz.asc" 
"apache-weex-incubating-$1-$2-src.tar.gz.sha512" 
"$TMPDIR""weex_release_candidate/""$1/$2"
 cd "$TMPDIR""weex_release_candidate"
-svn add "$1/$2"
-svn commit -m "$4"
\ No newline at end of file
+svn add . --force
+svn commit -m "Update for $1-$2"
diff --git a/scripts/publish_release_official.sh 
b/scripts/publish_release_official.sh
index 3d147a2..0752946 100755
--- a/scripts/publish_release_official.sh
+++ b/scripts/publish_release_official.sh
@@ -36,23 +36,26 @@ sed -i '' 's/^*//' commit-history.log
 sed -i '' 's/^/* /' commit-history.log
 sed -i '' -e '1i \
 # Detail Commit' commit-history.log
-cat CHANGELOG.md commit-history.log > RELEASE_NOTE.md
+cat DISCLAIMER CHANGELOG.md commit-history.log > RELEASE_NOTE.md
 
 echo "Publish source file to Apache SVN server"
 if [ ! -d "${TMPDIR}weex_release" ]
 then
     svn checkout https://dist.apache.org/repos/dist/release/incubator/weex/ 
"${TMPDIR}weex_release"
 fi
+cd "${TMPDIR}weex_release"
+export svn_dir=`ls -C -d */` ; svn delete $svn_dir
 mkdir -p "${TMPDIR}weex_release/${1}" && cd "$_"
 curl 
"https://dist.apache.org/repos/dist/dev/incubator/weex/${1}/${2}/apache-weex-incubating-${1}-${2}-src.tar.gz";
 -o "apache-weex-incubating-${1}-src.tar.gz"
 curl 
"https://dist.apache.org/repos/dist/dev/incubator/weex/${1}/${2}/apache-weex-incubating-${1}-${2}-src.tar.gz.asc";
 -o "apache-weex-incubating-${1}-src.tar.gz.asc"
 curl 
"https://dist.apache.org/repos/dist/dev/incubator/weex/${1}/${2}/apache-weex-incubating-${1}-${2}-src.tar.gz.sha512";
 -o "apache-weex-incubating-${1}-src.tar.gz.sha512"
 cd ..
-svn add "$1"
+svn add . --force
 svn commit -m "Release ${1}"
 
 echo "Push Git Tag to Github Repo"
-git tag -a -F "RELEASE_NOTE.md" "$1"
+pushd +3
+git tag -a -F "RELEASE_NOTE.md" "$1" "$1-$2"
 git push "$4" "$1"
 
 echo "Publish Github Release"
@@ -62,6 +65,7 @@ release-it --ci --no-npm --no-increment 
--no-git.requireCleanWorkingDir --no-git
 
 echo "Publish Android JCenter Release"
 cd android
-./gradlew clean install bintray -PbuildRuntimeApi=true 
-PignoreVersionCheck="true"  -PweexVersion="$1" -PbintrayUser=alibabaweex 
-PbintrayApiKey="$6" 
+./gradlew :weex_sdk:clean :weex_sdk:install :weex_sdk:bintray 
-PgroupId="org.apache.weex" -PartifactName="sdk" -PapachePackageName="true" 
-PvcsTag="$1" -PunbundlingJSC="true" -PbuildRuntimeApi=true 
-PignoreVersionCheck="true" -PweexVersion="$1" -PbintrayUser=weex 
-PbintrayApiKey="$6" 
+./gradlew :weex_sdk:install :weex_sdk:bintray -PgroupId="org.apache.weex" 
-PartifactName="sdk_legacy" -PapachePackageName="false" -PvcsTag="$1" 
-PunbundlingJSC="true" -PbuildRuntimeApi=true -PignoreVersionCheck="true" 
-PweexVersion="$1" -PbintrayUser=weex -PbintrayApiKey="$6" 
 
 # Publish iOS to Cocoapods
\ No newline at end of file
diff --git a/scripts/release_files.rules b/scripts/release_files.rules
index 1562aa0..0049f0a 100644
--- a/scripts/release_files.rules
+++ b/scripts/release_files.rules
@@ -29,6 +29,7 @@
 + /.eslintignore
 + /.babelrc
 + /src
++ /.rat-excludes
 - /src/h5-render/dist/index.js
 - /src/h5-render/node_modules
 - /src/js-framework/node_modules
@@ -77,6 +78,8 @@
 - /android/sdk/.classpath
 - /android/sdk/.project
 - /android/sdk/weex_sdk.iml
+- /android/sdk/android-weex_sdk.iml
+- /android/sdk/weex-android-weex_sdk.iml
 - /android/sdk/.cxx
 - /android/sdk/src/legacyRelease
 - /android/sdk/src/main/jniLibs
diff --git a/weex-playground b/weex-playground
index 1f536fa..c872038 160000
--- a/weex-playground
+++ b/weex-playground
@@ -1 +1 @@
-Subproject commit 1f536fa83893520568bccdefffdeb469c7e957cf
+Subproject commit c872038397c4b68319a4e6c55c75db561ea1c2c5

Reply via email to