diff options
author | Minh Nguyễn <mxn@1ec5.org> | 2015-09-10 14:44:39 -0700 |
---|---|---|
committer | Justin R. Miller <incanus@codesorcery.net> | 2015-09-15 11:05:46 -0700 |
commit | 6ec8b2805db9c88b3a37616a2c1ce82951557e1f (patch) | |
tree | e0ccb86af16392b1b4a8cd3306a65c3d764fac4a /test | |
parent | 121e95ada4b20525a47a3e8873219d1d19e50cb1 (diff) | |
download | qtlocation-mapboxgl-6ec8b2805db9c88b3a37616a2c1ce82951557e1f.tar.gz |
Upgraded to iOS Simulator 9.0, KIF 3.3.0
Upgraded the test project. Rolled back part of 69cf6ed3d273fc10e8cea2caef223f4a281388f0 to work around facebook/xctool#528.
Diffstat (limited to 'test')
-rw-r--r-- | test/ios/App-Info.plist | 6 | ||||
-rw-r--r-- | test/ios/Bundle-Info.plist | 2 | ||||
m--------- | test/ios/KIF | 0 | ||||
-rw-r--r-- | test/ios/ios-tests.xcodeproj/project.pbxproj | 64 | ||||
-rw-r--r-- | test/ios/ios-tests.xcodeproj/xcshareddata/xcschemes/Mapbox GL Tests.xcscheme | 2 |
5 files changed, 27 insertions, 47 deletions
diff --git a/test/ios/App-Info.plist b/test/ios/App-Info.plist index f817ea1d9a..ab5ac7ec8c 100644 --- a/test/ios/App-Info.plist +++ b/test/ios/App-Info.plist @@ -9,7 +9,7 @@ <key>CFBundleExecutable</key> <string>${EXECUTABLE_NAME}</string> <key>CFBundleIdentifier</key> - <string>com.mapbox.${PRODUCT_NAME:rfc1034identifier}</string> + <string>$(PRODUCT_BUNDLE_IDENTIFIER)</string> <key>CFBundleInfoDictionaryVersion</key> <string>6.0</string> <key>CFBundleName</key> @@ -28,6 +28,8 @@ <string>pk.eyJ1IjoianVzdGluIiwiYSI6Ik9RX3RRQzAifQ.dmOg_BAp1ywuDZMM7YsXRg</string> <key>MGLMapboxMetricsEnabledSettingShownInApp</key> <true/> + <key>NSLocationAlwaysUsageDescription</key> + <string>Strictly for testing purposes, promise!</string> <key>UILaunchStoryboardName</key> <string>LaunchScreen</string> <key>UIRequiredDeviceCapabilities</key> @@ -40,8 +42,6 @@ <string>UIInterfaceOrientationLandscapeLeft</string> <string>UIInterfaceOrientationLandscapeRight</string> </array> - <key>NSLocationAlwaysUsageDescription</key> - <string>Strictly for testing purposes, promise!</string> <key>UISupportedInterfaceOrientations~ipad</key> <array> <string>UIInterfaceOrientationPortrait</string> diff --git a/test/ios/Bundle-Info.plist b/test/ios/Bundle-Info.plist index 4ea0aed89c..169b6f710e 100644 --- a/test/ios/Bundle-Info.plist +++ b/test/ios/Bundle-Info.plist @@ -7,7 +7,7 @@ <key>CFBundleExecutable</key> <string>${EXECUTABLE_NAME}</string> <key>CFBundleIdentifier</key> - <string>com.mapbox.${PRODUCT_NAME:rfc1034identifier}</string> + <string>$(PRODUCT_BUNDLE_IDENTIFIER)</string> <key>CFBundleInfoDictionaryVersion</key> <string>6.0</string> <key>CFBundlePackageType</key> diff --git a/test/ios/KIF b/test/ios/KIF -Subproject 976aafa2e211dd095411bfef09da6c0919d7047 +Subproject 21a137bc8068f9fb738f835c6e285d44fe2ce4d diff --git a/test/ios/ios-tests.xcodeproj/project.pbxproj b/test/ios/ios-tests.xcodeproj/project.pbxproj index 6408372430..2807ee01bf 100644 --- a/test/ios/ios-tests.xcodeproj/project.pbxproj +++ b/test/ios/ios-tests.xcodeproj/project.pbxproj @@ -41,19 +41,19 @@ /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ - DDBD0143196DC3AE0033959E /* PBXContainerItemProxy */ = { + DA3BDF011BA2326400553BD2 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = DDBD013A196DC3AE0033959E /* KIF.xcodeproj */; proxyType = 2; - remoteGlobalIDString = EABD46AA1857A0C700A5F081; - remoteInfo = KIF; + remoteGlobalIDString = 9CC9673B1AD4B1B600576D13; + remoteInfo = KIFFramework; }; - DDBD0145196DC3AE0033959E /* PBXContainerItemProxy */ = { + DDBD0143196DC3AE0033959E /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = DDBD013A196DC3AE0033959E /* KIF.xcodeproj */; proxyType = 2; - remoteGlobalIDString = EB72047C1680DDAD00278DA2; - remoteInfo = "KIF-OCUnit"; + remoteGlobalIDString = EABD46AA1857A0C700A5F081; + remoteInfo = KIF; }; DDBD0147196DC3AE0033959E /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; @@ -69,13 +69,6 @@ remoteGlobalIDString = EABD46CD1857A0F300A5F081; remoteInfo = "KIF Tests"; }; - DDBD014B196DC3AE0033959E /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = DDBD013A196DC3AE0033959E /* KIF.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = EB60ECEB177F8DB3005A041A; - remoteInfo = "KIF Tests-OCUnit"; - }; DDBD0160196DC3D70033959E /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = DD04331B196DB9BC00E6F39D /* Project object */; @@ -327,10 +320,9 @@ isa = PBXGroup; children = ( DDBD0144196DC3AE0033959E /* libKIF.a */, - DDBD0146196DC3AE0033959E /* libKIF-OCUnit.a */, DDBD0148196DC3AE0033959E /* Test Host.app */, DDBD014A196DC3AE0033959E /* KIF Tests - XCTest.xctest */, - DDBD014C196DC3AE0033959E /* KIF Tests-OCUnit.octest */, + DA3BDF021BA2326400553BD2 /* KIF.framework */, ); name = Products; sourceTree = "<group>"; @@ -396,7 +388,7 @@ isa = PBXProject; attributes = { CLASSPREFIX = MGLT; - LastUpgradeCheck = 0620; + LastUpgradeCheck = 0700; ORGANIZATIONNAME = Mapbox; TargetAttributes = { DDBD0151196DC3D70033959E = { @@ -430,18 +422,18 @@ /* End PBXProject section */ /* Begin PBXReferenceProxy section */ - DDBD0144196DC3AE0033959E /* libKIF.a */ = { + DA3BDF021BA2326400553BD2 /* KIF.framework */ = { isa = PBXReferenceProxy; - fileType = archive.ar; - path = libKIF.a; - remoteRef = DDBD0143196DC3AE0033959E /* PBXContainerItemProxy */; + fileType = wrapper.framework; + path = KIF.framework; + remoteRef = DA3BDF011BA2326400553BD2 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - DDBD0146196DC3AE0033959E /* libKIF-OCUnit.a */ = { + DDBD0144196DC3AE0033959E /* libKIF.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; - path = "libKIF-OCUnit.a"; - remoteRef = DDBD0145196DC3AE0033959E /* PBXContainerItemProxy */; + path = libKIF.a; + remoteRef = DDBD0143196DC3AE0033959E /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; DDBD0148196DC3AE0033959E /* Test Host.app */ = { @@ -458,13 +450,6 @@ remoteRef = DDBD0149196DC3AE0033959E /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - DDBD014C196DC3AE0033959E /* KIF Tests-OCUnit.octest */ = { - isa = PBXReferenceProxy; - fileType = wrapper.cfbundle; - path = "KIF Tests-OCUnit.octest"; - remoteRef = DDBD014B196DC3AE0033959E /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; /* End PBXReferenceProxy section */ /* Begin PBXResourcesBuildPhase section */ @@ -547,6 +532,7 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = NO; + ENABLE_TESTABILITY = YES; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DYNAMIC_NO_PIC = NO; GCC_OPTIMIZATION_LEVEL = 0; @@ -618,6 +604,7 @@ ../../build/ios/pkg/static, ); OTHER_LDFLAGS = "-ObjC"; + PRODUCT_BUNDLE_IDENTIFIER = "com.mapbox.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = "$(TARGET_NAME)"; TARGETED_DEVICE_FAMILY = "1,2"; WRAPPER_EXTENSION = app; @@ -641,6 +628,7 @@ ../../build/ios/pkg/static, ); OTHER_LDFLAGS = "-ObjC"; + PRODUCT_BUNDLE_IDENTIFIER = "com.mapbox.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = "$(TARGET_NAME)"; TARGETED_DEVICE_FAMILY = "1,2"; WRAPPER_EXTENSION = app; @@ -651,12 +639,7 @@ isa = XCBuildConfiguration; buildSettings = { BUNDLE_LOADER = "$(BUILT_PRODUCTS_DIR)/Mapbox GL Tests.app/Mapbox GL Tests"; - FRAMEWORK_SEARCH_PATHS = ( - "$(SDKROOT)/Developer/Library/Frameworks", - "$(inherited)", - "$(DEVELOPER_FRAMEWORKS_DIR)", - "$(DEVELOPER_DIR)/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/Frameworks", - ); + FRAMEWORK_SEARCH_PATHS = ""; GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUG=1", "$(inherited)", @@ -680,6 +663,7 @@ XCTest, "-ObjC", ); + PRODUCT_BUNDLE_IDENTIFIER = "com.mapbox.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = "$(TARGET_NAME)"; TEST_HOST = "$(BUNDLE_LOADER)"; WRAPPER_EXTENSION = xctest; @@ -690,12 +674,7 @@ isa = XCBuildConfiguration; buildSettings = { BUNDLE_LOADER = "$(BUILT_PRODUCTS_DIR)/Mapbox GL Tests.app/Mapbox GL Tests"; - FRAMEWORK_SEARCH_PATHS = ( - "$(SDKROOT)/Developer/Library/Frameworks", - "$(inherited)", - "$(DEVELOPER_FRAMEWORKS_DIR)", - "$(DEVELOPER_DIR)/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/Frameworks", - ); + FRAMEWORK_SEARCH_PATHS = ""; GCC_PREPROCESSOR_DEFINITIONS = "KIF_XCTEST=1"; HEADER_SEARCH_PATHS = ( "$(inherited)", @@ -715,6 +694,7 @@ XCTest, "-ObjC", ); + PRODUCT_BUNDLE_IDENTIFIER = "com.mapbox.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = "$(TARGET_NAME)"; TEST_HOST = "$(BUNDLE_LOADER)"; WRAPPER_EXTENSION = xctest; diff --git a/test/ios/ios-tests.xcodeproj/xcshareddata/xcschemes/Mapbox GL Tests.xcscheme b/test/ios/ios-tests.xcodeproj/xcshareddata/xcschemes/Mapbox GL Tests.xcscheme index 2737f5185f..c80cdb3d57 100644 --- a/test/ios/ios-tests.xcodeproj/xcshareddata/xcschemes/Mapbox GL Tests.xcscheme +++ b/test/ios/ios-tests.xcodeproj/xcshareddata/xcschemes/Mapbox GL Tests.xcscheme @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <Scheme - LastUpgradeVersion = "0620" + LastUpgradeVersion = "0700" version = "1.3"> <BuildAction parallelizeBuildables = "YES" |