You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by so...@apache.org on 2017/06/01 10:04:09 UTC
[1/5] incubator-weex git commit: - [ios] remove redundant headers
Repository: incubator-weex
Updated Branches:
refs/heads/dev cfaf7d2b2 -> 41e01d780
- [ios] remove redundant headers
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/553c1f50
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/553c1f50
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/553c1f50
Branch: refs/heads/dev
Commit: 553c1f50aa6a643e7120287f51496be8ebb089a4
Parents: cfaf7d2
Author: yinfeng <cx...@apache.org>
Authored: Thu Jun 1 14:53:21 2017 +0800
Committer: yinfeng <cx...@apache.org>
Committed: Thu Jun 1 14:53:21 2017 +0800
----------------------------------------------------------------------
ios/sdk/WeexSDK/Sources/Component/WXLoadingComponent.m | 7 -------
ios/sdk/WeexSDK/Sources/Module/WXNavigatorModule.m | 7 -------
2 files changed, 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/553c1f50/ios/sdk/WeexSDK/Sources/Component/WXLoadingComponent.m
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Component/WXLoadingComponent.m b/ios/sdk/WeexSDK/Sources/Component/WXLoadingComponent.m
index 66bf08c..d57fa9a 100644
--- a/ios/sdk/WeexSDK/Sources/Component/WXLoadingComponent.m
+++ b/ios/sdk/WeexSDK/Sources/Component/WXLoadingComponent.m
@@ -16,13 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
- /**
- * Created by Weex.
- * Copyright (c) 2016, Alibaba, Inc. All rights reserved.
- *
- * This source code is licensed under the Apache Licence 2.0.
- * For the full copyright and license information,please view the LICENSE file in the root directory of this source tree.
- */
#import "WXLoadingComponent.h"
#import "WXScrollerComponent.h"
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/553c1f50/ios/sdk/WeexSDK/Sources/Module/WXNavigatorModule.m
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Module/WXNavigatorModule.m b/ios/sdk/WeexSDK/Sources/Module/WXNavigatorModule.m
index 4bcca98..0a58c1f 100644
--- a/ios/sdk/WeexSDK/Sources/Module/WXNavigatorModule.m
+++ b/ios/sdk/WeexSDK/Sources/Module/WXNavigatorModule.m
@@ -16,13 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
- /**
- * Created by Weex.
- * Copyright (c) 2016, Alibaba, Inc. All rights reserved.
- *
- * This source code is licensed under the Apache Licence 2.0.
- * For the full copyright and license information,please view the LICENSE file in the root directory of this source tree.
- */
#import "WXNavigatorModule.h"
#import "WXSDKManager.h"
[4/5] incubator-weex git commit: * [ios] ignore SRWebSocket for
copyright header checking
Posted by so...@apache.org.
* [ios] ignore SRWebSocket for copyright header checking
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/b3e1fcbb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/b3e1fcbb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/b3e1fcbb
Branch: refs/heads/dev
Commit: b3e1fcbbad2f98fd8373e2a6f25fe8c1417d48b5
Parents: 552f0f7
Author: yinfeng <cx...@apache.org>
Authored: Thu Jun 1 15:16:48 2017 +0800
Committer: yinfeng <cx...@apache.org>
Committed: Thu Jun 1 15:16:48 2017 +0800
----------------------------------------------------------------------
dangerfile.js | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/b3e1fcbb/dangerfile.js
----------------------------------------------------------------------
diff --git a/dangerfile.js b/dangerfile.js
index 114571d..0d4b0f5 100644
--- a/dangerfile.js
+++ b/dangerfile.js
@@ -169,7 +169,8 @@ const ignoreCopyrightVerifyPath = [
'android/sdk/assets',
'ios/playground/bundlejs',
'ios/sdk/WeexSDK/Resources',
- 'ios/sdk/WeexSDK/Sources/Layout'
+ 'ios/sdk/WeexSDK/Sources/Layout',
+ 'ios/sdk/WeexSDK/dependency/SRWebSocket'
]
codefiles.forEach(filepath => {
[2/5] incubator-weex git commit: * [ios] move SRWebSocket's header
back to BSD license
Posted by so...@apache.org.
* [ios] move SRWebSocket's header back to BSD license
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/a0d25dc9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/a0d25dc9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/a0d25dc9
Branch: refs/heads/dev
Commit: a0d25dc98471de1bd783f3d2944a649ca385b317
Parents: 553c1f5
Author: yinfeng <cx...@apache.org>
Authored: Thu Jun 1 14:57:32 2017 +0800
Committer: yinfeng <cx...@apache.org>
Committed: Thu Jun 1 14:57:32 2017 +0800
----------------------------------------------------------------------
ios/sdk/WeexSDK/dependency/SRWebSocket.h | 17 ++++++-----------
ios/sdk/WeexSDK/dependency/SRWebSocket.m | 18 ++++++------------
2 files changed, 12 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/a0d25dc9/ios/sdk/WeexSDK/dependency/SRWebSocket.h
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/dependency/SRWebSocket.h b/ios/sdk/WeexSDK/dependency/SRWebSocket.h
index 5f8bca1..094a39d 100644
--- a/ios/sdk/WeexSDK/dependency/SRWebSocket.h
+++ b/ios/sdk/WeexSDK/dependency/SRWebSocket.h
@@ -1,17 +1,12 @@
//
-// Copyright 2012 Square Inc.
+// Copyright 2012 Square Inc.
+// Portions Copyright (c) 2016-present, Facebook, Inc.
//
-// Licensed 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
+// All rights reserved.
//
-// 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.
+// This source code is licensed under the BSD-style license found in the
+// LICENSE file in the root directory of this source tree. An additional grant
+// of patent rights can be found in the PATENTS file in the same directory.
//
#import <Foundation/Foundation.h>
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/a0d25dc9/ios/sdk/WeexSDK/dependency/SRWebSocket.m
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/dependency/SRWebSocket.m b/ios/sdk/WeexSDK/dependency/SRWebSocket.m
index 3ba577b..03ad557 100644
--- a/ios/sdk/WeexSDK/dependency/SRWebSocket.m
+++ b/ios/sdk/WeexSDK/dependency/SRWebSocket.m
@@ -1,19 +1,13 @@
//
-// Copyright 2012 Square Inc.
+// Copyright 2012 Square Inc.
+// Portions Copyright (c) 2016-present, Facebook, Inc.
//
-// Licensed 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
+// All rights reserved.
//
-// http://www.apache.org/licenses/LICENSE-2.0
+// This source code is licensed under the BSD-style license found in the
+// LICENSE file in the root directory of this source tree. An additional grant
+// of patent rights can be found in the PATENTS file in the same directory.
//
-// 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.
-//
-
#import "SRWebSocket.h"
[5/5] incubator-weex git commit: * [all] update build instruction
Posted by so...@apache.org.
* [all] update build instruction
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/41e01d78
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/41e01d78
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/41e01d78
Branch: refs/heads/dev
Commit: 41e01d780091cebadb0315cbe2238575bcafe201
Parents: b3e1fcb
Author: sospartan <so...@apache.org>
Authored: Thu Jun 1 18:03:57 2017 +0800
Committer: sospartan <so...@apache.org>
Committed: Thu Jun 1 18:03:57 2017 +0800
----------------------------------------------------------------------
HOW-TO-BUILD.md | 80 ++++++++++++++++++++++++++++++++++++++++
README_RELEASE.md | 74 -------------------------------------
RUN-RAT.md | 12 ++++++
scripts/release_files.rules | 3 +-
4 files changed, 94 insertions(+), 75 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/41e01d78/HOW-TO-BUILD.md
----------------------------------------------------------------------
diff --git a/HOW-TO-BUILD.md b/HOW-TO-BUILD.md
new file mode 100644
index 0000000..278d3e7
--- /dev/null
+++ b/HOW-TO-BUILD.md
@@ -0,0 +1,80 @@
+# Weex Apache Source Release
+Weex produce SDKs to integrate to iOS/Android/Mobile web applications. This file will cover how to build Weex from source. You can either use the script we provided or manually build from source step by step.
+See `README.md` for further information about Weex Framework.
+
+Weex SDK produce 3 different SDKs to use in corresponding system/browser:
+* Android SDK
+* iOS SDK
+* Mobile Web SDK
+
+See our [guide in our website](http://weex.apache.org/guide/integrate-to-your-app.html) to learn more about how to integrate Weex SDK to your app.
+
+## Build Environment
+The environment required to build weex as follow:
+* Android SDK:
+ * NodeJS 4.0+
+ * JDK 1.6+
+ * Android SDK(`$ANDROID_HOME` must be set properly)
+ * Gradle 2.0+
+* iOS SDK:
+ * NodeJS 4.0+
+ * XCode & Command Tools 8.0+
+* Mobile web SDK:
+ * NodeJS 4.0+
+
+This article was tested in MacOSX system.
+
+# Build All by Script
+
+This script will build all 3 SDKs:
+> `$ bash scripts/build_from_source.sh`
+
+This's may take a while. After that, you can look into `dist/`, `android/sdk/build/output/` and `ios/sdk/Products` for Web/Android/iOS SDK artifacts.
+
+
+# Build for Platforms
+
+You can build all SDKs by one script as described above, or just build for a single platform you want step by step.
+
+## Build Javascript Framework and Html5 SDK
+Javascript Framework is required by native SDKs. **So this must be built first.**
+Install npm dependencies(You must have node&npm installed):
+> `$ npm install --production`
+
+Install build tools:
+> `$ npm run install:buildtools`
+
+Build the javascript libraries:
+> `$ npm run build:source`
+
+The artifacts are under `dist/`.
+> ```
+> $ ls dist
+> browser.js browser.min.js browser.min.js.gz
+> native.js native.min.js native.min.js.gz
+>```
+
+### Before build Native SDK
+Move `min` version to Native SDK folder, which will be used by native SDK build.
+> `cp dist/native.min.js ios_sdk/WeexSDK/Resources/main.js`
+> `cp dist/native.min.js android_sdk/assets/main.js`
+
+## Build Android SDK
+Make sure you have install gradle, see more details about 'how to install gradle' in [gradle website](https://gradle.org/install).
+execute root folder of project
+> `$ gradle wrapper --gradle-version 2.14.1`
+
+Create a Gradle setting file
+> `$ echo 'include ":android_sdk"'>settings.gradle`
+
+Build the SDK
+> `$ ./gradlew :android_sdk:assemble -PasfRelease`
+
+Now, you can see the artifacts under `android_sdk/build/output/`.
+You can now import the aar file to your android project.
+
+## Build iOS SDK
+Execute command below to compile iOS SDK:
+> `$ xcodebuild -project ios_sdk/WeexSDK.xcodeproj -target WeexSDK_MTL`
+
+Then you'll found iOS library(Framework file) under `ios_sdk/Products`.
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/41e01d78/README_RELEASE.md
----------------------------------------------------------------------
diff --git a/README_RELEASE.md b/README_RELEASE.md
deleted file mode 100644
index b46abbc..0000000
--- a/README_RELEASE.md
+++ /dev/null
@@ -1,74 +0,0 @@
-# Weex Apache Source Release
-Weex produce SDKs to integrate to iOS/Android/Mobile web applications. This file will cover how to build Weex from source. You can either use the script we provided or manually build from source step by step.
-See `README.md` for further information about Weex Framework.
-
-## Build Environment
-The environment required to build weex as follow:
-* NodeJs 4.0+
-* Gradle 2.0+
-* XCode & Command Tools 8.0+
-
-## Build with Script
-
-Run build script:
-> `$ bash scripts/build_from_source.sh`
-
-This's may take a while. After that, you can look into `dist/`, `android/sdk/build/output/` and `ios/sdk/Products` for Web/Android/iOS SDK artifacts.
-
-## Build Step by Step
-
-### Build Javascript Framework and Html5 SDK
-Javascript Framework is required by SDKs. **So this must be built first.**
-Install npm dependencies(You must have node&npm installed):
-> `$ npm install --production`
-
-Install build tools:
-> `$ npm run install:buildtools`
-
-Build the javascript libraries:
-> `$ npm run build:source`
-
-The artifacts are under `dist/`.
-> ```
-> $ ls dist
-> browser.js browser.min.js browser.min.js.gz
-> native.js native.min.js native.min.js.gz
->```
-
-### Before build Native SDK
-Move `min` version to Native SDK folder, which will be used by native SDK build.
-> `cp dist/native.min.js ios_sdk/WeexSDK/Resources/main.js`
-> `cp dist/native.min.js android_sdk/assets/main.js`
-
-### Build Android SDK
-Make sure you have install gradle, see more details about 'how to install gradle' in [gradle website](https://gradle.org/install).
-execute root folder of project
-> `$ gradle wrapper --gradle-version 2.14.1`
-
-Create a Gradle setting file
-> `$ echo 'include ":android_sdk"'>settings.gradle`
-
-Build the SDK
-> `$ ./gradlew :android_sdk:assemble -PasfRelease`
-
-Now, you can see the artifacts under `android_sdk/build/output/`.
-You can now import the aar file to your android project.
-
-### Build iOS SDK
-Execute command below to compile iOS SDK:
-> `$ xcodebuild -project ios_sdk/WeexSDK.xcodeproj -target WeexSDK_MTL`
-
-Then you'll found iOS library(Framework file) under `ios_sdk/Products`.
-
-## Run Apache-Rat
-
-### Download Apache Rat
-Download the binary from [Rat's website](https://creadur.apache.org/rat/download_rat.cgi), decompress it somewhere.
-We've tested using v0.12.
-
-### Run Rat against Release files
-Just execute in your termial:
-
-> `$ ant -buildfile scripts/rat-ant-build.xml -lib path_to_the_folder_you_place_rat/apache-rat-0.12.jar`
-
-See '`scripts/rat-ant-build.xml`' for details about rules we use.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/41e01d78/RUN-RAT.md
----------------------------------------------------------------------
diff --git a/RUN-RAT.md b/RUN-RAT.md
new file mode 100644
index 0000000..225519e
--- /dev/null
+++ b/RUN-RAT.md
@@ -0,0 +1,12 @@
+# Run Apache-Rat
+
+### Download Apache Rat
+Download the binary from [Rat's website](https://creadur.apache.org/rat/download_rat.cgi), decompress it somewhere.
+We've tested using v0.12.
+
+### Run Rat against Release files
+Just execute in your termial:
+
+> `$ ant -buildfile scripts/rat-ant-build.xml -lib path_to_the_folder_you_place_rat/apache-rat-0.12.jar`
+
+See '`scripts/rat-ant-build.xml`' for details about rules we use.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/41e01d78/scripts/release_files.rules
----------------------------------------------------------------------
diff --git a/scripts/release_files.rules b/scripts/release_files.rules
index 14190ca..bfc0958 100644
--- a/scripts/release_files.rules
+++ b/scripts/release_files.rules
@@ -20,7 +20,8 @@
+ /POSSIBLE-NOTICES-FOR-BIN-DIST
+ /DISCLAIMER
+ /README.MD
-+ /README_RELEASE.md
++ /HOW-TO-BUILD.md
++ /RUN-RAT.md
+ /package.json
+ /.wwprc
+ /.flowconfig
[3/5] incubator-weex git commit: - [ios] remove OCMock dependency
Posted by so...@apache.org.
- [ios] remove OCMock dependency
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/552f0f70
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/552f0f70
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/552f0f70
Branch: refs/heads/dev
Commit: 552f0f7010ae57383efcaea462d4470fde35d8d5
Parents: a0d25dc
Author: yinfeng <cx...@apache.org>
Authored: Thu Jun 1 15:08:34 2017 +0800
Committer: yinfeng <cx...@apache.org>
Committed: Thu Jun 1 15:08:34 2017 +0800
----------------------------------------------------------------------
ios/sdk/WeexSDK.xcodeproj/project.pbxproj | 4 ----
ios/sdk/WeexSDKTests/WXURLRewriteTests.m | 21 ---------------------
ios/sdk/WeexSDKTests/dependency/libOCMock.a | Bin 2098920 -> 0 bytes
3 files changed, 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/552f0f70/ios/sdk/WeexSDK.xcodeproj/project.pbxproj
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK.xcodeproj/project.pbxproj b/ios/sdk/WeexSDK.xcodeproj/project.pbxproj
index d211f5f..6a315d0 100644
--- a/ios/sdk/WeexSDK.xcodeproj/project.pbxproj
+++ b/ios/sdk/WeexSDK.xcodeproj/project.pbxproj
@@ -196,7 +196,6 @@
74EF31AE1DE58BE200667A07 /* WXURLRewriteDefaultImpl.m in Sources */ = {isa = PBXBuildFile; fileRef = 74EF31AC1DE58BE200667A07 /* WXURLRewriteDefaultImpl.m */; };
74EF31C01DE5ED6F00667A07 /* libstdc++.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 74EF31BE1DE5ED5900667A07 /* libstdc++.tbd */; };
74EF31C31DE6935600667A07 /* WXURLRewriteTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 74EF31C21DE6935600667A07 /* WXURLRewriteTests.m */; };
- 74EF31C51DE6AADD00667A07 /* libOCMock.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 74EF31C41DE6AADD00667A07 /* libOCMock.a */; };
74F7BFF51DC782EC004D0871 /* testRootView.js in Resources */ = {isa = PBXBuildFile; fileRef = 74F7BFF41DC782EC004D0871 /* testRootView.js */; };
74FD6E041C7C0E9600DBEB6D /* WXScrollerProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 74FD6E031C7C0E9600DBEB6D /* WXScrollerProtocol.h */; settings = {ATTRIBUTES = (Public, ); }; };
775BEE4E1C16F993008D1629 /* WXDefine.h in Headers */ = {isa = PBXBuildFile; fileRef = 775BEE4D1C16F993008D1629 /* WXDefine.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -508,7 +507,6 @@
74EF31AC1DE58BE200667A07 /* WXURLRewriteDefaultImpl.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WXURLRewriteDefaultImpl.m; sourceTree = "<group>"; };
74EF31BE1DE5ED5900667A07 /* libstdc++.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = "libstdc++.tbd"; path = "usr/lib/libstdc++.tbd"; sourceTree = SDKROOT; };
74EF31C21DE6935600667A07 /* WXURLRewriteTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WXURLRewriteTests.m; sourceTree = "<group>"; };
- 74EF31C41DE6AADD00667A07 /* libOCMock.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libOCMock.a; path = WeexSDKTests/dependency/libOCMock.a; sourceTree = "<group>"; };
74F7BFF41DC782EC004D0871 /* testRootView.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = testRootView.js; sourceTree = "<group>"; };
74FD6E031C7C0E9600DBEB6D /* WXScrollerProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WXScrollerProtocol.h; sourceTree = "<group>"; };
775BEE4D1C16F993008D1629 /* WXDefine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WXDefine.h; sourceTree = "<group>"; };
@@ -614,7 +612,6 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
- 74EF31C51DE6AADD00667A07 /* libOCMock.a in Frameworks */,
74EF31C01DE5ED6F00667A07 /* libstdc++.tbd in Frameworks */,
DC9867441D826D1E000AF388 /* GLKit.framework in Frameworks */,
740938FB1D3D0E1700DBB801 /* AVKit.framework in Frameworks */,
@@ -1150,7 +1147,6 @@
A5818E244F9E235722E3B938 /* Frameworks */ = {
isa = PBXGroup;
children = (
- 74EF31C41DE6AADD00667A07 /* libOCMock.a */,
74EF31BE1DE5ED5900667A07 /* libstdc++.tbd */,
DC9867431D826D1E000AF388 /* GLKit.framework */,
740938FA1D3D0E1700DBB801 /* AVKit.framework */,
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/552f0f70/ios/sdk/WeexSDKTests/WXURLRewriteTests.m
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDKTests/WXURLRewriteTests.m b/ios/sdk/WeexSDKTests/WXURLRewriteTests.m
index eb6a5fe..f1111e3 100644
--- a/ios/sdk/WeexSDKTests/WXURLRewriteTests.m
+++ b/ios/sdk/WeexSDKTests/WXURLRewriteTests.m
@@ -22,7 +22,6 @@
#import "WXHandlerFactory.h"
#import "WXSDKInstance.h"
#import "WXSDKEngine.h"
-#import <OCMock/OCMock.h>
@interface WXURLRewriteTests : XCTestCase
@@ -31,8 +30,6 @@
@end
-static id _mockNSBundle;
-
@implementation WXURLRewriteTests
- (void)setUp {
@@ -41,10 +38,6 @@ static id _mockNSBundle;
_rewriteHandler = [WXHandlerFactory handlerForProtocol:@protocol(WXURLRewriteProtocol)];
_instance = [[WXSDKInstance alloc] init];
_instance.scriptURL = [NSURL URLWithString:@"https://www.weex.com/test/test.js"];
-
- _mockNSBundle = [OCMockObject niceMockForClass:[NSBundle class]];
- NSBundle *correctMainBundle = [NSBundle bundleForClass:self.class];
- [[[_mockNSBundle stub] andReturn:correctMainBundle] mainBundle];
}
- (void)tearDown {
@@ -87,19 +80,5 @@ static id _mockNSBundle;
XCTAssertEqualObjects(@"https://www.weex.com/test/test.jpg", rewriteURL4.absoluteString);
}
-- (void)testFileURL {
- NSBundle *bundle = [NSBundle bundleForClass:[self class]];
- NSURL *fileURL = [bundle URLForResource:@"testRootView" withExtension:@"js"];
- NSURL *rewriteURL = [_rewriteHandler rewriteURL:fileURL.absoluteString withResourceType:WXResourceTypeMainBundle withInstance:_instance];
- XCTAssertEqualObjects(fileURL.absoluteString, [rewriteURL absoluteString]);
-}
-
-- (void)testLocalURL {
- NSString *testURL = @"local://testRootView.js";
- NSBundle *bundle = [NSBundle bundleForClass:[self class]];
- NSURL *fileURL = [bundle URLForResource:@"testRootView" withExtension:@"js"];
- NSURL *rewriteURL = [_rewriteHandler rewriteURL:testURL withResourceType:WXResourceTypeMainBundle withInstance:_instance];
- XCTAssertEqualObjects(fileURL.absoluteString, [rewriteURL absoluteString]);
-}
@end
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/552f0f70/ios/sdk/WeexSDKTests/dependency/libOCMock.a
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDKTests/dependency/libOCMock.a b/ios/sdk/WeexSDKTests/dependency/libOCMock.a
deleted file mode 100644
index 8edb6e3..0000000
Binary files a/ios/sdk/WeexSDKTests/dependency/libOCMock.a and /dev/null differ