diff options
author | Minh Nguyễn <mxn@1ec5.org> | 2016-04-07 16:39:12 -0400 |
---|---|---|
committer | Minh Nguyễn <mxn@1ec5.org> | 2016-04-16 13:20:12 -0700 |
commit | 96d3ccb0225ec784e6620b1a0f865bb9e466db41 (patch) | |
tree | 36ff35d301524405b3be4aee2b1502fc40230563 /platform/ios/test | |
parent | 2fcfc2a939df12e7abf75a9e5659a82728b805f2 (diff) | |
download | qtlocation-mapboxgl-96d3ccb0225ec784e6620b1a0f865bb9e466db41.tar.gz |
[ios] Added Xcode project for iosapp, ios-bench; workspace for ios-tests
ios.xcodeproj is an ordinary Xcode project with ordinary Xcode targets for iosapp and ios-bench, all contained in an ordinary Xcode workspace that happens to also reference the gyp-generated platform.xcodeproj. The iosapp target links to and embeds Mapbox.framework, which is a product of the gyp-generated platform.xcodeproj. ios-tests.xcodeproj is also in the workspace, enabling simultaneous debugging of KIF tests, the SDK, and core code.
Moved storyboards into Base.lproj and image assets into an asset catalog. Removed iOS 6 assets from the iosapp asset catalog. Moved the original ios-bench application icon SVG into a non-project location.
Removed app/Settings.bundle, which is identical to framework/Settings.bundle.
Removed a broken reference to an unused header from the ios-tests project.
Diffstat (limited to 'platform/ios/test')
-rw-r--r-- | platform/ios/test/Images.xcassets/AppIcon.appiconset/Contents.json | 11 | ||||
-rw-r--r-- | platform/ios/test/ios-tests.xcodeproj/project.pbxproj | 22 |
2 files changed, 10 insertions, 23 deletions
diff --git a/platform/ios/test/Images.xcassets/AppIcon.appiconset/Contents.json b/platform/ios/test/Images.xcassets/AppIcon.appiconset/Contents.json index 5008911f9e..f535da681c 100644 --- a/platform/ios/test/Images.xcassets/AppIcon.appiconset/Contents.json +++ b/platform/ios/test/Images.xcassets/AppIcon.appiconset/Contents.json @@ -96,9 +96,9 @@ "scale" : "2x" }, { - "idiom" : "car", - "size" : "120x120", - "scale" : "1x" + "idiom" : "ipad", + "size" : "83.5x83.5", + "scale" : "2x" }, { "size" : "24x24", @@ -153,6 +153,11 @@ "scale" : "2x", "role" : "quickLook", "subtype" : "42mm" + }, + { + "idiom" : "car", + "size" : "120x120", + "scale" : "1x" } ], "info" : { diff --git a/platform/ios/test/ios-tests.xcodeproj/project.pbxproj b/platform/ios/test/ios-tests.xcodeproj/project.pbxproj index 09cc7f3c31..723c73a20c 100644 --- a/platform/ios/test/ios-tests.xcodeproj/project.pbxproj +++ b/platform/ios/test/ios-tests.xcodeproj/project.pbxproj @@ -82,8 +82,7 @@ /* Begin PBXFileReference section */ 96567A221B0E84CD00D78776 /* LaunchScreen.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = LaunchScreen.xib; sourceTree = SOURCE_ROOT; }; 96567A301B0E8BB900D78776 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = SOURCE_ROOT; }; - DA482C7F1C12582600772FE3 /* Mapbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Mapbox.framework; path = ../../../build/ios/pkg/dynamic/Mapbox.framework; sourceTree = "<group>"; }; - DACAD7111B08719F009119DC /* MGLMapboxEvents.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MGLMapboxEvents.h; path = ../../platform/ios/MGLMapboxEvents.h; sourceTree = SOURCE_ROOT; }; + DA482C7F1C12582600772FE3 /* Mapbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Mapbox.framework; sourceTree = BUILT_PRODUCTS_DIR; }; DADD9EB51BD16D8B00DA9161 /* Compatibility.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Compatibility.h; path = OHHTTPStubs/OHHTTPStubs/Sources/Compatibility.h; sourceTree = SOURCE_ROOT; }; DD043323196DB9BC00E6F39D /* Mapbox GL Tests.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Mapbox GL Tests.app"; sourceTree = BUILT_PRODUCTS_DIR; }; DD04335F196DBBD500E6F39D /* MGLTAppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MGLTAppDelegate.m; sourceTree = SOURCE_ROOT; }; @@ -147,7 +146,6 @@ DD04331A196DB9BC00E6F39D = { isa = PBXGroup; children = ( - DA482C7F1C12582600772FE3 /* Mapbox.framework */, DD04332C196DB9BC00E6F39D /* App */, DDBD0139196DC38D0033959E /* Tests */, DD043325196DB9BC00E6F39D /* Frameworks */, @@ -167,6 +165,7 @@ DD043325196DB9BC00E6F39D /* Frameworks */ = { isa = PBXGroup; children = ( + DA482C7F1C12582600772FE3 /* Mapbox.framework */, DD0580E71ACB628200B112C9 /* IOKit.framework */, ); name = Frameworks; @@ -179,7 +178,6 @@ DD04335F196DBBD500E6F39D /* MGLTAppDelegate.m */, DD043361196DBBD500E6F39D /* MGLTViewController.h */, DD043360196DBBD500E6F39D /* MGLTViewController.m */, - DDAE739B1ACB557500E1A793 /* GL Library */, DD04332D196DB9BC00E6F39D /* Supporting Files */, ); name = App; @@ -242,14 +240,6 @@ name = OHHTTPStubs; sourceTree = "<group>"; }; - DDAE739B1ACB557500E1A793 /* GL Library */ = { - isa = PBXGroup; - children = ( - DACAD7111B08719F009119DC /* MGLMapboxEvents.h */, - ); - name = "GL Library"; - sourceTree = "<group>"; - }; DDBD0139196DC38D0033959E /* Tests */ = { isa = PBXGroup; children = ( @@ -545,10 +535,6 @@ INFOPLIST_FILE = "$(SRCROOT)/App-Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks"; - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "../../mason_packages/**", - ); OTHER_LDFLAGS = ""; PRODUCT_BUNDLE_IDENTIFIER = "com.mapbox.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -570,10 +556,6 @@ INFOPLIST_FILE = "$(SRCROOT)/App-Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks"; - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "../../mason_packages/**", - ); OTHER_LDFLAGS = ""; PRODUCT_BUNDLE_IDENTIFIER = "com.mapbox.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = "$(TARGET_NAME)"; |