Skip to content
This repository was archived by the owner on Aug 8, 2023. It is now read-only.

Commit 6ec8b28

Browse files
1ec5incanus
1ec5
authored and
incanus
committed
Upgraded to iOS Simulator 9.0, KIF 3.3.0
Upgraded the test project. Rolled back part of 69cf6ed to work around facebookarchive/xctool#528.
1 parent 121e95a commit 6ec8b28

File tree

6 files changed

+34
-51
lines changed

6 files changed

+34
-51
lines changed

‎scripts/ios/test.sh

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,11 @@ set -e
44
set -o pipefail
55
set -u
66

7-
xctool \
7+
xcodebuild \
88
-project ./test/ios/ios-tests.xcodeproj \
99
-scheme 'Mapbox GL Tests' \
10-
-sdk iphonesimulator8.4 \
11-
test
10+
-sdk iphonesimulator \
11+
-destination 'platform=iOS Simulator,name=iPhone 6,OS=latest' \
12+
-destination 'platform=iOS Simulator,name=iPad 2,OS=latest' \
13+
test \
14+
| xcpretty

‎test/ios/App-Info.plist

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<key>CFBundleExecutable</key>
1010
<string>${EXECUTABLE_NAME}</string>
1111
<key>CFBundleIdentifier</key>
12-
<string>com.mapbox.${PRODUCT_NAME:rfc1034identifier}</string>
12+
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
1313
<key>CFBundleInfoDictionaryVersion</key>
1414
<string>6.0</string>
1515
<key>CFBundleName</key>
@@ -28,6 +28,8 @@
2828
<string>pk.eyJ1IjoianVzdGluIiwiYSI6Ik9RX3RRQzAifQ.dmOg_BAp1ywuDZMM7YsXRg</string>
2929
<key>MGLMapboxMetricsEnabledSettingShownInApp</key>
3030
<true/>
31+
<key>NSLocationAlwaysUsageDescription</key>
32+
<string>Strictly for testing purposes, promise!</string>
3133
<key>UILaunchStoryboardName</key>
3234
<string>LaunchScreen</string>
3335
<key>UIRequiredDeviceCapabilities</key>
@@ -40,8 +42,6 @@
4042
<string>UIInterfaceOrientationLandscapeLeft</string>
4143
<string>UIInterfaceOrientationLandscapeRight</string>
4244
</array>
43-
<key>NSLocationAlwaysUsageDescription</key>
44-
<string>Strictly for testing purposes, promise!</string>
4545
<key>UISupportedInterfaceOrientations~ipad</key>
4646
<array>
4747
<string>UIInterfaceOrientationPortrait</string>

‎test/ios/Bundle-Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<key>CFBundleExecutable</key>
88
<string>${EXECUTABLE_NAME}</string>
99
<key>CFBundleIdentifier</key>
10-
<string>com.mapbox.${PRODUCT_NAME:rfc1034identifier}</string>
10+
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
1111
<key>CFBundleInfoDictionaryVersion</key>
1212
<string>6.0</string>
1313
<key>CFBundlePackageType</key>

‎test/ios/KIF

Submodule KIF updated 60 files

‎test/ios/ios-tests.xcodeproj/project.pbxproj

Lines changed: 22 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -41,19 +41,19 @@
4141
/* End PBXBuildFile section */
4242

