Skip to content

Commit e7a3d0a

Browse files
gabbopalmagabbopalma
authored
Merge branch 'release-0.23.0' into feat-added-set-style-method-on-controller
2 parents 39dc57c + 005f834 commit e7a3d0a

File tree

97 files changed

+2238
-684
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

97 files changed

+2238
-684
lines changed

‎.github/dependabot.yml‎

Lines changed: 123 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,128 @@
11
version: 2
22
enable-beta-ecosystems: true
3+
34
updates:
4-
- package-ecosystem: "github-actions"
5-
directory: "/"
5+
# GitHub Actions
6+
- package-ecosystem: github-actions
7+
directory: /
68
schedule:
7-
interval: "daily"
8-
- package-ecosystem: "pub"
9-
directory: "/"
9+
interval: daily
10+
11+
# Workspace root
12+
- package-ecosystem: pub
13+
directory: /
1014
schedule:
11-
interval: "daily"
15+
interval: daily
16+
open-pull-requests-limit: 10
17+
groups:
18+
root-runtime-deps:
19+
applies-to: version-updates
20+
patterns:
21+
- "*"
22+
23+
# Code generation scripts
24+
- package-ecosystem: pub
25+
directory: /scripts
26+
schedule:
27+
interval: daily
28+
groups:
29+
codegen-tools:
30+
applies-to: version-updates
31+
patterns:
32+
- dart_style
33+
- mustache_template
34+
- recase
35+
- "*"
36+
37+
# Core plugin
38+
- package-ecosystem: pub
39+
directory: /maplibre_gl
40+
schedule:
41+
interval: daily
42+
groups:
43+
maplibre-gl-core:
44+
applies-to: version-updates
45+
patterns:
46+
- "*"
47+
48+
# Web implementation
49+
- package-ecosystem: pub
50+
directory: /maplibre_gl_web
51+
schedule:
52+
interval: daily
53+
groups:
54+
maplibre-gl-web:
55+
applies-to: version-updates
56+
patterns:
57+
- "*"
58+
59+
# Platform interface
60+
- package-ecosystem: pub
61+
directory: /maplibre_gl_platform_interface
62+
schedule:
63+
interval: daily
64+
groups:
65+
platform-interface:
66+
applies-to: version-updates
67+
patterns:
68+
- "*"
69+
70+
# Example app dependencies
71+
- package-ecosystem: pub
72+
directory: /maplibre_gl_example
73+
schedule:
74+
interval: daily
75+
groups:
76+
example-deps:
77+
applies-to: version-updates
78+
patterns:
79+
- "*"
80+
81+
# Android Gradle (core plugin module)
82+
- package-ecosystem: gradle
83+
directory: /maplibre_gl/android
84+
schedule:
85+
interval: weekly
86+
groups:
87+
gradle-plugin:
88+
applies-to: version-updates
89+
patterns:
90+
- gradle
91+
- com.android.tools.build:gradle
92+
kotlin:
93+
applies-to: version-updates
94+
patterns:
95+
- org.jetbrains.kotlin:kotlin-*
96+
androidx-core:
97+
applies-to: version-updates
98+
patterns:
99+
- androidx.core:*
100+
- androidx.annotation:*
101+
google-maps-play-services:
102+
applies-to: version-updates
103+
patterns:
104+
- com.google.android.gms:play-services-*
105+
106+
# Android Gradle (example app)
107+
- package-ecosystem: gradle
108+
directory: /maplibre_gl_example/android
109+
schedule:
110+
interval: weekly
111+
groups:
112+
gradle-plugin:
113+
applies-to: version-updates
114+
patterns:
115+
- gradle
116+
- com.android.tools.build:gradle
117+
kotlin:
118+
applies-to: version-updates
119+
patterns:
120+
- org.jetbrains.kotlin:kotlin-*
121+
androidx:
122+
applies-to: version-updates
123+
patterns:
124+
- androidx.*:*
125+
google-play-services:
126+
applies-to: version-updates
127+
patterns:
128+
- com.google.android.gms:play-services-*

‎.github/workflows/dependency-review.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@ jobs:
1515
runs-on: ubuntu-latest
1616
steps:
1717
- name: 'Checkout Repository'
18-
uses: actions/checkout@v4
18+
uses: actions/checkout@v5
1919
- name: 'Dependency Review'
2020
uses: actions/dependency-review-action@v4

