From b270b6119b0ec12a005c95ad5527dd06c0f63597 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Minh=20Nguye=CC=82=CC=83n?= Date: Thu, 15 Sep 2016 00:18:20 -0400 Subject: [PATCH 1/3] Stop ignoring Podfile.lock Also upgraded OHHTTPStubs/Swift. --- .gitignore | 1 - Podfile | 2 +- Podfile.lock | 14 ++++++++++++++ 3 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 Podfile.lock diff --git a/.gitignore b/.gitignore index 78535fb..c039a5e 100644 --- a/.gitignore +++ b/.gitignore @@ -9,4 +9,3 @@ xcuserdata *.xcscmblueprint Pods/ -Podfile.lock diff --git a/Podfile b/Podfile index 345775d..9ad3c26 100644 --- a/Podfile +++ b/Podfile @@ -8,7 +8,7 @@ use_frameworks! #end def shared_test_pods - pod 'OHHTTPStubs/Swift', :git => 'https://github.com/AliSoftware/OHHTTPStubs.git', :commit => '4995ecd762abdd81227d14faf65fde003fbbe789', :configurations => ['Debug'] + pod 'OHHTTPStubs/Swift', '~> 5.0', :configurations => ['Debug'] end target 'MapboxStaticTests' do diff --git a/Podfile.lock b/Podfile.lock new file mode 100644 index 0000000..7155d99 --- /dev/null +++ b/Podfile.lock @@ -0,0 +1,14 @@ +PODS: + - OHHTTPStubs/Core (5.2.1) + - OHHTTPStubs/Swift (5.2.1): + - OHHTTPStubs/Core + +DEPENDENCIES: + - OHHTTPStubs/Swift (~> 5.0) + +SPEC CHECKSUMS: + OHHTTPStubs: 3a42f25c00563b71355ac73112ba2324e9e6cef4 + +PODFILE CHECKSUM: fe73f990cc38a5c9a39ea8dfbe31558c9c18b94a + +COCOAPODS: 1.1.0.rc.2 From 941d133b3f57d3999ef110bef386a6765289f071 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Minh=20Nguye=CC=82=CC=83n?= Date: Thu, 15 Sep 2016 00:21:25 -0400 Subject: [PATCH 2/3] Upgraded project and schemes Upgraded project build settings and schemes according to Xcode 8 recommendations, except for disabling code signing on watchOS. --- MapboxStatic.xcodeproj/project.pbxproj | 26 ++++++++++++++----- .../xcschemes/Example (Objective-C).xcscheme | 2 +- .../xcschemes/Example (Swift).xcscheme | 2 +- .../xcschemes/MapboxStatic Mac.xcscheme | 2 +- .../xcschemes/MapboxStatic iOS.xcscheme | 2 +- .../xcschemes/MapboxStatic tvOS.xcscheme | 2 +- .../xcschemes/MapboxStatic watchOS.xcscheme | 2 +- 7 files changed, 25 insertions(+), 13 deletions(-) diff --git a/MapboxStatic.xcodeproj/project.pbxproj b/MapboxStatic.xcodeproj/project.pbxproj index 39f9bd7..698bce6 100644 --- a/MapboxStatic.xcodeproj/project.pbxproj +++ b/MapboxStatic.xcodeproj/project.pbxproj @@ -558,7 +558,7 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0730; - LastUpgradeCheck = 0710; + LastUpgradeCheck = 0800; ORGANIZATIONNAME = Mapbox; TargetAttributes = { DA20FB9A1CE3DEBB00B07762 = { @@ -952,6 +952,7 @@ isa = XCBuildConfiguration; buildSettings = { CLANG_ANALYZER_NONNULL = YES; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; CURRENT_PROJECT_VERSION = 3; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; @@ -973,6 +974,7 @@ isa = XCBuildConfiguration; buildSettings = { CLANG_ANALYZER_NONNULL = YES; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; CURRENT_PROJECT_VERSION = 3; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; @@ -994,7 +996,7 @@ isa = XCBuildConfiguration; buildSettings = { CLANG_ANALYZER_NONNULL = YES; - CODE_SIGN_IDENTITY = "-"; + CODE_SIGN_IDENTITY = ""; COMBINE_HIDPI_IMAGES = YES; CURRENT_PROJECT_VERSION = 3; DEFINES_MODULE = YES; @@ -1019,7 +1021,7 @@ isa = XCBuildConfiguration; buildSettings = { CLANG_ANALYZER_NONNULL = YES; - CODE_SIGN_IDENTITY = "-"; + CODE_SIGN_IDENTITY = ""; COMBINE_HIDPI_IMAGES = YES; CURRENT_PROJECT_VERSION = 3; DEFINES_MODULE = YES; @@ -1044,6 +1046,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = 2D526F1AE52AC93AE1C09017 /* Pods-MapboxStaticMacTests.debug.xcconfig */; buildSettings = { + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; CLANG_ANALYZER_NONNULL = YES; CODE_SIGN_IDENTITY = "-"; COMBINE_HIDPI_IMAGES = YES; @@ -1078,6 +1081,7 @@ isa = XCBuildConfiguration; buildSettings = { CLANG_ANALYZER_NONNULL = YES; + "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; CURRENT_PROJECT_VERSION = 3; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; @@ -1102,6 +1106,7 @@ isa = XCBuildConfiguration; buildSettings = { CLANG_ANALYZER_NONNULL = YES; + "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; CURRENT_PROJECT_VERSION = 3; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; @@ -1126,6 +1131,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = FFF751D5A7D48495FB8444A2 /* Pods-MapboxStaticTVTests.debug.xcconfig */; buildSettings = { + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; CLANG_ANALYZER_NONNULL = YES; INFOPLIST_FILE = MapboxStaticTests/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; @@ -1205,9 +1211,9 @@ DAF15A601CE90A6C0040E86C /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ANALYZER_NONNULL = YES; - EMBEDDED_CONTENT_CONTAINS_SWIFT = YES; INFOPLIST_FILE = Example/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.mapbox.MapboxStaticExample.ObjC; @@ -1218,9 +1224,9 @@ DAF15A611CE90A6C0040E86C /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ANALYZER_NONNULL = YES; - EMBEDDED_CONTENT_CONTAINS_SWIFT = YES; INFOPLIST_FILE = Example/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.mapbox.MapboxStaticExample.ObjC; @@ -1241,8 +1247,10 @@ CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; @@ -1287,8 +1295,10 @@ CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; @@ -1308,6 +1318,7 @@ MACOSX_DEPLOYMENT_TARGET = 10.10; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; + SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; TARGETED_DEVICE_FAMILY = "1,2"; VALIDATE_PRODUCT = YES; }; @@ -1316,8 +1327,8 @@ DDAD196C1BD9B1780057AC9F /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; CURRENT_PROJECT_VERSION = 3; - EMBEDDED_CONTENT_CONTAINS_SWIFT = YES; INFOPLIST_FILE = "$(SRCROOT)/Example/Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.mapbox.MapboxStaticExample.Swift; @@ -1330,8 +1341,8 @@ DDAD196D1BD9B1780057AC9F /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; CURRENT_PROJECT_VERSION = 3; - EMBEDDED_CONTENT_CONTAINS_SWIFT = YES; INFOPLIST_FILE = "$(SRCROOT)/Example/Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.mapbox.MapboxStaticExample.Swift; @@ -1345,6 +1356,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = 55948DDFD41BC7FD1F8FE960 /* Pods-MapboxStaticTests.debug.xcconfig */; buildSettings = { + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; CLANG_ENABLE_MODULES = YES; CURRENT_PROJECT_VERSION = 3; INFOPLIST_FILE = MapboxStaticTests/Info.plist; diff --git a/MapboxStatic.xcodeproj/xcshareddata/xcschemes/Example (Objective-C).xcscheme b/MapboxStatic.xcodeproj/xcshareddata/xcschemes/Example (Objective-C).xcscheme index 80bc350..7c34555 100644 --- a/MapboxStatic.xcodeproj/xcshareddata/xcschemes/Example (Objective-C).xcscheme +++ b/MapboxStatic.xcodeproj/xcshareddata/xcschemes/Example (Objective-C).xcscheme @@ -1,6 +1,6 @@ Date: Thu, 15 Sep 2016 00:23:38 -0400 Subject: [PATCH 3/3] Set BITCODE_GENERATION_MODE --- MapboxStatic.xcodeproj/project.pbxproj | 2 ++ 1 file changed, 2 insertions(+) diff --git a/MapboxStatic.xcodeproj/project.pbxproj b/MapboxStatic.xcodeproj/project.pbxproj index 698bce6..5d3e51b 100644 --- a/MapboxStatic.xcodeproj/project.pbxproj +++ b/MapboxStatic.xcodeproj/project.pbxproj @@ -1238,6 +1238,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; @@ -1286,6 +1287,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;