Merge remote-tracking branch 'upstream/main' into v0.2.0-no-ios-upstream

# Conflicts:
#	ios/Classes/Pigeon.g.swift
#	ios/maplibre.podspec

Author: Erwan Jestin

.github/FUNDING.yml

@@ -1 +1,3 @@
-custom: ["https://www.paypal.com/paypalme/joschaeckert"]
+
+github: ["josxha"]
+custom: ["https://paypal.me/joschaeckert"]

.github/ISSUE_TEMPLATE/config.yml

@@ -1,8 +1,14 @@
 blank_issues_enabled: false
 contact_links:
-  - name: "Q&A - GitHub Discussions"
-    url: https://github.com/josxha/flutter-maplibre/discussions/categories/q-a
+  - name: "Ask a Question"
+    url: https://github.com/josxha/flutter-maplibre/discussions/new?category=q-a
     about: "If you have a question about using MapLibre on Flutter"
+  - name: "Start a Discussion"
+    url: https://github.com/josxha/flutter-maplibre/discussions/new?category=general
+    about: "Start a discussion on some topic"
+  - name: "Share some Idea"
+    url: https://github.com/josxha/flutter-maplibre/discussions/new?category=ideas
+    about: "Share an idea, that isn't quite ready for a feature request"
   - name: "Join on Slack"
     url: https://slack.openstreetmap.us/
     about: "Join #maplibre-flutter on the OpenStreetMap Slack"

codecov.yml renamed to .github/codecov.yml

@@ -8,4 +8,12 @@ comment:
 ignore:
   - "**/*.g.dart"
   - "lib/src/platform/android/jni/**"
-  - "example/**"
+  - "example/**"
+
+github_checks:
+  annotations: false
+
+coverage:
+  status:
+    project: off
+    patch: off

.github/workflows/ci.yml

@@ -20,6 +20,8 @@ jobs:
       - uses: subosito/flutter-action@v2
         with:
           cache: true
+      - name: "Get Flutter dependencies"
+        run: dart pub get
       - name: Lint analysis
         run: dart format --set-exit-if-changed .
   lint-dart:
@@ -69,7 +71,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        sdk: [ '3.27.0', '' ]
+        sdk: [ '3.32.0', '' ]
     timeout-minutes: 30
     steps:
       - uses: actions/checkout@v4
@@ -176,7 +178,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        sdk: [ '3.27.0', '' ]
+        sdk: [ '3.32.0', '' ]
     steps:
       - uses: actions/checkout@v4
       - uses: subosito/flutter-action@v2
@@ -208,7 +210,7 @@ jobs:
 #    strategy:
 #      fail-fast: false
 #      matrix:
-#        sdk: [ '3.27.0', '' ]
+#        sdk: [ '3.32.0', '' ]
 #    steps:
 #      - uses: actions/checkout@v4
 #      - uses: subosito/flutter-action@v2
@@ -237,7 +239,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        sdk: [ '3.27.0', '' ]
+        sdk: [ '3.32.0', '' ]
     steps:
       - uses: actions/checkout@v4
       - uses: subosito/flutter-action@v2
@@ -257,7 +259,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        sdk: [ '3.27.0', '' ]
+        sdk: [ '3.32.0', '' ]
     steps:
       - uses: actions/checkout@v4
       - uses: subosito/flutter-action@v2

.metadata

@@ -4,7 +4,7 @@
 # This file should be version controlled and should not be manually edited.
 
 version:
-  revision: "5dcb86f68f239346676ceb1ed1ea385bd215fba1"
+  revision: "c23637390482d4cf9598c3ce3f2be31aa7332daf"
   channel: "stable"
 
 project_type: plugin
@@ -13,26 +13,26 @@ project_type: plugin
 migration:
   platforms:
     - platform: root
-      create_revision: 5dcb86f68f239346676ceb1ed1ea385bd215fba1
-      base_revision: 5dcb86f68f239346676ceb1ed1ea385bd215fba1
+      create_revision: c23637390482d4cf9598c3ce3f2be31aa7332daf
+      base_revision: c23637390482d4cf9598c3ce3f2be31aa7332daf
     - platform: android
