From 4e694a42ce3e4ba4f1614b4fb8886ede3fc4234d Mon Sep 17 00:00:00 2001 From: Mai Mai Date: Thu, 28 Mar 2024 11:53:45 +0200 Subject: [PATCH] Prepare v11.3.0 rc.1 release (#2095) Co-authored-by: Roman Laitarenko --- .../xcshareddata/swiftpm/Package.resolved | 8 +- CHANGELOG.md | 6 + LICENSE.md | 185 +++++++++++++++++- MapboxMaps.podspec | 6 +- Package.resolved | 8 +- Package.swift | 4 +- Sources/MapboxMaps/Foundation/MapView.swift | 8 +- Sources/MapboxMaps/Info.plist | 2 +- Sources/MapboxMaps/MapboxMaps.json | 2 +- .../OfflineManagerIntegrationTests.swift | 1 + scripts/release/packager/versions.json | 4 +- 11 files changed, 212 insertions(+), 22 deletions(-) diff --git a/Apps/Apps.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Apps/Apps.xcworkspace/xcshareddata/swiftpm/Package.resolved index b83794fb80e7..2663cd86ca47 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" : "0ee31944d6df0f61f944d980431362b9c5186a15", - "version" : "24.3.0-beta.1" + "revision" : "2af5c688a58d8019af1376a0a76f505a5f36a27b", + "version" : "24.3.0-rc.1" } }, { @@ -23,8 +23,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/mapbox/mapbox-core-maps-ios.git", "state" : { - "revision" : "f58f001bb6ac25db92421d3a9ac2c0780cce60d7", - "version" : "11.3.0-beta.1" + "revision" : "a85b77f312ecd430245c618d107050fa42d5afc2", + "version" : "11.3.0-rc.1" } }, { diff --git a/CHANGELOG.md b/CHANGELOG.md index 39fe643623b8..c604950ad693 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,12 @@ Mapbox welcomes participation and contributions from everyone. ## main +# 11.3.0-rc.1 - 27 March, 2024 + +* [tile store] Expose API for estimating Tile Region downloads and storage size. +* Remove metal view's contentScaleFactor assertion. +* Bump core maps version to 11.3.0-rc.1 and common sdk to 24.3.0-rc.1. + # 11.3.0-beta.1 - 14 March, 2024 * Update the minimum Xcode version to 15.2 (Swift 5.9). diff --git a/LICENSE.md b/LICENSE.md index ecb491e09f00..ad350a310799 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,6 +1,6 @@ ## License -Mapbox Maps for iOS version 11.3.0-beta.1 +Mapbox Maps for iOS version 11.3.0-rc.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.3.0-beta.1,Mapbox ToS,Mapbox,https://www.mapbox.com/ +### MapboxCoreMaps,11.3.0-rc.1,Mapbox ToS,Mapbox,https://www.mapbox.com/ ``` Mapbox Core Maps version 10.0 @@ -1117,6 +1117,39 @@ DEALINGS IN THE SOFTWARE. --- +### vtzero,1.1.0,BSD-2-Clause,Mapbox,https://github.com/mapbox/vtzero + +``` +BSD 2-Clause License + +Copyright (c) 2017, Mapbox +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +* Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + +* Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +SERVICES LOSS OF USE, DATA, OR PROFITS OR BUSINESS INTERRUPTION) HOWEVER +CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +``` + +--- + ### microprofile,deda3d4,Unlicense,zeux,https://github.com/zeux/microprofile ``` @@ -1452,6 +1485,154 @@ SOFTWARE. --- +### spatial-algorithms,0.1.0,Mapbox ToS,Mapbox,https://github.com/mapbox/spatial-algorithms + +``` +Mapbox spatial-algorithms version 0.1.0 + +Copyright © 2017 - 2024 Mapbox, Inc. All rights reserved. + +The software and files in this repository (collectively, "Software") are +licensed under the Mapbox TOS for use only with the relevant Mapbox product(s) +listed at www.mapbox.com/pricing. This license allows developers with a +current active Mapbox account to use and modify the authorized portions of the +Software as needed for use only with the relevant Mapbox product(s) through +their Mapbox account in accordance with the Mapbox TOS. This license +terminates automatically if a developer no longer has a Mapbox account in good +standing or breaches the Mapbox TOS. For the license terms, please see the +Mapbox TOS at https://www.mapbox.com/legal/tos/ which incorporates the Mapbox +Product Terms at www.mapbox.com/legal/service-terms. If this Software is a +SDK, modifications that change or interfere with marked portions of the code +related to billing, accounting, or data collection are not authorized and the +SDK sends limited de-identified location and usage data which is used in +accordance with the Mapbox TOS. [Updated 2023-01] +``` + +--- + +### vtcomposite,2.1.0,CC0,Mapbox,https://github.com/mapbox/vtcomposite + +``` +CC0 1.0 Universal + +Statement of Purpose + +The laws of most jurisdictions throughout the world automatically confer +exclusive Copyright and Related Rights (defined below) upon the creator and +subsequent owner(s) (each and all, an "owner") of an original work of +authorship and/or a database (each, a "Work"). + +Certain owners wish to permanently relinquish those rights to a Work for the +purpose of contributing to a commons of creative, cultural and scientific +works ("Commons") that the public can reliably and without fear of later +claims of infringement build upon, modify, incorporate in other works, reuse +and redistribute as freely as possible in any form whatsoever and for any +purposes, including without limitation commercial purposes. These owners may +contribute to the Commons to promote the ideal of a free culture and the +further production of creative, cultural and scientific works, or to gain +reputation or greater distribution for their Work in part through the use and +efforts of others. + +For these and/or other purposes and motivations, and without any expectation +of additional consideration or compensation, the person associating CC0 with a +Work (the "Affirmer"), to the extent that he or she is an owner of Copyright +and Related Rights in the Work, voluntarily elects to apply CC0 to the Work +and publicly distribute the Work under its terms, with knowledge of his or her +Copyright and Related Rights in the Work and the meaning and intended legal +effect of CC0 on those rights. + +1. Copyright and Related Rights. A Work made available under CC0 may be +protected by copyright and related or neighboring rights ("Copyright and +Related Rights"). Copyright and Related Rights include, but are not limited +to, the following: + + i. the right to reproduce, adapt, distribute, perform, display, communicate, + and translate a Work + + ii. moral rights retained by the original author(s) and/or performer(s) + + iii. publicity and privacy rights pertaining to a person's image or likeness + depicted in a Work + + iv. rights protecting against unfair competition in regards to a Work, + subject to the limitations in paragraph 4(a), below + + v. rights protecting the extraction, dissemination, use and reuse of data in + a Work + + vi. database rights (such as those arising under Directive 96/9/EC of the + European Parliament and of the Council of 11 March 1996 on the legal + protection of databases, and under any national implementation thereof, + including any amended or successor version of such directive) and + + vii. other similar, equivalent or corresponding rights throughout the world + based on applicable law or treaty, and any national implementations thereof. + +2. Waiver. To the greatest extent permitted by, but not in contravention of, +applicable law, Affirmer hereby overtly, fully, permanently, irrevocably and +unconditionally waives, abandons, and surrenders all of Affirmer's Copyright +and Related Rights and associated claims and causes of action, whether now +known or unknown (including existing as well as future claims and causes of +action), in the Work (i) in all territories worldwide, (ii) for the maximum +duration provided by applicable law or treaty (including future time +extensions), (iii) in any current or future medium and for any number of +copies, and (iv) for any purpose whatsoever, including without limitation +commercial, advertising or promotional purposes (the "Waiver"). Affirmer makes +the Waiver for the benefit of each member of the public at large and to the +detriment of Affirmer's heirs and successors, fully intending that such Waiver +shall not be subject to revocation, rescission, cancellation, termination, or +any other legal or equitable action to disrupt the quiet enjoyment of the Work +by the public as contemplated by Affirmer's express Statement of Purpose. + +3. Public License Fallback. Should any part of the Waiver for any reason be +judged legally invalid or ineffective under applicable law, then the Waiver +shall be preserved to the maximum extent permitted taking into account +Affirmer's express Statement of Purpose. In addition, to the extent the Waiver +is so judged Affirmer hereby grants to each affected person a royalty-free, +non transferable, non sublicensable, non exclusive, irrevocable and +unconditional license to exercise Affirmer's Copyright and Related Rights in +the Work (i) in all territories worldwide, (ii) for the maximum duration +provided by applicable law or treaty (including future time extensions), (iii) +in any current or future medium and for any number of copies, and (iv) for any +purpose whatsoever, including without limitation commercial, advertising or +promotional purposes (the "License"). The License shall be deemed effective as +of the date CC0 was applied by Affirmer to the Work. Should any part of the +License for any reason be judged legally invalid or ineffective under +applicable law, such partial invalidity or ineffectiveness shall not +invalidate the remainder of the License, and in such case Affirmer hereby +affirms that he or she will not (i) exercise any of his or her remaining +Copyright and Related Rights in the Work or (ii) assert any associated claims +and causes of action with respect to the Work, in either case contrary to +Affirmer's express Statement of Purpose. + +4. Limitations and Disclaimers. + + a. No trademark or patent rights held by Affirmer are waived, abandoned, + surrendered, licensed or otherwise affected by this document. + + b. Affirmer offers the Work as-is and makes no representations or warranties + of any kind concerning the Work, express, implied, statutory or otherwise, + including without limitation warranties of title, merchantability, fitness + for a particular purpose, non infringement, or the absence of latent or + other defects, accuracy, or the present or absence of errors, whether or not + discoverable, all to the greatest extent permissible under applicable law. + + c. Affirmer disclaims responsibility for clearing rights of other persons + that may apply to the Work or any use thereof, including without limitation + any person's Copyright and Related Rights in the Work. Further, Affirmer + disclaims responsibility for obtaining any necessary consents, permissions + or other rights required for any use of the Work. + + d. Affirmer understands and acknowledges that Creative Commons is not a + party to this document and has no duty or obligation with respect to this + CC0 or use of the Work. + +For more information, please see + +``` + +--- + ### mapbox-base-internal,dev,BSD-3-Clause,Mapbox,https://github.com/mapbox/mapbox-base-internal ``` diff --git a/MapboxMaps.podspec b/MapboxMaps.podspec index 790b57ebce46..7fb43418dc5b 100644 --- a/MapboxMaps.podspec +++ b/MapboxMaps.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |m| - maps_version = '11.3.0-beta.1' + maps_version = '11.3.0-rc.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.3.0-beta.1' - m.dependency 'MapboxCommon', '24.3.0-beta.1' + m.dependency 'MapboxCoreMaps', '11.3.0-rc.1' + m.dependency 'MapboxCommon', '24.3.0-rc.1' m.dependency 'Turf', '2.8.0' end diff --git a/Package.resolved b/Package.resolved index dda533deb211..5142be1ac428 100644 --- a/Package.resolved +++ b/Package.resolved @@ -5,8 +5,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/mapbox/mapbox-common-ios.git", "state" : { - "revision" : "0ee31944d6df0f61f944d980431362b9c5186a15", - "version" : "24.3.0-beta.1" + "revision" : "2af5c688a58d8019af1376a0a76f505a5f36a27b", + "version" : "24.3.0-rc.1" } }, { @@ -14,8 +14,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/mapbox/mapbox-core-maps-ios.git", "state" : { - "revision" : "f58f001bb6ac25db92421d3a9ac2c0780cce60d7", - "version" : "11.3.0-beta.1" + "revision" : "a85b77f312ecd430245c618d107050fa42d5afc2", + "version" : "11.3.0-rc.1" } }, { diff --git a/Package.swift b/Package.swift index a998dc178950..b15c54227d07 100644 --- a/Package.swift +++ b/Package.swift @@ -4,8 +4,8 @@ import PackageDescription import Foundation -let coreMaps = MapsDependency.coreMaps(version: "11.3.0-beta.1") -let common = MapsDependency.common(version: "24.3.0-beta.1") +let coreMaps = MapsDependency.coreMaps(version: "11.3.0-rc.1") +let common = MapsDependency.common(version: "24.3.0-rc.1") let mapboxMapsPath: String? = nil diff --git a/Sources/MapboxMaps/Foundation/MapView.swift b/Sources/MapboxMaps/Foundation/MapView.swift index 9da9d2410744..eadf05a5711f 100644 --- a/Sources/MapboxMaps/Foundation/MapView.swift +++ b/Sources/MapboxMaps/Foundation/MapView.swift @@ -584,9 +584,11 @@ open class MapView: UIView, SizeTrackingLayerDelegate { mapboxMap.size = size metalView.drawableSize = CGSize(width: size.width * pixelRatio, height: size.height * pixelRatio) - // DrawableSize setter will recalculate `contentScaleFactor` if the new drawableSize doesn't fit into - // the current bounds.size and scale. - assert(metalView.contentScaleFactor == pixelRatio) + if metalView.contentScaleFactor != pixelRatio { + // DrawableSize setter will recalculate `contentScaleFactor` if the new drawableSize doesn't fit into + // the current bounds.size and scale. + Log.error(forMessage: "MetalView content scale factor \(metalView.contentScaleFactor) is not equal to pixel ratio \(pixelRatio)") + } // GL-Native will trigger update on `mapboxMap.size` update but it will come in the next frame. // To reduce glitches we can schedule repaint in the next frame to resize map texture. diff --git a/Sources/MapboxMaps/Info.plist b/Sources/MapboxMaps/Info.plist index 58ae59820a10..4e5c3000e81f 100644 --- a/Sources/MapboxMaps/Info.plist +++ b/Sources/MapboxMaps/Info.plist @@ -17,6 +17,6 @@ CFBundleShortVersionString 11.3.0 CFBundleVersion - 116 + 118 diff --git a/Sources/MapboxMaps/MapboxMaps.json b/Sources/MapboxMaps/MapboxMaps.json index ee8a6db0fe88..61b5e17fdd38 100644 --- a/Sources/MapboxMaps/MapboxMaps.json +++ b/Sources/MapboxMaps/MapboxMaps.json @@ -1,3 +1,3 @@ { - "version" : "11.3.0-beta.1" + "version" : "11.3.0-rc.1" } diff --git a/Tests/MapboxMapsTests/Integration Tests/OfflineManagerIntegrationTests.swift b/Tests/MapboxMapsTests/Integration Tests/OfflineManagerIntegrationTests.swift index d3e0a8394a21..f0801c2f2a2f 100644 --- a/Tests/MapboxMapsTests/Integration Tests/OfflineManagerIntegrationTests.swift +++ b/Tests/MapboxMapsTests/Integration Tests/OfflineManagerIntegrationTests.swift @@ -178,6 +178,7 @@ final class OfflineManagerIntegrationTestCase: IntegrationTestCase { } func testMapCanBeLoadediWithoutNetworkConnectivity() throws { + try XCTSkipIf(true, "Skip until MAPSNAT-1943 is fixed") try guardForMetalDevice() let rootView = try XCTUnwrap(rootViewController?.view) diff --git a/scripts/release/packager/versions.json b/scripts/release/packager/versions.json index 6c92b887fe07..aa7d0329246e 100644 --- a/scripts/release/packager/versions.json +++ b/scripts/release/packager/versions.json @@ -1,5 +1,5 @@ { - "MapboxCoreMaps": "11.3.0-beta.1", - "MapboxCommon": "24.3.0-beta.1", + "MapboxCoreMaps": "11.3.0-rc.1", + "MapboxCommon": "24.3.0-rc.1", "Turf": "2.8.0" }