Skip to content

Commit 70e01e8

Browse files
authored
Merge branch 'master' into move_gesture
2 parents 560416e + 9e6b1e3 commit 70e01e8

File tree

27 files changed

+242
-142
lines changed

27 files changed

+242
-142
lines changed

.github/workflows/branch.yml

Lines changed: 38 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
runs-on: ubuntu-latest
1616
steps:
1717
- name: Checkout Repository
18-
uses: actions/checkout@v4
18+
uses: actions/checkout@v6
1919
- name: Setup Flutter
2020
uses: subosito/flutter-action@v2
2121
with:
@@ -30,7 +30,7 @@ jobs:
3030
runs-on: ubuntu-latest
3131
steps:
3232
- name: Checkout Repository
33-
uses: actions/checkout@v4
33+
uses: actions/checkout@v6
3434
- name: Setup Flutter Environment
3535
uses: subosito/flutter-action@v2
3636
with:
@@ -46,45 +46,55 @@ jobs:
4646
run-tests:
4747
name: "Run Tests"
4848
runs-on: ubuntu-latest
49+
strategy:
50+
fail-fast: false
51+
matrix:
52+
sdk: [ '3.27.0', '' ]
4953
steps:
5054
- name: Checkout Repository
51-
uses: actions/checkout@v4
55+
uses: actions/checkout@v6
5256
- name: Setup Flutter Environment
5357
uses: subosito/flutter-action@v2
5458
with:
55-
channel: "stable"
59+
flutter-version: ${{ matrix.sdk }}
5660
cache: true
5761
- name: Run Tests with Coverage
5862
run: flutter test -r expanded --coverage
5963
- name: Run Codecov
64+
if: ${{ matrix.sdk == '' }}
6065
uses: codecov/codecov-action@v5
6166
env:
6267
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
6368

6469
build-android:
6570
name: "Build Android Example App"
6671
runs-on: ubuntu-latest
72+
strategy:
73+
fail-fast: false
74+
matrix:
75+
sdk: [ '3.27.0', '' ]
6776
defaults:
6877
run:
6978
working-directory: ./example
7079
steps:
7180
- name: Checkout Repository
72-
uses: actions/checkout@v4
81+
uses: actions/checkout@v6
7382
- name: Setup Java 21 Environment
74-
uses: actions/setup-java@v4
83+
uses: actions/setup-java@v5
7584
with:
7685
distribution: "temurin"
7786
java-version: "21"
7887
cache: 'gradle'
7988
- name: Setup Flutter Environment
8089
uses: subosito/flutter-action@v2
8190
with:
82-
channel: "stable"
91+
flutter-version: ${{ matrix.sdk }}
8392
cache: true
8493
- name: Build Android Application
8594
run: flutter build apk --dart-define=COMMIT_SHA=${{ github.sha }} --dart-define=flutter.flutter_map.unblockOSM="${{ secrets.UNBLOCK_OSM }}"
8695
- name: Archive Artifact
87-
uses: actions/upload-artifact@v4
96+
if: ${{ matrix.sdk == '' }}
97+
uses: actions/upload-artifact@v6
8898
with:
8999
name: apk-build
90100
path: example/build/app/outputs/apk/release
@@ -93,24 +103,33 @@ jobs:
93103
build-windows:
94104
name: "Build Windows Example App"
95105
runs-on: windows-latest
106+
strategy:
107+
fail-fast: false
108+
matrix:
109+
sdk: [ '3.27.0', '' ]
96110
defaults:
97111
run:
98112
working-directory: ./example
99113
steps:
100114
- name: Checkout Repository
101-
uses: actions/checkout@v4
115+
uses: actions/checkout@v6
102116
- name: Setup Flutter Environment
103117
uses: subosito/flutter-action@v2
104118
with:
105-
channel: "stable"
119+
flutter-version: ${{ matrix.sdk }}
106120
cache: true
107121
- name: Build Windows Application
108122
run: flutter build windows --dart-define=COMMIT_SHA=${{ github.sha }} --dart-define=flutter.flutter_map.unblockOSM="${{ secrets.UNBLOCK_OSM }}"
123+
- name: Install Inno Setup
124+
if: ${{ matrix.sdk == '' }}
125+
run: choco install innosetup --yes --no-progress
109126
- name: Create Windows Application Installer
127+
if: ${{ matrix.sdk == '' }}
110128
run: iscc "windowsApplicationInstallerSetup.iss"
111129
working-directory: .
112130
- name: Archive Artifact
113-
uses: actions/upload-artifact@v4
131+
if: ${{ matrix.sdk == '' }}
132+
uses: actions/upload-artifact@v6
114133
with:
115134
name: exe-build
116135
path: windowsTemp/WindowsApplication.exe
@@ -119,21 +138,26 @@ jobs:
119138
build-web:
120139
name: "Build Web Example App"
121140
runs-on: ubuntu-latest
141+
strategy:
142+
fail-fast: false
143+
matrix:
144+
sdk: [ '3.27.0', '' ]
122145
defaults:
123146
run:
124147
working-directory: ./example
125148
steps:
126149
- name: Checkout Repository
127-
uses: actions/checkout@v4
150+
uses: actions/checkout@v6
128151
- name: Setup Flutter Environment
129152
uses: subosito/flutter-action@v2
130153
with:
131-
channel: "stable"
154+
flutter-version: ${{ matrix.sdk }}
132155
cache: true
133156
- name: Build Web Application
134157
run: flutter build web --wasm --dart-define=COMMIT_SHA=${{ github.sha }} --dart-define=flutter.flutter_map.unblockOSM="${{ secrets.UNBLOCK_OSM }}"
135158
- name: Archive Artifact
136-
uses: actions/upload-artifact@v4
159+
uses: actions/upload-artifact@v6
160+
if: ${{ matrix.sdk == '' }}
137161
with:
138162
name: web-build
139163
path: example/build/web

