Prepare 2.11.0-beta.1 (#1016)

evil159 · web-flow · commit cfc96660e010 · 2025-08-19T10:52:39.000+03:00
* Prepare 2.11.0-beta.1

* Bump example app AGP and gradle wrapper version

* Resolve example app build warnings

* fix license check failing because license is too big to be passed as an argument

* Bump Maps SDK to 11.15.0-beta.1

* Bump Xcode version on CI

* bump kotlin and android sdk version in examples app

* Bump Maps SDK to 11.15.0-beta.3
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -266,7 +266,7 @@ executors:
   macos-xcode-latest:
     resource_class: macos.m1.medium.gen1
     macos:
-      xcode: 16.0.0
+      xcode: 16.2.0
   firebase-test-runner:
     resource_class: small
     docker:
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,7 @@
-### main
+### 2.11.0-beta.1
 
 * Fix Mapbox expression handling on Android by converting List expressions starting with strings to JSON format. 
+* Update Maps SDK to v11.15.0-beta.3
 
 ### 2.10.0
 
diff --git a/LICENSE b/LICENSE
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # Mapbox Maps SDK Flutter SDK
 
-The Mapbox Maps SDK Flutter SDK is an officially developed solution from Mapbox that enables use of our latest Maps SDK product (v11.14.0). The SDK allows developers to embed highly-customized maps using a Flutter widget on Android and iOS.
+The Mapbox Maps SDK Flutter SDK is an officially developed solution from Mapbox that enables use of our latest Maps SDK product (v11.15.0-beta.3). The SDK allows developers to embed highly-customized maps using a Flutter widget on Android and iOS.
 
 Web and desktop are not supported.
 
diff --git a/android/build.gradle b/android/build.gradle
@@ -59,7 +59,7 @@ if (file("$rootDir/gradle/ktlint.gradle").exists() && file("$rootDir/gradle/lint
 }
 
 dependencies {
-    implementation "com.mapbox.maps:android:11.14.0"
+    implementation "com.mapbox.maps:android:11.15.0-beta.2"
 
     implementation "androidx.annotation:annotation:1.5.0"
     implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.6.2"
diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle
@@ -24,8 +24,8 @@ if (flutterVersionName == null) {
 
 android {
     namespace "com.mapbox.maps.mapbox_maps_example"
-    compileSdk 34
-
+    compileSdk 36
+    ndkVersion = "27.0.12077973"
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'
     }
@@ -41,8 +41,8 @@ android {
 
     defaultConfig {
         applicationId "com.mapbox.maps.flutter.example"
-        minSdkVersion 21
-        targetSdkVersion 33
+        minSdkVersion 24
+        targetSdkVersion 35
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
diff --git a/example/android/gradle/wrapper/gradle-wrapper.properties b/example/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Tue Apr 30 20:27:36 EEST 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/example/android/settings.gradle b/example/android/settings.gradle
@@ -18,8 +18,8 @@ pluginManagement {
 
 plugins {
     id "dev.flutter.flutter-plugin-loader" version "1.0.0"
-    id "com.android.application" version "7.3.1" apply false
-    id "org.jetbrains.kotlin.android" version "1.8.22" apply false
+    id "com.android.application" version '8.10.1' apply false
+    id "org.jetbrains.kotlin.android" version "2.1.0" apply false
 }
 
 include ":app"
diff --git a/example/ios/Runner.xcodeproj/project.pbxproj b/example/ios/Runner.xcodeproj/project.pbxproj
@@ -56,6 +56,7 @@
 		97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		78E0A7A72DC9AD7400C4905E /* FlutterGeneratedPluginSwiftPackage */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = FlutterGeneratedPluginSwiftPackage; path = Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -88,6 +89,7 @@
 		9740EEB11CF90186004384FC /* Flutter */ = {
 			isa = PBXGroup;
 			children = (
+				78E0A7A72DC9AD7400C4905E /* FlutterGeneratedPluginSwiftPackage */,
 				3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */,
 				9740EEB21CF90195004384FC /* Debug.xcconfig */,
 				7AFA3C8E1D35360C0083082E /* Release.xcconfig */,
diff --git a/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
diff --git a/example/ios/Runner.xcworkspace/xcshareddata/swiftpm/Package.resolved b/example/ios/Runner.xcworkspace/xcshareddata/swiftpm/Package.resolved
diff --git a/example/pubspec.lock b/example/pubspec.lock
@@ -243,33 +243,33 @@ packages:
     dependency: transitive
     description:
       name: leak_tracker
-      sha256: "6bb818ecbdffe216e81182c2f0714a2e62b593f4a4f13098713ff1685dfb6ab0"
+      sha256: "8dcda04c3fc16c14f48a7bb586d4be1f0d1572731b6d81d51772ef47c02081e0"
       url: "https://pub.dev"
     source: hosted
-    version: "10.0.9"
+    version: "11.0.1"
   leak_tracker_flutter_testing:
     dependency: transitive
     description:
       name: leak_tracker_flutter_testing
-      sha256: f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573
+      sha256: "1dbc140bb5a23c75ea9c4811222756104fbcd1a27173f0c34ca01e16bea473c1"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.9"
+    version: "3.0.10"
   leak_tracker_testing:
     dependency: transitive
     description:
       name: leak_tracker_testing
-      sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3"
+      sha256: "8d5a2d49f4a66b49744b23b018848400d23e54caf9463f4eb20df3eb8acb2eb1"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.1"
+    version: "3.0.2"
   mapbox_maps_flutter:
     dependency: "direct main"
     description:
       path: ".."
       relative: true
     source: path
-    version: "2.10.0"
+    version: "2.11.0-beta.1"
   matcher:
     dependency: transitive
     description:
@@ -455,10 +455,10 @@ packages:
     dependency: transitive
     description:
       name: test_api
-      sha256: fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd
+      sha256: "522f00f556e73044315fa4585ec3270f1808a4b186c936e612cab0b565ff1e00"
       url: "https://pub.dev"
     source: hosted
-    version: "0.7.4"
+    version: "0.7.6"
   turf:
     dependency: "direct dev"
     description:
@@ -503,10 +503,10 @@ packages:
     dependency: transitive
     description:
       name: vector_math
-      sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803"
+      sha256: d530bd74fea330e6e364cda7a85019c434070188383e1cd8d9777ee586914c5b
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.4"
+    version: "2.2.0"
   vm_service:
     dependency: transitive
     description:
@@ -540,5 +540,5 @@ packages:
     source: hosted
     version: "1.1.0"
 sdks:
-  dart: ">=3.7.0 <4.0.0"
+  dart: ">=3.8.0-0 <4.0.0"
   flutter: ">=3.27.0"
diff --git a/ios/mapbox_maps_flutter.podspec b/ios/mapbox_maps_flutter.podspec
@@ -4,7 +4,7 @@
 #
 Pod::Spec.new do |s|
   s.name             = 'mapbox_maps_flutter'
-  s.version          = '2.10.0'
+  s.version          = '2.11.0-beta.1'
 
   s.summary          = 'Mapbox Maps SDK Flutter Plugin.'
   s.description      = 'An officially developed solution from Mapbox that enables use of our latest Maps SDK product.'
@@ -17,7 +17,7 @@ Pod::Spec.new do |s|
   s.dependency 'Flutter'
   s.platform = :ios, '14.0'
 
-  s.dependency 'MapboxMaps', '11.14.0'
+  s.dependency 'MapboxMaps', '11.15.0-beta.3'
   s.dependency 'Turf', '4.0.0'
 
   # Flutter.framework does not contain a i386 slice.
diff --git a/ios/mapbox_maps_flutter/Package.swift b/ios/mapbox_maps_flutter/Package.swift
@@ -12,7 +12,7 @@ let package = Package(
         .library(name: "mapbox-maps-flutter", targets: ["mapbox_maps_flutter"])
     ],
     dependencies: [
-        .package(url: "https://github.com/mapbox/mapbox-maps-ios.git", exact: "11.14.0"),
+        .package(url: "https://github.com/mapbox/mapbox-maps-ios.git", exact: "11.15.0-beta.3"),
     ],
     targets: [
         .target(
diff --git a/lib/src/package_info.dart b/lib/src/package_info.dart
@@ -1,3 +1,3 @@
 part of mapbox_maps_flutter;
 
-const String mapboxPluginVersion = '2.10.0';
+const String mapboxPluginVersion = '2.11.0-beta.1';
diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: mapbox_maps_flutter
 description: Interactive, thoroughly customizable maps powered by Mapbox Maps mobile SDKs.
-version: 2.10.0
+version: 2.11.0-beta.1
 homepage: https://github.com/mapbox/mapbox-maps-flutter
 
 environment:
diff --git a/scripts/license.sh b/scripts/license.sh
@@ -41,19 +41,19 @@ sdk_version=$(echo "$deps" | jq -r '.packages[] | select(.kind == "root") | .ver
 deps_licenses=""
 # Loop through each name/version pair
 while read -r name version; do
-  
+
   package_metadata=$(curl -s "https://pub.dev/api/packages/$name/versions/$version")
   archive_url=$(echo "$package_metadata" | jq -r '.archive_url')
   repository_url=$(echo "$package_metadata" | jq -r '.pubspec.repository // "No repository URL found"')
-  
+
   # download the package archive
   curl -s -o "/tmp/${name}-${version}.tar.gz" "$archive_url"
   mkdir -p "/tmp/${name}-${version}"
   tar -xzf "/tmp/${name}-${version}.tar.gz" -C "/tmp/${name}-${version}"
-  
+
   # Find the license file in the unzipped folder (case-insensitive search)
   license_file=$(find "/tmp/${name}-${version}" -type f -iname "license*")
-  
+
   if [ -n "$license_file" ]; then
     license_entry="### $name, $repository_url"$'\n\n'"\`\`\`"$'\n'"$(cat "$license_file")"$'\n'"\`\`\`"$'\n\n'
     deps_licenses+="$license_entry"
@@ -68,31 +68,26 @@ android_sdk_version=$(grep 'com.mapbox.maps:android' android/build.gradle | sed
 ios_license_content=$(curl -s "https://raw.githubusercontent.com/mapbox/mapbox-maps-ios/v$ios_sdk_version/LICENSE.md")
 android_license_content=$(curl -s "https://raw.githubusercontent.com/mapbox/mapbox-maps-android/v$android_sdk_version/LICENSE.md")
 
-license_template="changequote("""","""")dnl # prevents m4 from being confused with backquotes by changing quotes to non-existent tokens
-## License
+current_year=$(date +%Y)
+
+license="## License
 
-Mapbox Maps for Flutter version __SDK_VERSION__
+Mapbox Maps for Flutter version $sdk_version
 Mapbox Maps Flutter SDK
 
-Copyright &copy; 2022 - __YEAR__ Mapbox, Inc. All rights reserved.
+Copyright &copy; 2022 - $current_year 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]
 
 ## Acknowledgements
 
 This application makes use of the following third party libraries:
 
-__DEPS_LICENSES__---
+$deps_licenses---
 
-__IOS_LICENSES__
+$ios_license_content
 
-__ANDROID_LICENSES__
-"
-license=$(echo "$license_template" | m4 -D __SDK_VERSION__="$sdk_version" \
-                                        -D __DEPS_LICENSES__="$deps_licenses" \
-                                        -D __IOS_LICENSES__="$ios_license_content" \
-                                        -D __ANDROID_LICENSES__="$android_license_content" \
-                                        -D __YEAR__="$(date +%Y)")
+$android_license_content"
 
 if [ "$mode" == "validate" ]; then
     if [[ "$(cat LICENSE)" == "$license" ]]; then

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ if (file("$rootDir/gradle/ktlint.gradle").exists() && file("$rootDir/gradle/lint`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`dependencies {`
`62`		`- implementation "com.mapbox.maps:android:11.14.0"`
	`62`	`+ implementation "com.mapbox.maps:android:11.15.0-beta.2"`
`63`	`63`
`64`	`64`	`implementation "androidx.annotation:annotation:1.5.0"`
`65`	`65`	`implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.6.2"`
Original file line number	Diff line number	Diff line change
`@@ -18,8 +18,8 @@ pluginManagement {`
`18`	`18`
`19`	`19`	`plugins {`
`20`	`20`	`id "dev.flutter.flutter-plugin-loader" version "1.0.0"`
`21`		`- id "com.android.application" version "7.3.1" apply false`
`22`		`- id "org.jetbrains.kotlin.android" version "1.8.22" apply false`
	`21`	`+ id "com.android.application" version '8.10.1' apply false`
	`22`	`+ id "org.jetbrains.kotlin.android" version "2.1.0" apply false`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`include ":app"`