You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by bo...@apache.org on 2017/04/18 10:50:56 UTC
[4/5] incubator-weex git commit: Merge remote-tracking branch
'upstream/0.12-dev' into iOS-0.12-dev-text-refactor
Merge remote-tracking branch 'upstream/0.12-dev' into iOS-0.12-dev-text-refactor
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/1fd7c08f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/1fd7c08f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/1fd7c08f
Branch: refs/heads/0.12-dev
Commit: 1fd7c08f61e6932f3641d1adcfaab5257be2d90d
Parents: 5985968 24ef3af
Author: acton393 <zh...@gmail.com>
Authored: Tue Apr 18 17:58:28 2017 +0800
Committer: acton393 <zh...@gmail.com>
Committed: Tue Apr 18 17:58:28 2017 +0800
----------------------------------------------------------------------
.travis.yml | 42 +++++++++--
NOTICE | 75 ++++++++++++++++++++
WeexSDK.podspec | 45 ++++++++++++
android/run-ci.sh | 2 +-
.../com/taobao/weex/ui/component/WXEmbed.java | 2 +-
examples/component/input-demo.we | 14 ++--
examples/index.we | 5 +-
examples/vue/components/input.vue | 14 ++--
examples/vue/index.vue | 3 +
examples/vue/market/gcanvas.vue | 40 +++++++++++
ios/playground/Podfile | 5 +-
.../WeexDemo.xcodeproj/project.pbxproj | 4 +-
ios/sdk/WeexSDK.podspec | 47 ------------
.../WeexSDK/Sources/Bridge/WXBridgeContext.m | 2 +-
ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.m | 2 +-
.../Sources/Component/WXSliderComponent.m | 53 +++-----------
.../Sources/Controller/WXBaseViewController.h | 2 +-
.../Sources/Controller/WXBaseViewController.m | 16 -----
.../Sources/Controller/WXRootViewController.m | 17 ++++-
ios/sdk/WeexSDK/Sources/Utility/WXUtility.m | 1 +
.../Sources/View/WXComponent+ViewManagement.m | 4 +-
ios/sdk/WeexSDK/Sources/WeexSDK.h | 33 ++++-----
ios/sdk/WeexSDKTests/WXRootViewTests.m | 4 +-
ios/sdk/buildScripts.sh | 25 +++++--
package.json | 4 +-
test/ci-funcs.sh | 75 +++-----------------
test/run.sh | 41 ++++++-----
test/scripts/components/image-onload.test.js | 2 +-
test/scripts/components/recycler.test.js | 2 +-
29 files changed, 333 insertions(+), 248 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/1fd7c08f/WeexSDK.podspec
----------------------------------------------------------------------
diff --cc WeexSDK.podspec
index 0000000,8279ec3..ae1b6a9
mode 000000,100644..100644
--- a/WeexSDK.podspec
+++ b/WeexSDK.podspec
@@@ -1,0 -1,45 +1,45 @@@
+ # coding: utf-8
+ Pod::Spec.new do |s|
+
+ s.name = "WeexSDK"
+
- s.version = "0.11.0"
++ s.version = "0.12.0"
+
+ s.summary = "WeexSDK Source ."
+
+ s.description = <<-DESC
+ A framework for building Mobile cross-platform UI
+ DESC
+
+ s.homepage = "https://github.com/alibaba/weex"
+ s.license = {
+ :type => 'Copyright',
+ :text => <<-LICENSE
+ Alibaba-INC copyright
+ LICENSE
+ }
+ s.authors = { "cxfeng1" => "cxfeng1@gmail.com",
+ "boboning" => "ningli928@163.com",
+ "yangshengtao" => "yangshengtao1314@163.com",
+ "kfeagle" => "sunjjbobo@163.com",
+ "acton393" => "zhangxing610321@gmail.com"
+ }
+ s.platform = :ios
+ s.ios.deployment_target = '7.0'
+ s.source = { :path => '.' }
+ s.source_files = 'ios/sdk/WeexSDK/Sources/**/*.{h,m,mm,c}'
+ s.resources = 'ios/sdk/WeexSDK/Resources/main.js', 'ios/sdk/WeexSDK/Resources/wx_load_error@3x.png'
+
+ s.requires_arc = true
+ s.prefix_header_file = 'ios/sdk/WeexSDK/Sources/Supporting Files/WeexSDK-Prefix.pch'
+
+ # s.xcconfig = { "GCC_PREPROCESSOR_DEFINITIONS" => '$(inherited) DEBUG=1' }
+
+ s.xcconfig = { "OTHER_LINK_FLAG" => '$(inherited) -ObjC'}
+
+ s.frameworks = 'CoreMedia','MediaPlayer','AVFoundation','AVKit','JavaScriptCore', 'GLKit'
+
+ s.dependency 'SocketRocket'
+ s.libraries = "stdc++"
+
+ end