Skip to content

Commit 51097b2

Browse files
yogevbdyogevbd
authored
Xcode 11 support in CI (wix#384)
* Run detox e2e tests on iPhone 11 * Run detox e2e tests on iPhone 11 * Run detox e2e tests on iPhone 11 * Link CallKit framework for iOS 11 * Upgrade [email protected] * Add CallKit to example project frameworks
1 parent d65dc4f commit 51097b2

File tree

4 files changed

+12
-36
lines changed

4 files changed

+12
-36
lines changed

‎RNNotifications/RNNotifications.xcodeproj/project.pbxproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -409,6 +409,7 @@
409409
developmentRegion = English;
410410
hasScannedForEncodings = 0;
411411
knownRegions = (
412+
English,
412413
en,
413414
);
414415
mainGroup = 58B511D21A9E6C8500147676;

‎example/ios/NotificationsExampleApp.xcodeproj/project.pbxproj‎

Lines changed: 5 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
13B07FBD1A68108700A75B9A /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB11A68108700A75B9A /* LaunchScreen.xib */; };
1212
13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; };
1313
13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; };
14+
5004AC02233BE75A00490132 /* CallKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5004ABE1233BE75A00490132 /* CallKit.framework */; };
1415
50F1F0CC22CE3B4700FD5829 /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 50F1F06022CE3A6100FD5829 /* libReact.a */; };
1516
50F1F0CD22CE3B6300FD5829 /* libRCTActionSheet.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 50F1F08A22CE3AA000FD5829 /* libRCTActionSheet.a */; };
1617
50F1F0CF22CE3B6300FD5829 /* libRCTImage.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 50F1F09522CE3ABE00FD5829 /* libRCTImage.a */; };
@@ -244,20 +245,6 @@
244245
remoteGlobalIDString = 2D2A28881D9B049200D4039D;
245246
remoteInfo = "RCTWebSocket-tvOS";
246247
};
247-
50F1F0C822CE3B2E00FD5829 /* PBXContainerItemProxy */ = {
248-
isa = PBXContainerItemProxy;
249-
containerPortal = 139FDEE61B06529A00C62182 /* RCTWebSocket.xcodeproj */;
250-
proxyType = 2;
251-
remoteGlobalIDString = 3DBE0D001F3B181A0099AA32;
252-
remoteInfo = fishhook;
253-
};
254-
50F1F0CA22CE3B2E00FD5829 /* PBXContainerItemProxy */ = {
255-
isa = PBXContainerItemProxy;
256-
containerPortal = 139FDEE61B06529A00C62182 /* RCTWebSocket.xcodeproj */;
257-
proxyType = 2;
258-
remoteGlobalIDString = 3DBE0D0D1F3B181C0099AA32;
259-
remoteInfo = "fishhook-tvOS";
260-
};
261248
D85498D01D97B31100DEEE06 /* PBXContainerItemProxy */ = {
262249
isa = PBXContainerItemProxy;
263250
containerPortal = D85498C21D97B31100DEEE06 /* RNNotifications.xcodeproj */;
@@ -283,6 +270,7 @@
283270
13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = NotificationsExampleApp/Info.plist; sourceTree = "<group>"; };
284271
13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = NotificationsExampleApp/main.m; sourceTree = "<group>"; };
285272
146833FF1AC3E56700842450 /* React.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = React.xcodeproj; path = "../../node_modules/react-native/React/React.xcodeproj"; sourceTree = "<group>"; };
273+
5004ABE1233BE75A00490132 /* CallKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CallKit.framework; path = System/Library/Frameworks/CallKit.framework; sourceTree = SDKROOT; };
286274
50F1F08522CE3A9F00FD5829 /* RCTActionSheet.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTActionSheet.xcodeproj; path = "../../node_modules/react-native/Libraries/ActionSheetIOS/RCTActionSheet.xcodeproj"; sourceTree = "<group>"; };
287275
50F1F0A022CE3B0600FD5829 /* RCTNetwork.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTNetwork.xcodeproj; path = "../../node_modules/react-native/Libraries/Network/RCTNetwork.xcodeproj"; sourceTree = "<group>"; };
288276
78C398B01ACF4ADC00677621 /* RCTLinking.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTLinking.xcodeproj; path = "../../node_modules/react-native/Libraries/LinkingIOS/RCTLinking.xcodeproj"; sourceTree = "<group>"; };
@@ -305,6 +293,7 @@
305293
50F1F0D222CE3B6300FD5829 /* libRCTSettings.a in Frameworks */,
306294
50F1F0D322CE3B6300FD5829 /* libRCTText.a in Frameworks */,
307295
50F1F0D422CE3B6300FD5829 /* libRCTVibration.a in Frameworks */,
296+
5004AC02233BE75A00490132 /* CallKit.framework in Frameworks */,
308297
50F1F0D522CE3B6300FD5829 /* libRCTWebSocket.a in Frameworks */,
309298
50F1F0CC22CE3B4700FD5829 /* libReact.a in Frameworks */,
310299
D84861182267695100E9103D /* JavaScriptCore.framework in Frameworks */,
@@ -435,8 +424,6 @@
435424
children = (
436425
50F1F0C522CE3B2E00FD5829 /* libRCTWebSocket.a */,
437426
50F1F0C722CE3B2E00FD5829 /* libRCTWebSocket-tvOS.a */,
438-
50F1F0C922CE3B2E00FD5829 /* libfishhook.a */,
439-
50F1F0CB22CE3B2E00FD5829 /* libfishhook-tvOS.a */,
440427
);
441428
name = Products;
442429
sourceTree = "<group>";
@@ -482,6 +469,7 @@
482469
D84860E82267695100E9103D /* Frameworks */ = {
483470
isa = PBXGroup;
484471
children = (
472+
5004ABE1233BE75A00490132 /* CallKit.framework */,
485473
D84861172267695100E9103D /* JavaScriptCore.framework */,
486474
);
487475
name = Frameworks;
@@ -531,6 +519,7 @@
531519
developmentRegion = English;
532520
hasScannedForEncodings = 0;
533521
knownRegions = (
522+
English,
534523
en,
535524
Base,
536525
);
@@ -804,20 +793,6 @@
804793
remoteRef = 50F1F0C622CE3B2E00FD5829 /* PBXContainerItemProxy */;
805794
sourceTree = BUILT_PRODUCTS_DIR;
806795
};
807-
50F1F0C922CE3B2E00FD5829 /* libfishhook.a */ = {
808-
isa = PBXReferenceProxy;
809-
fileType = archive.ar;
810-
path = libfishhook.a;
811-
remoteRef = 50F1F0C822CE3B2E00FD5829 /* PBXContainerItemProxy */;
812-
sourceTree = BUILT_PRODUCTS_DIR;
813-
};
814-
50F1F0CB22CE3B2E00FD5829 /* libfishhook-tvOS.a */ = {
815-
isa = PBXReferenceProxy;
816-
fileType = archive.ar;
817-
path = "libfishhook-tvOS.a";
818-
remoteRef = 50F1F0CA22CE3B2E00FD5829 /* PBXContainerItemProxy */;
819-
sourceTree = BUILT_PRODUCTS_DIR;
820-
};
821796
D85498D11D97B31100DEEE06 /* libRNNotifications.a */ = {
822797
isa = PBXReferenceProxy;
823798
fileType = archive.ar;

‎package.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
"shell-utils": "1.x.x",
6262
"react-native": "0.60.5",
6363
"react": "16.8.6",
64-
"detox": "13.x.x",
64+
"detox": "14.x.x",
6565
"jsc-android": "236355.x.x",
6666
"jest": "24.8.0",
6767
"metro-react-native-babel-preset": "0.55.x",
@@ -85,7 +85,7 @@
8585
"ios.none": {
8686
"binaryPath": "playground/ios/DerivedData/playground/Build/Products/Debug-iphonesimulator/playground.app",
8787
"type": "ios.none",
88-
"name": "iPhone X",
88+
"name": "iPhone 11",
8989
"session": {
9090
"server": "ws://localhost:8099",
9191
"sessionId": "playground"
@@ -95,13 +95,13 @@
9595
"binaryPath": "example/ios/DerivedData/NotificationsExampleApp/Build/Products/Debug-iphonesimulator/NotificationsExampleApp.app",
9696
"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",
9797
"type": "ios.simulator",
98-
"name": "iPhone X"
98+
"name": "iPhone 11"
9999
},
100100
"ios.sim.release": {
101101
"binaryPath": "example/ios/DerivedData/NotificationsExampleApp/Build/Products/Release-iphonesimulator/NotificationsExampleApp.app",
102102
"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",
103103
"type": "ios.simulator",
104-
"name": "iPhone X"
104+
"name": "iPhone 11"
105105
}
106106
}
107107
},
@@ -134,4 +134,4 @@
134134
"html"
135135
]
136136
}
137-
}
137+
}

‎scripts/test-unit.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ function runIosUnitTests() {
4444
-project NotificationsExampleApp.xcodeproj
4545
-sdk iphonesimulator
4646
-configuration ${conf}
47-
-destination 'platform=iOS Simulator,name=iPhone X'
47+
-destination 'platform=iOS Simulator,name=iPhone 11'
4848
-derivedDataPath ./example/ios/DerivedData/NotificationsExampleApp
4949
ONLY_ACTIVE_ARCH=YES`);
5050
}

0 commit comments

Comments
 (0)