Merge Beta 0.20.1

WeexSDK.modulemap

@@ -0,0 +1,6 @@
+framework module WeexSDK {
+  umbrella header "WeexSDK.h"
+
+  export *
+  module * { export * }
+}

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,42 +19,99 @@ 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}'
+
+  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}'
-
-    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

ios/playground/WeexDemo/AppDelegate.m

@@ -20,9 +20,7 @@
 #import "AppDelegate.h"
 #import "WXDemoViewController.h"
 #import "UIViewController+WXDemoNaviBar.h"
-#import "WXStreamModule.h"
 #import "WXEventModule.h"
-#import "WXNavigationDefaultImpl.h"
 #import "WXImgLoaderDefaultImpl.h"
 #import "DemoDefine.h"
 #import "WXScannerVC.h"

weex_core/Source/base/ViewUtils.h

@@ -21,7 +21,7 @@
 
 #include <string.h>
 #include <math.h>
-#include <core/config/core_environment.h>
+#include "core/config/core_environment.h"
 #include <cmath>
 #include <cstdlib>
 #include <sstream>

weex_core/Source/core/config/core_environment.cpp

@@ -21,7 +21,7 @@
 #include <stdlib.h>
 #include "core_environment.h"
 #include "base/CoreConstants.h"
-#include <base/ViewUtils.h>
+#include "base/ViewUtils.h"
 #include "base/LogDefines.h"
 
 namespace WeexCore {

weex_core/Source/core/data_render/class_array.cc

@@ -23,7 +23,7 @@
 #include "core/data_render/exec_state.h"
 #include "core/data_render/common_error.h"
 #include "core/data_render/table.h"
-#include <base/LogDefines.h>
+#include "base/LogDefines.h"
 
 namespace weex {
 namespace core {

weex_core/Source/core/data_render/class_console.cc

@@ -25,7 +25,7 @@
 #include "core/data_render/common_error.h"
 #include "core/data_render/vnode/vnode_render_manager.h"
 #include "third_party/json11/json11.hpp"
-#include <base/LogDefines.h>
+#include "base/LogDefines.h"
 
 namespace weex {
 namespace core {

weex_core/Source/core/data_render/class_function.cc

@@ -22,7 +22,7 @@
 #include "core/data_render/class_function.h"
 #include "core/data_render/exec_state.h"
 #include "core/data_render/common_error.h"
-#include <base/LogDefines.h>
+#include "base/LogDefines.h"
 
 namespace weex {
 namespace core {

weex_core/Source/core/data_render/class_json.cc

@@ -22,8 +22,9 @@
 #include "core/data_render/exec_state.h"
 #include "core/data_render/common_error.h"
 #include "core/data_render/table.h"
+
 #include "core/data_render/vnode/vnode_exec_env.h"
-#include <base/LogDefines.h>
+#include "base/LogDefines.h"
 
 namespace weex {
 namespace core {

weex_core/Source/core/data_render/class_object.cc

@@ -23,7 +23,7 @@
 #include "core/data_render/common_error.h"
 #include "core/data_render/table.h"
 #include "core/data_render/class_array.h"
-#include <base/LogDefines.h>
+#include "base/LogDefines.h"
 
 namespace weex {
 namespace core {

weex_core/Source/core/data_render/class_regex.cc

@@ -24,7 +24,7 @@
 #include "core/data_render/exec_state.h"
 #include "core/data_render/common_error.h"
 #include "core/data_render/table.h"
-#include <base/LogDefines.h>
+#include "base/LogDefines.h"
 
 namespace weex {
 namespace core {

weex_core/Source/core/data_render/class_string.cc

@@ -27,7 +27,7 @@
 #include "core/data_render/common_error.h"
 #include "core/data_render/table.h"
 #include "core/data_render/string_table.h"
-#include <base/LogDefines.h>
+#include "base/LogDefines.h"
 
 namespace weex {
 namespace core {

weex_core/Source/core/data_render/js_common_function.cc

@@ -19,7 +19,7 @@
 
 #include "core/data_render/js_common_function.h"
 #include "core/data_render/common_error.h"
-#include <base/LogDefines.h>
+#include "base/LogDefines.h"
 
 namespace weex {
 namespace core {

weex_core/Source/core/data_render/monitor/vm_monitor.h

@@ -27,7 +27,7 @@
 #include <chrono>
 #include <unordered_map>
 #include <vector>
-#include <base/LogDefines.h>
+#include "base/LogDefines.h"
 
 using namespace std::chrono;
 

weex_core/Source/core/data_render/rax_parser.cc

@@ -28,7 +28,7 @@
 #include <sstream>
 #include <string>
 #include <cstdlib>
-#include <base/LogDefines.h>
+#include "base/LogDefines.h"
 
 namespace weex {
 namespace core {

weex_core/Source/core/data_render/vnode/vcomponent.h

@@ -19,7 +19,7 @@
 #ifndef CORE_DATA_RENDER_VNODE_VCOMPONENT_H_
 #define CORE_DATA_RENDER_VNODE_VCOMPONENT_H_
 
-#include <core/data_render/object.h>
+#include "core/data_render/object.h"
 #include <unordered_map>
 #include "core/data_render/vnode/vnode.h"
 

weex_core/Source/core/data_render/vnode/vnode_exec_env.cc

@@ -29,7 +29,7 @@
 #include "core/data_render/js_common_function.h"
 #include "core/data_render/vnode/vcomponent.h"
 #include "core/data_render/vnode/vnode_render_manager.h"
-#include <base/LogDefines.h>
+#include "base/LogDefines.h"
 
 namespace weex {
 namespace core {

weex_core/Source/core/parser/dom_wson.cpp

@@ -20,9 +20,9 @@
 // Created by furture on 2018/5/15.
 //
 
-#include <core/render/node/render_object.h>
-#include <core/render/page/render_page.h>
-#include <core/render/node/factory/render_creator.h>
+#include "core/render/node/render_object.h"
+#include "core/render/page/render_page.h"
+#include "core/render/node/factory/render_creator.h"
 #include "dom_wson.h"
 #include "wson/wson.h"
 #include "wson/wson_parser.h"

weex_core/Source/core/render/manager/render_manager.cpp

@@ -19,13 +19,13 @@
 
 #include <utility>
 #include <vector>
-#include "wson/wson_parser.h"
-#include <base/LogDefines.h>
 #include <chrono>
 
+#include "wson/wson_parser.h"
+#include "base/LogDefines.h"
 #include "base/ViewUtils.h"
-#include "core/css/constants_name.h"
 #include "base/TimeUtils.h"
+#include "core/css/constants_name.h"
 #include "core/layout/measure_func_adapter.h"
 #include "core/parser/dom_wson.h"
 #include "core/render/manager/render_manager.h"

weex_core/Source/core/render/node/render_list.cpp

@@ -20,7 +20,7 @@
 #include <math.h>
 #include <cmath>
 #include <utility>
-#include <core/render/manager/render_manager.h>
+#include "core/render/manager/render_manager.h"
 
 #include "base/ViewUtils.h"
 #include "core/css/constants_name.h"