Skip to content

Commit 2ab5c12

Browse files
chore: ignore deprecations, bump action versions, add lower flutter sdk bound to ci (#2155)
* pub upgrade * chore(deps): bump actions/github-script from 7 to 8 Bumps [actions/github-script](https://github.com/actions/github-script) from 7 to 8. - [Release notes](https://github.com/actions/github-script/releases) - [Commits](actions/github-script@v7...v8) --- updated-dependencies: - dependency-name: actions/github-script dependency-version: '8' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> * chore(deps): bump actions/stale from 9 to 10 Bumps [actions/stale](https://github.com/actions/stale) from 9 to 10. - [Release notes](https://github.com/actions/stale/releases) - [Changelog](https://github.com/actions/stale/blob/main/CHANGELOG.md) - [Commits](actions/stale@v9...v10) --- updated-dependencies: - dependency-name: actions/stale dependency-version: '10' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> * chore(deps): bump actions/setup-java from 4 to 5 Bumps [actions/setup-java](https://github.com/actions/setup-java) from 4 to 5. - [Release notes](https://github.com/actions/setup-java/releases) - [Commits](actions/setup-java@v4...v5) --- updated-dependencies: - dependency-name: actions/setup-java dependency-version: '5' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> * chore(deps): bump actions/checkout from 4 to 5 Bumps [actions/checkout](https://github.com/actions/checkout) from 4 to 5. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](actions/checkout@v4...v5) --- updated-dependencies: - dependency-name: actions/checkout dependency-version: '5' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> * add matrix ci * temp allow ci to run on all branches * Revert "temp allow ci to run on all branches" This reverts commit 4513f24. * only update artifact if using the latest flutter sdk in ci * install iscc manually * ignore deprecations * update ci * lower path dependency range * adjust flutter_lints range --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
1 parent b26fb40 commit 2ab5c12

File tree

12 files changed

+79
-46
lines changed

12 files changed

+79
-46
lines changed

.github/workflows/branch.yml

Lines changed: 35 additions & 11 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@v5
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@v5
3434
- name: Setup Flutter Environment
3535
uses: subosito/flutter-action@v2
3636
with:
@@ -46,44 +46,54 @@ 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@v5
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@v5
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
96+
if: ${{ matrix.sdk == '' }}
8797
uses: actions/upload-artifact@v4
8898
with:
8999
name: apk-build
@@ -93,23 +103,32 @@ 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@v5
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
131+
if: ${{ matrix.sdk == '' }}
113132
uses: actions/upload-artifact@v4
114133
with:
115134
name: exe-build
@@ -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@v5
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
136159
uses: actions/upload-artifact@v4
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: 7 additions & 6 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@v5
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@v5
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"
@@ -69,14 +69,15 @@ jobs:
6969
working-directory: ./example
7070
steps:
7171
- name: Checkout Repository
72-
uses: actions/checkout@v4
72+
uses: actions/checkout@v5
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: .
@@ -97,7 +98,7 @@ jobs:
9798
working-directory: ./example
9899
steps:
99100
- name: Checkout Repository
100-
uses: actions/checkout@v4
101+
uses: actions/checkout@v5
101102
- name: Setup Flutter Environment
102103
uses: subosito/flutter-action@v2
103104
with:

example/macos/Flutter/GeneratedPluginRegistrant.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,12 @@
55
import FlutterMacOS
66
import Foundation
77

8+
import path_provider_foundation
89
import shared_preferences_foundation
910
import url_launcher_macos
1011

1112
func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
13+
PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin"))
1214
SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin"))
1315
UrlLauncherPlugin.register(with: registry.registrar(forPlugin: "UrlLauncherPlugin"))
1416
}

example/pubspec.lock

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -139,10 +139,10 @@ packages:
139139
dependency: "direct main"
140140
description:
141141
name: http
142-
sha256: "559ab0d950643c9a04512f4c4bd1c435dcb5af1aa9c848f3bf5867347044328a"
142+
sha256: bb2ce4590bc2667c96f318d68cac1b5a7987ec819351d32b1c987239a815e007
143143
url: "https://pub.dev"
144144
source: hosted
145-
version: "1.5.0-beta"
145+
version: "1.5.0"
146146
http_parser:
147147
dependency: transitive
148148
description:
@@ -171,10 +171,10 @@ packages:
171171
dependency: transitive
172172
description:
173173
name: leak_tracker
174-
sha256: "8dcda04c3fc16c14f48a7bb586d4be1f0d1572731b6d81d51772ef47c02081e0"
174+
sha256: "33e2e26bdd85a0112ec15400c8cbffea70d0f9c3407491f672a2fad47915e2de"
175175
url: "https://pub.dev"
176176
source: hosted
177-
version: "11.0.1"
177+
version: "11.0.2"
178178
leak_tracker_flutter_testing:
179179
dependency: transitive
180180
description:
@@ -211,10 +211,10 @@ packages:
211211
dependency: transitive
212212
description:
213213
name: logger
214-
sha256: "2621da01aabaf223f8f961e751f2c943dbb374dc3559b982f200ccedadaa6999"
214+
sha256: "55d6c23a6c15db14920e037fe7e0dc32e7cdaf3b64b4b25df2d541b5b6b81c0c"
215215
url: "https://pub.dev"
216216
source: hosted
217-
version: "2.6.0"
217+
version: "2.6.1"
218218
matcher:
219219
dependency: transitive
220220
description:
@@ -267,18 +267,18 @@ packages:
267267
dependency: transitive
268268
description:
269269
name: path_provider_android
270-
sha256: d0d310befe2c8ab9e7f393288ccbb11b60c019c6b5afc21973eeee4dda2b35e9
270+
sha256: "993381400e94d18469750e5b9dcb8206f15bc09f9da86b9e44a9b0092a0066db"
271271
url: "https://pub.dev"
272272
source: hosted
273-
version: "2.2.17"
273+
version: "2.2.18"
274274
path_provider_foundation:
275275
dependency: transitive
276276
description:
277277
name: path_provider_foundation
278-
sha256: "4843174df4d288f5e29185bd6e72a6fbdf5a4a4602717eed565497429f179942"
278+
sha256: "16eef174aacb07e09c351502740fa6254c165757638eba1e9116b0a781201bbd"
279279
url: "https://pub.dev"
280280
source: hosted
281-
version: "2.4.1"
281+
version: "2.4.2"
282282
path_provider_linux:
283283
dependency: transitive
284284
description:
@@ -339,10 +339,10 @@ packages:
339339
dependency: transitive
340340
description:
341341
name: shared_preferences_android
342-
sha256: "20cbd561f743a342c76c151d6ddb93a9ce6005751e7aa458baad3858bfbfb6ac"
342+
sha256: a2608114b1ffdcbc9c120eb71a0e207c71da56202852d4aab8a5e30a82269e74
343343
url: "https://pub.dev"
344344
source: hosted
345-
version: "2.4.10"
345+
version: "2.4.12"
346346
shared_preferences_foundation:
347347
dependency: transitive
348348
description:
@@ -464,26 +464,26 @@ packages:
464464
dependency: "direct main"
465465
description:
466466
name: url_launcher
467-
sha256: "9d06212b1362abc2f0f0d78e6f09f726608c74e3b9462e8368bb03314aa8d603"
467+
sha256: f6a7e5c4835bb4e3026a04793a4199ca2d14c739ec378fdfe23fc8075d0439f8
468468
url: "https://pub.dev"
469469
source: hosted
470-
version: "6.3.1"
470+
version: "6.3.2"
471471
url_launcher_android:
472472
dependency: transitive
473473
description:
474474
name: url_launcher_android
475-
sha256: "8582d7f6fe14d2652b4c45c9b6c14c0b678c2af2d083a11b604caeba51930d79"
475+
sha256: "199bc33e746088546a39cc5f36bac5a278c5e53b40cb3196f99e7345fdcfae6b"
476476
url: "https://pub.dev"
477477
source: hosted
478-
version: "6.3.16"
478+
version: "6.3.22"
479479
url_launcher_ios:
480480
dependency: transitive
481481
description:
482482
name: url_launcher_ios
483-
sha256: "7f2022359d4c099eea7df3fdf739f7d3d3b9faf3166fb1dd390775176e0b76cb"
483+
sha256: d80b3f567a617cb923546034cc94bfe44eb15f989fe670b37f26abdb9d939cb7
484484
url: "https://pub.dev"
485485
source: hosted
486-
version: "6.3.3"
486+
version: "6.3.4"
487487
url_launcher_linux:
488488
dependency: transitive
489489
description:
@@ -496,10 +496,10 @@ packages:
496496
dependency: transitive
497497
description:
498498
name: url_launcher_macos
499-
sha256: "17ba2000b847f334f16626a574c702b196723af2a289e7a93ffcb79acff855c2"
499+
sha256: c043a77d6600ac9c38300567f33ef12b0ef4f4783a2c1f00231d2b1941fea13f
500500
url: "https://pub.dev"
501501
source: hosted
502-
version: "3.2.2"
502+
version: "3.2.3"
503503
url_launcher_platform_interface:
504504
dependency: transitive
505505
description:
@@ -573,5 +573,5 @@ packages:
573573
source: hosted
574574
version: "1.1.0"
575575
sdks:
576-
dart: ">=3.8.0 <4.0.0"
577-
flutter: ">=3.27.0"
576+
dart: ">=3.9.0 <4.0.0"
577+
flutter: ">=3.35.0"

example/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ dependency_overrides:
2424
path: ../
2525

2626
dev_dependencies:
27-
flutter_lints: ^6.0.0
27+
flutter_lints: ">=5.0.0 <7.0.0"
2828
flutter_test:
2929
sdk: flutter
3030
geojson_vi: ^2.2.5

lib/src/layer/tile_layer/tile_provider/network/caching/built_in/impl/native/native.dart

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,13 @@ import 'dart:async';
22
import 'dart:convert';
33
import 'dart:io';
44
import 'dart:isolate';
5+
// ignore: unnecessary_import
56
import 'dart:typed_data';
67

78
import 'package:flutter/foundation.dart';
89
import 'package:flutter_map/flutter_map.dart';
910
import 'package:flutter_map/src/layer/tile_layer/tile_provider/network/caching/built_in/impl/native/workers/tile_and_size_monitor_writer.dart';
11+
// ignore: unnecessary_import
1012
import 'package:meta/meta.dart';
1113
import 'package:path/path.dart' as p;
1214
import 'package:path_provider/path_provider.dart';

lib/src/layer/tile_layer/tile_provider/network/image_provider/consolidate_response.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import 'dart:convert';
66

77
import 'package:flutter/foundation.dart';
88
import 'package:http/http.dart';
9+
// ignore: unnecessary_import
910
import 'package:meta/meta.dart';
1011

1112
/// Efficiently converts the response body of an [Response] into a

lib/src/layer/tile_layer/tile_provider/network/image_provider/image_provider.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import 'package:flutter_map/flutter_map.dart';
88
import 'package:flutter_map/src/layer/tile_layer/tile_provider/network/image_provider/consolidate_response.dart';
99
import 'package:http/http.dart';
1010
import 'package:logger/logger.dart';
11+
// ignore: unnecessary_import
1112
import 'package:meta/meta.dart';
1213

1314
/// Dedicated [ImageProvider] to fetch tiles from the network

0 commit comments

Comments
 (0)