Repository: incubator-weex Updated Branches: refs/heads/master 71af7585d -> 947767b4c
[WEEX-364][iOS] support swift build * [iOS] head newlayout node.h * [iOS] fix compile error close #1176 Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/947767b4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/947767b4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/947767b4 Branch: refs/heads/master Commit: 947767b4c5b1cc5e23d4ad6262f6789c1b5b04d6 Parents: 71af758 Author: zouming.zm <zouming...@alibaba-inc.com> Authored: Tue May 15 12:02:03 2018 +0800 Committer: acton393 <zhangxing610...@gmail.com> Committed: Tue May 15 15:55:12 2018 +0800 ---------------------------------------------------------------------- WeexSDK.podspec | 3 +++ ios/sdk/WeexSDK.xcodeproj/project.pbxproj | 2 +- ios/sdk/WeexSDK/Sources/Layout/WXCoreStyle.h | 2 +- ios/sdk/WeexSDK/Sources/Layout/WXScrollerComponent+Layout.h | 4 ++++ 4 files changed, 9 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/947767b4/WeexSDK.podspec ---------------------------------------------------------------------- diff --git a/WeexSDK.podspec b/WeexSDK.podspec index 53f0a17..5fe38ea 100644 --- a/WeexSDK.podspec +++ b/WeexSDK.podspec @@ -36,6 +36,9 @@ Pod::Spec.new do |s| # s.xcconfig = { "GCC_PREPROCESSOR_DEFINITIONS" => '$(inherited) DEBUG=1' } + s.private_header_files = 'ios/sdk/WeexSDK/Sources/Component/RecycleList/WXJSASTParser.h', + 'ios/sdk/WeexSDK/Sources/Layout/WXScrollerComponent+Layout.h' + s.xcconfig = { "OTHER_LINK_FLAG" => '$(inherited) -ObjC'} s.frameworks = 'CoreMedia','MediaPlayer','AVFoundation','AVKit','JavaScriptCore', 'GLKit', 'OpenGLES', 'CoreText', 'QuartzCore', 'CoreGraphics' http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/947767b4/ios/sdk/WeexSDK.xcodeproj/project.pbxproj ---------------------------------------------------------------------- diff --git a/ios/sdk/WeexSDK.xcodeproj/project.pbxproj b/ios/sdk/WeexSDK.xcodeproj/project.pbxproj index 04f689b..d5be6cc 100644 --- a/ios/sdk/WeexSDK.xcodeproj/project.pbxproj +++ b/ios/sdk/WeexSDK.xcodeproj/project.pbxproj @@ -508,7 +508,7 @@ DCA445C71EFA57F300D0CFA8 /* Layout.h in Headers */ = {isa = PBXBuildFile; fileRef = 59D3CA3F1CF9ED57008835DC /* Layout.h */; settings = {ATTRIBUTES = (Public, ); }; }; DCA445C91EFA58CE00D0CFA8 /* native-bundle-main.js in Resources */ = {isa = PBXBuildFile; fileRef = DCF0CD9D1EAF3A6B0062CA8F /* native-bundle-main.js */; }; DCA445CA1EFA58CE00D0CFA8 /* wx_load_er...@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 59AC02501D2A7E6E00355112 /* wx_load_er...@3x.png */; }; - DCA445CB1EFA590600D0CFA8 /* WXComponent+Layout.h in Headers */ = {isa = PBXBuildFile; fileRef = 744BEA571D0520F300452B5D /* WXComponent+Layout.h */; }; + DCA445CB1EFA590600D0CFA8 /* WXComponent+Layout.h in Headers */ = {isa = PBXBuildFile; fileRef = 744BEA571D0520F300452B5D /* WXComponent+Layout.h */; settings = {ATTRIBUTES = (Public, ); }; }; DCA445CC1EFA592800D0CFA8 /* WXResourceLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 742AD7381DF98C8B007DC46C /* WXResourceLoader.h */; settings = {ATTRIBUTES = (Public, ); }; }; DCA445CD1EFA592E00D0CFA8 /* WXComponent+Events.h in Headers */ = {isa = PBXBuildFile; fileRef = 7408C48C1CFB345D000BCCD0 /* WXComponent+Events.h */; }; DCA445CE1EFA593500D0CFA8 /* WXComponent+BoxShadow.h in Headers */ = {isa = PBXBuildFile; fileRef = C4E375361E5FCBD3009B2D9C /* WXComponent+BoxShadow.h */; }; http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/947767b4/ios/sdk/WeexSDK/Sources/Layout/WXCoreStyle.h ---------------------------------------------------------------------- diff --git a/ios/sdk/WeexSDK/Sources/Layout/WXCoreStyle.h b/ios/sdk/WeexSDK/Sources/Layout/WXCoreStyle.h index bc7dd06..4289792 100644 --- a/ios/sdk/WeexSDK/Sources/Layout/WXCoreStyle.h +++ b/ios/sdk/WeexSDK/Sources/Layout/WXCoreStyle.h @@ -117,7 +117,7 @@ namespace WeexCore { } inline bool isNAN() { - return isnan(mTop) || isnan(mBottom) || isnan(mLeft) || isnan(mRight); + return std::isnan(mTop) || std::isnan(mBottom) || std::isnan(mLeft) || std::isnan(mRight); } inline void reset() { http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/947767b4/ios/sdk/WeexSDK/Sources/Layout/WXScrollerComponent+Layout.h ---------------------------------------------------------------------- diff --git a/ios/sdk/WeexSDK/Sources/Layout/WXScrollerComponent+Layout.h b/ios/sdk/WeexSDK/Sources/Layout/WXScrollerComponent+Layout.h index c9b633f..9af5170 100644 --- a/ios/sdk/WeexSDK/Sources/Layout/WXScrollerComponent+Layout.h +++ b/ios/sdk/WeexSDK/Sources/Layout/WXScrollerComponent+Layout.h @@ -26,7 +26,9 @@ //#ifndef USE_FLEX css_node_t *_scrollerCSSNode; //#else +#ifdef __cplusplus WeexCore::WXCoreLayoutNode *_flexScrollerCSSNode; +#endif //#endif } @end @@ -36,7 +38,9 @@ //#ifndef USE_FLEX @property (nonatomic, readonly, assign) css_node_t *scrollerCSSNode; //#else +#ifdef __cplusplus @property (nonatomic, readonly, assign) WeexCore::WXCoreLayoutNode *flexScrollerCSSNode; +#endif //#endif @end