Skip to content

Commit 821bf1b

Browse files
fix: missing proguard rules, chore: prepare v0.3.2 release (#412)
- update changelog - bump versions - update node dependencies - update github release workflow - move /docs to /website - fix missing proguard rules, add kotlin Keep annotation --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
1 parent 262e189 commit 821bf1b

File tree

214 files changed

+712
-617
lines changed

Some content is hidden

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

214 files changed

+712
-617
lines changed

.github/dependabot.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ updates:
44
- package-ecosystem: "github-actions"
55
directory: "/"
66
schedule:
7-
interval: "weekly"
7+
interval: "monthly"
88
- package-ecosystem: "pub"
99
directories: [ "/example", "/maplibre", "/maplibre_ios", "/" ]
1010
schedule:
11-
interval: "weekly"
11+
interval: "monthly"
1212
ignore:
1313
- dependency-name: "*"
1414
update-types:
@@ -25,7 +25,7 @@ updates:
2525
- package-ecosystem: "gradle"
2626
directories: [ "/maplibre/android" , "/example/android" ]
2727
schedule:
28-
interval: "weekly"
28+
interval: "monthly"
2929
groups:
3030
dependencies:
3131
patterns: [ "*" ]

.github/workflows/ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ jobs:
221221
timeout-minutes: 30
222222
defaults:
223223
run:
224-
working-directory: maplibre_ios/example
224+
working-directory: example
225225
strategy:
226226
fail-fast: false
227227
matrix:
@@ -242,7 +242,7 @@ jobs:
242242
uses: actions/upload-artifact@v5
243243
with:
244244
name: maplibre-flutter-demo.app
245-
path: build/ios/iphonesimulator
245+
path: build/ios/iphoneos/Runner.app
246246
build-web:
247247
name: "[Web] Build"
248248
runs-on: ubuntu-latest
@@ -384,4 +384,4 @@ jobs:
384384
# exit 1
385385
# else
386386
# echo "✅ No uncommitted changes"
387-
# fi
387+
# fi

.github/workflows/docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
build:
1616
defaults:
1717
run:
18-
working-directory: docs
18+
working-directory: website
1919
runs-on: ubuntu-latest
2020
steps:
2121
- name: Checkout

.github/workflows/publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,4 @@ jobs:
2020
id-token: write
2121
uses: dart-lang/setup-dart/.github/workflows/publish.yml@v1
2222
with:
23-
working-directory: .
23+
working-directory: maplibre

docs/.yarn/install-state.gz

-1.47 MB
Binary file not shown.

example/lib/layers_marker_page.dart

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,22 @@ class LayersMarkerPage extends StatefulWidget {
1313

1414
class _LayersMarkerPageState extends State<LayersMarkerPage> {
1515
final _points = <Feature<Point>>[
16-
const Feature(geometry: Point(Geographic(lon: 9.17, lat: 47.68))),
17-
const Feature(geometry: Point(Geographic(lon: 9.17, lat: 48))),
18-
const Feature(geometry: Point(Geographic(lon: 9, lat: 48))),
19-
const Feature(geometry: Point(Geographic(lon: 9.5, lat: 48))),
16+
const Feature(
17+
geometry: Point(Geographic(lon: 9.17, lat: 47.68)),
18+
properties: {'name': 'Marker 1'},
19+
),
20+
const Feature(
21+
geometry: Point(Geographic(lon: 9.17, lat: 48)),
22+
properties: {'name': 'Marker 2'},
23+
),
24+
const Feature(
25+
geometry: Point(Geographic(lon: 9, lat: 48)),
26+
properties: {'name': 'Marker 3'},
27+
),
28+
const Feature(
29+
geometry: Point(Geographic(lon: 9.5, lat: 48)),
30+
properties: {'name': 'Marker 4'},
31+
),
2032
];
2133

2234
bool _imageLoaded = false;
@@ -55,7 +67,7 @@ class _LayersMarkerPageState extends State<LayersMarkerPage> {
5567
layers: [
5668
MarkerLayer(
5769
points: _points,
58-
textField: 'Marker',
70+
textField: '{name}',
5971
textAllowOverlap: true,
6072
iconImage: _imageLoaded ? 'marker' : null,
6173
iconSize: 0.15,

example/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ dependencies:
1616
sdk: flutter
1717
go_router: ^16.0.0
1818
http: ^1.2.2
19-
maplibre: ^0.3.1
19+
maplibre: ^0.3.2
2020

2121
dev_dependencies:
2222
flutter_launcher_icons: ^0.14.3

maplibre/CHANGELOG.md

Lines changed: 18 additions & 0 deletions

maplibre/README.md

Lines changed: 1 addition & 1 deletion

maplibre/android/consumer-rules.pro

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,5 @@
1616
-keep class org.maplibre.android.text.** { public *; }
1717
-keep class org.maplibre.android.util.** { public *; }
1818
-keep class org.maplibre.android.utils.** { public *; }
19-
-keep class org.maplibre.geojson.** { public *; }
19+
-keep class org.maplibre.geojson.** { public *; }
20+
-keep class io.flutter.plugin.platform.** { public *; }

0 commit comments

Comments
 (0)