Merge branch 'master' into develop-data-render-script

# Conflicts: # WeexSDK.podspec # android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java # weex_core/Source/core/data_render/vnode/vnode_exec_env.cc
gubaojian · Dec 13, 2018 · 8e1499a · 8e1499a
2 parents 411ffeb + 491cc95
commit 8e1499a
Show file tree

Hide file tree

Showing 63 changed files with 716 additions and 385 deletions.
diff --git a/LICENSE b/LICENSE
@@ -256,7 +256,8 @@ This product bundles chromium v66.0.3344.2, which is available under a "BSD-styl
   weex_core/Source/android/jniprebuild/jniheader/NativeRenderObjectUtils_jni.h
   weex_core/Source/android/jniprebuild/jniheader/SystemMessageHandler_jni.h
   weex_core/Source/android/jniprebuild/jniheader/WXBridge_jni.h
-  weex_core/Source/android/jniprebuild/jniheader/WXJsFunctions_jni.h
+  weex_core/Source/android/jniprebuild/jniheader/WXDebugJsBridge_jni.h
+  weex_core/Source/android/jniprebuild/jniheader/WXParams_jni.h
   weex_core/Source/android/jniprebuild/jni_generator.py
 
 This product bundles Android Open Source Project vandroid-4.2.2_r1, which is available under a "BSD" license. For details, see https://android.googlesource.com/platform/bionic/+/android-4.2.2_r1/libc/README and following files:

diff --git a/WeexSDK.modulemap b/WeexSDK.modulemap
@@ -0,0 +1,6 @@
+framework module WeexSDK {
+  umbrella header "WeexSDK.h"
+
+  export *
+  module * { export * }
+}
diff --git a/WeexSDK.podspec b/WeexSDK.podspec
@@ -1,11 +1,12 @@
 # coding: utf-8
+
 Pod::Spec.new do |s|
 
   s.name         = "WeexSDK"
 
-  s.version      = "0.19.0"
+  s.version      = "0.20.0"
 
-  s.summary      = "WeexSDK Source ."
+  s.summary      = "WeexSDK Source."
 
   s.description  = <<-DESC
                    A framework for building Mobile cross-platform UI
@@ -18,43 +19,100 @@ Pod::Spec.new do |s|
            Alibaba-INC copyright
     LICENSE
   }
