Merge branch 'main' into feat/handle-gestures-in-flutter

Author: josxha

.github/dependabot.yml

@@ -4,11 +4,11 @@ updates:
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:
-      interval: "weekly"
+      interval: "monthly"
   - package-ecosystem: "pub"
     directories: [ "/example", "/maplibre", "/maplibre_ios", "/" ]
     schedule:
-      interval: "weekly"
+      interval: "monthly"
     ignore:
       - dependency-name: "*"
         update-types:
@@ -25,7 +25,7 @@ updates:
   - package-ecosystem: "gradle"
     directories: [ "/maplibre/android" , "/example/android" ]
     schedule:
-      interval: "weekly"
+      interval: "monthly"
     groups:
       dependencies:
         patterns: [ "*" ]

.github/workflows/ci.yml

@@ -16,7 +16,7 @@ jobs:
     name: "[Dart] Check formatting"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - uses: subosito/flutter-action@v2
         with:
           cache: true
@@ -28,7 +28,7 @@ jobs:
     name: "[Swift] Check formatting"
     runs-on: macos-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - name: "Install SwiftFormat"
         run: brew install swiftformat
       - name: "Format Swift code"
@@ -37,7 +37,7 @@ jobs:
     name: "[Dart] Static code analysis"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - uses: subosito/flutter-action@v2
         with:
           cache: true
@@ -49,7 +49,7 @@ jobs:
     name: "[Kotlin] Code quality"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - name: ktlint
         uses: ScaCap/action-ktlint@v1
         with:
@@ -65,7 +65,7 @@ jobs:
 #      run:
 #        working-directory: example
 #    steps:
-#      - uses: actions/checkout@v5
+#      - uses: actions/checkout@v6
 #      - uses: futureware-tech/simulator-action@v3
 #        with:
 #          model: 'iPhone 15'
@@ -86,7 +86,7 @@ jobs:
       run:
         working-directory: maplibre
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - name: "Setup Flutter SDK"
         uses: subosito/flutter-action@v2
         with:
@@ -109,7 +109,7 @@ jobs:
 #        api-level: [ 24, 35 ]
 #    timeout-minutes: 30
 #    steps:
-#      - uses: actions/checkout@v5
+#      - uses: actions/checkout@v6
 #      - name: "Setup Flutter SDK"
 #        uses: subosito/flutter-action@v2
 #        with:
@@ -147,7 +147,7 @@ jobs:
 #      run:
 #        working-directory: example
 #    steps:
-#      - uses: actions/checkout@v5
+#      - uses: actions/checkout@v6
 #      - name: "Setup Flutter SDK"
 #        uses: subosito/flutter-action@v2
 #        with:
@@ -173,7 +173,7 @@ jobs:
         working-directory: maplibre
     steps:
       - name: Checkout project
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
       - name: Setup Flutter
         uses: subosito/flutter-action@v2
         with:
@@ -195,7 +195,7 @@ jobs:
       matrix:
         sdk: [ '' ] # option to use a matrix test with the lower supported flutter version
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - uses: subosito/flutter-action@v2
         with:
           flutter-version: ${{ matrix.sdk }}
@@ -221,13 +221,13 @@ jobs:
     timeout-minutes: 30
     defaults:
       run:
-        working-directory: maplibre_ios/example
+        working-directory: example
     strategy:
       fail-fast: false
       matrix:
         sdk: [ '' ] # option to use a matrix test with the lower supported flutter version
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - uses: subosito/flutter-action@v2
         with:
           flutter-version: ${{ matrix.sdk }}
@@ -242,7 +242,7 @@ jobs:
         uses: actions/upload-artifact@v5
         with:
           name: maplibre-flutter-demo.app
-          path: build/ios/iphonesimulator
+          path: build/ios/iphoneos/Runner.app
   build-web:
     name: "[Web] Build"
     runs-on: ubuntu-latest
@@ -254,7 +254,7 @@ jobs:
       matrix:
         sdk: [ '' ] # option to use a matrix test with the lower supported flutter version
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - uses: subosito/flutter-action@v2
         with:
           flutter-version: ${{ matrix.sdk }}
@@ -274,7 +274,7 @@ jobs:
       matrix:
         sdk: [ '' ] # option to use a matrix test with the lower supported flutter version
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - uses: subosito/flutter-action@v2
         with:
           flutter-version: ${{ matrix.sdk }}
@@ -287,7 +287,7 @@ jobs:
     name: "[Pigeon] Check codegen"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - uses: subosito/flutter-action@v2
         with:
           cache: true
@@ -310,7 +310,7 @@ jobs:
     name: "[Android] Check codegen"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - uses: subosito/flutter-action@v2
         with:
           cache: true