.github/workflows/daily.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
issues: write
1111
pull-requests: write
1212
steps:
13-
- uses: actions/stale@v9
13+
- uses: actions/stale@v10
1414
with:
1515
days-before-issue-stale: 21
1616
days-before-issue-close: 7

.github/workflows/issue-comment.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
steps:
1313
- name: Check labels of issue
1414
id: check_labels
15-
uses: actions/github-script@v7
15+
uses: actions/github-script@v8
1616
with:
1717
github-token: ${{ secrets.GITHUB_TOKEN }}
1818
script: |
@@ -42,7 +42,7 @@ jobs:
4242
# action removes the label when the automatic reminder message gets sent.
4343
- name: Remove `waiting for user response` label if exists
4444
if: steps.check_labels.outputs.result == 'true'
45-
uses: actions/github-script@v7
45+
uses: actions/github-script@v8
4646
with:
4747
github-token: ${{ secrets.GITHUB_TOKEN }}
4848
script: |

.github/workflows/master.yml

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
runs-on: ubuntu-latest
1616
steps:
1717
- name: Checkout Repository
18-
uses: actions/checkout@v4
18+
uses: actions/checkout@v6
1919
- name: Setup Flutter Environment
2020
uses: subosito/flutter-action@v2
2121
with:
@@ -38,9 +38,9 @@ jobs:
3838
working-directory: ./example
3939
steps:
4040
- name: Checkout Repository
41-
uses: actions/checkout@v4
41+
uses: actions/checkout@v6
4242
- name: Setup Java 21 Environment
43-
uses: actions/setup-java@v4
43+
uses: actions/setup-java@v5
4444
with:
4545
distribution: "temurin"
4646
java-version: "21"
@@ -53,7 +53,7 @@ jobs:
5353
- name: Build Android Application
5454
run: flutter build apk --dart-define=COMMIT_SHA=${{ github.sha }} --dart-define=flutter.flutter_map.unblockOSM="${{ secrets.UNBLOCK_OSM }}"
5555
- name: Archive Artifact
56-
uses: actions/upload-artifact@v4
56+
uses: actions/upload-artifact@v6
5757
with:
5858
name: apk-build
5959
path: example/build/app/outputs/apk/release
@@ -69,19 +69,20 @@ jobs:
6969
working-directory: ./example
7070
steps:
7171
- name: Checkout Repository
72-
uses: actions/checkout@v4
72+
uses: actions/checkout@v6
7373
- name: Setup Flutter Environment
7474
uses: subosito/flutter-action@v2
7575
with:
76-
channel: "stable"
7776
cache: true
7877
- name: Build Windows Application
7978
run: flutter build windows --dart-define=COMMIT_SHA=${{ github.sha }} --dart-define=flutter.flutter_map.unblockOSM="${{ secrets.UNBLOCK_OSM }}"
79+
- name: Install Inno Setup
80+
run: choco install innosetup --yes --no-progress
8081
- name: Create Windows Application Installer
8182
run: iscc "windowsApplicationInstallerSetup.iss"
8283
working-directory: .
8384
- name: Archive Artifact
84-
uses: actions/upload-artifact@v4
85+
uses: actions/upload-artifact@v6
8586
with:
8687
name: exe-build
8788
path: windowsTemp/WindowsApplication.exe
@@ -97,7 +98,7 @@ jobs:
9798
working-directory: ./example
9899
steps:
99100
- name: Checkout Repository
100-
uses: actions/checkout@v4
101+
uses: actions/checkout@v6
101102
- name: Setup Flutter Environment
102103
uses: subosito/flutter-action@v2
103104
with:
@@ -106,7 +107,7 @@ jobs:
106107
- name: Build Web Application
107108
run: flutter build web --wasm --dart-define=COMMIT_SHA=${{ github.sha }} --dart-define=flutter.flutter_map.unblockOSM="${{ secrets.UNBLOCK_OSM }}"
108109
- name: Archive Artifact
109-
uses: actions/upload-artifact@v4
110+
uses: actions/upload-artifact@v6
110111
with:
111112
name: web-build
112113
path: example/build/web