4343
/* Begin PBXContainerItemProxy section */
44-
DDBD0143196DC3AE0033959E /* PBXContainerItemProxy */ = {
44+
DA3BDF011BA2326400553BD2 /* PBXContainerItemProxy */ = {
4545
isa = PBXContainerItemProxy;
4646
containerPortal = DDBD013A196DC3AE0033959E /* KIF.xcodeproj */;
4747
proxyType = 2;
48-
remoteGlobalIDString = EABD46AA1857A0C700A5F081;
49-
remoteInfo = KIF;
48+
remoteGlobalIDString = 9CC9673B1AD4B1B600576D13;
49+
remoteInfo = KIFFramework;
5050
};
51-
DDBD0145196DC3AE0033959E /* PBXContainerItemProxy */ = {
51+
DDBD0143196DC3AE0033959E /* PBXContainerItemProxy */ = {
5252
isa = PBXContainerItemProxy;
5353
containerPortal = DDBD013A196DC3AE0033959E /* KIF.xcodeproj */;
5454
proxyType = 2;
55-
remoteGlobalIDString = EB72047C1680DDAD00278DA2;
56-
remoteInfo = "KIF-OCUnit";
55+
remoteGlobalIDString = EABD46AA1857A0C700A5F081;
56+
remoteInfo = KIF;
5757
};
5858
DDBD0147196DC3AE0033959E /* PBXContainerItemProxy */ = {
5959
isa = PBXContainerItemProxy;
@@ -69,13 +69,6 @@
6969
remoteGlobalIDString = EABD46CD1857A0F300A5F081;
7070
remoteInfo = "KIF Tests";
7171
};
72-
DDBD014B196DC3AE0033959E /* PBXContainerItemProxy */ = {
73-
isa = PBXContainerItemProxy;
74-
containerPortal = DDBD013A196DC3AE0033959E /* KIF.xcodeproj */;
75-
proxyType = 2;
76-
remoteGlobalIDString = EB60ECEB177F8DB3005A041A;
77-
remoteInfo = "KIF Tests-OCUnit";
78-
};
7972
DDBD0160196DC3D70033959E /* PBXContainerItemProxy */ = {
8073
isa = PBXContainerItemProxy;
8174
containerPortal = DD04331B196DB9BC00E6F39D /* Project object */;
@@ -327,10 +320,9 @@
327320
isa = PBXGroup;
328321
children = (
329322
DDBD0144196DC3AE0033959E /* libKIF.a */,
330-
DDBD0146196DC3AE0033959E /* libKIF-OCUnit.a */,
331323
DDBD0148196DC3AE0033959E /* Test Host.app */,
332324
DDBD014A196DC3AE0033959E /* KIF Tests - XCTest.xctest */,
333-
DDBD014C196DC3AE0033959E /* KIF Tests-OCUnit.octest */,
325+
DA3BDF021BA2326400553BD2 /* KIF.framework */,
334326
);
335327
name = Products;
336328
sourceTree = "<group>";
@@ -396,7 +388,7 @@
396388
isa = PBXProject;
397389
attributes = {
398390
CLASSPREFIX = MGLT;
399-
LastUpgradeCheck = 0620;
391+
LastUpgradeCheck = 0700;
400392
ORGANIZATIONNAME = Mapbox;
401393
TargetAttributes = {
402394
DDBD0151196DC3D70033959E = {
@@ -430,18 +422,18 @@
430422
/* End PBXProject section */
431423

432424
/* Begin PBXReferenceProxy section */
433-
DDBD0144196DC3AE0033959E /* libKIF.a */ = {
425+
DA3BDF021BA2326400553BD2 /* KIF.framework */ = {
434426
isa = PBXReferenceProxy;
435-
fileType = archive.ar;
436-
path = libKIF.a;
437-
remoteRef = DDBD0143196DC3AE0033959E /* PBXContainerItemProxy */;
427+
fileType = wrapper.framework;
428+
path = KIF.framework;
429+
remoteRef = DA3BDF011BA2326400553BD2 /* PBXContainerItemProxy */;
438430
sourceTree = BUILT_PRODUCTS_DIR;
439431
};
440-
DDBD0146196DC3AE0033959E /* libKIF-OCUnit.a */ = {
432+
DDBD0144196DC3AE0033959E /* libKIF.a */ = {
441433
isa = PBXReferenceProxy;
442434
fileType = archive.ar;
443-
path = "libKIF-OCUnit.a";
444-
remoteRef = DDBD0145196DC3AE0033959E /* PBXContainerItemProxy */;
435+
path = libKIF.a;
436+
remoteRef = DDBD0143196DC3AE0033959E /* PBXContainerItemProxy */;
445437
sourceTree = BUILT_PRODUCTS_DIR;
446438
};
447439
DDBD0148196DC3AE0033959E /* Test Host.app */ = {
@@ -458,13 +450,6 @@
458450
remoteRef = DDBD0149196DC3AE0033959E /* PBXContainerItemProxy */;
459451
sourceTree = BUILT_PRODUCTS_DIR;
460452
};
461-
DDBD014C196DC3AE0033959E /* KIF Tests-OCUnit.octest */ = {
462-
isa = PBXReferenceProxy;
463-
fileType = wrapper.cfbundle;
464-
path = "KIF Tests-OCUnit.octest";
465-
remoteRef = DDBD014B196DC3AE0033959E /* PBXContainerItemProxy */;
466-
sourceTree = BUILT_PRODUCTS_DIR;
467-
};
468453
/* End PBXReferenceProxy section */
469454

470455
/* Begin PBXResourcesBuildPhase section */
@@ -547,6 +532,7 @@
547532
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
548533
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
549534
COPY_PHASE_STRIP = NO;
535+
ENABLE_TESTABILITY = YES;
550536
GCC_C_LANGUAGE_STANDARD = gnu99;
551537
GCC_DYNAMIC_NO_PIC = NO;
552538
GCC_OPTIMIZATION_LEVEL = 0;
@@ -618,6 +604,7 @@
618604
../../build/ios/pkg/static,
619605
);
620606
OTHER_LDFLAGS = "-ObjC";
607+
PRODUCT_BUNDLE_IDENTIFIER = "com.mapbox.${PRODUCT_NAME:rfc1034identifier}";
621608
PRODUCT_NAME = "$(TARGET_NAME)";
622609
TARGETED_DEVICE_FAMILY = "1,2";
623610
WRAPPER_EXTENSION = app;
@@ -641,6 +628,7 @@
641628
../../build/ios/pkg/static,
642629
);
643630
OTHER_LDFLAGS = "-ObjC";
631+
PRODUCT_BUNDLE_IDENTIFIER = "com.mapbox.${PRODUCT_NAME:rfc1034identifier}";
644632
PRODUCT_NAME = "$(TARGET_NAME)";
645633
TARGETED_DEVICE_FAMILY = "1,2";
646634
WRAPPER_EXTENSION = app;
@@ -651,12 +639,7 @@
651639
isa = XCBuildConfiguration;
652640
buildSettings = {
653641
BUNDLE_LOADER = "$(BUILT_PRODUCTS_DIR)/Mapbox GL Tests.app/Mapbox GL Tests";
654-
FRAMEWORK_SEARCH_PATHS = (
655-
"$(SDKROOT)/Developer/Library/Frameworks",
656-
"$(inherited)",
657-
"$(DEVELOPER_FRAMEWORKS_DIR)",
658-
"$(DEVELOPER_DIR)/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/Frameworks",
659-
);
642+
FRAMEWORK_SEARCH_PATHS = "";
660643
GCC_PREPROCESSOR_DEFINITIONS = (
661644
"DEBUG=1",
662645
"$(inherited)",
@@ -680,6 +663,7 @@
680663
XCTest,
681664
"-ObjC",
682665
);
666+
PRODUCT_BUNDLE_IDENTIFIER = "com.mapbox.${PRODUCT_NAME:rfc1034identifier}";
683667
PRODUCT_NAME = "$(TARGET_NAME)";
684668
TEST_HOST = "$(BUNDLE_LOADER)";
685669
WRAPPER_EXTENSION = xctest;
@@ -690,12 +674,7 @@
690674
isa = XCBuildConfiguration;
691675
buildSettings = {
692676
BUNDLE_LOADER = "$(BUILT_PRODUCTS_DIR)/Mapbox GL Tests.app/Mapbox GL Tests";
693-
FRAMEWORK_SEARCH_PATHS = (
694-
"$(SDKROOT)/Developer/Library/Frameworks",
695-
"$(inherited)",
696-
"$(DEVELOPER_FRAMEWORKS_DIR)",
697-
"$(DEVELOPER_DIR)/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/Frameworks",
698-
);
677+
FRAMEWORK_SEARCH_PATHS = "";
699678
GCC_PREPROCESSOR_DEFINITIONS = "KIF_XCTEST=1";
700679
HEADER_SEARCH_PATHS = (
701680
"$(inherited)",
@@ -715,6 +694,7 @@
715694
XCTest,
716695
"-ObjC",
717696
);
697+
PRODUCT_BUNDLE_IDENTIFIER = "com.mapbox.${PRODUCT_NAME:rfc1034identifier}";
718698
PRODUCT_NAME = "$(TARGET_NAME)";
719699
TEST_HOST = "$(BUNDLE_LOADER)";
720700
WRAPPER_EXTENSION = xctest;

‎test/ios/ios-tests.xcodeproj/xcshareddata/xcschemes/Mapbox GL Tests.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0620"
3+
LastUpgradeVersion = "0700"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

0 commit comments

Comments
 (0)