From 6bf772cc0df50f87bce4546a0fac39f436243eb1 Mon Sep 17 00:00:00 2001 From: Jarrad Hope Date: Mon, 14 Mar 2016 14:11:16 +0100 Subject: [PATCH 1/6] initial pom.xml --- ios/Messenger.xcodeproj/project.pbxproj | 34 ++++++++++-------- .../xcshareddata/xcschemes/Messenger.xcscheme | 13 ++++--- ios/Messenger/Info.plist | 17 +++++---- ios/MessengerTests/Info.plist | 2 +- ios/pom.xml | 35 +++++++++++++++++++ 5 files changed, 71 insertions(+), 30 deletions(-) create mode 100644 ios/pom.xml diff --git a/ios/Messenger.xcodeproj/project.pbxproj b/ios/Messenger.xcodeproj/project.pbxproj index c41d248ac7..dcce23ede6 100644 --- a/ios/Messenger.xcodeproj/project.pbxproj +++ b/ios/Messenger.xcodeproj/project.pbxproj @@ -105,17 +105,17 @@ /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ - 008F07F21AC5B25A0029DE68 /* main.jsbundle */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = main.jsbundle; path = main.jsbundle; sourceTree = ""; }; - 00C302A71ABCB8CE00DB3ED1 /* RCTActionSheet.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTActionSheet.xcodeproj; path = ../node_modules/react-native/Libraries/ActionSheetIOS/RCTActionSheet.xcodeproj; sourceTree = ""; }; - 00C302B51ABCB90400DB3ED1 /* RCTGeolocation.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTGeolocation.xcodeproj; path = ../node_modules/react-native/Libraries/Geolocation/RCTGeolocation.xcodeproj; sourceTree = ""; }; - 00C302BB1ABCB91800DB3ED1 /* RCTImage.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTImage.xcodeproj; path = ../node_modules/react-native/Libraries/Image/RCTImage.xcodeproj; sourceTree = ""; }; - 00C302D31ABCB9D200DB3ED1 /* RCTNetwork.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTNetwork.xcodeproj; path = ../node_modules/react-native/Libraries/Network/RCTNetwork.xcodeproj; sourceTree = ""; }; - 00C302DF1ABCB9EE00DB3ED1 /* RCTVibration.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTVibration.xcodeproj; path = ../node_modules/react-native/Libraries/Vibration/RCTVibration.xcodeproj; sourceTree = ""; }; + 008F07F21AC5B25A0029DE68 /* main.jsbundle */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = main.jsbundle; sourceTree = ""; }; + 00C302A71ABCB8CE00DB3ED1 /* RCTActionSheet.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTActionSheet.xcodeproj; path = "../node_modules/react-native/Libraries/ActionSheetIOS/RCTActionSheet.xcodeproj"; sourceTree = ""; }; + 00C302B51ABCB90400DB3ED1 /* RCTGeolocation.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTGeolocation.xcodeproj; path = "../node_modules/react-native/Libraries/Geolocation/RCTGeolocation.xcodeproj"; sourceTree = ""; }; + 00C302BB1ABCB91800DB3ED1 /* RCTImage.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTImage.xcodeproj; path = "../node_modules/react-native/Libraries/Image/RCTImage.xcodeproj"; sourceTree = ""; }; + 00C302D31ABCB9D200DB3ED1 /* RCTNetwork.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTNetwork.xcodeproj; path = "../node_modules/react-native/Libraries/Network/RCTNetwork.xcodeproj"; sourceTree = ""; }; + 00C302DF1ABCB9EE00DB3ED1 /* RCTVibration.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTVibration.xcodeproj; path = "../node_modules/react-native/Libraries/Vibration/RCTVibration.xcodeproj"; sourceTree = ""; }; 00E356EE1AD99517003FC87E /* MessengerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = MessengerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 00E356F11AD99517003FC87E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 00E356F21AD99517003FC87E /* MessengerTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MessengerTests.m; sourceTree = ""; }; - 139105B61AF99BAD00B5F7CC /* RCTSettings.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTSettings.xcodeproj; path = ../node_modules/react-native/Libraries/Settings/RCTSettings.xcodeproj; sourceTree = ""; }; - 139FDEE61B06529A00C62182 /* RCTWebSocket.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTWebSocket.xcodeproj; path = ../node_modules/react-native/Libraries/WebSocket/RCTWebSocket.xcodeproj; sourceTree = ""; }; + 139105B61AF99BAD00B5F7CC /* RCTSettings.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTSettings.xcodeproj; path = "../node_modules/react-native/Libraries/Settings/RCTSettings.xcodeproj"; sourceTree = ""; }; + 139FDEE61B06529A00C62182 /* RCTWebSocket.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTWebSocket.xcodeproj; path = "../node_modules/react-native/Libraries/WebSocket/RCTWebSocket.xcodeproj"; sourceTree = ""; }; 13B07F961A680F5B00A75B9A /* Messenger.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Messenger.app; sourceTree = BUILT_PRODUCTS_DIR; }; 13B07FAF1A68108700A75B9A /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = Messenger/AppDelegate.h; sourceTree = ""; }; 13B07FB01A68108700A75B9A /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AppDelegate.m; path = Messenger/AppDelegate.m; sourceTree = ""; }; @@ -123,9 +123,9 @@ 13B07FB51A68108700A75B9A /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = Messenger/Images.xcassets; sourceTree = ""; }; 13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = Messenger/Info.plist; sourceTree = ""; }; 13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = Messenger/main.m; sourceTree = ""; }; - 146833FF1AC3E56700842450 /* React.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = React.xcodeproj; path = ../node_modules/react-native/React/React.xcodeproj; sourceTree = ""; }; - 78C398B01ACF4ADC00677621 /* RCTLinking.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTLinking.xcodeproj; path = ../node_modules/react-native/Libraries/LinkingIOS/RCTLinking.xcodeproj; sourceTree = ""; }; - 832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTText.xcodeproj; path = ../node_modules/react-native/Libraries/Text/RCTText.xcodeproj; sourceTree = ""; }; + 146833FF1AC3E56700842450 /* React.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = React.xcodeproj; path = "../node_modules/react-native/React/React.xcodeproj"; sourceTree = ""; }; + 78C398B01ACF4ADC00677621 /* RCTLinking.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTLinking.xcodeproj; path = "../node_modules/react-native/Libraries/LinkingIOS/RCTLinking.xcodeproj"; sourceTree = ""; }; + 832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTText.xcodeproj; path = "../node_modules/react-native/Libraries/Text/RCTText.xcodeproj"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -350,7 +350,7 @@ 83CBB9F71A601CBA00E9B192 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0610; + LastUpgradeCheck = 0720; ORGANIZATIONNAME = Facebook; TargetAttributes = { 00E356ED1AD99517003FC87E = { @@ -526,7 +526,6 @@ runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; shellScript = "export NODE_BINARY=node\n../node_modules/react-native/packager/react-native-xcode.sh"; - showEnvVarsInLog = 1; }; /* End PBXShellScriptBuildPhase section */ @@ -586,6 +585,7 @@ INFOPLIST_FILE = MessengerTests/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 8.2; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + PRODUCT_BUNDLE_IDENTIFIER = "org.reactjs.native.example.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Messenger.app/Messenger"; }; @@ -603,6 +603,7 @@ INFOPLIST_FILE = MessengerTests/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 8.2; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + PRODUCT_BUNDLE_IDENTIFIER = "org.reactjs.native.example.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Messenger.app/Messenger"; }; @@ -618,9 +619,10 @@ /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, "$(SRCROOT)/../node_modules/react-native/React/**", ); - INFOPLIST_FILE = "Messenger/Info.plist"; + INFOPLIST_FILE = Messenger/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; OTHER_LDFLAGS = "-ObjC"; + PRODUCT_BUNDLE_IDENTIFIER = "org.reactjs.native.example.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = Messenger; }; name = Debug; @@ -634,9 +636,10 @@ /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, "$(SRCROOT)/../node_modules/react-native/React/**", ); - INFOPLIST_FILE = "Messenger/Info.plist"; + INFOPLIST_FILE = Messenger/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; OTHER_LDFLAGS = "-ObjC"; + PRODUCT_BUNDLE_IDENTIFIER = "org.reactjs.native.example.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = Messenger; }; name = Release; @@ -661,6 +664,7 @@ "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DYNAMIC_NO_PIC = NO; GCC_OPTIMIZATION_LEVEL = 0; diff --git a/ios/Messenger.xcodeproj/xcshareddata/xcschemes/Messenger.xcscheme b/ios/Messenger.xcodeproj/xcshareddata/xcschemes/Messenger.xcscheme index 0161b0c810..0a73b677db 100644 --- a/ios/Messenger.xcodeproj/xcshareddata/xcschemes/Messenger.xcscheme +++ b/ios/Messenger.xcodeproj/xcshareddata/xcschemes/Messenger.xcscheme @@ -1,6 +1,6 @@ + shouldUseLaunchSchemeArgsEnv = "YES"> @@ -62,15 +62,18 @@ ReferencedContainer = "container:Messenger.xcodeproj"> + + @@ -86,10 +89,10 @@ diff --git a/ios/Messenger/Info.plist b/ios/Messenger/Info.plist index 91963b2670..682480a6e6 100644 --- a/ios/Messenger/Info.plist +++ b/ios/Messenger/Info.plist @@ -7,7 +7,7 @@ CFBundleExecutable $(EXECUTABLE_NAME) CFBundleIdentifier - org.reactjs.native.example.$(PRODUCT_NAME:rfc1034identifier) + $(PRODUCT_BUNDLE_IDENTIFIER) CFBundleInfoDictionaryVersion 6.0 CFBundleName @@ -22,6 +22,13 @@ 1 LSRequiresIPhoneOS + NSAppTransportSecurity + + NSAllowsArbitraryLoads + + + NSLocationWhenInUseUsageDescription + UILaunchStoryboardName LaunchScreen UIRequiredDeviceCapabilities @@ -36,13 +43,5 @@ UIViewControllerBasedStatusBarAppearance - NSLocationWhenInUseUsageDescription - - NSAppTransportSecurity - - - NSAllowsArbitraryLoads - - diff --git a/ios/MessengerTests/Info.plist b/ios/MessengerTests/Info.plist index 886825ccc9..ba72822e87 100644 --- a/ios/MessengerTests/Info.plist +++ b/ios/MessengerTests/Info.plist @@ -7,7 +7,7 @@ CFBundleExecutable $(EXECUTABLE_NAME) CFBundleIdentifier - org.reactjs.native.example.$(PRODUCT_NAME:rfc1034identifier) + $(PRODUCT_BUNDLE_IDENTIFIER) CFBundleInfoDictionaryVersion 6.0 CFBundleName diff --git a/ios/pom.xml b/ios/pom.xml new file mode 100644 index 0000000000..91b9067184 --- /dev/null +++ b/ios/pom.xml @@ -0,0 +1,35 @@ + + 4.0.0 + + im.syng + Syng + 1.0-SNAPSHOT + xcode-lib + + + + ci.syng.im + http://syng.im:8081/artifactory/libs-release-local/ + + + + + syng-im + ios-geth + 1.4.0-201603140656-92d65cf + zip + + + + + + com.sap.prd.mobile.ios.mios + xcode-maven-plugin + 1.14.2 + true + + + + \ No newline at end of file From 02205bf36dc1193402e5ef4c94ab388b7a1569f3 Mon Sep 17 00:00:00 2001 From: Jarrad Hope Date: Mon, 14 Mar 2016 14:35:53 +0100 Subject: [PATCH 2/6] add missing dependencies iOS --- ios/Messenger.xcodeproj/project.pbxproj | 75 +++++++++++++++++++++++++ ios/pom.xml | 16 +++--- 2 files changed, 84 insertions(+), 7 deletions(-) diff --git a/ios/Messenger.xcodeproj/project.pbxproj b/ios/Messenger.xcodeproj/project.pbxproj index dcce23ede6..32d1c3da15 100644 --- a/ios/Messenger.xcodeproj/project.pbxproj +++ b/ios/Messenger.xcodeproj/project.pbxproj @@ -22,6 +22,8 @@ 13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; }; 146834051AC3E58100842450 /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 146834041AC3E56700842450 /* libReact.a */; }; 832341BD1AAA6AB300B99B32 /* libRCTText.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 832341B51AAA6A8300B99B32 /* libRCTText.a */; }; + E343FE8E1C96F54100C01DB5 /* libRNI18n.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E343FE8B1C96F4E200C01DB5 /* libRNI18n.a */; }; + E343FE8F1C96F54A00C01DB5 /* libRCTContacts.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E343FE841C96F4DA00C01DB5 /* libRCTContacts.a */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -102,6 +104,27 @@ remoteGlobalIDString = 58B5119B1A9E6C1200147676; remoteInfo = RCTText; }; + E343FE831C96F4DA00C01DB5 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = E343FE7F1C96F4DA00C01DB5 /* RCTContacts.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 1441618E1BD0A79300FA4F59; + remoteInfo = RCTContacts; + }; + E343FE8A1C96F4E200C01DB5 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = E343FE851C96F4E200C01DB5 /* RNI18n.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = CDD7BF781B2D5125006FDA75; + remoteInfo = RNI18n; + }; + E343FE8C1C96F4E200C01DB5 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = E343FE851C96F4E200C01DB5 /* RNI18n.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = CDD7BF831B2D5126006FDA75; + remoteInfo = RNI18nTests; + }; /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ @@ -126,6 +149,8 @@ 146833FF1AC3E56700842450 /* React.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = React.xcodeproj; path = "../node_modules/react-native/React/React.xcodeproj"; sourceTree = ""; }; 78C398B01ACF4ADC00677621 /* RCTLinking.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTLinking.xcodeproj; path = "../node_modules/react-native/Libraries/LinkingIOS/RCTLinking.xcodeproj"; sourceTree = ""; }; 832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTText.xcodeproj; path = "../node_modules/react-native/Libraries/Text/RCTText.xcodeproj"; sourceTree = ""; }; + E343FE7F1C96F4DA00C01DB5 /* RCTContacts.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTContacts.xcodeproj; path = "../node_modules/react-native-contacts/ios/RCTContacts.xcodeproj"; sourceTree = ""; }; + E343FE851C96F4E200C01DB5 /* RNI18n.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RNI18n.xcodeproj; path = "../node_modules/react-native-i18n/RNI18n.xcodeproj"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -142,6 +167,8 @@ files = ( 146834051AC3E58100842450 /* libReact.a in Frameworks */, 00C302E51ABCBA2D00DB3ED1 /* libRCTActionSheet.a in Frameworks */, + E343FE8F1C96F54A00C01DB5 /* libRCTContacts.a in Frameworks */, + E343FE8E1C96F54100C01DB5 /* libRNI18n.a in Frameworks */, 00C302E71ABCBA2D00DB3ED1 /* libRCTGeolocation.a in Frameworks */, 00C302E81ABCBA2D00DB3ED1 /* libRCTImage.a in Frameworks */, 133E29F31AD74F7200F7D852 /* libRCTLinking.a in Frameworks */, @@ -262,6 +289,8 @@ 832341AE1AAA6A7D00B99B32 /* Libraries */ = { isa = PBXGroup; children = ( + E343FE851C96F4E200C01DB5 /* RNI18n.xcodeproj */, + E343FE7F1C96F4DA00C01DB5 /* RCTContacts.xcodeproj */, 146833FF1AC3E56700842450 /* React.xcodeproj */, 00C302A71ABCB8CE00DB3ED1 /* RCTActionSheet.xcodeproj */, 00C302B51ABCB90400DB3ED1 /* RCTGeolocation.xcodeproj */, @@ -305,6 +334,23 @@ name = Products; sourceTree = ""; }; + E343FE801C96F4DA00C01DB5 /* Products */ = { + isa = PBXGroup; + children = ( + E343FE841C96F4DA00C01DB5 /* libRCTContacts.a */, + ); + name = Products; + sourceTree = ""; + }; + E343FE861C96F4E200C01DB5 /* Products */ = { + isa = PBXGroup; + children = ( + E343FE8B1C96F4E200C01DB5 /* libRNI18n.a */, + E343FE8D1C96F4E200C01DB5 /* RNI18nTests.xctest */, + ); + name = Products; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -375,6 +421,10 @@ ProductGroup = 00C302A81ABCB8CE00DB3ED1 /* Products */; ProjectRef = 00C302A71ABCB8CE00DB3ED1 /* RCTActionSheet.xcodeproj */; }, + { + ProductGroup = E343FE801C96F4DA00C01DB5 /* Products */; + ProjectRef = E343FE7F1C96F4DA00C01DB5 /* RCTContacts.xcodeproj */; + }, { ProductGroup = 00C302B61ABCB90400DB3ED1 /* Products */; ProjectRef = 00C302B51ABCB90400DB3ED1 /* RCTGeolocation.xcodeproj */; @@ -411,6 +461,10 @@ ProductGroup = 146834001AC3E56700842450 /* Products */; ProjectRef = 146833FF1AC3E56700842450 /* React.xcodeproj */; }, + { + ProductGroup = E343FE861C96F4E200C01DB5 /* Products */; + ProjectRef = E343FE851C96F4E200C01DB5 /* RNI18n.xcodeproj */; + }, ); projectRoot = ""; targets = ( @@ -491,6 +545,27 @@ remoteRef = 832341B41AAA6A8300B99B32 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; + E343FE841C96F4DA00C01DB5 /* libRCTContacts.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = libRCTContacts.a; + remoteRef = E343FE831C96F4DA00C01DB5 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + E343FE8B1C96F4E200C01DB5 /* libRNI18n.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = libRNI18n.a; + remoteRef = E343FE8A1C96F4E200C01DB5 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + E343FE8D1C96F4E200C01DB5 /* RNI18nTests.xctest */ = { + isa = PBXReferenceProxy; + fileType = wrapper.cfbundle; + path = RNI18nTests.xctest; + remoteRef = E343FE8C1C96F4E200C01DB5 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; /* End PBXReferenceProxy section */ /* Begin PBXResourcesBuildPhase section */ diff --git a/ios/pom.xml b/ios/pom.xml index 91b9067184..294caf0e2d 100644 --- a/ios/pom.xml +++ b/ios/pom.xml @@ -11,16 +11,18 @@ ci.syng.im - http://syng.im:8081/artifactory/libs-release-local/ + http://ci.syng.im:8081/artifactory/libs-release-local/ - - syng-im - ios-geth - 1.4.0-201603140656-92d65cf - zip - + + + syng-im + ios-geth + 1.4.0-201603140656-92d65cf + zip + + From 6953fa670b2af64208c7ce9280b661decdf056f3 Mon Sep 17 00:00:00 2001 From: Jarrad Hope Date: Mon, 14 Mar 2016 15:36:22 +0100 Subject: [PATCH 3/6] passing pom.xml on mvn initialize --- ios/pom.xml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/ios/pom.xml b/ios/pom.xml index 294caf0e2d..43f184f75d 100644 --- a/ios/pom.xml +++ b/ios/pom.xml @@ -3,11 +3,15 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - im.syng - Syng + org.reactjs.native.example + Messenger 1.0-SNAPSHOT xcode-lib + + . + + ci.syng.im @@ -31,6 +35,9 @@ xcode-maven-plugin 1.14.2 true + + + From 96b91cd8a684710dd01c6ab4b631678e957b3912 Mon Sep 17 00:00:00 2001 From: Jarrad Hope Date: Mon, 14 Mar 2016 15:56:29 +0100 Subject: [PATCH 4/6] --- ios/pom.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ios/pom.xml b/ios/pom.xml index 43f184f75d..9e617bd47a 100644 --- a/ios/pom.xml +++ b/ios/pom.xml @@ -24,13 +24,14 @@ syng-im ios-geth 1.4.0-201603140656-92d65cf - zip + xcode-framework + com.sap.prd.mobile.ios.mios xcode-maven-plugin 1.14.2 From be9029c4537f10b950d95430b2629a4ddee5325e Mon Sep 17 00:00:00 2001 From: Jarrad Hope Date: Mon, 14 Mar 2016 17:26:57 +0100 Subject: [PATCH 5/6] Geth.framework linkage --- ios/Messenger.xcodeproj/project.pbxproj | 20 +++++++++++ ios/pom.xml | 45 +++++++++++-------------- 2 files changed, 39 insertions(+), 26 deletions(-) diff --git a/ios/Messenger.xcodeproj/project.pbxproj b/ios/Messenger.xcodeproj/project.pbxproj index 32d1c3da15..664e54be92 100644 --- a/ios/Messenger.xcodeproj/project.pbxproj +++ b/ios/Messenger.xcodeproj/project.pbxproj @@ -24,6 +24,7 @@ 832341BD1AAA6AB300B99B32 /* libRCTText.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 832341B51AAA6A8300B99B32 /* libRCTText.a */; }; E343FE8E1C96F54100C01DB5 /* libRNI18n.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E343FE8B1C96F4E200C01DB5 /* libRNI18n.a */; }; E343FE8F1C96F54A00C01DB5 /* libRCTContacts.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E343FE841C96F4DA00C01DB5 /* libRCTContacts.a */; }; + E343FE911C971D4200C01DB5 /* Geth.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E343FE901C971D4200C01DB5 /* Geth.framework */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -151,6 +152,7 @@ 832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTText.xcodeproj; path = "../node_modules/react-native/Libraries/Text/RCTText.xcodeproj"; sourceTree = ""; }; E343FE7F1C96F4DA00C01DB5 /* RCTContacts.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTContacts.xcodeproj; path = "../node_modules/react-native-contacts/ios/RCTContacts.xcodeproj"; sourceTree = ""; }; E343FE851C96F4E200C01DB5 /* RNI18n.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RNI18n.xcodeproj; path = "../node_modules/react-native-i18n/RNI18n.xcodeproj"; sourceTree = ""; }; + E343FE901C971D4200C01DB5 /* Geth.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Geth.framework; path = target/Frameworks/Geth.framework; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -165,6 +167,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + E343FE911C971D4200C01DB5 /* Geth.framework in Frameworks */, 146834051AC3E58100842450 /* libReact.a in Frameworks */, 00C302E51ABCBA2D00DB3ED1 /* libRCTActionSheet.a in Frameworks */, E343FE8F1C96F54A00C01DB5 /* libRCTContacts.a in Frameworks */, @@ -316,6 +319,7 @@ 83CBB9F61A601CBA00E9B192 = { isa = PBXGroup; children = ( + E343FE921C971D5400C01DB5 /* Frameworks */, 13B07FAE1A68108700A75B9A /* Messenger */, 832341AE1AAA6A7D00B99B32 /* Libraries */, 00E356EF1AD99517003FC87E /* MessengerTests */, @@ -351,6 +355,14 @@ name = Products; sourceTree = ""; }; + E343FE921C971D5400C01DB5 /* Frameworks */ = { + isa = PBXGroup; + children = ( + E343FE901C971D4200C01DB5 /* Geth.framework */, + ); + name = Frameworks; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -689,6 +701,10 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; DEAD_CODE_STRIPPING = NO; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "$(PROJECT_DIR)/target/Frameworks", + ); HEADER_SEARCH_PATHS = ( "$(inherited)", /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, @@ -706,6 +722,10 @@ isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "$(PROJECT_DIR)/target/Frameworks", + ); HEADER_SEARCH_PATHS = ( "$(inherited)", /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, diff --git a/ios/pom.xml b/ios/pom.xml index 9e617bd47a..f21a0251ac 100644 --- a/ios/pom.xml +++ b/ios/pom.xml @@ -6,11 +6,6 @@ org.reactjs.native.example Messenger 1.0-SNAPSHOT - xcode-lib - - - . - @@ -19,27 +14,25 @@ - - - syng-im - ios-geth - 1.4.0-201603140656-92d65cf - xcode-framework - - - - - - - com.sap.prd.mobile.ios.mios - xcode-maven-plugin - 1.14.2 - true - - - - - + + + org.apache.maven.plugins + maven-dependency-plugin + 2.10 + + + + syng-im + ios-geth + 1.4.0-201603140656-92d65cf + zip + true + ${project.build.directory}/Frameworks + + + + + \ No newline at end of file From 9b71a2ff4e7633745a1fc502c635f67d562f893e Mon Sep 17 00:00:00 2001 From: Jarrad Hope Date: Tue, 15 Mar 2016 21:27:36 +0100 Subject: [PATCH 6/6] successful link and running of geth iOS, mvn dependency:unpack --- ios/Messenger/main.m | 6 +++++- ios/pom.xml | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ios/Messenger/main.m b/ios/Messenger/main.m index 3d767fcbb9..afe0335e03 100644 --- a/ios/Messenger/main.m +++ b/ios/Messenger/main.m @@ -8,11 +8,15 @@ */ #import - +#import #import "AppDelegate.h" int main(int argc, char * argv[]) { @autoreleasepool { + dispatch_async(dispatch_get_global_queue( DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{ + run("--bootnodes enode://e2f28126720452aa82f7d3083e49e6b3945502cb94d9750a15e27ee310eed6991618199f878e5fbc7dfa0e20f0af9554b41f491dc8f1dbae8f0f2d37a3a613aa@139.162.13.89:30303 --shh --ipcdisable --nodiscover --rpc --rpcapi db,eth,net,web3,shh --fast"); + }); + return UIApplicationMain(argc, argv, nil, NSStringFromClass([AppDelegate class])); } } diff --git a/ios/pom.xml b/ios/pom.xml index f21a0251ac..1f41b6d02b 100644 --- a/ios/pom.xml +++ b/ios/pom.xml @@ -25,7 +25,7 @@ syng-im ios-geth - 1.4.0-201603140656-92d65cf + 1.4.0-201603151613-92d65cf zip true ${project.build.directory}/Frameworks