Skip to content

Commit 510a1b3

Browse files
authored
Merge pull request #93 from mapbox/1ec5-cocoapods-1.2
Xcode 8.2, CocoaPods 1.2
2 parents b07b4cd + 53dfd84 commit 510a1b3

File tree

7 files changed

+16
-17
lines changed

7 files changed

+16
-17
lines changed

MapboxGeocoder.xcodeproj/project.pbxproj

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -656,7 +656,7 @@
656656
attributes = {
657657
LastSwiftMigration = 0700;
658658
LastSwiftUpdateCheck = 0730;
659-
LastUpgradeCheck = 0800;
659+
LastUpgradeCheck = 0820;
660660
ORGANIZATIONNAME = Mapbox;
661661
TargetAttributes = {
662662
DA5170951CF1B18F00CD6DCF = {
@@ -1226,7 +1226,6 @@
12261226
isa = XCBuildConfiguration;
12271227
baseConfigurationReference = AAD436380AAB501AB6291304 /* Pods-MapboxGeocoderMacTests.debug.xcconfig */;
12281228
buildSettings = {
1229-
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
12301229
CLANG_ANALYZER_NONNULL = YES;
12311230
CODE_SIGN_IDENTITY = "-";
12321231
COMBINE_HIDPI_IMAGES = YES;
@@ -1319,7 +1318,6 @@
13191318
isa = XCBuildConfiguration;
13201319
baseConfigurationReference = BF3AEBC5904F365B64817732 /* Pods-MapboxGeocoderTVTests.debug.xcconfig */;
13211320
buildSettings = {
1322-
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
13231321
CLANG_ANALYZER_NONNULL = YES;
13241322
DEBUG_INFORMATION_FORMAT = dwarf;
13251323
GCC_NO_COMMON_BLOCKS = YES;
@@ -1356,6 +1354,7 @@
13561354
buildSettings = {
13571355
APPLICATION_EXTENSION_API_ONLY = YES;
13581356
CLANG_ANALYZER_NONNULL = YES;
1357+
"CODE_SIGN_IDENTITY[sdk=watchos*]" = "";
13591358
CURRENT_PROJECT_VERSION = 3;
13601359
DEBUG_INFORMATION_FORMAT = dwarf;
13611360
DEFINES_MODULE = YES;
@@ -1383,6 +1382,7 @@
13831382
buildSettings = {
13841383
APPLICATION_EXTENSION_API_ONLY = YES;
13851384
CLANG_ANALYZER_NONNULL = YES;
1385+
"CODE_SIGN_IDENTITY[sdk=watchos*]" = "";
13861386
COPY_PHASE_STRIP = NO;
13871387
CURRENT_PROJECT_VERSION = 3;
13881388
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
@@ -1610,7 +1610,6 @@
16101610
isa = XCBuildConfiguration;
16111611
baseConfigurationReference = 05A6B8764F1B74BB857B037B /* Pods-MapboxGeocoderTests.debug.xcconfig */;
16121612
buildSettings = {
1613-
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
16141613
DEBUG_INFORMATION_FORMAT = dwarf;
16151614
GCC_NO_COMMON_BLOCKS = YES;
16161615
INFOPLIST_FILE = MapboxGeocoderTests/Info.plist;

MapboxGeocoder.xcodeproj/xcshareddata/xcschemes/Example (Objective-C).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 = "0800"
3+
LastUpgradeVersion = "0820"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

MapboxGeocoder.xcodeproj/xcshareddata/xcschemes/MapboxGeocoder iOS.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 = "0800"
3+
LastUpgradeVersion = "0820"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

MapboxGeocoder.xcodeproj/xcshareddata/xcschemes/MapboxGeocoder tvOS.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 = "0800"
3+
LastUpgradeVersion = "0820"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

MapboxGeocoder.xcodeproj/xcshareddata/xcschemes/MapboxGeocoder watchOS.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 = "0800"
3+
LastUpgradeVersion = "0820"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

Podfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use_frameworks!
22

33
def shared_pods
4-
pod 'Mapbox-iOS-SDK', '~> 3.3'
4+
pod 'Mapbox-iOS-SDK', '~> 3.4'
55
end
66

77
def shared_test_pods

Podfile.lock

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
PODS:
2-
- Mapbox-iOS-SDK (3.3.6)
3-
- OHHTTPStubs/Core (5.2.2)
4-
- OHHTTPStubs/Swift (5.2.2):
2+
- Mapbox-iOS-SDK (3.4.1)
3+
- OHHTTPStubs/Core (5.2.3)
4+
- OHHTTPStubs/Swift (5.2.3):
55
- OHHTTPStubs/Core
66

77
DEPENDENCIES:
8-
- Mapbox-iOS-SDK (~> 3.3)
8+
- Mapbox-iOS-SDK (~> 3.4)
99
- OHHTTPStubs/Swift (~> 5.0)
1010

1111
SPEC CHECKSUMS:
12-
Mapbox-iOS-SDK: 1651ab31beec917b60ccbb8f737d0435ec80eeb3
13-
OHHTTPStubs: 34d9d0994e64fcf8552dbfade5ce82ada913ee31
12+
Mapbox-iOS-SDK: 9c0d23e9a3784e6c9e45af4339898e4598b5b09b
13+
OHHTTPStubs: e238cd5b66d8efa51c861db45895de8fe079f4a7
1414

15-
PODFILE CHECKSUM: 0d327e0fe430b4211f61e91065c69151ac64aef7
15+
PODFILE CHECKSUM: c226b6f83d5572c7669bfdd75dd6622a2e1a5fa0
1616

17-
COCOAPODS: 1.1.1
17+
COCOAPODS: 1.2.0

0 commit comments

Comments
 (0)