Skip to content

Commit 215fcb5

Browse files
1ec51ec5
authored
Merge pull request #209 from mapbox/1ec5-spm-132
Support installation via Swift Package Manager
2 parents 22104ba + 85e7496 commit 215fcb5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+432
-176
lines changed

‎.circleci/config.yml‎

Lines changed: 27 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,26 @@ step-library:
2727
command: bash <(curl -s https://codecov.io/bash)
2828

2929
jobs:
30+
SPM-job:
31+
parameters:
32+
xcode:
33+
type: string
34+
macos:
35+
xcode: << parameters.xcode >>
36+
environment:
37+
HOMEBREW_NO_AUTO_UPDATE: 1
38+
steps:
39+
- checkout
40+
- run: swift build
41+
- run: swift test
42+
3043
build-job:
3144
parameters:
3245
xcode:
3346
type: string
3447
device:
3548
type: string
36-
default: "iPhone 6 Plus"
49+
default: "iPhone 8 Plus"
3750
iOS:
3851
type: string
3952
default: "12.1"
@@ -64,10 +77,10 @@ jobs:
6477
- run:
6578
name: Dependencies
6679
command: |
67-
carthage bootstrap --platform ios --cache-builds --configuration Debug --no-use-binaries
68-
carthage bootstrap --platform tvos --cache-builds --configuration Debug --no-use-binaries
69-
carthage bootstrap --platform macos --cache-builds --configuration Debug --no-use-binaries
70-
carthage bootstrap --platform watchos --cache-builds --configuration Debug --no-use-binaries
80+
./scripts/wcarthage.sh bootstrap --platform ios --cache-builds --configuration Debug --no-use-binaries
81+
./scripts/wcarthage.sh bootstrap --platform tvos --cache-builds --configuration Debug --no-use-binaries
82+
./scripts/wcarthage.sh bootstrap --platform macos --cache-builds --configuration Debug --no-use-binaries
83+
./scripts/wcarthage.sh bootstrap --platform watchos --cache-builds --configuration Debug --no-use-binaries
7184
- *save-cache
7285
- run:
7386
name: iOS
@@ -88,22 +101,18 @@ jobs:
88101
command: xcodebuild -project MapboxGeocoder.xcodeproj -scheme 'MapboxGeocoder Mac' clean build<<# parameters.test >> test <</ parameters.test >><<# parameters.codecoverage >>-enableCodeCoverage YES<</ parameters.codecoverage >>
89102
- run:
90103
name: watchOS
91-
command: xcodebuild -project MapboxGeocoder.xcodeproj -scheme 'MapboxGeocoder watchOS' -destination 'platform=watchOS Simulator,name=Apple Watch Series 4 - 44mm,OS=<< parameters.watchOS >>' clean build
104+
command: xcodebuild -project MapboxGeocoder.xcodeproj -scheme 'MapboxGeocoder watchOS' -destination 'platform=watchOS Simulator,name=Apple Watch Series 5 - 44mm,OS=<< parameters.watchOS >>' clean build
92105

93106
workflows:
94107
workflow:
95108
jobs:
96109
- build-job:
97-
name: "Xcode_10.2_iOS_12"
98-
xcode: "10.2.0"
99-
iOS: "12.2"
100-
tvOS: "12.2"
101-
watchOS: "5.2"
110+
name: "Xcode_12.0"
111+
xcode: "12.0.0"
112+
iOS: "14.0"
113+
tvOS: "14.0"
114+
watchOS: "7.0"
102115
codecoverage: true
103-
- build-job:
104-
name: "Xcode_11.3_iOS_13"
105-
xcode: "11.3.0"
106-
device: "iPhone 8 Plus"
107-
iOS: "13.3"
108-
tvOS: "13.3"
109-
watchOS: "6.1.1"
116+
- SPM-job:
117+
name: "SPM"
118+
xcode: "12.2.0"

‎Cartfile.private‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
binary "https://www.mapbox.com/ios-sdk/Mapbox-iOS-SDK.json" ~> 5.5
2-
github "frederoni/OHHTTPStubs" "563f48d3fab84ef04639649c770b00f4fa502cca"
2+
github "AliSoftware/OHHTTPStubs" ~> 9.0

‎Cartfile.resolved‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
binary "https://www.mapbox.com/ios-sdk/Mapbox-iOS-SDK.json" "5.5.0"
2-
github "frederoni/OHHTTPStubs" "563f48d3fab84ef04639649c770b00f4fa502cca"
1+
binary "https://www.mapbox.com/ios-sdk/Mapbox-iOS-SDK.json" "5.9.0"
2+
github "AliSoftware/OHHTTPStubs" "9.0.0"

‎MapboxGeocoder.swift.podspec‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ Pod::Spec.new do |s|
2424
# ――― Platform Specifics ――――――――――――――――――――――――――――――――――――――――――――――――――――――― #
2525

2626
# When using multiple platforms
27-
s.ios.deployment_target = "8.0"
28-
s.osx.deployment_target = "10.10"
29-
s.watchos.deployment_target = "2.0"
30-
s.tvos.deployment_target = "9.0"
27+
s.ios.deployment_target = "10.0"
28+
s.osx.deployment_target = "10.12"
29+
s.watchos.deployment_target = "3.0"
30+
s.tvos.deployment_target = "10.0"
3131

3232
# ――― Source Location ―――――――――――――――――――――――――――――――――――――――――――――――――――――――――― #
3333

‎MapboxGeocoder.xcodeproj/project.pbxproj‎

Lines changed: 36 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,10 @@
6464
DA2E03F21CB0FE0200D1269A /* MBRectangularRegion.swift in Sources */ = {isa = PBXBuildFile; fileRef = DA2E03F11CB0FE0200D1269A /* MBRectangularRegion.swift */; };
6565
DA2EC05C1CED72E900D4BA5D /* MBPlacemarkScope.swift in Sources */ = {isa = PBXBuildFile; fileRef = DA2EC05B1CED72E900D4BA5D /* MBPlacemarkScope.swift */; };
6666
DA2EC05E1CED732F00D4BA5D /* MBGeocodeOptions.swift in Sources */ = {isa = PBXBuildFile; fileRef = DA2EC05D1CED732F00D4BA5D /* MBGeocodeOptions.swift */; };
67+
DA4B402F255BCBA7001A4F30 /* MBPlacemarkPrecision.swift in Sources */ = {isa = PBXBuildFile; fileRef = DA4B402E255BCBA7001A4F30 /* MBPlacemarkPrecision.swift */; };
68+
DA4B4030255BCBA7001A4F30 /* MBPlacemarkPrecision.swift in Sources */ = {isa = PBXBuildFile; fileRef = DA4B402E255BCBA7001A4F30 /* MBPlacemarkPrecision.swift */; };
69+
DA4B4031255BCBA7001A4F30 /* MBPlacemarkPrecision.swift in Sources */ = {isa = PBXBuildFile; fileRef = DA4B402E255BCBA7001A4F30 /* MBPlacemarkPrecision.swift */; };
70+
DA4B4032255BCBA7001A4F30 /* MBPlacemarkPrecision.swift in Sources */ = {isa = PBXBuildFile; fileRef = DA4B402E255BCBA7001A4F30 /* MBPlacemarkPrecision.swift */; };
6771
DA4C581920E195E300A61B00 /* MapboxGeocoder.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = DDC2470419A1C3B40054B0C0 /* MapboxGeocoder.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
6872
DA4D90071DD63AEC006EC71A /* PlacemarkScopeTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = DA4D90061DD63AEC006EC71A /* PlacemarkScopeTests.swift */; };
6973
DA4D90081DD63AEC006EC71A /* PlacemarkScopeTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = DA4D90061DD63AEC006EC71A /* PlacemarkScopeTests.swift */; };
@@ -244,6 +248,7 @@
244248
DA2E03F11CB0FE0200D1269A /* MBRectangularRegion.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MBRectangularRegion.swift; sourceTree = "<group>"; };
245249
DA2EC05B1CED72E900D4BA5D /* MBPlacemarkScope.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MBPlacemarkScope.swift; sourceTree = "<group>"; };
246250
DA2EC05D1CED732F00D4BA5D /* MBGeocodeOptions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MBGeocodeOptions.swift; sourceTree = "<group>"; };
251+
DA4B402E255BCBA7001A4F30 /* MBPlacemarkPrecision.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MBPlacemarkPrecision.swift; sourceTree = "<group>"; };
247252
DA4D90061DD63AEC006EC71A /* PlacemarkScopeTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PlacemarkScopeTests.swift; sourceTree = "<group>"; };
248253
DA5170961CF1B18F00CD6DCF /* MapboxGeocoder.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = MapboxGeocoder.framework; sourceTree = BUILT_PRODUCTS_DIR; };
249254
DA51709F1CF1B18F00CD6DCF /* MapboxGeocoderTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = MapboxGeocoderTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -427,13 +432,15 @@
427432
DA2E03EF1CB0FDB400D1269A /* MBPlacemark.swift */,
428433
DA8B5C05225FB2F400CD1C99 /* MBPlacemarkPrecision.h */,
429434
DA8B5C06225FB2F400CD1C99 /* MBPlacemarkPrecision.m */,
435+
DA4B402E255BCBA7001A4F30 /* MBPlacemarkPrecision.swift */,
430436
DA29C8DE1CEBE90200E48A61 /* MBPlacemarkScope.h */,
431437
DA2EC05B1CED72E900D4BA5D /* MBPlacemarkScope.swift */,
432438
DA2E03F11CB0FE0200D1269A /* MBRectangularRegion.swift */,
433439
DDC2470619A1C3B40054B0C0 /* Supporting Files */,
434440
35D3DE382112410A00B62912 /* CoreLocation.swift */,
435441
);
436-
path = MapboxGeocoder;
442+
name = MapboxGeocoder;
443+
path = Sources/MapboxGeocoder;
437444
sourceTree = "<group>";
438445
};
439446
DDC246FD19A1C2D20054B0C0 /* Swift */ = {
@@ -477,7 +484,8 @@
477484
DDF1E84E1BD6F7BA00C40C78 /* Info.plist */,
478485
DDF1E8571BD700EB00C40C78 /* Fixtures */,
479486
);
480-
path = MapboxGeocoderTests;
487+
name = MapboxGeocoderTests;
488+
path = Tests/MapboxGeocoderTests;
481489
sourceTree = "<group>";
482490
};
483491
DDF1E8571BD700EB00C40C78 /* Fixtures */ = {
@@ -984,6 +992,7 @@
984992
isa = PBXSourcesBuildPhase;
985993
buildActionMask = 2147483647;
986994
files = (
995+
DA4B4030255BCBA7001A4F30 /* MBPlacemarkPrecision.swift in Sources */,
987996
DA5170B31CF1B1E000CD6DCF /* MBRectangularRegion.swift in Sources */,
988997
DA5170B01CF1B1E000CD6DCF /* MBPlacemark.swift in Sources */,
989998
DA5170AF1CF1B1E000CD6DCF /* MBGeocoder.swift in Sources */,
@@ -1011,6 +1020,7 @@
10111020
isa = PBXSourcesBuildPhase;
10121021
buildActionMask = 2147483647;
10131022
files = (
1023+
DA4B4031255BCBA7001A4F30 /* MBPlacemarkPrecision.swift in Sources */,
10141024
DA5170DE1CF2541C00CD6DCF /* MBRectangularRegion.swift in Sources */,
10151025
DA5170DB1CF2541C00CD6DCF /* MBPlacemark.swift in Sources */,
10161026
DA5170DA1CF2541C00CD6DCF /* MBGeocoder.swift in Sources */,
@@ -1038,6 +1048,7 @@
10381048
isa = PBXSourcesBuildPhase;
10391049
buildActionMask = 2147483647;
10401050
files = (
1051+
DA4B4032255BCBA7001A4F30 /* MBPlacemarkPrecision.swift in Sources */,
10411052
DA5170F91CF2582F00CD6DCF /* MBRectangularRegion.swift in Sources */,
10421053
DA5170F61CF2582F00CD6DCF /* MBPlacemark.swift in Sources */,
10431054
DA5170F51CF2582F00CD6DCF /* MBGeocoder.swift in Sources */,
@@ -1061,6 +1072,7 @@
10611072
isa = PBXSourcesBuildPhase;
10621073
buildActionMask = 2147483647;
10631074
files = (
1075+
DA4B402F255BCBA7001A4F30 /* MBPlacemarkPrecision.swift in Sources */,
10641076
DA2EC05E1CED732F00D4BA5D /* MBGeocodeOptions.swift in Sources */,
10651077
DA2E03F21CB0FE0200D1269A /* MBRectangularRegion.swift in Sources */,
10661078
DDC2295E1A360843006BE405 /* MBGeocoder.swift in Sources */,
@@ -1148,7 +1160,7 @@
11481160
);
11491161
FRAMEWORK_VERSION = A;
11501162
GCC_NO_COMMON_BLOCKS = YES;
1151-
INFOPLIST_FILE = MapboxGeocoder/Info.plist;
1163+
INFOPLIST_FILE = Sources/MapboxGeocoder/Info.plist;
11521164
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
11531165
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
11541166
PRODUCT_BUNDLE_IDENTIFIER = com.mapbox.MapboxGeocoder;
@@ -1179,7 +1191,7 @@
11791191
);
11801192
FRAMEWORK_VERSION = A;
11811193
GCC_NO_COMMON_BLOCKS = YES;
1182-
INFOPLIST_FILE = MapboxGeocoder/Info.plist;
1194+
INFOPLIST_FILE = Sources/MapboxGeocoder/Info.plist;
11831195
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
11841196
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
11851197
PRODUCT_BUNDLE_IDENTIFIER = com.mapbox.MapboxGeocoder;
@@ -1205,7 +1217,7 @@
12051217
"$(PROJECT_DIR)/Carthage/Build/Mac",
12061218
);
12071219
GCC_NO_COMMON_BLOCKS = YES;
1208-
INFOPLIST_FILE = MapboxGeocoderTests/Info.plist;
1220+
INFOPLIST_FILE = Tests/MapboxGeocoderTests/Info.plist;
12091221
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks $(PROJECT_DIR)/Carthage/Build/Mac";
12101222
PRODUCT_BUNDLE_IDENTIFIER = com.mapbox.MapboxGeocoderTests;
12111223
PRODUCT_NAME = MapboxGeocoderTests;
@@ -1228,7 +1240,7 @@
12281240
"$(PROJECT_DIR)/Carthage/Build/Mac",
12291241
);
12301242
GCC_NO_COMMON_BLOCKS = YES;
1231-
INFOPLIST_FILE = MapboxGeocoderTests/Info.plist;
1243+
INFOPLIST_FILE = Tests/MapboxGeocoderTests/Info.plist;
12321244
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks $(PROJECT_DIR)/Carthage/Build/Mac";
12331245
PRODUCT_BUNDLE_IDENTIFIER = com.mapbox.MapboxGeocoderTests;
12341246
PRODUCT_NAME = MapboxGeocoderTests;
@@ -1253,15 +1265,14 @@
12531265
"$(PROJECT_DIR)/Carthage/Build/tvOS",
12541266
);
12551267
GCC_NO_COMMON_BLOCKS = YES;
1256-
INFOPLIST_FILE = MapboxGeocoder/Info.plist;
1268+
INFOPLIST_FILE = Sources/MapboxGeocoder/Info.plist;
12571269
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
12581270
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
12591271
PRODUCT_BUNDLE_IDENTIFIER = com.mapbox.MapboxGeocoder;
12601272
PRODUCT_NAME = MapboxGeocoder;
12611273
SDKROOT = appletvos;
12621274
SKIP_INSTALL = YES;
12631275
TARGETED_DEVICE_FAMILY = 3;
1264-
TVOS_DEPLOYMENT_TARGET = 9.0;
12651276
VERSIONING_SYSTEM = "apple-generic";
12661277
VERSION_INFO_PREFIX = "";
12671278
};
@@ -1284,7 +1295,7 @@
12841295
"$(PROJECT_DIR)/Carthage/Build/tvOS",
12851296
);
12861297
GCC_NO_COMMON_BLOCKS = YES;
1287-
INFOPLIST_FILE = MapboxGeocoder/Info.plist;
1298+
INFOPLIST_FILE = Sources/MapboxGeocoder/Info.plist;
12881299
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
12891300
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
12901301
PRODUCT_BUNDLE_IDENTIFIER = com.mapbox.MapboxGeocoder;
@@ -1293,7 +1304,6 @@
12931304
SKIP_INSTALL = YES;
12941305
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
12951306
TARGETED_DEVICE_FAMILY = 3;
1296-
TVOS_DEPLOYMENT_TARGET = 9.0;
12971307
VERSIONING_SYSTEM = "apple-generic";
12981308
VERSION_INFO_PREFIX = "";
12991309
};
@@ -1310,14 +1320,13 @@
13101320
"$(PROJECT_DIR)/Carthage/Build/tvOS",
13111321
);
13121322
GCC_NO_COMMON_BLOCKS = YES;
1313-
INFOPLIST_FILE = MapboxGeocoderTests/Info.plist;
1323+
INFOPLIST_FILE = Tests/MapboxGeocoderTests/Info.plist;
13141324
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
13151325
PRODUCT_BUNDLE_IDENTIFIER = com.mapbox.MapboxGeocoderTests;
13161326
PRODUCT_NAME = MapboxGeocoderTests;
13171327
SDKROOT = appletvos;
13181328
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
13191329
TARGETED_DEVICE_FAMILY = "1,2,3";
1320-
TVOS_DEPLOYMENT_TARGET = 9.0;
13211330
};
13221331
name = Debug;
13231332
};
@@ -1333,14 +1342,13 @@
13331342
"$(PROJECT_DIR)/Carthage/Build/tvOS",
13341343
);
13351344
GCC_NO_COMMON_BLOCKS = YES;
1336-
INFOPLIST_FILE = MapboxGeocoderTests/Info.plist;
1345+
INFOPLIST_FILE = Tests/MapboxGeocoderTests/Info.plist;
13371346
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
13381347
PRODUCT_BUNDLE_IDENTIFIER = com.mapbox.MapboxGeocoderTests;
13391348
PRODUCT_NAME = MapboxGeocoderTests;
13401349
SDKROOT = appletvos;
13411350
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
13421351
TARGETED_DEVICE_FAMILY = "1,2,3";
1343-
TVOS_DEPLOYMENT_TARGET = 9.0;
13441352
};
13451353
name = Release;
13461354
};
@@ -1357,7 +1365,7 @@
13571365
DYLIB_CURRENT_VERSION = 17;
13581366
DYLIB_INSTALL_NAME_BASE = "@rpath";
13591367
GCC_NO_COMMON_BLOCKS = YES;
1360-
INFOPLIST_FILE = MapboxGeocoder/Info.plist;
1368+
INFOPLIST_FILE = Sources/MapboxGeocoder/Info.plist;
13611369
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
13621370
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
13631371
PRODUCT_BUNDLE_IDENTIFIER = com.mapbox.MapboxGeocoder;
@@ -1367,7 +1375,6 @@
13671375
TARGETED_DEVICE_FAMILY = 4;
13681376
VERSIONING_SYSTEM = "apple-generic";
13691377
VERSION_INFO_PREFIX = "";
1370-
WATCHOS_DEPLOYMENT_TARGET = 2.0;
13711378
};
13721379
name = Debug;
13731380
};
@@ -1385,7 +1392,7 @@
13851392
DYLIB_CURRENT_VERSION = 17;
13861393
DYLIB_INSTALL_NAME_BASE = "@rpath";
13871394
GCC_NO_COMMON_BLOCKS = YES;
1388-
INFOPLIST_FILE = MapboxGeocoder/Info.plist;
1395+
INFOPLIST_FILE = Sources/MapboxGeocoder/Info.plist;
13891396
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
13901397
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
13911398
PRODUCT_BUNDLE_IDENTIFIER = com.mapbox.MapboxGeocoder;
@@ -1396,7 +1403,6 @@
13961403
TARGETED_DEVICE_FAMILY = 4;
13971404
VERSIONING_SYSTEM = "apple-generic";
13981405
VERSION_INFO_PREFIX = "";
1399-
WATCHOS_DEPLOYMENT_TARGET = 2.0;
14001406
};
14011407
name = Release;
14021408
};
@@ -1448,15 +1454,17 @@
14481454
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
14491455
GCC_WARN_UNUSED_FUNCTION = YES;
14501456
GCC_WARN_UNUSED_VARIABLE = YES;
1451-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
1452-
MACOSX_DEPLOYMENT_TARGET = 10.10;
1457+
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
1458+
MACOSX_DEPLOYMENT_TARGET = 10.12;
14531459
MTL_ENABLE_DEBUG_INFO = YES;
14541460
ONLY_ACTIVE_ARCH = YES;
14551461
SDKROOT = iphoneos;
14561462
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
14571463
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
14581464
SWIFT_VERSION = 5.0;
14591465
TARGETED_DEVICE_FAMILY = "1,2";
1466+
TVOS_DEPLOYMENT_TARGET = 12.0;
1467+
WATCHOS_DEPLOYMENT_TARGET = 3.0;
14601468
};
14611469
name = Debug;
14621470
};
@@ -1501,15 +1509,17 @@
15011509
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
15021510
GCC_WARN_UNUSED_FUNCTION = YES;
15031511
GCC_WARN_UNUSED_VARIABLE = YES;
1504-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
1505-
MACOSX_DEPLOYMENT_TARGET = 10.10;
1512+
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
1513+
MACOSX_DEPLOYMENT_TARGET = 10.12;
15061514
MTL_ENABLE_DEBUG_INFO = NO;
15071515
SDKROOT = iphoneos;
15081516
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
15091517
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
15101518
SWIFT_VERSION = 5.0;
15111519
TARGETED_DEVICE_FAMILY = "1,2";
1520+
TVOS_DEPLOYMENT_TARGET = 12.0;
15121521
VALIDATE_PRODUCT = YES;
1522+
WATCHOS_DEPLOYMENT_TARGET = 3.0;
15131523
};
15141524
name = Release;
15151525
};
@@ -1562,7 +1572,7 @@
15621572
"DEBUG=1",
15631573
"$(inherited)",
15641574
);
1565-
INFOPLIST_FILE = MapboxGeocoder/Info.plist;
1575+
INFOPLIST_FILE = Sources/MapboxGeocoder/Info.plist;
15661576
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
15671577
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
15681578
PRODUCT_BUNDLE_IDENTIFIER = "com.mapbox.$(PRODUCT_NAME:rfc1034identifier)";
@@ -1585,7 +1595,7 @@
15851595
DYLIB_COMPATIBILITY_VERSION = 1;
15861596
DYLIB_CURRENT_VERSION = 17;
15871597
DYLIB_INSTALL_NAME_BASE = "@rpath";
1588-
INFOPLIST_FILE = MapboxGeocoder/Info.plist;
1598+
INFOPLIST_FILE = Sources/MapboxGeocoder/Info.plist;
15891599
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
15901600
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
15911601
PRODUCT_BUNDLE_IDENTIFIER = "com.mapbox.$(PRODUCT_NAME:rfc1034identifier)";
@@ -1642,7 +1652,7 @@
16421652
"$(PROJECT_DIR)/Carthage/Build/iOS",
16431653
);
16441654
GCC_NO_COMMON_BLOCKS = YES;
1645-
INFOPLIST_FILE = MapboxGeocoderTests/Info.plist;
1655+
INFOPLIST_FILE = Tests/MapboxGeocoderTests/Info.plist;
16461656
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
16471657
PRODUCT_BUNDLE_IDENTIFIER = com.mapbox.MapboxGeocoderTests;
16481658
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -1662,7 +1672,7 @@
16621672
"$(PROJECT_DIR)/Carthage/Build/iOS",
16631673
);
16641674
GCC_NO_COMMON_BLOCKS = YES;
1665-
INFOPLIST_FILE = MapboxGeocoderTests/Info.plist;
1675+
INFOPLIST_FILE = Tests/MapboxGeocoderTests/Info.plist;
16661676
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
16671677
PRODUCT_BUNDLE_IDENTIFIER = com.mapbox.MapboxGeocoderTests;
16681678
PRODUCT_NAME = "$(TARGET_NAME)";

0 commit comments

Comments
 (0)