You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by cx...@apache.org on 2017/04/18 07:58:48 UTC
[1/5] incubator-weex git commit: + [example] fix bug demo
Repository: incubator-weex
Updated Branches:
refs/heads/0.12-dev ca6a9ffe3 -> 32ae6e47e
+ [example] fix bug demo
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/eb6b55c2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/eb6b55c2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/eb6b55c2
Branch: refs/heads/0.12-dev
Commit: eb6b55c25ceda9e3681e195df03a0460787b77e7
Parents: 2f8eec6
Author: \u9f50\u5c71 <su...@163.com>
Authored: Sat Apr 15 21:56:17 2017 +0800
Committer: \u9f50\u5c71 <su...@163.com>
Committed: Sat Apr 15 21:56:17 2017 +0800
----------------------------------------------------------------------
examples/component/input-demo.we | 14 +++++++-------
examples/vue/components/input.vue | 14 +++++++-------
2 files changed, 14 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/eb6b55c2/examples/component/input-demo.we
----------------------------------------------------------------------
diff --git a/examples/component/input-demo.we b/examples/component/input-demo.we
index 950805a..ea4313b 100644
--- a/examples/component/input-demo.we
+++ b/examples/component/input-demo.we
@@ -11,7 +11,7 @@
<div style="background-color: #286090">
<text class="title" style="height: 80 ;padding: 20;color: #FFFFFF">input type = text</text>
</div>
- <input type="text" placeholder="Input Text" class="input" :autofocus="autofocus" value="" onchange="onchange" oninput="oninput"/>
+ <input type="text" placeholder="Input Text" class="input" autofocus=true value="" onchange="onchange" oninput="oninput"/>
</div>
<div>
@@ -58,42 +58,42 @@
<div>
<div style="background-color: #286090">
- <text class="title" style="height: 80 ;padding: 20;color: #FFFFFF">input keyboard = default</text>
+ <text class="title" style="height: 80 ;padding: 20;color: #FFFFFF">input return-key-type = default</text>
</div>
<input type="text" placeholder="please input" return-key-type="default" class="input" onchange="onchange" onreturn = "onreturn" oninput="oninput" />
</div>
<div>
<div style="background-color: #286090">
- <text class="title" style="height: 80 ;padding: 20;color: #FFFFFF">input keyboard = go</text>
+ <text class="title" style="height: 80 ;padding: 20;color: #FFFFFF">input return-key-type = go</text>
</div>
<input type="text" placeholder="please input" return-key-type="go" class="input" onchange="onchange" onreturn = "onreturn" oninput="oninput" />
</div>
<div>
<div style="background-color: #286090">
- <text class="title" style="height: 80 ;padding: 20;color: #FFFFFF">input keyboard = next</text>
+ <text class="title" style="height: 80 ;padding: 20;color: #FFFFFF">input return-key-type = next</text>
</div>
<input type="text" placeholder="please input" return-key-type="next" class="input" onchange="onchange" onreturn = "onreturn" oninput="oninput" />
</div>
<div>
<div style="background-color: #286090">
- <text class="title" style="height: 80 ;padding: 20;color: #FFFFFF">input keyboard = search</text>
+ <text class="title" style="height: 80 ;padding: 20;color: #FFFFFF">input return-key-type = search</text>
</div>
<input type="text" placeholder="please input" return-key-type="search" class="input" onchange="onchange" onreturn = "onreturn" oninput="oninput" />
</div>
<div>
<div style="background-color: #286090">
- <text class="title" style="height: 80 ;padding: 20;color: #FFFFFF">input keyboard = send</text>
+ <text class="title" style="height: 80 ;padding: 20;color: #FFFFFF">input return-key-type = send</text>
</div>
<input type="text" placeholder="please input" return-key-type="send" class="input" onchange="onchange" onreturn = "onreturn" oninput="oninput" />
</div>
<div>
<div style="background-color: #286090">
- <text class="title" style="height: 80 ;padding: 20;color: #FFFFFF">input keyboard = done</text>
+ <text class="title" style="height: 80 ;padding: 20;color: #FFFFFF">input return-key-type = done</text>
</div>
<input type="text" placeholder="please input" return-key-type="done" class="input" onchange="onchange" onreturn = "onreturn" oninput="oninput" />
</div>
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/eb6b55c2/examples/vue/components/input.vue
----------------------------------------------------------------------
diff --git a/examples/vue/components/input.vue b/examples/vue/components/input.vue
index 6ef5f9b..9cf4c37 100644
--- a/examples/vue/components/input.vue
+++ b/examples/vue/components/input.vue
@@ -10,7 +10,7 @@
<div style="background-color: #286090">
<text class="title" style="height: 80 ;padding: 20;color: #FFFFFF">input type = text</text>
</div>
- <input type="text" placeholder="Input Text" class="input" :autofocus="autofocus" value="" @change="onchange" @input="oninput"/>
+ <input type="text" placeholder="Input Text" class="input" :autofocus=true value="" @change="onchange" @input="oninput"/>
</div>
<div>
@@ -57,42 +57,42 @@
<div>
<div style="background-color: #286090">
- <text class="title" style="height: 80 ;padding: 20;color: #FFFFFF">input keyboard = default</text>
+ <text class="title" style="height: 80 ;padding: 20;color: #FFFFFF">input return-key-type = default</text>
</div>
<input type="text" placeholder="please input" return-key-type="default" class="input" @change="onchange" @return = "onreturn" @input="oninput" />
</div>
<div>
<div style="background-color: #286090">
- <text class="title" style="height: 80 ;padding: 20;color: #FFFFFF">input keyboard = go</text>
+ <text class="title" style="height: 80 ;padding: 20;color: #FFFFFF">input return-key-type = go</text>
</div>
<input type="text" placeholder="please input" return-key-type="go" class="input" @change="onchange" @return = "onreturn" @input="oninput" />
</div>
<div>
<div style="background-color: #286090">
- <text class="title" style="height: 80 ;padding: 20;color: #FFFFFF">input keyboard = next</text>
+ <text class="title" style="height: 80 ;padding: 20;color: #FFFFFF">input return-key-type = next</text>
</div>
<input type="text" placeholder="please input" return-key-type="next" class="input" @change="onchange" @return = "onreturn" @input="oninput" />
</div>
<div>
<div style="background-color: #286090">
- <text class="title" style="height: 80 ;padding: 20;color: #FFFFFF">input keyboard = search</text>
+ <text class="title" style="height: 80 ;padding: 20;color: #FFFFFF">input return-key-type = search</text>
</div>
<input type="text" placeholder="please input" return-key-type="search" class="input" @change="onchange" @return = "onreturn" @input="oninput" />
</div>
<div>
<div style="background-color: #286090">
- <text class="title" style="height: 80 ;padding: 20;color: #FFFFFF">input keyboard = send</text>
+ <text class="title" style="height: 80 ;padding: 20;color: #FFFFFF">input return-key-type = send</text>
</div>
<input type="text" placeholder="please input" return-key-type="send" class="input" @change="onchange" @return = "onreturn" @input="oninput" />
</div>
<div>
<div style="background-color: #286090">
- <text class="title" style="height: 80 ;padding: 20;color: #FFFFFF">input keyboard = done</text>
+ <text class="title" style="height: 80 ;padding: 20;color: #FFFFFF">input return-key-type = done</text>
</div>
<input type="text" placeholder="please input" return-key-type="done" class="input" @change="onchange" @return = "onreturn" @input="oninput" />
</div>
[2/5] incubator-weex git commit: + [ios] add gcanvas example & fix
wxdevtool crash & move spec to root directory
Posted by cx...@apache.org.
+ [ios] add gcanvas example & fix wxdevtool crash & move spec to root directory
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/e7286623
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/e7286623
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/e7286623
Branch: refs/heads/0.12-dev
Commit: e72866232abccc74284c480284ec1e83dc6586d1
Parents: eb6b55c
Author: \u9f50\u5c71 <su...@163.com>
Authored: Mon Apr 17 19:11:27 2017 +0800
Committer: \u9f50\u5c71 <su...@163.com>
Committed: Mon Apr 17 19:11:27 2017 +0800
----------------------------------------------------------------------
WeexSDK.podspec | 47 ++++++++++++++++++++
examples/index.we | 5 ++-
examples/vue/index.vue | 3 ++
examples/vue/market/gcanvas.vue | 40 +++++++++++++++++
ios/playground/Podfile | 2 +
.../WeexSDK/Sources/Bridge/WXBridgeContext.m | 2 +-
package.json | 4 +-
7 files changed, 100 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/e7286623/WeexSDK.podspec
----------------------------------------------------------------------
diff --git a/WeexSDK.podspec b/WeexSDK.podspec
new file mode 100644
index 0000000..6ec182f
--- /dev/null
+++ b/WeexSDK.podspec
@@ -0,0 +1,47 @@
+# coding: utf-8
+Pod::Spec.new do |s|
+
+ s.name = "WeexSDK"
+
+ s.version = "0.11.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/playground/WeexSDK/Sources/**/*.{h,m,mm,c}'
+ s.resources = 'ios/playground/WeexSDK/Resources/main.js', 'ios/playground/WeexSDK/Resources/wx_load_error@3x.png'
+
+ s.requires_arc = true
+ s.prefix_header_file = 'ios/playground/WeexSDK/Sources/Supporting Files/WeexSDK-Prefix.pch'
+
+# s.xcconfig = { "GCC_PREPROCESSOR_DEFINITIONS" => '$(inherited) DEBUG=1' }
+
+ s.xcconfig = { "OTHER_LINK_FLAG" => '$(inherited) -ObjC'}
+
+ s.user_target_xcconfig = { 'FRAMEWORK_SEARCH_PATHS' => "'$(PODS_ROOT)/WeexSDK'" }
+
+ s.frameworks = 'CoreMedia','MediaPlayer','AVFoundation','AVKit','JavaScriptCore', 'GLKit'
+
+ s.dependency 'SocketRocket'
+ s.libraries = "stdc++"
+
+end
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/e7286623/examples/index.we
----------------------------------------------------------------------
diff --git a/examples/index.we b/examples/index.we
index e0b1a9f..aa0b842 100644
--- a/examples/index.we
+++ b/examples/index.we
@@ -54,7 +54,10 @@
{name: 'showcase/ui', title: 'UI Gallery'},
{name: 'showcase/dropdown/dropdown-demo', title: 'Dropdown'},
{name: 'showcase/pseudo-class', title: 'PseudoClass'},
- {name: 'showcase/boxshadow', title: 'boxshadow'}
+ {name: 'showcase/boxshadow', title: 'boxshadow'},
+
+ // market
+ {name: 'market/gcanvas', title: 'Gcanvas'},
]
}
}
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/e7286623/examples/vue/index.vue
----------------------------------------------------------------------
diff --git a/examples/vue/index.vue b/examples/vue/index.vue
index fb4693d..4d263cd 100644
--- a/examples/vue/index.vue
+++ b/examples/vue/index.vue
@@ -45,6 +45,9 @@
// {name: root + '/showcase/minesweeper', title: 'Minesweeper'},
// {name: root + '/showcase/ui', title: 'UI Gallery'},
// {name: root + '/showcase/dropdown/dropdown-demo', title: 'Dropdown'}
+
+ // market
+ {name: root + '/market/gcanvas', title: 'Gcanvas'}
]
}
},
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/e7286623/examples/vue/market/gcanvas.vue
----------------------------------------------------------------------
diff --git a/examples/vue/market/gcanvas.vue b/examples/vue/market/gcanvas.vue
new file mode 100644
index 0000000..626ece1
--- /dev/null
+++ b/examples/vue/market/gcanvas.vue
@@ -0,0 +1,40 @@
+<template>
+ <div ref="test">
+ <gcanvas ref="canvas_holder" style="width:750;height:750;"></gcanvas>
+ </div>
+</template>
+<script>
+ // var gcanvas = weex.requireModule('weex-gcanvas');
+
+ var gcanvas=require('weex-gcanvas');
+
+
+ module.exports = {
+
+ created: function () {
+ console.log('created gcanvas');
+ gcanvas.disable();
+ },
+ mounted: function () {
+ var ref = this.$refs.canvas_holder.ref;
+ gcanvas.start(ref, function () {
+ var ctx = gcanvas.getContext('2d');
+
+ ctx.fillStyle = 'red';
+ ctx.fillRect(0, 0, 100, 100);
+
+ ctx.fillStyle = 'black';
+ ctx.fillRect(100, 100, 100, 100);
+ ctx.fillRect(25, 210, 700, 5);
+
+ ctx.arc(450, 200, 100, 0, Math.PI * 2, true);
+ ctx.fill();
+
+ var img = 'https://img.alicdn.com/tps/TB1TFNdKVXXXXbeaXXXXXXXXXXX-210-330.png';
+ ctx.drawImage(img, 100, 200, 210, 330);
+ //ctx.drawImage(img, 0,0,105,165, 100, 200, 210, 330);
+ ctx.render();
+ });
+ }
+ };
+</script>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/e7286623/ios/playground/Podfile
----------------------------------------------------------------------
diff --git a/ios/playground/Podfile b/ios/playground/Podfile
index 4949ee8..5ca0552 100644
--- a/ios/playground/Podfile
+++ b/ios/playground/Podfile
@@ -8,6 +8,8 @@ def common
pod 'SDWebImage', '3.7.5'
pod 'SocketRocket', '0.4.2'
pod 'ATSDK-Weex', '0.0.1'
+
+ pod 'WeexGcanvas', '0.0.1.3'
end
target 'WeexDemo' do
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/e7286623/ios/sdk/WeexSDK/Sources/Bridge/WXBridgeContext.m
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Bridge/WXBridgeContext.m b/ios/sdk/WeexSDK/Sources/Bridge/WXBridgeContext.m
index bf057c4..a982e92 100644
--- a/ios/sdk/WeexSDK/Sources/Bridge/WXBridgeContext.m
+++ b/ios/sdk/WeexSDK/Sources/Bridge/WXBridgeContext.m
@@ -258,7 +258,7 @@ _Pragma("clang diagnostic pop") \
[self.insStack removeObject:instance];
}
- if(_jsBridge){
+ if(_jsBridge && [_jsBridge respondsToSelector:@selector(removeTimers:)]){
[_jsBridge removeTimers:instance];
}
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/e7286623/package.json
----------------------------------------------------------------------
diff --git a/package.json b/package.json
index 53f65d8..156eaee 100644
--- a/package.json
+++ b/package.json
@@ -160,6 +160,8 @@
"weex-vdom-tester": "^0.2.0",
"weex-wd": "^1.0.22",
"wwp": "^0.3.5",
- "xml2map": "^1.0.2"
+ "xml2map": "^1.0.2",
+ "weex-gcanvas":"^0.3.5"
+
}
}
[5/5] incubator-weex git commit: Merge branch 'ios-demo-0.12-dev' of
https://github.com/kfeagle/incubator-weex into 0.12-dev
Posted by cx...@apache.org.
Merge branch 'ios-demo-0.12-dev' of https://github.com/kfeagle/incubator-weex into 0.12-dev
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/32ae6e47
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/32ae6e47
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/32ae6e47
Branch: refs/heads/0.12-dev
Commit: 32ae6e47e0d2f92b5d71e12d1dad3c1a6c9af252
Parents: ca6a9ff dd047ba
Author: cxfeng <cx...@apache.org>
Authored: Tue Apr 18 15:58:36 2017 +0800
Committer: cxfeng <cx...@apache.org>
Committed: Tue Apr 18 15:58:36 2017 +0800
----------------------------------------------------------------------
WeexSDK.podspec | 45 +++++++++++++++++++
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 +-
package.json | 4 +-
11 files changed, 116 insertions(+), 67 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/32ae6e47/ios/playground/WeexDemo.xcodeproj/project.pbxproj
----------------------------------------------------------------------
[4/5] incubator-weex git commit: + [ios] update podspec
Posted by cx...@apache.org.
+ [ios] update podspec
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/dd047ba5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/dd047ba5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/dd047ba5
Branch: refs/heads/0.12-dev
Commit: dd047ba525709c9c0f002d560f58676886d350e4
Parents: 18fd3e6
Author: \u9f50\u5c71 <su...@163.com>
Authored: Tue Apr 18 14:25:26 2017 +0800
Committer: \u9f50\u5c71 <su...@163.com>
Committed: Tue Apr 18 14:25:26 2017 +0800
----------------------------------------------------------------------
WeexSDK.podspec | 8 ++--
ios/playground/Podfile | 3 +-
.../WeexDemo.xcodeproj/project.pbxproj | 20 +--------
ios/sdk/WeexSDK.podspec | 47 --------------------
4 files changed, 7 insertions(+), 71 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/dd047ba5/WeexSDK.podspec
----------------------------------------------------------------------
diff --git a/WeexSDK.podspec b/WeexSDK.podspec
index 6ec182f..8279ec3 100644
--- a/WeexSDK.podspec
+++ b/WeexSDK.podspec
@@ -27,18 +27,16 @@ Pod::Spec.new do |s|
s.platform = :ios
s.ios.deployment_target = '7.0'
s.source = { :path => '.' }
- s.source_files = 'ios/playground/WeexSDK/Sources/**/*.{h,m,mm,c}'
- s.resources = 'ios/playground/WeexSDK/Resources/main.js', 'ios/playground/WeexSDK/Resources/wx_load_error@3x.png'
+ 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/playground/WeexSDK/Sources/Supporting Files/WeexSDK-Prefix.pch'
+ 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.user_target_xcconfig = { 'FRAMEWORK_SEARCH_PATHS' => "'$(PODS_ROOT)/WeexSDK'" }
-
s.frameworks = 'CoreMedia','MediaPlayer','AVFoundation','AVKit','JavaScriptCore', 'GLKit'
s.dependency 'SocketRocket'
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/dd047ba5/ios/playground/Podfile
----------------------------------------------------------------------
diff --git a/ios/playground/Podfile b/ios/playground/Podfile
index b9e11fb..8c47e78 100644
--- a/ios/playground/Podfile
+++ b/ios/playground/Podfile
@@ -3,12 +3,13 @@ platform :ios, '7.0'
#inhibit_all_warnings!
def common
- pod 'WeexSDK', :path=>'../sdk/'
+ pod 'WeexSDK', :path=>'../../'
pod 'WXDevtool', '0.9.5'
pod 'SDWebImage', '3.7.5'
pod 'SocketRocket', '0.4.2'
pod 'ATSDK-Weex', '0.0.1'
+ # WeexGcanvas is added by Weex Plugin, more info at https://market.dotwe.org/ext/list.htm
pod 'WeexGcanvas', '0.0.1.5'
end
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/dd047ba5/ios/playground/WeexDemo.xcodeproj/project.pbxproj
----------------------------------------------------------------------
diff --git a/ios/playground/WeexDemo.xcodeproj/project.pbxproj b/ios/playground/WeexDemo.xcodeproj/project.pbxproj
index b613286..c005e17 100644
--- a/ios/playground/WeexDemo.xcodeproj/project.pbxproj
+++ b/ios/playground/WeexDemo.xcodeproj/project.pbxproj
@@ -364,7 +364,6 @@
84361D431CA10F8E00F43825 /* Resources */,
84361D6F1CA10F8E00F43825 /* [CP] Copy Pods Resources */,
84361D701CA10F8E00F43825 /* [CP] Embed Pods Frameworks */,
- 567369891CE436EB000A646C /* ShellScript */,
);
buildRules = (
);
@@ -447,21 +446,6 @@
/* End PBXResourcesBuildPhase section */
/* Begin PBXShellScriptBuildPhase section */
- 36DF47C61FC947C616E7CB76 /* [CP] Copy Pods Resources */ = {
- isa = PBXShellScriptBuildPhase;
- buildActionMask = 2147483647;
- files = (
- );
- inputPaths = (
- );
- name = "[CP] Copy Pods Resources";
- outputPaths = (
- );
- runOnlyForDeploymentPostprocessing = 0;
- shellPath = /bin/sh;
- shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-WeexDemo/Pods-WeexDemo-resources.sh\"\n";
- showEnvVarsInLog = 0;
- };
685399B3421CD1410375A2AD /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
@@ -474,7 +458,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "myFile=\"XcodeCoverage/exportenv.sh\"\n\nif [ -f \"$myFile\" ]; then\nXcodeCoverage/exportenv.sh\nfi";
+ shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-WeexDemo/Pods-WeexDemo-frameworks.sh\"\n";
};
74CC7A221C2C13BF00829368 /* Start Samples */ = {
isa = PBXShellScriptBuildPhase;
@@ -562,7 +546,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-WeexDemo/Pods-WeexDemo-frameworks.sh\"\n";
+ shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-WeexDemo/Pods-WeexDemo-resources.sh\"\n";
showEnvVarsInLog = 0;
};
/* End PBXShellScriptBuildPhase section */
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/dd047ba5/ios/sdk/WeexSDK.podspec
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK.podspec b/ios/sdk/WeexSDK.podspec
deleted file mode 100644
index 5cc5805..0000000
--- a/ios/sdk/WeexSDK.podspec
+++ /dev/null
@@ -1,47 +0,0 @@
-# coding: utf-8
-Pod::Spec.new do |s|
-
- s.name = "WeexSDK"
-
- s.version = "0.11.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 = 'WeexSDK/Sources/**/*.{h,m,mm,c}'
- s.resources = 'WeexSDK/Resources/main.js', 'WeexSDK/Resources/wx_load_error@3x.png'
-
- s.requires_arc = true
- s.prefix_header_file = 'WeexSDK/Sources/Supporting Files/WeexSDK-Prefix.pch'
-
-# s.xcconfig = { "GCC_PREPROCESSOR_DEFINITIONS" => '$(inherited) DEBUG=1' }
-
- s.xcconfig = { "OTHER_LINK_FLAG" => '$(inherited) -ObjC'}
-
- s.user_target_xcconfig = { 'FRAMEWORK_SEARCH_PATHS' => "'$(PODS_ROOT)/WeexSDK'" }
-
- s.frameworks = 'CoreMedia','MediaPlayer','AVFoundation','AVKit','JavaScriptCore', 'GLKit'
-
- s.dependency 'SocketRocket'
- s.libraries = "stdc++"
-
-end
[3/5] incubator-weex git commit: + [ios] update version
Posted by cx...@apache.org.
+ [ios] update version
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/18fd3e6b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/18fd3e6b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/18fd3e6b
Branch: refs/heads/0.12-dev
Commit: 18fd3e6b8397711cba5f2af67b3fcc0d7f38dfdb
Parents: e728662
Author: \u9f50\u5c71 <su...@163.com>
Authored: Mon Apr 17 19:32:48 2017 +0800
Committer: \u9f50\u5c71 <su...@163.com>
Committed: Mon Apr 17 19:32:48 2017 +0800
----------------------------------------------------------------------
ios/playground/Podfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/18fd3e6b/ios/playground/Podfile
----------------------------------------------------------------------
diff --git a/ios/playground/Podfile b/ios/playground/Podfile
index 5ca0552..b9e11fb 100644
--- a/ios/playground/Podfile
+++ b/ios/playground/Podfile
@@ -9,7 +9,7 @@ def common
pod 'SocketRocket', '0.4.2'
pod 'ATSDK-Weex', '0.0.1'
- pod 'WeexGcanvas', '0.0.1.3'
+ pod 'WeexGcanvas', '0.0.1.5'
end
target 'WeexDemo' do