Skip to content

Commit 4a4f0b4

Browse files
JaffaKetchupJaffaKetchup
authored
Merge branch 'master' into master
2 parents dd95b47 + 6da14f8 commit 4a4f0b4

106 files changed

Lines changed: 4843 additions & 1763 deletions

File tree

Some content is hidden

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

‎.github/FUNDING.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
custom: "https://docs.fleaflet.dev/supporters#support-us"
1+
github: fleaflet

‎.github/workflows/branch.yml‎

Lines changed: 45 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: "Branch & PR"
22
on:
33
push:
4-
branches: [ '!master' ]
4+
branches: [ "!master" ]
55
pull_request:
66
workflow_dispatch:
77

@@ -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
60-
uses: codecov/codecov-action@v5
64+
if: ${{ matrix.sdk == '' }}
65+
uses: codecov/codecov-action@v6
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"
78-
cache: 'gradle'
87+
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
85-
run: flutter build apk --dart-define=flutter.flutter_map.unblockOSM="${{ secrets.UNBLOCK_OSM }}"
94+
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@v7
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
108-
run: flutter build windows --dart-define=flutter.flutter_map.unblockOSM="${{ secrets.UNBLOCK_OSM }}"
122+
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@v7
114133
with:
115134
name: exe-build
116135
path: windowsTemp/WindowsApplication.exe
@@ -119,22 +138,27 @@ 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
134-
run: flutter build web --wasm --dart-define=flutter.flutter_map.unblockOSM="${{ secrets.UNBLOCK_OSM }}"
157+
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@v7
160+
if: ${{ matrix.sdk == '' }}
137161
with:
138162
name: web-build
139163
path: example/build/web
140-
if-no-files-found: error
164+
if-no-files-found: error

‎.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@v9
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@v9
4646
with:
4747
github-token: ${{ secrets.GITHUB_TOKEN }}
4848
script: |

‎.github/workflows/master.yml‎

Lines changed: 14 additions & 13 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:
@@ -24,7 +24,7 @@ jobs:
2424
- name: Run Tests with Coverage
2525
run: flutter test -r expanded --coverage
2626
- name: Run Codecov
27-
uses: codecov/codecov-action@v5
27+
uses: codecov/codecov-action@v6
2828
env:
2929
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
3030

@@ -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"
@@ -51,9 +51,9 @@ jobs:
5151
channel: "stable"
5252
cache: true
5353
- name: Build Android Application
54-
run: flutter build apk --dart-define=flutter.flutter_map.unblockOSM="${{ secrets.UNBLOCK_OSM }}"
54+
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@v7
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
79-
run: flutter build windows --dart-define=flutter.flutter_map.unblockOSM="${{ secrets.UNBLOCK_OSM }}"
78+
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@v7
8586
with:
8687
name: exe-build
8788
path: windowsTemp/WindowsApplication.exe
@@ -97,16 +98,16 @@ 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:
104105
channel: "stable"
105106
cache: true
106107
- name: Build Web Application
107-
run: flutter build web --wasm --dart-define=flutter.flutter_map.unblockOSM="${{ secrets.UNBLOCK_OSM }}"
108+
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@v7
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

0 commit comments

Comments
 (0)