You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by ac...@apache.org on 2017/06/05 09:22:29 UTC
[1/3] incubator-weex git commit: + [ios] public wxerrorview.h
Repository: incubator-weex
Updated Branches:
refs/heads/0.14-dev 99ac1e91a -> 217907e5a
+ [ios] public wxerrorview.h
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/c40329ce
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/c40329ce
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/c40329ce
Branch: refs/heads/0.14-dev
Commit: c40329cecf3e1af3b12bd60982cfbe76cf0b228e
Parents: eb1e637
Author: lybeen <il...@gmail.com>
Authored: Mon Jun 5 11:37:11 2017 +0800
Committer: lybeen <il...@gmail.com>
Committed: Mon Jun 5 11:40:39 2017 +0800
----------------------------------------------------------------------
ios/sdk/WeexSDK/Sources/WeexSDK.h | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/c40329ce/ios/sdk/WeexSDK/Sources/WeexSDK.h
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/WeexSDK.h b/ios/sdk/WeexSDK/Sources/WeexSDK.h
index 88af286..61681f9 100644
--- a/ios/sdk/WeexSDK/Sources/WeexSDK.h
+++ b/ios/sdk/WeexSDK/Sources/WeexSDK.h
@@ -28,6 +28,7 @@
#import "WXSDKManager.h"
#import "WXSDKInstance.h"
#import "WXSDKError.h"
+#import "WXErrorView.h"
#import "WXSDKEngine.h"
#import "WXRootViewController.h"
#import "WXResourceResponse.h"
[3/3] incubator-weex git commit: Merge branch
'ios-feature-publicWXErrorViewHeaderFile' of
https://github.com/lybeen/incubator-weex into wip-us-0.14-dev
Posted by ac...@apache.org.
Merge branch 'ios-feature-publicWXErrorViewHeaderFile' of https://github.com/lybeen/incubator-weex into wip-us-0.14-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/217907e5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/217907e5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/217907e5
Branch: refs/heads/0.14-dev
Commit: 217907e5a28082bc50174aeff61cf9e6db387a66
Parents: 99ac1e9 cf17a23
Author: acton393 <zh...@gmail.com>
Authored: Mon Jun 5 17:21:53 2017 +0800
Committer: acton393 <zh...@gmail.com>
Committed: Mon Jun 5 17:21:53 2017 +0800
----------------------------------------------------------------------
ios/sdk/WeexSDK.xcodeproj/project.pbxproj | 2 +-
ios/sdk/WeexSDK/Sources/WeexSDK.h | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
[2/3] incubator-weex git commit: * [ios] public WXErrorView
Posted by ac...@apache.org.
* [ios] public WXErrorView
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/cf17a236
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/cf17a236
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/cf17a236
Branch: refs/heads/0.14-dev
Commit: cf17a2363b67b2e54f177a9b4934f963e735124a
Parents: c40329c
Author: lybeen <il...@gmail.com>
Authored: Mon Jun 5 15:54:39 2017 +0800
Committer: lybeen <il...@gmail.com>
Committed: Mon Jun 5 15:54:39 2017 +0800
----------------------------------------------------------------------
ios/sdk/WeexSDK.xcodeproj/project.pbxproj | 2 +-
ios/sdk/WeexSDK/Sources/WeexSDK.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/cf17a236/ios/sdk/WeexSDK.xcodeproj/project.pbxproj
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK.xcodeproj/project.pbxproj b/ios/sdk/WeexSDK.xcodeproj/project.pbxproj
index 4f2e73c..af53def 100644
--- a/ios/sdk/WeexSDK.xcodeproj/project.pbxproj
+++ b/ios/sdk/WeexSDK.xcodeproj/project.pbxproj
@@ -43,7 +43,7 @@
37B51EE51E97804D0040A743 /* WXCycleSliderComponent.m in Sources */ = {isa = PBXBuildFile; fileRef = 37B51EE31E97804D0040A743 /* WXCycleSliderComponent.m */; };
591324A31D49B7F1004E89ED /* WXTimerModuleTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 591324A21D49B7F1004E89ED /* WXTimerModuleTests.m */; };
591DD3311D23AD5800BE8709 /* WXErrorView.m in Sources */ = {isa = PBXBuildFile; fileRef = 591DD32F1D23AD5800BE8709 /* WXErrorView.m */; };
- 591DD3321D23AD5800BE8709 /* WXErrorView.h in Headers */ = {isa = PBXBuildFile; fileRef = 591DD3301D23AD5800BE8709 /* WXErrorView.h */; };
+ 591DD3321D23AD5800BE8709 /* WXErrorView.h in Headers */ = {isa = PBXBuildFile; fileRef = 591DD3301D23AD5800BE8709 /* WXErrorView.h */; settings = {ATTRIBUTES = (Public, ); }; };
594C28921CF9E61A009793A4 /* WXAnimationModule.m in Sources */ = {isa = PBXBuildFile; fileRef = 594C28901CF9E61A009793A4 /* WXAnimationModule.m */; };
594C28931CF9E61A009793A4 /* WXAnimationModule.h in Headers */ = {isa = PBXBuildFile; fileRef = 594C28911CF9E61A009793A4 /* WXAnimationModule.h */; };
59597F981D2A041700EE9317 /* WXDebugLoggerBridge.h in Headers */ = {isa = PBXBuildFile; fileRef = 59597F961D2A041700EE9317 /* WXDebugLoggerBridge.h */; };
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/cf17a236/ios/sdk/WeexSDK/Sources/WeexSDK.h
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/WeexSDK.h b/ios/sdk/WeexSDK/Sources/WeexSDK.h
index 61681f9..640dd02 100644
--- a/ios/sdk/WeexSDK/Sources/WeexSDK.h
+++ b/ios/sdk/WeexSDK/Sources/WeexSDK.h
@@ -28,7 +28,6 @@
#import "WXSDKManager.h"
#import "WXSDKInstance.h"
#import "WXSDKError.h"
-#import "WXErrorView.h"
#import "WXSDKEngine.h"
#import "WXRootViewController.h"
#import "WXResourceResponse.h"
@@ -48,6 +47,7 @@
#import "WXIndicatorComponent.h"
#import "WXImgLoaderProtocol.h"
#import "WXEventModuleProtocol.h"
+#import "WXErrorView.h"
#import "WXDefine.h"
#import "WXDebugTool.h"
#import "WXConvert.h"