.metadata

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# This file should be version controlled and should not be manually edited.
55

66
version:
7-
revision: 8962f6dc68ec8e2206ac2fa874da4a453856c7d3
8-
channel: stable
7+
revision: "b45fa18946ecc2d9b4009952c636ba7e2ffbb787"
8+
channel: "stable"
99

1010
project_type: package

CHANGELOG.md

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,29 @@
22

33
Please consider [donating](https://github.com/sponsors/fleaflet) or [contributing](https://github.com/fleaflet/flutter_map/blob/master/CONTRIBUTING.md) if you're a fan of what we're doing and you'd like to support future releases!
44

5-
This CHANGELOG does not include every commit and/or PR - it is a hand picked selection of the ones that have an effect on you. For a full list of changes, please check the GitHub repository releases/tags.
5+
This CHANGELOG does not include every commit and/or PR - it is a hand picked selection of the ones that have an effect on most users. For a full list of changes, please check the GitHub repository releases/tags. We also release highlights for some releases on the docs site.
6+
7+
## [8.2.2] - 2025/09/19
8+
9+
Contains the following user-affecting bug fixes:
10+
11+
- Prevent crash caused by usage of negative `TileLayer.zoomOffset` - [#2133](https://github.com/fleaflet/flutter_map/pull/2133) for [#2127](https://github.com/fleaflet/flutter_map/issues/2127)
12+
- Assert that `MapCamera.zoom` is finite (to prevent confusing errors within layers) - [#2141](https://github.com/fleaflet/flutter_map/pull/2141) for [#2135](https://github.com/fleaflet/flutter_map/issues/2135)
13+
14+
Many thanks to these contributors (in no particular order):
15+
16+
- @monsieurtanuki
17+
- @ReinisSprogis
18+
- ... and all the maintainers
619

720
## [8.2.1] - 2025/07/11
821

9-
Contains the following user-affecting changes:
22+
Contains the following user-affecting bug fixes:
1023

1124
- Ensure tiles still load when failing to cache them due to HTTP spec non-compliance - [#2125](https://github.com/fleaflet/flutter_map/pull/2125) for [#2124](https://github.com/fleaflet/flutter_map/issues/2124)
25+
26+
Contains the following user-affecting changes:
27+
1228
- Log informational warnings to console when a tile fails to cache due to HTTP spec non-compliance or a shortage of information to calculate an accurate freshness age - [#2125](https://github.com/fleaflet/flutter_map/pull/2125) for [#2124](https://github.com/fleaflet/flutter_map/issues/2124)
1329

1430
Many thanks to these contributors (in no particular order):

example/.metadata

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,29 @@
44
# This file should be version controlled and should not be manually edited.
55

66
version:
7-
revision: "6e74ee483380f2d8ec77f08ce23f891af9a03933"
8-
channel: "master"
7+
revision: "b45fa18946ecc2d9b4009952c636ba7e2ffbb787"
8+
channel: "stable"
99

1010
project_type: app
1111

1212
# Tracks metadata for the flutter migrate command
1313
migration:
1414
platforms:
1515
- platform: root
16-
create_revision: 6e74ee483380f2d8ec77f08ce23f891af9a03933
17-
base_revision: 6e74ee483380f2d8ec77f08ce23f891af9a03933
16+
create_revision: b45fa18946ecc2d9b4009952c636ba7e2ffbb787
17+
base_revision: b45fa18946ecc2d9b4009952c636ba7e2ffbb787
1818
- platform: android
19-
create_revision: 6e74ee483380f2d8ec77f08ce23f891af9a03933
20-
base_revision: 6e74ee483380f2d8ec77f08ce23f891af9a03933
19+
create_revision: b45fa18946ecc2d9b4009952c636ba7e2ffbb787
20+
base_revision: b45fa18946ecc2d9b4009952c636ba7e2ffbb787
21+
- platform: ios
22+
create_revision: b45fa18946ecc2d9b4009952c636ba7e2ffbb787
23+
base_revision: b45fa18946ecc2d9b4009952c636ba7e2ffbb787
24+
- platform: web
25+
create_revision: b45fa18946ecc2d9b4009952c636ba7e2ffbb787
26+
base_revision: b45fa18946ecc2d9b4009952c636ba7e2ffbb787
27+
- platform: windows
28+
create_revision: b45fa18946ecc2d9b4009952c636ba7e2ffbb787
29+
base_revision: b45fa18946ecc2d9b4009952c636ba7e2ffbb787
2130

2231
# User provided section
2332

example/android/app/build.gradle.kts

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,15 @@ plugins {
88
android {
99
namespace = "dev.fleaflet.flutter_map.example"
1010
compileSdk = flutter.compileSdkVersion
11-
// ndkVersion = flutter.ndkVersion
12-
ndkVersion = "27.0.12077973"
11+
ndkVersion = flutter.ndkVersion
1312

1413
compileOptions {
15-
sourceCompatibility = JavaVersion.VERSION_1_8
16-
targetCompatibility = JavaVersion.VERSION_1_8
14+
sourceCompatibility = JavaVersion.VERSION_17
15+
targetCompatibility = JavaVersion.VERSION_17
1716
}
1817

1918
kotlinOptions {
20-
jvmTarget = JavaVersion.VERSION_1_8.toString()
19+
jvmTarget = JavaVersion.VERSION_17.toString()
2120
}
2221

2322
defaultConfig {

example/android/gradle.properties

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
11
org.gradle.jvmargs=-Xmx8G -XX:MaxMetaspaceSize=4G -XX:ReservedCodeCacheSize=512m -XX:+HeapDumpOnOutOfMemoryError
22
android.useAndroidX=true
3-
android.enableJetifier=true

example/android/gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
33
zipStoreBase=GRADLE_USER_HOME
44
zipStorePath=wrapper/dists
5-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip
5+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-all.zip

0 commit comments

Comments
 (0)