Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade project to Xcode 8.2 #108

Merged
merged 6 commits into from
Feb 19, 2017
Merged

Upgrade project to Xcode 8.2 #108

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f5ecd0b
CocoaPods v1.2.0, Mapbox iOS SDK v3.4.1, OHHTTPStubs v5.2.3
1ec5 Feb 19, 2017
dda4871
Removed ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES overrides
1ec5 Feb 19, 2017
72282c4
Upgraded to Xcode 8.2
1ec5 Feb 19, 2017
ab2df60
Set BITCODE_GENERATION_MODE
1ec5 Feb 19, 2017
e91de58
Require Polyline v3.3
1ec5 Feb 19, 2017
141e289
Lock in current pod versions
1ec5 Feb 19, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion MapboxDirections.swift.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,6 @@ Pod::Spec.new do |s|
s.requires_arc = true
s.module_name = "MapboxDirections"

s.dependency "Polyline", "~> 3.2"
s.dependency "Polyline", "~> 3.3"

end
16 changes: 5 additions & 11 deletions MapboxDirections.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -728,7 +728,7 @@
attributes = {
LastSwiftMigration = 0700;
LastSwiftUpdateCheck = 0800;
LastUpgradeCheck = 0800;
LastUpgradeCheck = 0820;
ORGANIZATIONNAME = Mapbox;
TargetAttributes = {
DA1A10AE1D00F8FF009F82FA = {
Expand Down Expand Up @@ -1429,7 +1429,6 @@
isa = XCBuildConfiguration;
baseConfigurationReference = C5216CD064790304C0D12E08 /* Pods-MapboxDirectionsMacTests.debug.xcconfig */;
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
CLANG_ANALYZER_NONNULL = YES;
CODE_SIGN_IDENTITY = "-";
COMBINE_HIDPI_IMAGES = YES;
Expand All @@ -1447,7 +1446,6 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 7E3FF4F9120D6C9E60708335 /* Pods-MapboxDirectionsMacTests.release.xcconfig */;
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
CLANG_ANALYZER_NONNULL = YES;
CODE_SIGN_IDENTITY = "-";
COMBINE_HIDPI_IMAGES = YES;
Expand Down Expand Up @@ -1517,7 +1515,6 @@
isa = XCBuildConfiguration;
baseConfigurationReference = BEAF6404FB359F49700E9114 /* Pods-MapboxDirectionsTVTests.debug.xcconfig */;
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
CLANG_ANALYZER_NONNULL = YES;
DEBUG_INFORMATION_FORMAT = dwarf;
INFOPLIST_FILE = MapboxDirectionsTests/Info.plist;
Expand All @@ -1534,7 +1531,6 @@
isa = XCBuildConfiguration;
baseConfigurationReference = D39D92434CEA7E755F68A0DD /* Pods-MapboxDirectionsTVTests.release.xcconfig */;
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
CLANG_ANALYZER_NONNULL = YES;
INFOPLIST_FILE = MapboxDirectionsTests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
Expand All @@ -1552,6 +1548,7 @@
buildSettings = {
APPLICATION_EXTENSION_API_ONLY = YES;
CLANG_ANALYZER_NONNULL = YES;
"CODE_SIGN_IDENTITY[sdk=watchos*]" = "";
CURRENT_PROJECT_VERSION = 2;
DEBUG_INFORMATION_FORMAT = dwarf;
DEFINES_MODULE = YES;
Expand Down Expand Up @@ -1579,6 +1576,7 @@
buildSettings = {
APPLICATION_EXTENSION_API_ONLY = YES;
CLANG_ANALYZER_NONNULL = YES;
"CODE_SIGN_IDENTITY[sdk=watchos*]" = "";
CURRENT_PROJECT_VERSION = 2;
DEFINES_MODULE = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
Expand All @@ -1603,7 +1601,6 @@
isa = XCBuildConfiguration;
baseConfigurationReference = BCCCE5847449F3E3DC3C47DD /* Pods-Example (Objective-C).debug.xcconfig */;
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ANALYZER_NONNULL = YES;
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
Expand All @@ -1622,7 +1619,6 @@
isa = XCBuildConfiguration;
baseConfigurationReference = AC8D78F2AFDD3C48B47A899A /* Pods-Example (Objective-C).release.xcconfig */;
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ANALYZER_NONNULL = YES;
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
Expand Down Expand Up @@ -1689,7 +1685,6 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 46B778CDD353A9BEFD44A098 /* Pods-MapboxDirectionsTests.debug.xcconfig */;
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
CLANG_ANALYZER_NONNULL = YES;
DEBUG_INFORMATION_FORMAT = dwarf;
INFOPLIST_FILE = MapboxDirectionsTests/Info.plist;
Expand All @@ -1705,7 +1700,6 @@
isa = XCBuildConfiguration;
baseConfigurationReference = B215B2487667504F84228843 /* Pods-MapboxDirectionsTests.release.xcconfig */;
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
CLANG_ANALYZER_NONNULL = YES;
INFOPLIST_FILE = MapboxDirectionsTests/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 9.3;
Expand All @@ -1720,6 +1714,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
BITCODE_GENERATION_MODE = bitcode;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
Expand Down Expand Up @@ -1769,6 +1764,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
BITCODE_GENERATION_MODE = bitcode;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
Expand Down Expand Up @@ -1811,7 +1807,6 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 280512B2AFE7777BE47B598C /* Pods-Example (Swift).debug.xcconfig */;
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
INFOPLIST_FILE = "Directions Example/Info.plist";
PRODUCT_BUNDLE_IDENTIFIER = com.mapbox.MapboxDirectionsExample.swift;
Expand All @@ -1824,7 +1819,6 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 5ABC95CC4D6BF3BCA6667F5C /* Pods-Example (Swift).release.xcconfig */;
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
INFOPLIST_FILE = "Directions Example/Info.plist";
PRODUCT_BUNDLE_IDENTIFIER = com.mapbox.MapboxDirectionsExample.swift;
Expand Down
2 changes: 1 addition & 1 deletion MapboxDirections.xcodeproj/xcshareddata/xcschemes/Example (Objective-C).xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0800"
LastUpgradeVersion = "0820"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
2 changes: 1 addition & 1 deletion MapboxDirections.xcodeproj/xcshareddata/xcschemes/Example (Swift).xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0800"
LastUpgradeVersion = "0820"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
2 changes: 1 addition & 1 deletion MapboxDirections.xcodeproj/xcshareddata/xcschemes/MapboxDirections Mac.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0800"
LastUpgradeVersion = "0820"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
2 changes: 1 addition & 1 deletion MapboxDirections.xcodeproj/xcshareddata/xcschemes/MapboxDirections iOS.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0800"
LastUpgradeVersion = "0820"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
2 changes: 1 addition & 1 deletion MapboxDirections.xcodeproj/xcshareddata/xcschemes/MapboxDirections tvOS.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0800"
LastUpgradeVersion = "0820"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
2 changes: 1 addition & 1 deletion MapboxDirections.xcodeproj/xcshareddata/xcschemes/MapboxDirections watchOS.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0800"
LastUpgradeVersion = "0820"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
4 changes: 2 additions & 2 deletions Podfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ end

def shared_test_pods
shared_pods
pod 'OHHTTPStubs/Swift', '~> 5.0', :configurations => ['Debug']
pod 'OHHTTPStubs/Swift', '~> 5.2', :configurations => ['Debug']
end

def shared_example_pods
shared_pods
pod 'Mapbox-iOS-SDK', '~> 3.3'
pod 'Mapbox-iOS-SDK', '~> 3.4'
end

target 'MapboxDirections' do
Expand Down
18 changes: 9 additions & 9 deletions Podfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
PODS:
- Mapbox-iOS-SDK (3.3.4)
- OHHTTPStubs/Core (5.2.1)
- OHHTTPStubs/Swift (5.2.1):
- Mapbox-iOS-SDK (3.4.1)
- OHHTTPStubs/Core (5.2.3)
- OHHTTPStubs/Swift (5.2.3):
- OHHTTPStubs/Core
- Polyline (3.3.1)

DEPENDENCIES:
- Mapbox-iOS-SDK (~> 3.3)
- OHHTTPStubs/Swift (~> 5.0)
- Mapbox-iOS-SDK (~> 3.4)
- OHHTTPStubs/Swift (~> 5.2)
- Polyline (~> 3.3)

SPEC CHECKSUMS:
Mapbox-iOS-SDK: b22da0d9703fcfb0a8b592b6a7f6a21264fe44b0
OHHTTPStubs: 3a42f25c00563b71355ac73112ba2324e9e6cef4
Mapbox-iOS-SDK: 9c0d23e9a3784e6c9e45af4339898e4598b5b09b
OHHTTPStubs: e238cd5b66d8efa51c861db45895de8fe079f4a7
Polyline: 5639e50818bc04957597667925d206318025db83

PODFILE CHECKSUM: e0f48751fb510f231a36788d513200be4483a93e
PODFILE CHECKSUM: 8e2c944d6400df0294d90893cc2b67ff088797cf

COCOAPODS: 1.1.0
COCOAPODS: 1.2.0