From e98b9dae29d559afe2b8d85893b333c195560712 Mon Sep 17 00:00:00 2001 From: yogevbd Date: Wed, 25 Sep 2019 10:40:38 +0300 Subject: [PATCH 1/6] Run detox e2e tests on iPhone 11 --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index d3098bfcf..e35043854 100644 --- a/package.json +++ b/package.json @@ -85,7 +85,7 @@ "ios.none": { "binaryPath": "playground/ios/DerivedData/playground/Build/Products/Debug-iphonesimulator/playground.app", "type": "ios.none", - "name": "iPhone X", + "name": "iPhone 11", "session": { "server": "ws://localhost:8099", "sessionId": "playground" @@ -95,7 +95,7 @@ "binaryPath": "example/ios/DerivedData/NotificationsExampleApp/Build/Products/Debug-iphonesimulator/NotificationsExampleApp.app", "build": "RCT_NO_LAUNCH_PACKAGER=true xcodebuild build -scheme NotificationsExampleApp -project example/ios/NotificationsExampleApp.xcodeproj -sdk iphonesimulator -configuration Debug -derivedDataPath example/ios/DerivedData/NotificationsExampleApp ONLY_ACTIVE_ARCH=YES -quiet -UseModernBuildSystem=NO", "type": "ios.simulator", - "name": "iPhone X" + "name": "iPhone 11" }, "ios.sim.release": { "binaryPath": "example/ios/DerivedData/NotificationsExampleApp/Build/Products/Release-iphonesimulator/NotificationsExampleApp.app", From a6ee6f2cea6246dc356215693da9142631581718 Mon Sep 17 00:00:00 2001 From: yogevbd Date: Wed, 25 Sep 2019 10:54:22 +0300 Subject: [PATCH 2/6] Run detox e2e tests on iPhone 11 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e35043854..a01e28020 100644 --- a/package.json +++ b/package.json @@ -101,7 +101,7 @@ "binaryPath": "example/ios/DerivedData/NotificationsExampleApp/Build/Products/Release-iphonesimulator/NotificationsExampleApp.app", "build": "RCT_NO_LAUNCH_PACKAGER=true xcodebuild build -scheme NotificationsExampleApp_release -project example/ios/NotificationsExampleApp.xcodeproj -sdk iphonesimulator -configuration Release -derivedDataPath example/ios/DerivedData/NotificationsExampleApp ONLY_ACTIVE_ARCH=YES -quiet -UseModernBuildSystem=NO", "type": "ios.simulator", - "name": "iPhone X" + "name": "iPhone 11" } } }, From d1b5c75f2f7d15e582e1fa1931a34bcbc8cd2bf2 Mon Sep 17 00:00:00 2001 From: yogevbd Date: Wed, 25 Sep 2019 10:55:57 +0300 Subject: [PATCH 3/6] Run detox e2e tests on iPhone 11 --- scripts/test-unit.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/test-unit.js b/scripts/test-unit.js index 01b85f666..dec650f67 100644 --- a/scripts/test-unit.js +++ b/scripts/test-unit.js @@ -44,7 +44,7 @@ function runIosUnitTests() { -project NotificationsExampleApp.xcodeproj -sdk iphonesimulator -configuration ${conf} - -destination 'platform=iOS Simulator,name=iPhone X' + -destination 'platform=iOS Simulator,name=iPhone 11' -derivedDataPath ./example/ios/DerivedData/NotificationsExampleApp ONLY_ACTIVE_ARCH=YES`); } From ae1c0c6b1bb6ecf4a87f02fe85583c3119c24f25 Mon Sep 17 00:00:00 2001 From: yogevbd Date: Wed, 25 Sep 2019 12:16:08 +0300 Subject: [PATCH 4/6] Link CallKit framework for iOS 11 --- RNNotifications/RNNotifications.xcodeproj/project.pbxproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/RNNotifications/RNNotifications.xcodeproj/project.pbxproj b/RNNotifications/RNNotifications.xcodeproj/project.pbxproj index fe2bba152..5ccf50196 100644 --- a/RNNotifications/RNNotifications.xcodeproj/project.pbxproj +++ b/RNNotifications/RNNotifications.xcodeproj/project.pbxproj @@ -15,6 +15,7 @@ 50351F9222CD7DF4000713B3 /* RNBridgeModule.m in Sources */ = {isa = PBXBuildFile; fileRef = 50351F9122CD7DF4000713B3 /* RNBridgeModule.m */; }; 50351F9522CD7FF1000713B3 /* RCTConvert+RNNotifications.m in Sources */ = {isa = PBXBuildFile; fileRef = 50351F9422CD7FF1000713B3 /* RCTConvert+RNNotifications.m */; }; 50351F9822CD8604000713B3 /* RNCommandsHandler.m in Sources */ = {isa = PBXBuildFile; fileRef = 50351F9722CD8604000713B3 /* RNCommandsHandler.m */; }; + 503BCA54233B67AF00D8384F /* CallKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 503BCA53233B67AF00D8384F /* CallKit.framework */; }; 504D54BE22E4B8660088F2E4 /* RNBridgeModuleIntegrationTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 504D54BD22E4B8660088F2E4 /* RNBridgeModuleIntegrationTest.m */; }; 507DCCF522CE3EBD005D4E0B /* RNNotifications.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = D8A2F7561CB57F28002CC8F5 /* RNNotifications.h */; }; 507DCCF722CE3EF7005D4E0B /* RNBridgeModule.h in Headers */ = {isa = PBXBuildFile; fileRef = 50351F9022CD7DF4000713B3 /* RNBridgeModule.h */; }; @@ -94,6 +95,7 @@ 50351F9422CD7FF1000713B3 /* RCTConvert+RNNotifications.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "RCTConvert+RNNotifications.m"; sourceTree = ""; }; 50351F9622CD8604000713B3 /* RNCommandsHandler.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNCommandsHandler.h; sourceTree = ""; }; 50351F9722CD8604000713B3 /* RNCommandsHandler.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNCommandsHandler.m; sourceTree = ""; }; + 503BCA53233B67AF00D8384F /* CallKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CallKit.framework; path = System/Library/Frameworks/CallKit.framework; sourceTree = SDKROOT; }; 504D54BD22E4B8660088F2E4 /* RNBridgeModuleIntegrationTest.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNBridgeModuleIntegrationTest.m; sourceTree = ""; }; 504D54CC22E4BCB80088F2E4 /* libcxxreact.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libcxxreact.a; sourceTree = BUILT_PRODUCTS_DIR; }; 504D54CE22E4BCB80088F2E4 /* libdouble-conversion.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = "libdouble-conversion.a"; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -178,6 +180,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 503BCA54233B67AF00D8384F /* CallKit.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -204,6 +207,7 @@ 504D54CB22E4BCB80088F2E4 /* Frameworks */ = { isa = PBXGroup; children = ( + 503BCA53233B67AF00D8384F /* CallKit.framework */, 50002A7F22E8885A008F6742 /* libOCMock.a */, 50858B7A22E87FBA008272FE /* libRCTActionSheet.a */, 50858B7C22E87FBA008272FE /* libRCTImage.a */, From 09accea9c4b22e82ea1c182fbb0b91caeec46cc0 Mon Sep 17 00:00:00 2001 From: yogevbd Date: Wed, 25 Sep 2019 13:08:34 +0300 Subject: [PATCH 5/6] Upgrade detox@14.x.x --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index a01e28020..a96cf20a2 100644 --- a/package.json +++ b/package.json @@ -61,7 +61,7 @@ "shell-utils": "1.x.x", "react-native": "0.60.5", "react": "16.8.6", - "detox": "13.x.x", + "detox": "14.x.x", "jsc-android": "236355.x.x", "jest": "24.8.0", "metro-react-native-babel-preset": "0.55.x", @@ -134,4 +134,4 @@ "html" ] } -} \ No newline at end of file +} From d05e91441e3e463bcb4109ac5b1d1fb51a740864 Mon Sep 17 00:00:00 2001 From: yogevbd Date: Wed, 25 Sep 2019 21:21:50 +0300 Subject: [PATCH 6/6] Add CallKit to example project frameworks --- .../RNNotifications.xcodeproj/project.pbxproj | 5 +-- .../project.pbxproj | 35 +++---------------- 2 files changed, 6 insertions(+), 34 deletions(-) diff --git a/RNNotifications/RNNotifications.xcodeproj/project.pbxproj b/RNNotifications/RNNotifications.xcodeproj/project.pbxproj index 5ccf50196..566e82af6 100644 --- a/RNNotifications/RNNotifications.xcodeproj/project.pbxproj +++ b/RNNotifications/RNNotifications.xcodeproj/project.pbxproj @@ -15,7 +15,6 @@ 50351F9222CD7DF4000713B3 /* RNBridgeModule.m in Sources */ = {isa = PBXBuildFile; fileRef = 50351F9122CD7DF4000713B3 /* RNBridgeModule.m */; }; 50351F9522CD7FF1000713B3 /* RCTConvert+RNNotifications.m in Sources */ = {isa = PBXBuildFile; fileRef = 50351F9422CD7FF1000713B3 /* RCTConvert+RNNotifications.m */; }; 50351F9822CD8604000713B3 /* RNCommandsHandler.m in Sources */ = {isa = PBXBuildFile; fileRef = 50351F9722CD8604000713B3 /* RNCommandsHandler.m */; }; - 503BCA54233B67AF00D8384F /* CallKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 503BCA53233B67AF00D8384F /* CallKit.framework */; }; 504D54BE22E4B8660088F2E4 /* RNBridgeModuleIntegrationTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 504D54BD22E4B8660088F2E4 /* RNBridgeModuleIntegrationTest.m */; }; 507DCCF522CE3EBD005D4E0B /* RNNotifications.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = D8A2F7561CB57F28002CC8F5 /* RNNotifications.h */; }; 507DCCF722CE3EF7005D4E0B /* RNBridgeModule.h in Headers */ = {isa = PBXBuildFile; fileRef = 50351F9022CD7DF4000713B3 /* RNBridgeModule.h */; }; @@ -95,7 +94,6 @@ 50351F9422CD7FF1000713B3 /* RCTConvert+RNNotifications.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "RCTConvert+RNNotifications.m"; sourceTree = ""; }; 50351F9622CD8604000713B3 /* RNCommandsHandler.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNCommandsHandler.h; sourceTree = ""; }; 50351F9722CD8604000713B3 /* RNCommandsHandler.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNCommandsHandler.m; sourceTree = ""; }; - 503BCA53233B67AF00D8384F /* CallKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CallKit.framework; path = System/Library/Frameworks/CallKit.framework; sourceTree = SDKROOT; }; 504D54BD22E4B8660088F2E4 /* RNBridgeModuleIntegrationTest.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNBridgeModuleIntegrationTest.m; sourceTree = ""; }; 504D54CC22E4BCB80088F2E4 /* libcxxreact.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libcxxreact.a; sourceTree = BUILT_PRODUCTS_DIR; }; 504D54CE22E4BCB80088F2E4 /* libdouble-conversion.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = "libdouble-conversion.a"; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -180,7 +178,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 503BCA54233B67AF00D8384F /* CallKit.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -207,7 +204,6 @@ 504D54CB22E4BCB80088F2E4 /* Frameworks */ = { isa = PBXGroup; children = ( - 503BCA53233B67AF00D8384F /* CallKit.framework */, 50002A7F22E8885A008F6742 /* libOCMock.a */, 50858B7A22E87FBA008272FE /* libRCTActionSheet.a */, 50858B7C22E87FBA008272FE /* libRCTImage.a */, @@ -413,6 +409,7 @@ developmentRegion = English; hasScannedForEncodings = 0; knownRegions = ( + English, en, ); mainGroup = 58B511D21A9E6C8500147676; diff --git a/example/ios/NotificationsExampleApp.xcodeproj/project.pbxproj b/example/ios/NotificationsExampleApp.xcodeproj/project.pbxproj index cbd028911..c9a99bb41 100644 --- a/example/ios/NotificationsExampleApp.xcodeproj/project.pbxproj +++ b/example/ios/NotificationsExampleApp.xcodeproj/project.pbxproj @@ -11,6 +11,7 @@ 13B07FBD1A68108700A75B9A /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB11A68108700A75B9A /* LaunchScreen.xib */; }; 13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; }; 13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; }; + 5004AC02233BE75A00490132 /* CallKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5004ABE1233BE75A00490132 /* CallKit.framework */; }; 50F1F0CC22CE3B4700FD5829 /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 50F1F06022CE3A6100FD5829 /* libReact.a */; }; 50F1F0CD22CE3B6300FD5829 /* libRCTActionSheet.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 50F1F08A22CE3AA000FD5829 /* libRCTActionSheet.a */; }; 50F1F0CF22CE3B6300FD5829 /* libRCTImage.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 50F1F09522CE3ABE00FD5829 /* libRCTImage.a */; }; @@ -244,20 +245,6 @@ remoteGlobalIDString = 2D2A28881D9B049200D4039D; remoteInfo = "RCTWebSocket-tvOS"; }; - 50F1F0C822CE3B2E00FD5829 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 139FDEE61B06529A00C62182 /* RCTWebSocket.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 3DBE0D001F3B181A0099AA32; - remoteInfo = fishhook; - }; - 50F1F0CA22CE3B2E00FD5829 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 139FDEE61B06529A00C62182 /* RCTWebSocket.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 3DBE0D0D1F3B181C0099AA32; - remoteInfo = "fishhook-tvOS"; - }; D85498D01D97B31100DEEE06 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = D85498C21D97B31100DEEE06 /* RNNotifications.xcodeproj */; @@ -283,6 +270,7 @@ 13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = NotificationsExampleApp/Info.plist; sourceTree = ""; }; 13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = NotificationsExampleApp/main.m; sourceTree = ""; }; 146833FF1AC3E56700842450 /* React.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = React.xcodeproj; path = "../../node_modules/react-native/React/React.xcodeproj"; sourceTree = ""; }; + 5004ABE1233BE75A00490132 /* CallKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CallKit.framework; path = System/Library/Frameworks/CallKit.framework; sourceTree = SDKROOT; }; 50F1F08522CE3A9F00FD5829 /* RCTActionSheet.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTActionSheet.xcodeproj; path = "../../node_modules/react-native/Libraries/ActionSheetIOS/RCTActionSheet.xcodeproj"; sourceTree = ""; }; 50F1F0A022CE3B0600FD5829 /* RCTNetwork.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTNetwork.xcodeproj; path = "../../node_modules/react-native/Libraries/Network/RCTNetwork.xcodeproj"; sourceTree = ""; }; 78C398B01ACF4ADC00677621 /* RCTLinking.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTLinking.xcodeproj; path = "../../node_modules/react-native/Libraries/LinkingIOS/RCTLinking.xcodeproj"; sourceTree = ""; }; @@ -305,6 +293,7 @@ 50F1F0D222CE3B6300FD5829 /* libRCTSettings.a in Frameworks */, 50F1F0D322CE3B6300FD5829 /* libRCTText.a in Frameworks */, 50F1F0D422CE3B6300FD5829 /* libRCTVibration.a in Frameworks */, + 5004AC02233BE75A00490132 /* CallKit.framework in Frameworks */, 50F1F0D522CE3B6300FD5829 /* libRCTWebSocket.a in Frameworks */, 50F1F0CC22CE3B4700FD5829 /* libReact.a in Frameworks */, D84861182267695100E9103D /* JavaScriptCore.framework in Frameworks */, @@ -435,8 +424,6 @@ children = ( 50F1F0C522CE3B2E00FD5829 /* libRCTWebSocket.a */, 50F1F0C722CE3B2E00FD5829 /* libRCTWebSocket-tvOS.a */, - 50F1F0C922CE3B2E00FD5829 /* libfishhook.a */, - 50F1F0CB22CE3B2E00FD5829 /* libfishhook-tvOS.a */, ); name = Products; sourceTree = ""; @@ -482,6 +469,7 @@ D84860E82267695100E9103D /* Frameworks */ = { isa = PBXGroup; children = ( + 5004ABE1233BE75A00490132 /* CallKit.framework */, D84861172267695100E9103D /* JavaScriptCore.framework */, ); name = Frameworks; @@ -531,6 +519,7 @@ developmentRegion = English; hasScannedForEncodings = 0; knownRegions = ( + English, en, Base, ); @@ -804,20 +793,6 @@ remoteRef = 50F1F0C622CE3B2E00FD5829 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 50F1F0C922CE3B2E00FD5829 /* libfishhook.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = libfishhook.a; - remoteRef = 50F1F0C822CE3B2E00FD5829 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 50F1F0CB22CE3B2E00FD5829 /* libfishhook-tvOS.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = "libfishhook-tvOS.a"; - remoteRef = 50F1F0CA22CE3B2E00FD5829 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; D85498D11D97B31100DEEE06 /* libRNNotifications.a */ = { isa = PBXReferenceProxy; fileType = archive.ar;