‎.github/workflows/flutter_beta.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ jobs:
1515
run:
1616
working-directory: maplibre_gl_example
1717
steps:
18-
- uses: actions/checkout@v4
19-
- uses: actions/setup-java@v4
18+
- uses: actions/checkout@v5
19+
- uses: actions/setup-java@v5
2020
with:
2121
java-version: '17'
2222
distribution: 'temurin'
@@ -41,7 +41,7 @@ jobs:
4141
run:
4242
working-directory: maplibre_gl_example
4343
steps:
44-
- uses: actions/checkout@v4
44+
- uses: actions/checkout@v5
4545
- uses: subosito/flutter-action@v2
4646
with:
4747
channel: ${{ env.FLUTTER_CHANNEL }}
@@ -65,7 +65,7 @@ jobs:
6565
run:
6666
working-directory: maplibre_gl_example
6767
steps:
68-
- uses: actions/checkout@v4
68+
- uses: actions/checkout@v5
6969
- uses: subosito/flutter-action@v2
7070
with:
7171
channel: ${{ env.FLUTTER_CHANNEL }}

‎.github/workflows/flutter_ci.yml‎

Lines changed: 31 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -12,64 +12,74 @@ jobs:
1212
name: "Check formatting"
1313
runs-on: ubuntu-latest
1414
steps:
15-
- uses: actions/checkout@v4
15+
- uses: actions/checkout@v5
1616
- uses: subosito/flutter-action@v2
1717
with:
1818
channel: stable
1919
cache: true
2020
- uses: bluefireteam/melos-action@v3
21+
with:
22+
run-bootstrap: true
2123
- name: Lint analysis
22-
run: melos format --set-exit-if-changed .
24+
run: melos run format-all
2325

2426
lint:
2527
name: "Static code analysis"
2628
runs-on: ubuntu-latest
2729
steps:
28-
- uses: actions/checkout@v4
30+
- uses: actions/checkout@v5
2931
- uses: subosito/flutter-action@v2
3032
with:
3133
channel: stable
3234
cache: true
3335
- uses: bluefireteam/melos-action@v3
36+
with:
37+
run-bootstrap: true
3438
- name: Lint analysis
35-
run: melos analyze --fatal-warnings --fatal-infos --concurrency 10
39+
run: melos run analyze-all
3640

3741
test:
3842
name: "Run tests"
3943
runs-on: ubuntu-latest
4044
steps:
41-
- uses: actions/checkout@v4
45+
- uses: actions/checkout@v5
4246
- uses: subosito/flutter-action@v2
4347
with:
4448
channel: stable
4549
cache: true
4650
- uses: bluefireteam/melos-action@v3
47-
- run: melos test:io
51+
with:
52+
run-bootstrap: true
53+
- run: melos run test:io
4854

4955
test-web:
5056
name: "Run web tests"
5157
runs-on: ubuntu-latest
5258
steps:
53-
- uses: actions/checkout@v4
59+
- uses: actions/checkout@v5
5460
- uses: subosito/flutter-action@v2
5561
with:
5662
channel: stable
5763
cache: true
5864
- uses: bluefireteam/melos-action@v3
59-
- run: melos test:web
65+
with:
66+
run-bootstrap: true
67+
- run: melos run test:web
6068

6169
code-gen:
6270
name: "Generate code from templates"
6371
runs-on: ubuntu-latest
6472
steps:
65-
- uses: actions/checkout@v4
73+
- uses: actions/checkout@v5
6674
- uses: subosito/flutter-action@v2
6775
with:
6876
channel: stable
6977
cache: true
7078
- uses: bluefireteam/melos-action@v3
71-
- run: melos generate
72-
- run: melos format
79+
with:
80+
run-bootstrap: true
81+
- run: melos run generate
82+
- run: melos run format-all
7383
- name: Check Git changes
7484
uses: multani/git-changes-action@v1
7585