@@ -347,7 +347,7 @@ jobs:
 #      matrix:
 #        sdk: [ '' ] # option to use a matrix test with the lower supported flutter version
 #    steps:
-#      - uses: actions/checkout@v5
+#      - uses: actions/checkout@v6
 #      - name: Clone maplibre-native with shallow submodules
 #        run: |
 #          git clone \
@@ -384,4 +384,4 @@ jobs:
 #            exit 1
 #          else
 #            echo "✅ No uncommitted changes"
-#          fi
+#          fi

.github/workflows/dependency-review.yml

@@ -15,6 +15,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: 'Checkout Repository'
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
       - name: 'Dependency Review'
         uses: actions/dependency-review-action@v4

.github/workflows/docs.yml

@@ -15,11 +15,11 @@ jobs:
   build:
     defaults:
       run:
-        working-directory: docs
+        working-directory: website
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
       - name: Set up Node.js
         uses: actions/setup-node@v6
 #        with:

.github/workflows/flutter-beta.yml

@@ -15,7 +15,7 @@ jobs:
       run:
         working-directory: example
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - uses: actions/setup-java@v5
         with:
           java-version: '21'
@@ -39,7 +39,7 @@ jobs:
 #      run:
 #        working-directory: example
 #    steps:
-#      - uses: actions/checkout@v5
+#      - uses: actions/checkout@v6
 #      - uses: subosito/flutter-action@v2
 #        with:
 #          channel: ${{ env.FLUTTER_CHANNEL }}
@@ -61,7 +61,7 @@ jobs:
       run:
         working-directory: example
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - uses: subosito/flutter-action@v2
         with:
           channel: ${{ env.FLUTTER_CHANNEL }}
@@ -75,7 +75,7 @@ jobs:
       run:
         working-directory: example
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - uses: subosito/flutter-action@v2
         with:
           channel: ${{ env.FLUTTER_CHANNEL }}

.github/workflows/publish.yml

@@ -20,4 +20,4 @@ jobs:
       id-token: write
     uses: dart-lang/setup-dart/.github/workflows/publish.yml@v1
     with:
-      working-directory: .
+      working-directory: maplibre

docs/.yarn/install-state.gz

@@ -22,7 +22,7 @@ plugins {
     id("dev.flutter.flutter-plugin-loader") version "1.0.0"
     id("com.android.application") version "8.12.0" apply false
     id("org.jetbrains.kotlin.android") version "2.1.21" apply false
-    id("org.jlleitschuh.gradle.ktlint") version "13.1.+" apply false
+    id("org.jlleitschuh.gradle.ktlint") version "14.0.+" apply false
 }
 
 include(":app")

example/android/settings.gradle.kts

@@ -13,10 +13,22 @@ class LayersMarkerPage extends StatefulWidget {
 
 class _LayersMarkerPageState extends State<LayersMarkerPage> {
   final _points = <Feature<Point>>[
-    const Feature(geometry: Point(Geographic(lon: 9.17, lat: 47.68))),
-    const Feature(geometry: Point(Geographic(lon: 9.17, lat: 48))),
-    const Feature(geometry: Point(Geographic(lon: 9, lat: 48))),
-    const Feature(geometry: Point(Geographic(lon: 9.5, lat: 48))),
+    const Feature(
+      geometry: Point(Geographic(lon: 9.17, lat: 47.68)),
+      properties: {'name': 'Marker 1'},
+    ),
+    const Feature(
+      geometry: Point(Geographic(lon: 9.17, lat: 48)),
+      properties: {'name': 'Marker 2'},
+    ),
+    const Feature(
+      geometry: Point(Geographic(lon: 9, lat: 48)),
+      properties: {'name': 'Marker 3'},
+    ),
+    const Feature(
+      geometry: Point(Geographic(lon: 9.5, lat: 48)),
+      properties: {'name': 'Marker 4'},
+    ),
   ];
 
   bool _imageLoaded = false;
@@ -55,7 +67,7 @@ class _LayersMarkerPageState extends State<LayersMarkerPage> {
         layers: [
           MarkerLayer(
             points: _points,
-            textField: 'Marker',
+            textField: '{name}',
             textAllowOverlap: true,
             iconImage: _imageLoaded ? 'marker' : null,
             iconSize: 0.15,

example/lib/layers_marker_page.dart

@@ -16,7 +16,7 @@ dependencies:
     sdk: flutter
   go_router: ^16.0.0
   http: ^1.2.2
-  maplibre: ^0.3.1
+  maplibre: ^0.3.2
 
 dev_dependencies:
   flutter_launcher_icons: ^0.14.3