From 9d8e7f5693eb4176695ef4833bd65346df188173 Mon Sep 17 00:00:00 2001 From: Ivan Persidsky Date: Wed, 13 Mar 2024 16:23:55 +0200 Subject: [PATCH] Bump version to 11.3.0-beta.1 --- .../xcshareddata/swiftpm/Package.resolved | 8 ++-- CHANGELOG.md | 14 ++++--- LICENSE.md | 39 +++++++++++++------ MapboxMaps.podspec | 6 +-- Package.resolved | 8 ++-- Package.swift | 4 +- Sources/MapboxMaps/Info.plist | 4 +- Sources/MapboxMaps/MapboxMaps.json | 2 +- scripts/release/packager/versions.json | 4 +- 9 files changed, 54 insertions(+), 35 deletions(-) diff --git a/Apps/Apps.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Apps/Apps.xcworkspace/xcshareddata/swiftpm/Package.resolved index 91b9e5304cff..b83794fb80e7 100644 --- a/Apps/Apps.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/Apps/Apps.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -14,8 +14,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/mapbox/mapbox-common-ios.git", "state" : { - "revision" : "72474daaeabb644edd449492f9e668f716da72e6", - "version" : "24.2.0" + "revision" : "0ee31944d6df0f61f944d980431362b9c5186a15", + "version" : "24.3.0-beta.1" } }, { @@ -23,8 +23,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/mapbox/mapbox-core-maps-ios.git", "state" : { - "revision" : "d0958ada64a617991cd90560ec5a6f221a734f84", - "version" : "11.2.0" + "revision" : "f58f001bb6ac25db92421d3a9ac2c0780cce60d7", + "version" : "11.3.0-beta.1" } }, { diff --git a/CHANGELOG.md b/CHANGELOG.md index bc001e697634..39fe643623b8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,17 +4,19 @@ Mapbox welcomes participation and contributions from everyone. ## main +# 11.3.0-beta.1 - 14 March, 2024 + * Update the minimum Xcode version to 15.2 (Swift 5.9). * Add `onClusterTap` and `onClusterLongPress` to AnnotationManagers(UIKit) and AnnotationGroups(SwiftUI) which support clustering * Add annotations drag handlers callbacks `dragBeginHandler`, `dragChangeHandler`, `dragEndHandler` to all Annotation types. -* Add `allowHistTesting` modifier on `MapViewAnnotation`. -* Fix taps propagation on `ViewAnnotation`. -* Fix view annotations positioning on `.ignoresSafeArea(.all)` in SwiftUI -* Bump core maps version to 11.2.0 and common sdk to 24.2.0. -* Expose `captureSnapshot` on `MapProxy` which allows to capture SwiftUI Map snapshot using `MapReader` -* Expose `opaque` and `frameRate` on SwiftUI Map +* [SwiftUI] Expose `captureSnapshot` on `MapProxy` which allows to capture SwiftUI Map snapshot using `MapReader` +* [SwiftUI] Expose `opaque` and `frameRate` on SwiftUI Map +* [SwiftUI] Add `allowHistTesting` modifier on `MapViewAnnotation`. +* [SwiftUI] Fix view annotations positioning on `.ignoresSafeArea(.all)` * Add `includeOverlays` parameter to `MapView.snapshot()` +* Fix taps propagation on `ViewAnnotation` and `MapViewAnnotation`. * Added Attribution and Telemetry pop-up dialogs and compass view content description translations for Arabic, Belarusian, Bulgarian, Catalan, Chinese Simplified, Chinese Traditional, Czech, Danish, Dutch, French, Galician, German, Hebrew, Italian, Japanese, Korean, Lithuanian, Norwegian, Polish, Belarusian, Russian, Spanish, Swedish, Ukranian and Vietnamese. +* Bump core maps version to 11.3.0-beta.1 and common sdk to 24.3.0-beta.1. ## 11.2.0 - 28 February, 2024 diff --git a/LICENSE.md b/LICENSE.md index 40d132cfbba2..ecb491e09f00 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,6 +1,6 @@ ## License -Mapbox Maps for iOS version 11.2.0 +Mapbox Maps for iOS version 11.3.0-beta.1 Mapbox Maps iOS SDK Copyright © 2021 - 2024 Mapbox, Inc. All rights reserved. @@ -31,7 +31,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. --- -### MapboxCoreMaps,11.2.0,Mapbox ToS,Mapbox,https://www.mapbox.com/ +### MapboxCoreMaps,11.3.0-beta.1,Mapbox ToS,Mapbox,https://www.mapbox.com/ ``` Mapbox Core Maps version 10.0 @@ -986,7 +986,7 @@ SOFTWARE. --- -### protozero,1.5.2,BSD-2-Clause,Mapbox,https://github.com/mapbox/protozero +### protozero,1.7.1,BSD-2-Clause,Mapbox,https://github.com/mapbox/protozero ``` protozero copyright (c) Mapbox. @@ -1070,7 +1070,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. --- -### wagyu,0.4.3,BSL-1.0,Angus Johnson and Mapbox,https://github.com/mapbox/wagyu.git +### wagyu,0.5.0,BSL-1.0,Angus Johnson and Mapbox,https://github.com/mapbox/wagyu.git ``` Parts of the code in the Wagyu Library are derived from the version of the @@ -1082,12 +1082,14 @@ Date : 2 July 2015 Website : http://www.angusj.com Copyright for portions of the derived code in the Wagyu library are held -by Angus Johnson, 2010-2015. All other copyright for the Wagyu Library are held by -Mapbox, 2016. This code is published in accordance with, and retains the same license -as the Clipper Library by Angus Johnson. +by Angus Johnson, 2010-2015. Copyright for the "include/mapbox/geometry/wagyu/almost_equal.hpp" +file is held by Google Inc and its license is listed at the top of that file. +All other copyright for the Wagyu Library are held by Mapbox, 2016. This code +is published in accordance with, and retains the same license as the Clipper +Library by Angus Johnson. Copyright (c) 2010-2015, Angus Johnson -Copyright (c) 2016, Mapbox +Copyright (c) 2016-2020, Mapbox Permission is hereby granted, free of charge, to any person or organization obtaining a copy of the software and accompanying documentation covered by @@ -1406,12 +1408,27 @@ For more information, please refer to --- -### tinygltf,2.2.0,MIT,Syoyo Fujita,https://github.com/syoyo/tinygltf +### cgltf,1.13,MIT,Johannes Kuhlmann,https://github.com/jkuhlmann/cgltf + +``` +Copyright (c) 2018-2021 Johannes Kuhlmann + +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +``` + +--- + +### meshoptimizer,0.20,MIT,zeux,https://github.com/zeux/meshoptimizer ``` MIT License -Copyright (c) 2017 Syoyo Fujita, AurĂ©lien Chatelain and many contributors +Copyright (c) 2016-2023 Arseny Kapoulkine Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -1604,7 +1621,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. --- -### glm,0.9.9.8,MIT,g-truc,https://github.com/g-truc/glm +### glm,1.0.0,MIT,g-truc,https://github.com/g-truc/glm ``` ================================================================================ diff --git a/MapboxMaps.podspec b/MapboxMaps.podspec index dd23f17fa56d..790b57ebce46 100644 --- a/MapboxMaps.podspec +++ b/MapboxMaps.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |m| - maps_version = '11.2.0' + maps_version = '11.3.0-beta.1' m.name = 'MapboxMaps' m.version = maps_version @@ -21,8 +21,8 @@ Pod::Spec.new do |m| m.source_files = 'Sources/MapboxMaps/**/*.{swift,h}' m.resource_bundles = { 'MapboxMapsResources' => ['Sources/**/*.{xcassets,strings}', 'Sources/MapboxMaps/MapboxMaps.json', 'Sources/MapboxMaps/PrivacyInfo.xcprivacy'] } - m.dependency 'MapboxCoreMaps', '11.2.0' - m.dependency 'MapboxCommon', '24.2.0' + m.dependency 'MapboxCoreMaps', '11.3.0-beta.1' + m.dependency 'MapboxCommon', '24.3.0-beta.1' m.dependency 'Turf', '2.8.0' end diff --git a/Package.resolved b/Package.resolved index b68798c9aaae..dda533deb211 100644 --- a/Package.resolved +++ b/Package.resolved @@ -5,8 +5,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/mapbox/mapbox-common-ios.git", "state" : { - "revision" : "72474daaeabb644edd449492f9e668f716da72e6", - "version" : "24.2.0" + "revision" : "0ee31944d6df0f61f944d980431362b9c5186a15", + "version" : "24.3.0-beta.1" } }, { @@ -14,8 +14,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/mapbox/mapbox-core-maps-ios.git", "state" : { - "revision" : "d0958ada64a617991cd90560ec5a6f221a734f84", - "version" : "11.2.0" + "revision" : "f58f001bb6ac25db92421d3a9ac2c0780cce60d7", + "version" : "11.3.0-beta.1" } }, { diff --git a/Package.swift b/Package.swift index be47fc8382bd..a998dc178950 100644 --- a/Package.swift +++ b/Package.swift @@ -4,8 +4,8 @@ import PackageDescription import Foundation -let coreMaps = MapsDependency.coreMaps(version: "11.2.0") -let common = MapsDependency.common(version: "24.2.0") +let coreMaps = MapsDependency.coreMaps(version: "11.3.0-beta.1") +let common = MapsDependency.common(version: "24.3.0-beta.1") let mapboxMapsPath: String? = nil diff --git a/Sources/MapboxMaps/Info.plist b/Sources/MapboxMaps/Info.plist index f7093bc112d0..58ae59820a10 100644 --- a/Sources/MapboxMaps/Info.plist +++ b/Sources/MapboxMaps/Info.plist @@ -15,8 +15,8 @@ CFBundlePackageType $(PRODUCT_BUNDLE_PACKAGE_TYPE) CFBundleShortVersionString - 11.2.0 + 11.3.0 CFBundleVersion - 115 + 116 diff --git a/Sources/MapboxMaps/MapboxMaps.json b/Sources/MapboxMaps/MapboxMaps.json index 2ee31cd60062..ee8a6db0fe88 100644 --- a/Sources/MapboxMaps/MapboxMaps.json +++ b/Sources/MapboxMaps/MapboxMaps.json @@ -1,3 +1,3 @@ { - "version" : "11.2.0" + "version" : "11.3.0-beta.1" } diff --git a/scripts/release/packager/versions.json b/scripts/release/packager/versions.json index 70d4fb7e4c40..6c92b887fe07 100644 --- a/scripts/release/packager/versions.json +++ b/scripts/release/packager/versions.json @@ -1,5 +1,5 @@ { - "MapboxCoreMaps": "11.2.0", - "MapboxCommon": "24.2.0", + "MapboxCoreMaps": "11.3.0-beta.1", + "MapboxCommon": "24.3.0-beta.1", "Turf": "2.8.0" }