@@ -80,13 +90,15 @@ jobs:
8090
run:
8191
working-directory: maplibre_gl_example
8292
steps:
83-
- uses: actions/checkout@v4
93+
- uses: actions/checkout@v5
8494
- uses: subosito/flutter-action@v2
8595
with:
8696
channel: stable
8797
cache: true
8898
- uses: bluefireteam/melos-action@v3
89-
- uses: actions/setup-java@v4
99+
with:
100+
run-bootstrap: true
101+
- uses: actions/setup-java@v5
90102
with:
91103
java-version: '21'
92104
distribution: 'temurin'
@@ -106,12 +118,14 @@ jobs:
106118
run:
107119
working-directory: maplibre_gl_example
108120
steps:
109-
- uses: actions/checkout@v4
121+
- uses: actions/checkout@v5
110122
- uses: subosito/flutter-action@v2
111123
with:
112124
channel: stable
113125
cache: true
114126
- uses: bluefireteam/melos-action@v3
127+
with:
128+
run-bootstrap: true
115129
- uses: maxim-lobanov/setup-cocoapods@v1
116130
with:
117131
podfile-path: maplibre_gl_example/ios/Podfile.lock
@@ -130,11 +144,13 @@ jobs:
130144
run:
131145
working-directory: maplibre_gl_example
132146
steps:
133-
- uses: actions/checkout@v4
147+
- uses: actions/checkout@v5
134148
- uses: subosito/flutter-action@v2
135149
with:
136150
channel: stable
137151
cache: true
138152
- uses: bluefireteam/melos-action@v3
153+
with:
154+
run-bootstrap: true
139155
- name: Build web
140156
run: flutter build web

‎.github/workflows/publish-single.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
runs-on: ubuntu-latest
2020
if: github.repository_owner == 'maplibre'
2121
steps:
22-
- uses: actions/checkout@v4
22+
- uses: actions/checkout@v5
2323
- uses: dart-lang/setup-dart@v1
2424
# --force skips the y/N confirmation
2525
# --skip-validation because of "Because maplibre_gl requires the Flutter SDK, version solving failed. Flutter users should use `flutter pub` instead of `dart pub`."

‎CONTRIBUTING.md‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,36 @@ interested in making contributions:
1717
4. If there are any changes that developers should be aware of, please update
1818
the [changelog](https://github.com/maplibre/flutter-maplibre-gl/blob/master/CHANGELOG.md)
1919
once your pull request has been merged to the `main` branch.
20+
21+
## Code Generation & Formatting
22+
23+
Some parts of the public API (layer & source property helpers, expression utilities, etc.) are **generated**.
24+
25+
Do not edit generated Dart / Java / Swift files manually. Instead:
26+
27+
1. Make or adjust templates / generator logic under `scripts/` (main entry: `scripts/lib/generate.dart`).
28+
29+
2. Activate Melos and run a clean bootstrap:
30+
```bash
31+
dart pub global activate melos && melos clean && melos bootstrap
32+
```
33+
3. Run the generator:
34+
```bash
35+
melos run generate
36+
```
37+
4. (Optional) Run the workspace formatter (Dart files generated are already batch‑formatted automatically):
38+
```bash
39+
melos format-all
40+
```
41+
5. Review changes:
42+
```bash
43+
git diff
44+
```
45+
6. Stage & commit if everything looks correct.
46+
47+
Notes:
48+
- The generator itself batch‑formats newly created Dart files using `dart format` so CI should not introduce extra diffs.
49+
- Running `melos format-all` afterward is still fine (idempotent) and catches accidental manual edits elsewhere.
50+
- Never hand‑edit generated files: your edits will be overwritten the next time the generator runs.
51+
52+
If you add new style specification fields, extend the mapping logic in `scripts/lib/conversions.dart` and/or templates under `scripts/templates/`.

‎analysis_options.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ analyzer:
77
strict-raw-types: false
88
strict-inference: false
99

10+
errors:
11+
avoid_catches_without_on_clauses: ignore
12+
1013
linter:
1114
rules:
1215
# temporary rules

‎maplibre_gl/CHANGELOG.md‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
## UNRELEASED
2+
3+
### Breaking changes
4+
* `annotation` argument now replaces the previous `id` argument in the onFeatureDrag and onFeatureTapped callbacks. Existing implementations must be updated to use the new annotation parameter.
5+
6+
### Changed
7+
* Added `onFeatureHover` to the controller for listening to hover interactions.
8+
* Fixed: annotationConsumeTapEvents previously had no effect. This has been fixed, and it now properly controls whether tap events on annotations are consumed.
9+
* Fixed: Avoided calling notifyListeners() on a disposed controller.
10+
* Fixed: Internal event listeners wasn't properly removed/off in web.
11+
112
## [0.22.0](https://github.com/maplibre/flutter-maplibre-gl/compare/v0.21.0...v0.22.0)
213

314
### Breaking changes

0 commit comments

Comments
 (0)