Merge Release/0.28 into master (alibaba#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
jinwencan · Oct 24, 2019 · 8922b1e · 8922b1e
1 parent e5d78b6
commit 8922b1e
Show file tree

Hide file tree

Showing 17 changed files with 127 additions and 154 deletions.
diff --git 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
diff --git 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
@@ -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
@@ -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
@@ -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
diff --git 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
@@ -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
@@ -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
@@ -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
+preBuild.dependsOn licenseFormat, copyJSCHeaderToWeexCore
+clean.dependsOn cleanCopyJSCHeaderToWeexCore
diff --git 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
+preBuild.dependsOn copyJscToJniDir
+clean.dependsOn cleanCopyJscToJniDir