-      create_revision: 5dcb86f68f239346676ceb1ed1ea385bd215fba1
-      base_revision: 5dcb86f68f239346676ceb1ed1ea385bd215fba1
+      create_revision: c23637390482d4cf9598c3ce3f2be31aa7332daf
+      base_revision: c23637390482d4cf9598c3ce3f2be31aa7332daf
     - platform: ios
-      create_revision: 5dcb86f68f239346676ceb1ed1ea385bd215fba1
-      base_revision: 5dcb86f68f239346676ceb1ed1ea385bd215fba1
+      create_revision: c23637390482d4cf9598c3ce3f2be31aa7332daf
+      base_revision: c23637390482d4cf9598c3ce3f2be31aa7332daf
     - platform: linux
-      create_revision: 5dcb86f68f239346676ceb1ed1ea385bd215fba1
-      base_revision: 5dcb86f68f239346676ceb1ed1ea385bd215fba1
+      create_revision: c23637390482d4cf9598c3ce3f2be31aa7332daf
+      base_revision: c23637390482d4cf9598c3ce3f2be31aa7332daf
     - platform: macos
-      create_revision: 5dcb86f68f239346676ceb1ed1ea385bd215fba1
-      base_revision: 5dcb86f68f239346676ceb1ed1ea385bd215fba1
+      create_revision: c23637390482d4cf9598c3ce3f2be31aa7332daf
+      base_revision: c23637390482d4cf9598c3ce3f2be31aa7332daf
     - platform: web
-      create_revision: 5dcb86f68f239346676ceb1ed1ea385bd215fba1
-      base_revision: 5dcb86f68f239346676ceb1ed1ea385bd215fba1
+      create_revision: c23637390482d4cf9598c3ce3f2be31aa7332daf
+      base_revision: c23637390482d4cf9598c3ce3f2be31aa7332daf
     - platform: windows
-      create_revision: 5dcb86f68f239346676ceb1ed1ea385bd215fba1
-      base_revision: 5dcb86f68f239346676ceb1ed1ea385bd215fba1
+      create_revision: c23637390482d4cf9598c3ce3f2be31aa7332daf
+      base_revision: c23637390482d4cf9598c3ce3f2be31aa7332daf
 
   # User provided section
 

CHANGELOG.md

