diff --git a/Cartfile b/Cartfile index 7ddd79a74e..f3b78e71d9 100644 --- a/Cartfile +++ b/Cartfile @@ -1,2 +1,2 @@ -binary "https://api.mapbox.com/downloads/v2/carthage/mobile-maps-gl-core/mapbox-ios-sdk-gl-core-static.json" == 5.0.0 +binary "https://api.mapbox.com/downloads/v2/carthage/mobile-maps-gl-core/mapbox-ios-sdk-gl-core-static.json" == 5.0.1 github "mapbox/mapbox-events-ios" ~> 0.10.2 diff --git a/Cartfile.resolved b/Cartfile.resolved index f3b0ed46b2..599677ceee 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1,2 +1,2 @@ -binary "https://api.mapbox.com/downloads/v2/carthage/mobile-maps-gl-core/mapbox-ios-sdk-gl-core-static.json" "5.0.0" +binary "https://api.mapbox.com/downloads/v2/carthage/mobile-maps-gl-core/mapbox-ios-sdk-gl-core-static.json" "5.0.1" github "mapbox/mapbox-events-ios" "v0.10.3" diff --git a/platform/ios/CHANGELOG.md b/platform/ios/CHANGELOG.md index d00f50bbad..26d2b2b673 100644 --- a/platform/ios/CHANGELOG.md +++ b/platform/ios/CHANGELOG.md @@ -4,9 +4,7 @@ Mapbox welcomes participation and contributions from everyone. Please read [CONT ## 6.2.0 -** This release supports beta versions of iOS 14. ** - -You should not submit apps built with `6.2.0-beta.N` to the App Store. If you need to submit a build to TestFlight you should use Xcode 12 beta 6 (or newer). [Read more](https://github.com/mapbox/mapbox-gl-native-ios/issues/418). +**This release supports iOS 14 and Xcode 12** ### ✨ New features @@ -29,8 +27,8 @@ You should not submit apps built with `6.2.0-beta.N` to the App Store. If you ne ### 🔧 Dependencies -* Core library updated to `5.0.0`. ([#438](https://github.com/mapbox/mapbox-gl-native-ios/pull/438)) -* `mapbox-events-ios` versioning updated to `~> 0.10.2`. Compiling 0.10.3 with Carthage and Xcode 11.1 will fail; this is a known [compilation issue](https://github.com/mapbox/mapbox-events-ios/issues/236) with earlier versions of Xcode. +* Core library updated to `5.0.1`. ([#438](https://github.com/mapbox/mapbox-gl-native-ios/pull/453)) +* `mapbox-events-ios` versioning updated to `~> 0.10.2`. ## 6.1.0 - August 26, 2020 diff --git a/platform/ios/Integration Test Harness/Info.plist b/platform/ios/Integration Test Harness/Info.plist index 264ac8fd0d..2443521e33 100644 --- a/platform/ios/Integration Test Harness/Info.plist +++ b/platform/ios/Integration Test Harness/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString 6.2.0 CFBundleVersion - 15268 + 15269 LSRequiresIPhoneOS UILaunchStoryboardName diff --git a/platform/ios/Integration Tests/Info.plist b/platform/ios/Integration Tests/Info.plist index 822dfba7f0..ba527658d6 100644 --- a/platform/ios/Integration Tests/Info.plist +++ b/platform/ios/Integration Tests/Info.plist @@ -17,6 +17,6 @@ CFBundleShortVersionString 6.2.0 CFBundleVersion - 15268 + 15269 diff --git a/platform/ios/Mapbox-iOS-SDK-snapshot-dynamic.podspec b/platform/ios/Mapbox-iOS-SDK-snapshot-dynamic.podspec index 61fce95463..f6eff56dae 100644 --- a/platform/ios/Mapbox-iOS-SDK-snapshot-dynamic.podspec +++ b/platform/ios/Mapbox-iOS-SDK-snapshot-dynamic.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |m| - version = '6.2.0-beta.2' + version = '6.2.0' m.name = 'Mapbox-iOS-SDK-snapshot-dynamic' m.version = "#{version}-snapshot" diff --git a/platform/ios/Mapbox-iOS-SDK-stripped.podspec b/platform/ios/Mapbox-iOS-SDK-stripped.podspec index 0097ca6b3c..d92a874a3a 100644 --- a/platform/ios/Mapbox-iOS-SDK-stripped.podspec +++ b/platform/ios/Mapbox-iOS-SDK-stripped.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |m| - version = '6.2.0-beta.2' + version = '6.2.0' m.name = 'Mapbox-iOS-SDK-stripped' m.version = "#{version}-stripped" diff --git a/platform/ios/Mapbox-iOS-SDK.podspec b/platform/ios/Mapbox-iOS-SDK.podspec index 344b8cd3ca..4946063d70 100644 --- a/platform/ios/Mapbox-iOS-SDK.podspec +++ b/platform/ios/Mapbox-iOS-SDK.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |m| - version = '6.2.0-beta.2' + version = '6.2.0' m.name = 'Mapbox-iOS-SDK' m.version = version diff --git a/platform/ios/app/Info.plist b/platform/ios/app/Info.plist index 23d946b080..587fd477dd 100644 --- a/platform/ios/app/Info.plist +++ b/platform/ios/app/Info.plist @@ -21,7 +21,7 @@ CFBundleSignature MBGL CFBundleVersion - 15268 + 15269 LSRequiresIPhoneOS NSLocationTemporaryUsageDescriptionDictionary diff --git a/platform/ios/benchmark/Info.plist b/platform/ios/benchmark/Info.plist index effaf156e5..d2029c82d1 100644 --- a/platform/ios/benchmark/Info.plist +++ b/platform/ios/benchmark/Info.plist @@ -21,7 +21,7 @@ CFBundleSignature MBGL CFBundleVersion - 15268 + 15269 LSRequiresIPhoneOS NSHumanReadableCopyright diff --git a/platform/ios/framework/Info-static.plist b/platform/ios/framework/Info-static.plist index 0858ca35ae..aae4016b6d 100644 --- a/platform/ios/framework/Info-static.plist +++ b/platform/ios/framework/Info-static.plist @@ -15,7 +15,7 @@ CFBundleSignature ???? CFBundleVersion - 15268 + 15269 MGLCommitHash $(CURRENT_COMMIT_HASH) MGLSemanticVersionString diff --git a/platform/ios/framework/Info.plist b/platform/ios/framework/Info.plist index ce6a63d1fb..49854a2b70 100644 --- a/platform/ios/framework/Info.plist +++ b/platform/ios/framework/Info.plist @@ -19,7 +19,7 @@ CFBundleSignature ???? CFBundleVersion - 15268 + 15269 MGLCommitHash $(CURRENT_COMMIT_HASH) MGLSemanticVersionString diff --git a/platform/ios/ios.xcodeproj/project.pbxproj b/platform/ios/ios.xcodeproj/project.pbxproj index 2af462dd82..b27dc0200f 100644 --- a/platform/ios/ios.xcodeproj/project.pbxproj +++ b/platform/ios/ios.xcodeproj/project.pbxproj @@ -3767,7 +3767,7 @@ CLANG_ENABLE_MODULES = YES; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 15268; + CURRENT_PROJECT_VERSION = 15269; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_NS_ASSERTIONS = NO; GCC_PREPROCESSOR_DEFINITIONS = ""; @@ -3820,7 +3820,7 @@ CODE_SIGN_STYLE = Automatic; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 15268; + DYLIB_CURRENT_VERSION = 15269; DYLIB_INSTALL_NAME_BASE = "@rpath"; ENABLE_BITCODE = YES; GCC_PREPROCESSOR_DEFINITIONS = "NDEBUG=1"; @@ -3844,7 +3844,7 @@ buildSettings = { BITCODE_GENERATION_MODE = bitcode; DEFINES_MODULE = YES; - DYLIB_CURRENT_VERSION = 15268; + DYLIB_CURRENT_VERSION = 15269; LIBRARY_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)", @@ -3966,7 +3966,7 @@ CLANG_ENABLE_MODULES = YES; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 15268; + CURRENT_PROJECT_VERSION = 15269; DEBUG_INFORMATION_FORMAT = dwarf; ENABLE_TESTABILITY = YES; GCC_OPTIMIZATION_LEVEL = 0; @@ -3990,7 +3990,7 @@ CLANG_ENABLE_MODULES = YES; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 15268; + CURRENT_PROJECT_VERSION = 15269; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_NS_ASSERTIONS = NO; GCC_PREPROCESSOR_DEFINITIONS = ""; @@ -4108,7 +4108,7 @@ CODE_SIGN_STYLE = Automatic; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 15268; + DYLIB_CURRENT_VERSION = 15269; DYLIB_INSTALL_NAME_BASE = "@rpath"; ENABLE_BITCODE = YES; INFOPLIST_FILE = framework/Info.plist; @@ -4136,7 +4136,7 @@ DEFINES_MODULE = YES; DEPLOYMENT_POSTPROCESSING = YES; DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 15268; + DYLIB_CURRENT_VERSION = 15269; DYLIB_INSTALL_NAME_BASE = "@rpath"; ENABLE_BITCODE = YES; GCC_PREPROCESSOR_DEFINITIONS = "NDEBUG=1"; @@ -4183,7 +4183,7 @@ buildSettings = { BITCODE_GENERATION_MODE = bitcode; DEFINES_MODULE = YES; - DYLIB_CURRENT_VERSION = 15268; + DYLIB_CURRENT_VERSION = 15269; LIBRARY_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)", @@ -4208,7 +4208,7 @@ BITCODE_GENERATION_MODE = bitcode; DEFINES_MODULE = YES; DEPLOYMENT_POSTPROCESSING = YES; - DYLIB_CURRENT_VERSION = 15268; + DYLIB_CURRENT_VERSION = 15269; LIBRARY_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)", diff --git a/platform/ios/test/Info.plist b/platform/ios/test/Info.plist index fcca757487..814225093b 100644 --- a/platform/ios/test/Info.plist +++ b/platform/ios/test/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 15268 + 15269