-  s.authors      = { "cxfeng1"      => "cxfeng1@gmail.com",
-                     "yangshengtao" => "yangshengtao1314@163.com",
-                     "kfeagle"      => "sunjjbobo@163.com"
+  s.authors      = {
+                    "cxfeng1"      => "cxfeng1@gmail.com",
+                    "boboning"     => "ningli928@163.com",
+                    "yangshengtao" => "yangshengtao1314@163.com",
+                    "kfeagle"      => "sunjjbobo@163.com",
+                    "acton393"     => "zhangxing610321@gmail.com",
+                    "wqyfavor"     => "wqyfavor88@gmail.com",
+                    "doumafang "   => "doumafang@gmail.com"
                    }
   s.platform     = :ios
   s.ios.deployment_target = '8.0'
+
+  # use for public
+  # s.source =  {
+  #  :git => 'https://github.com/apache/incubator-weex.git',
+  #  :tag => #{s.version}
+  # }
+
+  # use for playground
   s.source =  { :path => '.' }
-  s.source_files = 'ios/sdk/WeexSDK/Sources/**/*.{h,m,mm,c,cpp,cc}'
+
+  s.source_files = 'ios/sdk/WeexSDK/Sources/**/*.{h,m,mm,c,cpp,cc}',
+                    'weex_core/Source/base/**/*.{h,hpp,m,mm,c,cpp,cc}',
+                    'weex_core/Source/core/**/*.{h,hpp,m,mm,c,cpp,cc}',
+                    'weex_core/Source/wson/**/*.{h,hpp,m,mm,c,cpp,cc}',
+                    'weex_core/Source/third_party/**/*.{h,hpp,m,mm,c,cpp,cc}',
+                    'weex_core/Source/include/**/*.{h,hpp,m,mm,c,cpp,cc}'
+  s.exclude_files = 'weex_core/Source/**/*android.{h,hpp,m,mm,c,cpp,cc}',
+                    'weex_core/Source/core/network/android/'
+
+  s.private_header_files = 'ios/sdk/WeexSDK/Sources/Component/RecycleList/WXJSASTParser.h'
+  s.public_header_files = 'ios/sdk/WeexSDK/Sources/WeexSDK.h',
+                          'ios/sdk/WeexSDK/Sources/Layout/WXComponent+Layout.h',
+                          'ios/sdk/WeexSDK/Sources/Debug/WXDebugTool.h',
+                          'ios/sdk/WeexSDK/Sources/Loader/WXResourceLoader.h',
+                          'ios/sdk/WeexSDK/Sources/WebSocket/WXWebSocketHandler.h',
+                          'ios/sdk/WeexSDK/Sources/Module/WXVoiceOverModule.h',
+                          'ios/sdk/WeexSDK/Sources/Module/WXPrerenderManager.h',
+                          'ios/sdk/WeexSDK/Sources/Module/WXModalUIModule.h',
+                          'ios/sdk/WeexSDK/Sources/Component/WXListComponent.h',
+                          'ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.h',
+                          'ios/sdk/WeexSDK/Sources/Component/WXRichText.h',
+                          'ios/sdk/WeexSDK/Sources/Component/WXIndicatorComponent.h',
+                          'ios/sdk/WeexSDK/Sources/Component/WXAComponent.h',
+                          'ios/sdk/WeexSDK/Sources/Component/Recycler/WXRecyclerComponent.h',
+                          'ios/sdk/WeexSDK/Sources/Controller/WXBaseViewController.h',
+                          'ios/sdk/WeexSDK/Sources/Controller/WXRootViewController.h',
+                          'ios/sdk/WeexSDK/Sources/View/WXView.h',
+                          'ios/sdk/WeexSDK/Sources/View/WXErrorView.h',
+                          'ios/sdk/WeexSDK/Sources/Protocol/*.h',
+                          'ios/sdk/WeexSDK/Sources/Network/WXResourceRequestHandler.h',
+                          'ios/sdk/WeexSDK/Sources/Network/WXResourceRequest.h',
+                          'ios/sdk/WeexSDK/Sources/Network/WXResourceResponse.h',
+                          'ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.h',
+                          'ios/sdk/WeexSDK/Sources/Model/WXJSExceptionInfo.h',
+                          'ios/sdk/WeexSDK/Sources/Model/WXComponent.h',
+                          'ios/sdk/WeexSDK/Sources/Monitor/WXMonitor.h',
+                          'ios/sdk/WeexSDK/Sources/Monitor/WXExceptionUtils.h',
+                          'ios/sdk/WeexSDK/Sources/Monitor/WXAnalyzerCenter.h',
+                          'ios/sdk/WeexSDK/Sources/Manager/WXTracingManager.h',
+                          'ios/sdk/WeexSDK/Sources/Manager/WXSDKManager.h',
+                          'ios/sdk/WeexSDK/Sources/Manager/WXBridgeManager.h',
+                          'ios/sdk/WeexSDK/Sources/Manager/WXComponentManager.h',
+                          'ios/sdk/WeexSDK/Sources/Manager/WXDisplayLinkManager.h',
+                          'ios/sdk/WeexSDK/Sources/Engine/WXSDKEngine.h',
+                          'ios/sdk/WeexSDK/Sources/Engine/WXSDKError.h',
+                          'ios/sdk/WeexSDK/Sources/Utility/WXConvert.h',
+                          'ios/sdk/WeexSDK/Sources/Utility/WXUtility.h',
+                          'ios/sdk/WeexSDK/Sources/Utility/WXLog.h',
+                          'ios/sdk/WeexSDK/Sources/Utility/WXDefine.h',
+                          'ios/sdk/WeexSDK/Sources/Utility/WXType.h',
+                          'ios/sdk/WeexSDK/Sources/Utility/NSObject+WXSwizzle.h',
+                          'ios/sdk/WeexSDK/Sources/Utility/WXAppConfiguration.h',
+                          'ios/sdk/WeexSDK/Sources/Performance/WXApmForInstance.h',
+                          'ios/sdk/WeexSDK/Sources/Bridge/JSContext+Weex.h',
+                          'weex_core/Source/core/layout/flex_enum.h',
+                          'weex_core/Source/core/layout/layout.h',
+                          'weex_core/Source/core/layout/style.h'
+
+  s.module_map = 'WeexSDK.modulemap'
+
+  # 0.21.0 版本开始不再需要 native-bundle-main.js
   s.resources = 'pre-build/*.js','ios/sdk/WeexSDK/Resources/wx_load_error@3x.png'
 
   s.user_target_xcconfig  = { 'FRAMEWORK_SEARCH_PATHS' => "'$(PODS_ROOT)/WeexSDK'" }
   s.requires_arc = true
   s.prefix_header_file = 'ios/sdk/WeexSDK/Sources/Supporting Files/WeexSDK-Prefix.pch'
 
-  s.private_header_files = 'ios/sdk/WeexSDK/Sources/Component/RecycleList/WXJSASTParser.h',
-                           'ios/sdk/WeexSDK/Sources/Layout/WXScrollerComponent+Layout.h',
-                           'weex_core/Source/**/*.{h,hpp}'
-
-  s.xcconfig = { "OTHER_LINK_FLAG" => '$(inherited) -ObjC', 'GCC_PREPROCESSOR_DEFINITIONS' => 'OS_IOS=1' }
+  s.xcconfig = { "OTHER_LINK_FLAG" => '$(inherited) -ObjC' }
+  s.pod_target_xcconfig = { 'USER_HEADER_SEARCH_PATHS' => '${PODS_ROOT}/WeexSDK/weex_core/Source/ ${PROJECT_DIR}/../../../weex_core/Source',
+    'GCC_PREPROCESSOR_DEFINITIONS' => 'OS_IOS=1' }
 
   s.frameworks = 'CoreMedia','MediaPlayer','AVFoundation','AVKit','JavaScriptCore','GLKit','OpenGLES','CoreText','QuartzCore','CoreGraphics'
 
-  s.default_subspec='WeexCore'
-
-  s.subspec 'WeexCore' do |w|
-    w.source_files = 'weex_core/Source/base/**/*.{h,hpp,m,mm,c,cpp,cc}',
-                    'weex_core/Source/core/**/*.{h,hpp,m,mm,c,cpp,cc}',
-                    'weex_core/Source/wson/**/*.{h,hpp,m,mm,c,cpp,cc}',
-                    'weex_core/Source/third_party/**/*.{h,hpp,m,mm,c,cpp,cc}',
-                    'weex_core/Source/include/**/*.{h,hpp,m,mm,c,cpp,cc}'
-    w.exclude_files = 'weex_core/Source/**/*android.{h,hpp,m,mm,c,cpp,cc}',
-                      'weex_core/Source/core/network/android/'
-
-    w.xcconfig = { 'USER_HEADER_SEARCH_PATHS' => ['${PODS_ROOT}/Headers/Public/WeexSDK/core/**'] }
-    w.header_mappings_dir = 'weex_core/Source'
-
-    w.libraries = "c++"
-  end
+  s.libraries = 'c++'
 
-end
+end
diff --git a/android/commons/build.gradle b/android/commons/build.gradle
@@ -6,7 +6,6 @@ apply plugin: 'com.android.library'
 
 android {
 
-    publishNonDefault  true
     compileSdkVersion project.compileSdkVersion
     buildToolsVersion project.buildToolsVersion
     resourcePrefix "weexcomm"
@@ -43,11 +42,10 @@ android {
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
+    compile project(':weex_sdk')
     compile "com.android.support:support-v4:${project.supportLibVersion}"
     compile "com.android.support:appcompat-v7:${project.supportLibVersion}"
     // compile project(':weex_sdk')
-    debugCompile project(path: ':weex_sdk', configuration: 'debug')
-    releaseCompile project(path: ':weex_sdk', configuration: 'release')
     compile 'com.squareup.picasso:picasso:2.5.2'
     compile 'com.facebook.fresco:fresco:0.10.0'
     compile 'com.taobao.android.weex_inspection:protocol:1.1.4.1'

diff --git a/android/playground/app/build.gradle b/android/playground/app/build.gradle
@@ -13,7 +13,7 @@ android {
         minSdkVersion project.minSdkVersion
         targetSdkVersion project.targetSdkVersion
         versionCode 20
-        versionName "0.19.1"
+        versionName "0.20.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
         ndk{
@@ -90,12 +90,8 @@ dependencies {
     androidTestCompile 'com.android.support.test.uiautomator:uiautomator-v18:2.1.2'
     /*source dependency*/
 
-    debugCompile project(path: ':commons', configuration: 'debug')
-    releaseCompile project(path: ':commons', configuration: 'release')
-
-    debugCompile project(path: ':weex_sdk', configuration: 'debug')
-    releaseCompile project(path: ':weex_sdk', configuration: 'release')
-
+    compile project(':commons')
+    compile project(':weex_sdk')
     //https://github.com/weexteam/weex-analyzer-android
     //Weex-Analyzer provides several convenient tools such as Memory Monitor
     // to optimize your application. It's not available by default,you can

diff --git a/android/sdk/build.gradle b/android/sdk/build.gradle
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
 buildscript {
     dependencies {
         classpath 'com.android.tools.build:gradle:2.3.3'
@@ -36,11 +55,10 @@ checkstyle {
 }
 
 
-version = "0.19.0.4"
+version = "0.20.0.1"
 
 android {
 
-    publishNonDefault true
     compileSdkVersion project.compileSdkVersion
     buildToolsVersion project.buildToolsVersion
     resourcePrefix "weex"
@@ -110,7 +128,7 @@ android {
         multiDexEnabled true
 
         versionCode 1
-        versionName "1.0"
+        versionName project.version
         ndk {
             abiFilters "armeabi-v7a","armeabi","x86"
         }
@@ -264,3 +282,66 @@ task checkNdkVersion() {
 }
 
 preBuild.dependsOn checkNdkVersion
+
+apply plugin: 'com.jfrog.bintray'
+apply plugin: 'com.github.dcendents.android-maven'
+def siteUrl = 'http://weex.incubator.apache.org'
+def gitUrl = 'https://github.com/apache/incubator-weex.git'
+group = "com.taobao.android"
+install {
+    repositories.mavenInstaller {
+        // This generates POM.xml with proper parameters
+        pom {
+            project {
+                packaging 'aar'
+                name 'weex_sdk'
+                url siteUrl
+                licenses {
+                    license {
+                        name 'The Apache Software License, Version 2.0'
+                        url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
+                    }
+                }
+                developers {
+                    developer {
+                        id 'weex alibaba'
+                        name 'weex alibaba'
+                        email 'alibabaweex@gmail.com'
+                    }
+                }
+                scm {
+                    connection gitUrl
+                    developerConnection gitUrl
+                    url siteUrl
+                }
+            }
+        }
+    }
+}
+
+task sourcesJar(type: Jar) {
+    from android.sourceSets.main.java.srcDirs
+    classifier = 'sources'
+}
+
+artifacts {
+    archives sourcesJar
+}
+
+bintray {
+    configurations = ['archives']
+    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"
+        websiteUrl = siteUrl
+        vcsUrl = gitUrl
+        licenses = ["Apache-2.0"]
+        publish = true
+        version {
+            //这里填写需要发布的版本号
+            name = project.version
+        }
+    }
+}
diff --git a/android/sdk/gradle.properties b/android/sdk/gradle.properties
@@ -1,3 +1,22 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+
 # Project-wide Gradle settings.
 
 # IDE (e.g. Android Studio) users:

diff --git a/android/sdk/proguard-rules.pro b/android/sdk/proguard-rules.pro
@@ -1,3 +1,22 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+
 # Add project specific ProGuard rules here.
 # By default, the flags in this file are appended to flags specified
 # in /Users/ouy/Library/AndroidStudio/sdk/tools/proguard/proguard-android.txt
@@ -19,4 +38,4 @@
 -keep class com.taobao.weex.layout.** { *; }
 -keep class com.taobao.weex.WXSDKEngine { *; }
 -keep class com.taobao.weex.base.SystemMessageHandler { *; }
--dontwarn com.taobao.weex.bridge.**
+-dontwarn com.taobao.weex.bridge.**
diff --git a/android/sdk/publish.sh b/android/sdk/publish.sh
@@ -1,2 +1,21 @@
 #!/usr/bin/env bash
-./gradlew clean  assemble publish
+
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+./gradlew clean  assemble publish