diff --git a/Cartfile b/Cartfile
index 844bdc3683..55b9cc8105 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.2.0
+binary "https://api.mapbox.com/downloads/v2/carthage/mobile-maps-gl-core/mapbox-ios-sdk-gl-core-static.json" == 5.2.1
github "mapbox/mapbox-events-ios" ~> 0.10.5
diff --git a/Cartfile.resolved b/Cartfile.resolved
index 383051a833..2b680174d1 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.2.0"
+binary "https://api.mapbox.com/downloads/v2/carthage/mobile-maps-gl-core/mapbox-ios-sdk-gl-core-static.json" "5.2.1"
github "mapbox/mapbox-events-ios" "v0.10.5"
diff --git a/platform/ios/CHANGELOG.md b/platform/ios/CHANGELOG.md
index 2770a52d60..e5616e1ea3 100644
--- a/platform/ios/CHANGELOG.md
+++ b/platform/ios/CHANGELOG.md
@@ -2,18 +2,20 @@
Mapbox welcomes participation and contributions from everyone. Please read [CONTRIBUTING.md](../../CONTRIBUTING.md) to get started.
-## 6.3.0
+## 6.3.0 - November 10, 2020
+
+This version does not support Apple Silicon Macs (arm64).
### 🐞 Bug fixes
-* Partly fixed an issue on iOS 14 where `-[UIView layoutSubviews]` was being repeatedly called. ([#501](https://github.com/mapbox/mapbox-gl-native-ios/pull/501))
+* Fixed issues on iOS 14 where `-[UIView layoutSubviews]` was being repeatedly called. ([#501](https://github.com/mapbox/mapbox-gl-native-ios/pull/501), [#507](https://github.com/mapbox/mapbox-gl-native-ios/pull/507))
* Fixed a bug with UIViews being incorrectly updated with a one frame delay. ([#483](https://github.com/mapbox/mapbox-gl-native-ios/pull/483))
* Fixed an issue where CocoaPods users could not install the SDK when using Xcode 12. ([#482](https://github.com/mapbox/mapbox-gl-native-ios/pull/482))
-* Fixed an issue on iOS 14 where scalebar triggers unnecessary `-[UIView layoutSubviews]`. ([#507](https://github.com/mapbox/mapbox-gl-native-ios/pull/507))
### 🔧 Dependencies
-* Updated `mapbox-events-ios` to `0.10.5-beta.2` in order to add additional iOS 14 support.([#491](https://github.com/mapbox/mapbox-gl-native-ios/pull/491))
+* Updated `mapbox-events-ios` to `0.10.5` in order to add additional iOS 14 support.([#510](https://github.com/mapbox/mapbox-gl-native-ios/pull/510))
+* Core library updated to `5.2.1`. ([#537](https://github.com/mapbox/mapbox-gl-native-ios/pull/537))
### ✨ Other changes
diff --git a/platform/ios/Integration Test Harness/Info.plist b/platform/ios/Integration Test Harness/Info.plist
index 297b63772a..82ea2b109a 100644
--- a/platform/ios/Integration Test Harness/Info.plist
+++ b/platform/ios/Integration Test Harness/Info.plist
@@ -19,7 +19,7 @@
CFBundleShortVersionString
6.3.0
CFBundleVersion
- 15277
+ 15278
LSRequiresIPhoneOS
UILaunchStoryboardName
diff --git a/platform/ios/Integration Tests/Info.plist b/platform/ios/Integration Tests/Info.plist
index 04d9d021a9..bc80bd4930 100644
--- a/platform/ios/Integration Tests/Info.plist
+++ b/platform/ios/Integration Tests/Info.plist
@@ -17,6 +17,6 @@
CFBundleShortVersionString
6.3.0
CFBundleVersion
- 15277
+ 15278
diff --git a/platform/ios/Mapbox-iOS-SDK-snapshot-dynamic.podspec b/platform/ios/Mapbox-iOS-SDK-snapshot-dynamic.podspec
index 0e27f1e0f1..99ce68e7c4 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.3.0-beta.1'
+ version = '6.3.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 05bccebaf8..4dc878cbd9 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.3.0-beta.1'
+ version = '6.3.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 3e242390ee..38d78e8bee 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.3.0-beta.1'
+ version = '6.3.0'
m.name = 'Mapbox-iOS-SDK'
m.version = version
diff --git a/platform/ios/app/Info.plist b/platform/ios/app/Info.plist
index 8e0e7349cc..08c7f6103f 100644
--- a/platform/ios/app/Info.plist
+++ b/platform/ios/app/Info.plist
@@ -21,7 +21,7 @@
CFBundleSignature
MBGL
CFBundleVersion
- 15277
+ 15278
LSRequiresIPhoneOS
NSLocationTemporaryUsageDescriptionDictionary
diff --git a/platform/ios/benchmark/Info.plist b/platform/ios/benchmark/Info.plist
index e4b489e934..93debc0e21 100644
--- a/platform/ios/benchmark/Info.plist
+++ b/platform/ios/benchmark/Info.plist
@@ -21,7 +21,7 @@
CFBundleSignature
MBGL
CFBundleVersion
- 15277
+ 15278
LSRequiresIPhoneOS
NSHumanReadableCopyright
diff --git a/platform/ios/framework/Info-static.plist b/platform/ios/framework/Info-static.plist
index eac4c84de2..9ad48692af 100644
--- a/platform/ios/framework/Info-static.plist
+++ b/platform/ios/framework/Info-static.plist
@@ -15,7 +15,7 @@
CFBundleSignature
????
CFBundleVersion
- 15277
+ 15278
MGLCommitHash
$(CURRENT_COMMIT_HASH)
MGLSemanticVersionString
diff --git a/platform/ios/framework/Info.plist b/platform/ios/framework/Info.plist
index c55f26c030..404459dcaa 100644
--- a/platform/ios/framework/Info.plist
+++ b/platform/ios/framework/Info.plist
@@ -19,7 +19,7 @@
CFBundleSignature
????
CFBundleVersion
- 15277
+ 15278
MGLCommitHash
$(CURRENT_COMMIT_HASH)
MGLSemanticVersionString
diff --git a/platform/ios/ios.xcodeproj/project.pbxproj b/platform/ios/ios.xcodeproj/project.pbxproj
index dcb5cddbff..3d4ac7ba52 100644
--- a/platform/ios/ios.xcodeproj/project.pbxproj
+++ b/platform/ios/ios.xcodeproj/project.pbxproj
@@ -3773,7 +3773,7 @@
CLANG_ENABLE_MODULES = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COPY_PHASE_STRIP = NO;
- CURRENT_PROJECT_VERSION = 15277;
+ CURRENT_PROJECT_VERSION = 15278;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
ENABLE_NS_ASSERTIONS = NO;
GCC_PREPROCESSOR_DEFINITIONS = "";
@@ -3826,7 +3826,7 @@
CODE_SIGN_STYLE = Automatic;
DEFINES_MODULE = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
- DYLIB_CURRENT_VERSION = 15277;
+ DYLIB_CURRENT_VERSION = 15278;
DYLIB_INSTALL_NAME_BASE = "@rpath";
ENABLE_BITCODE = YES;
GCC_PREPROCESSOR_DEFINITIONS = "NDEBUG=1";
@@ -3850,7 +3850,7 @@
buildSettings = {
BITCODE_GENERATION_MODE = bitcode;
DEFINES_MODULE = YES;
- DYLIB_CURRENT_VERSION = 15277;
+ DYLIB_CURRENT_VERSION = 15278;
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)",
@@ -3972,7 +3972,7 @@
CLANG_ENABLE_MODULES = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COPY_PHASE_STRIP = NO;
- CURRENT_PROJECT_VERSION = 15277;
+ CURRENT_PROJECT_VERSION = 15278;
DEBUG_INFORMATION_FORMAT = dwarf;
ENABLE_TESTABILITY = YES;
GCC_OPTIMIZATION_LEVEL = 0;
@@ -3996,7 +3996,7 @@
CLANG_ENABLE_MODULES = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COPY_PHASE_STRIP = NO;
- CURRENT_PROJECT_VERSION = 15277;
+ CURRENT_PROJECT_VERSION = 15278;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
ENABLE_NS_ASSERTIONS = NO;
GCC_PREPROCESSOR_DEFINITIONS = "";
@@ -4114,7 +4114,7 @@
CODE_SIGN_STYLE = Automatic;
DEFINES_MODULE = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
- DYLIB_CURRENT_VERSION = 15277;
+ DYLIB_CURRENT_VERSION = 15278;
DYLIB_INSTALL_NAME_BASE = "@rpath";
ENABLE_BITCODE = YES;
INFOPLIST_FILE = framework/Info.plist;
@@ -4142,7 +4142,7 @@
DEFINES_MODULE = YES;
DEPLOYMENT_POSTPROCESSING = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
- DYLIB_CURRENT_VERSION = 15277;
+ DYLIB_CURRENT_VERSION = 15278;
DYLIB_INSTALL_NAME_BASE = "@rpath";
ENABLE_BITCODE = YES;
GCC_PREPROCESSOR_DEFINITIONS = "NDEBUG=1";
@@ -4189,7 +4189,7 @@
buildSettings = {
BITCODE_GENERATION_MODE = bitcode;
DEFINES_MODULE = YES;
- DYLIB_CURRENT_VERSION = 15277;
+ DYLIB_CURRENT_VERSION = 15278;
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)",
@@ -4214,7 +4214,7 @@
BITCODE_GENERATION_MODE = bitcode;
DEFINES_MODULE = YES;
DEPLOYMENT_POSTPROCESSING = YES;
- DYLIB_CURRENT_VERSION = 15277;
+ DYLIB_CURRENT_VERSION = 15278;
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)",
diff --git a/platform/ios/test/Info.plist b/platform/ios/test/Info.plist
index f525438ada..2e7f04a141 100644
--- a/platform/ios/test/Info.plist
+++ b/platform/ios/test/Info.plist
@@ -19,6 +19,6 @@
CFBundleSignature
????
CFBundleVersion
- 15277
+ 15278