diff --git a/platform/ios/CHANGELOG.md b/platform/ios/CHANGELOG.md index bebc071173..b0834ef0af 100644 --- a/platform/ios/CHANGELOG.md +++ b/platform/ios/CHANGELOG.md @@ -2,8 +2,21 @@ Mapbox welcomes participation and contributions from everyone. Please read [CONTRIBUTING.md](../../CONTRIBUTING.md) to get started. -## 5.10.0-beta.1 -Starting this release, the Mapbox Maps SDK for iOS will use a pre-built GL Native binary licensed under the [Mapbox Terms of Service](https://www.mapbox.com/legal/tos). The license of the Maps SDK for iOS remains BSD-2. For more information on using this and future releases, see [README.md](https://github.com/mapbox/mapbox-gl-native-iOS/blob/master/README.md). For more details on licensing, see [LICENSE.md](https://github.com/mapbox/mapbox-gl-native-iOS/blob/master/LICENSE.md). +## 6.0.0 + +This major release does not include any breaking changes to public APIs. We are treating this release as a SEMVER major change because our installation instructions have changed. + +**Distribution Updates** + +Standard installation methods still apply – we will continue to support SDK installation via CocoaPods, Carthage, and manual integration. However, you are now required to authenticate installation with a new access token. For more information about this new process, [view our installation guide](https://docs.mapbox.com/ios/maps/overview/#install-the-sdk). + +**Licensing Updates** + +Release v6.0.0 updates the Mapbox Maps SDK for iOS to use a pre-built GL Native binary rather than building from source as a submodule dependency. GL Native is changing some of its development workflows to build some Mapbox platform-specific features internally, similar to Chrome/Chromium development. Please refer to the [README.md](https://github.com/mapbox/mapbox-gl-native-ios/blob/master/platform/ios/README.md) and/or [DEVELOPING.md](https://github.com/mapbox/mapbox-gl-native-ios/blob/master/platform/ios/DEVELOPING.md) for guidance. + +Starting today, new binary releases of GL Native are licensed under the Mapbox Terms of Service. The Mapbox Maps SDKs repos will continue to be public and licensed under BSD-2. + +If you have any questions about how this change may impact your use of the Maps SDK, please don’t hesitate to reach out to Mapbox Support to connect with the Mapbox mobile team. ### ✨ New features * Added support for the `hash` expression operator that generates a hash value for the given string. Use this function in expressions in style JSON or with the `MGL_FUNCTION()` syntax in an `NSExpression` format string. ([#326](https://github.com/mapbox/mapbox-gl-native-ios/pull/326)) diff --git a/platform/ios/Integration Test Harness/Info.plist b/platform/ios/Integration Test Harness/Info.plist index 6f46680d63..229180f3e3 100644 --- a/platform/ios/Integration Test Harness/Info.plist +++ b/platform/ios/Integration Test Harness/Info.plist @@ -17,9 +17,9 @@ CFBundlePackageType APPL CFBundleShortVersionString - 5.10.0 + 6.0.0 CFBundleVersion - 15258 + 15259 LSRequiresIPhoneOS UILaunchStoryboardName diff --git a/platform/ios/Integration Tests/Info.plist b/platform/ios/Integration Tests/Info.plist index fbb2e4a6e2..5547c02e61 100644 --- a/platform/ios/Integration Tests/Info.plist +++ b/platform/ios/Integration Tests/Info.plist @@ -15,8 +15,8 @@ CFBundlePackageType BNDL CFBundleShortVersionString - 5.10.0 + 6.0.0 CFBundleVersion - 15258 + 15259 diff --git a/platform/ios/Mapbox-iOS-SDK-snapshot-dynamic.podspec b/platform/ios/Mapbox-iOS-SDK-snapshot-dynamic.podspec index 7a99db11ad..c8ac145b10 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 = '5.10.0-beta.1' + version = '6.0.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 c14912c91e..ddef3e2934 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 = '5.10.0-beta.1' + version = '6.0.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 452d98a5b9..5a386caf77 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 = '5.10.0-beta.1' + version = '6.0.0' m.name = 'Mapbox-iOS-SDK' m.version = version diff --git a/platform/ios/app/Info.plist b/platform/ios/app/Info.plist index 8e64a75150..6feeb52c4a 100644 --- a/platform/ios/app/Info.plist +++ b/platform/ios/app/Info.plist @@ -17,11 +17,11 @@ CFBundlePackageType APPL CFBundleShortVersionString - 5.10.0 + 6.0.0 CFBundleSignature MBGL CFBundleVersion - 15258 + 15259 LSRequiresIPhoneOS NSHumanReadableCopyright diff --git a/platform/ios/benchmark/Info.plist b/platform/ios/benchmark/Info.plist index 6c6eb45313..2416e2e811 100644 --- a/platform/ios/benchmark/Info.plist +++ b/platform/ios/benchmark/Info.plist @@ -17,11 +17,11 @@ CFBundlePackageType APPL CFBundleShortVersionString - 5.10.0 + 6.0.0 CFBundleSignature MBGL CFBundleVersion - 15258 + 15259 LSRequiresIPhoneOS NSHumanReadableCopyright diff --git a/platform/ios/framework/Info-static.plist b/platform/ios/framework/Info-static.plist index 92265c5bec..beb4687c8a 100644 --- a/platform/ios/framework/Info-static.plist +++ b/platform/ios/framework/Info-static.plist @@ -11,11 +11,11 @@ CFBundleName $(PRODUCT_NAME) CFBundleShortVersionString - 5.10.0 + 6.0.0 CFBundleSignature ???? CFBundleVersion - 15258 + 15259 MGLCommitHash $(CURRENT_COMMIT_HASH) MGLSemanticVersionString diff --git a/platform/ios/framework/Info.plist b/platform/ios/framework/Info.plist index 99fe2828c5..059a40b003 100644 --- a/platform/ios/framework/Info.plist +++ b/platform/ios/framework/Info.plist @@ -15,11 +15,11 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 5.10.0 + 6.0.0 CFBundleSignature ???? CFBundleVersion - 15258 + 15259 MGLCommitHash $(CURRENT_COMMIT_HASH) MGLSemanticVersionString diff --git a/platform/ios/ios.xcodeproj/project.pbxproj b/platform/ios/ios.xcodeproj/project.pbxproj index 4b40f48958..7c4210de53 100644 --- a/platform/ios/ios.xcodeproj/project.pbxproj +++ b/platform/ios/ios.xcodeproj/project.pbxproj @@ -3676,7 +3676,7 @@ CLANG_ENABLE_MODULES = YES; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 15258; + CURRENT_PROJECT_VERSION = 15259; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_NS_ASSERTIONS = NO; GCC_PREPROCESSOR_DEFINITIONS = ""; @@ -3729,7 +3729,7 @@ CODE_SIGN_STYLE = Automatic; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 15258; + DYLIB_CURRENT_VERSION = 15259; DYLIB_INSTALL_NAME_BASE = "@rpath"; GCC_PREPROCESSOR_DEFINITIONS = "NDEBUG=1"; INFOPLIST_FILE = framework/Info.plist; @@ -3751,7 +3751,7 @@ buildSettings = { BITCODE_GENERATION_MODE = bitcode; DEFINES_MODULE = YES; - DYLIB_CURRENT_VERSION = 15258; + DYLIB_CURRENT_VERSION = 15259; LIBRARY_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)", @@ -3873,7 +3873,7 @@ CLANG_ENABLE_MODULES = YES; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 15258; + CURRENT_PROJECT_VERSION = 15259; DEBUG_INFORMATION_FORMAT = dwarf; ENABLE_TESTABILITY = YES; GCC_OPTIMIZATION_LEVEL = 0; @@ -3897,7 +3897,7 @@ CLANG_ENABLE_MODULES = YES; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 15258; + CURRENT_PROJECT_VERSION = 15259; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_NS_ASSERTIONS = NO; GCC_PREPROCESSOR_DEFINITIONS = ""; @@ -4015,7 +4015,7 @@ CODE_SIGN_STYLE = Automatic; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 15258; + DYLIB_CURRENT_VERSION = 15259; DYLIB_INSTALL_NAME_BASE = "@rpath"; INFOPLIST_FILE = framework/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; @@ -4041,7 +4041,7 @@ DEFINES_MODULE = YES; DEPLOYMENT_POSTPROCESSING = YES; DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 15258; + DYLIB_CURRENT_VERSION = 15259; DYLIB_INSTALL_NAME_BASE = "@rpath"; GCC_PREPROCESSOR_DEFINITIONS = "NDEBUG=1"; INFOPLIST_FILE = framework/Info.plist; @@ -4086,7 +4086,7 @@ buildSettings = { BITCODE_GENERATION_MODE = bitcode; DEFINES_MODULE = YES; - DYLIB_CURRENT_VERSION = 15258; + DYLIB_CURRENT_VERSION = 15259; LIBRARY_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)", @@ -4111,7 +4111,7 @@ BITCODE_GENERATION_MODE = bitcode; DEFINES_MODULE = YES; DEPLOYMENT_POSTPROCESSING = YES; - DYLIB_CURRENT_VERSION = 15258; + DYLIB_CURRENT_VERSION = 15259; LIBRARY_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)", diff --git a/platform/ios/test/Info.plist b/platform/ios/test/Info.plist index f21fa3e3ee..ed282d17d8 100644 --- a/platform/ios/test/Info.plist +++ b/platform/ios/test/Info.plist @@ -15,10 +15,10 @@ CFBundlePackageType BNDL CFBundleShortVersionString - 5.10.0 + 6.0.0 CFBundleSignature ???? CFBundleVersion - 15258 + 15259