@@ -1,3 +1,46 @@
+## 0.2.1
+
+This release builds upon the long anticipated merged threads in Flutter 3.29.0
+which removes the need of switching threads. Furthermore, the release contains a
+couple of features and new fixes.
+
+Thanks for your contributions for this release, @felix-larsen and @pamtbaau!
+
+### New Features
+
+- Upgrade MapLibre Native on Android
+  to [11.8.0](https://github.com/maplibre/maplibre-native/blob/main/platform/android/CHANGELOG.md#1180)
+  which introduces support for PMTiles.
+- Add `removePinchOnPressed` and `webRotationSpeed` as parameters to the
+  `MapCompass` widget.
+- Allow the `SourceAttribution` widget to use multiple lines for its
+  attributions.
+- Underline an attribution link for a `SourceAttribution` widget when hovered
+  with a cursor.
+- Add the parameter `allowInteraction` to the `WidgetLayer` that allows widgets
+  to detect gestures on these widgets.
+- Reintroduce awaitable `moveCamera()`, `animateCamera()` and `fitCamera()` on
+  Android.
+- Use synchronous JNI calls on Android to prevent thread hopping.
+
+### Bug Fixes
+
+- Fix exceptions when the map widget rebuilds a lot in a short amount of time.
+- Fix `moveCamera()`, `animateCamera()` and `fitCamera()` does not ignore null
+  parameters.
+- Fix app freeze on Android using Flutter 3.29.0 caused by the merged threads.
+- Fix exception when adding a RasterSource programatically.
+
+### Misc
+
+- Update examples and documentation.
+- Set minimum Flutter version
+  to [3.29.0](https://discord.com/channels/951867686378409984/951879268227485707/1339719764574081148)
+  and minimum Dart version
+  to [3.7.0](https://discord.com/channels/951867686378409984/951879268227485707/1339719747981545485).
+- Use the new code formatting.
+- Upgrade pigeon to 24.
+
 ## 0.2.0
 
 This release is a collection of user affecting changes along a couple of new

README.md

@@ -4,7 +4,7 @@
 [![stars](https://badgen.net/github/stars/josxha/flutter-maplibre?label=stars&color=green&icon=github)](https://github.com/josxha/flutter-maplibre/stargazers)
 [![likes](https://img.shields.io/pub/likes/maplibre?logo=flutter)](https://pub.dev/packages/maplibre)
 [![Pub Points](https://img.shields.io/pub/points/maplibre)](https://pub.dev/packages/maplibre/score)
-[![Pub Popularity](https://img.shields.io/pub/popularity/maplibre)](https://pub.dev/packages/maplibre)
+[![Pub Downloads](https://img.shields.io/pub/dm/maplibre)](https://pub.dev/packages/maplibre)
 
 [![codecov](https://codecov.io/gh/josxha/flutter-maplibre/graph/badge.svg?token=3LK7EQMSUM)](https://codecov.io/gh/josxha/flutter-maplibre)
 [![style: very good analysis](https://img.shields.io/badge/style-very_good_analysis-B22C89.svg)](https://pub.dev/packages/very_good_analysis)
@@ -76,8 +76,6 @@ functionality.
       </td>
       <td style="text-align: center;">
       </td>
-      <td style="text-align: center;">
-      </td>
     </tr>
   </tbody>
 </table>
@@ -112,4 +110,5 @@ development:
   feature, [open a feature request](https://github.com/josxha/flutter-maplibre/issues/new?assignees=&labels=feature&projects=&template=2-feature.yml&title=%5BFEATURE%5D+%3Ctitle%3E).
   or [post your idea as discussion](https://github.com/josxha/flutter-maplibre/discussions/categories/ideas).
 - Enhance the package documentation.
-- [Sponsor this project](https://www.paypal.com/paypalme/joschaeckert).
+- Sponsor this
+  project: [GitHub-Sponsors](https://github.com/sponsors/josxha), [PayPal](https://www.paypal.com/paypalme/joschaeckert).

android/build.gradle

@@ -2,7 +2,7 @@ group = "com.github.josxha.maplibre"
 version = "1.0-SNAPSHOT"
 
 buildscript {
-    ext.kotlin_version = "2.1.0"
+    ext.kotlin_version = "2.1.21"
     repositories {
         google()
         mavenCentral()
@@ -12,10 +12,10 @@ buildscript {
     }
 
     dependencies {
-        classpath("com.android.tools.build:gradle:8.6.1")
+        classpath("com.android.tools.build:gradle:8.10.1")
         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version")
         // noinspection GradleDynamicVersion
-        classpath("org.jlleitschuh.gradle:ktlint-gradle:12.1.+")
+        classpath("org.jlleitschuh.gradle:ktlint-gradle:12.3.+")
     }
 }
 
@@ -45,7 +45,7 @@ android {
         namespace = "com.github.josxha.maplibre"
     }
 
-    compileSdk = 34
+    compileSdk = 35
 
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_11
@@ -67,18 +67,18 @@ android {
 
     dependencies {
         // noinspection GradleDynamicVersion
-       implementation 'org.maplibre.gl:android-sdk:11.7.+' // JNIGEN
 // JNIGEN       implementation project(":MapLibreAndroid")
 // JNIGEN        implementation 'com.google.code.gson:gson:2.11.0'
 // JNIGEN        implementation 'org.maplibre.gl:maplibre-android-gestures:0.0.3'
 // JNIGEN        implementation 'org.maplibre.gl:android-sdk-geojson:6.0.1'
 // JNIGEN        implementation 'org.maplibre.gl:android-sdk-turf:6.0.1'
 // JNIGEN        implementation 'com.jakewharton.timber:timber:5.0.1'
 // JNIGEN        implementation 'androidx.annotation:annotation:1.9.0'
+        implementation 'org.maplibre.gl:android-sdk:11.10.+' // JNIGEN
 //        implementation 'org.maplibre.gl:android-plugin-offline-v9:3.0.2'
 // JNIGEN        implementation 'com.squareup.okhttp3:okhttp:4.12.0'
         testImplementation("org.jetbrains.kotlin:kotlin-test")
-        testImplementation("org.mockito:mockito-core:5.14.2")
+        testImplementation("org.mockito:mockito-core:5.18.0")
     }
 
     testOptions {