Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ updates:
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "weekly"
interval: "monthly"
- package-ecosystem: "pub"
directories: [ "/example", "/maplibre", "/maplibre_ios", "/" ]
schedule:
interval: "weekly"
interval: "monthly"
ignore:
- dependency-name: "*"
update-types:
Expand All @@ -25,7 +25,7 @@ updates:
- package-ecosystem: "gradle"
directories: [ "/maplibre/android" , "/example/android" ]
schedule:
interval: "weekly"
interval: "monthly"
groups:
dependencies:
patterns: [ "*" ]
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ jobs:
timeout-minutes: 30
defaults:
run:
working-directory: maplibre_ios/example
working-directory: example
strategy:
fail-fast: false
matrix:
Expand All @@ -242,7 +242,7 @@ jobs:
uses: actions/upload-artifact@v5
with:
name: maplibre-flutter-demo.app
path: build/ios/iphonesimulator
path: build/ios/iphoneos/Runner.app
build-web:
name: "[Web] Build"
runs-on: ubuntu-latest
Expand Down Expand Up @@ -384,4 +384,4 @@ jobs:
# exit 1
# else
# echo "✅ No uncommitted changes"
# fi
# fi
2 changes: 1 addition & 1 deletion .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
build:
defaults:
run:
working-directory: docs
working-directory: website
runs-on: ubuntu-latest
steps:
- name: Checkout
Expand Down
Binary file removed docs/.yarn/install-state.gz
Binary file not shown.
22 changes: 17 additions & 5 deletions example/lib/layers_marker_page.dart
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,22 @@ class LayersMarkerPage extends StatefulWidget {

class _LayersMarkerPageState extends State<LayersMarkerPage> {
final _points = <Feature<Point>>[
const Feature(geometry: Point(Geographic(lon: 9.17, lat: 47.68))),
const Feature(geometry: Point(Geographic(lon: 9.17, lat: 48))),
const Feature(geometry: Point(Geographic(lon: 9, lat: 48))),
const Feature(geometry: Point(Geographic(lon: 9.5, lat: 48))),
const Feature(
geometry: Point(Geographic(lon: 9.17, lat: 47.68)),
properties: {'name': 'Marker 1'},
),
const Feature(
geometry: Point(Geographic(lon: 9.17, lat: 48)),
properties: {'name': 'Marker 2'},
),
const Feature(
geometry: Point(Geographic(lon: 9, lat: 48)),
properties: {'name': 'Marker 3'},
),
const Feature(
geometry: Point(Geographic(lon: 9.5, lat: 48)),
properties: {'name': 'Marker 4'},
),
];

bool _imageLoaded = false;
Expand Down Expand Up @@ -55,7 +67,7 @@ class _LayersMarkerPageState extends State<LayersMarkerPage> {
layers: [
MarkerLayer(
points: _points,
textField: 'Marker',
textField: '{name}',
textAllowOverlap: true,
iconImage: _imageLoaded ? 'marker' : null,
iconSize: 0.15,
Expand Down
2 changes: 1 addition & 1 deletion example/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ dependencies:
sdk: flutter
go_router: ^16.0.0
http: ^1.2.2
maplibre: ^0.3.1
maplibre: ^0.3.2

dev_dependencies:
flutter_launcher_icons: ^0.14.3
Expand Down
17 changes: 17 additions & 0 deletions maplibre/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,20 @@
## 0.3.2

Maintenance release with some optimizations and dependency upgrades.

### Bug Fixes

- Fix missing proguard rules for jni/jnigen causing issues in release builds on
Android.

### Maintenance

- Restructure repository and optimize package size on pub.dev.
- Upgrade `jni` / `jnigen` to 0.15.

Full
Changelog: [v0.3.1...v0.3.2](https://github.com/josxha/flutter-maplibre/compare/v0.3.1...v0.3.2)

## 0.3.1

This release brings a couple of new features and bug fixes.
Expand Down
2 changes: 1 addition & 1 deletion maplibre/README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# MapLibre for Flutter

[![Pub Version](https://img.shields.io/pub/v/maplibre)](https://pub.dev/packages/maplibre)
[![stars](https://badgen.net/github/stars/josxha/flutter-maplibre?label=stars&color=green&icon=github)](https://github.com/josxha/flutter-maplibre/stargazers)
[![stars](https://img.shields.io/github/stars/josxha/flutter-maplibre?style=flat&logo=github)](https://github.com/josxha/flutter-maplibre)
[![likes](https://img.shields.io/pub/likes/maplibre?logo=flutter)](https://pub.dev/packages/maplibre)
[![Pub Points](https://img.shields.io/pub/points/maplibre)](https://pub.dev/packages/maplibre/score)
[![Pub Downloads](https://img.shields.io/pub/dm/maplibre)](https://pub.dev/packages/maplibre)
Expand Down
3 changes: 2 additions & 1 deletion maplibre/android/consumer-rules.pro
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,5 @@
-keep class org.maplibre.android.text.** { public *; }
-keep class org.maplibre.android.util.** { public *; }
-keep class org.maplibre.android.utils.** { public *; }
-keep class org.maplibre.geojson.** { public *; }
-keep class org.maplibre.geojson.** { public *; }
-keep class io.flutter.plugin.platform.** { public *; }
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
package com.github.josxha.maplibre

import androidx.annotation.Keep
import io.flutter.plugin.platform.PlatformView

@Keep
interface FlutterApi {
fun createPlatformView(viewId: Int): PlatformView
}
1 change: 1 addition & 0 deletions maplibre/lib/src/platform/pigeon.g.dart
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
// swiftformat:disable all
// ignore_for_file: type=lint
// ignore_for_file: always_put_required_named_parameters_first
// Autogenerated from Pigeon (v26.0.1), do not edit directly.
// See also: https://pub.dev/packages/pigeon
// ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unused_import, unnecessary_parenthesis, prefer_null_aware_operators, omit_local_variable_types, unused_shown_name, unnecessary_import, no_leading_underscores_for_local_identifiers
Expand Down
2 changes: 1 addition & 1 deletion maplibre/pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: maplibre
description: "Permissive and performant mapping library that supports Mapbox Vector Tiles (MVT) powered by MapLibre SDKs."
version: 0.3.1
version: 0.3.2
repository: https://github.com/josxha/flutter-maplibre
issue_tracker: https://github.com/josxha/flutter-maplibre/issues
homepage: https://flutter-maplibre.pages.dev
Expand Down
4 changes: 4 additions & 0 deletions maplibre_ios/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## 0.3.2

[Check the maplibre changelog](https://pub.dev/packages/maplibre/changelog#032)

## 0.3.1

[Check the maplibre changelog](https://pub.dev/packages/maplibre/changelog#031)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
// swiftformat:disable all
// ignore_for_file: type=lint
// ignore_for_file: always_put_required_named_parameters_first
// Autogenerated from Pigeon (v26.0.1), do not edit directly.
// See also: https://pub.dev/packages/pigeon

Expand Down
2 changes: 1 addition & 1 deletion maplibre_ios/pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: maplibre_ios
description: "Helper package for maplibre that provides iOS FFI bindings"
version: 0.3.1
version: 0.3.2
repository: https://github.com/josxha/flutter-maplibre
issue_tracker: https://github.com/josxha/flutter-maplibre/issues
homepage: https://flutter-maplibre.pages.dev
Expand Down
3 changes: 2 additions & 1 deletion pigeons/header.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
swiftformat:disable all
ignore_for_file: type=lint
ignore_for_file: type=lint
ignore_for_file: always_put_required_named_parameters_first
File renamed without changes.
Binary file added website/.yarn/install-state.gz
Binary file not shown.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion docs/docusaurus.config.ts → website/docusaurus.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ const config: Config = {
// Please change this to your repo.
// Remove this to remove the "edit this page" links.
editUrl:
'https://github.com/josxha/flutter-maplibre/tree/main/docs/',
'https://github.com/josxha/flutter-maplibre/tree/main/website/',
},
theme: {
customCss: './src/css/custom.css',
Expand Down
8 changes: 4 additions & 4 deletions docs/package.json → website/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,17 @@
"@docusaurus/core": "^3.9.2",
"@docusaurus/preset-classic": "^3.9.2",
"@docusaurus/theme-mermaid": "^3.9.2",
"@mdx-js/react": "^3.1.0",
"@mdx-js/react": "^3.1.1",
"clsx": "^2.1.1",
"prism-react-renderer": "^2.4.1",
"react": "^19.2.0",
"react-dom": "^19.2.0"
"react": "^19.2.1",
"react-dom": "^19.2.1"
},
"devDependencies": {
"@docusaurus/module-type-aliases": "^3.9.2",
"@docusaurus/tsconfig": "^3.9.2",
"@docusaurus/types": "^3.9.2",
"@types/shelljs": "^0",
"@types/shelljs": "^0.8.17",
"shelljs": "^0.10.0",
"typescript": "~5.9.3"
},
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes.
File renamed without changes.
36 changes: 18 additions & 18 deletions docs/yarn.lock → website/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3059,7 +3059,7 @@ __metadata:
languageName: node
linkType: hard

"@mdx-js/react@npm:^3.0.0, @mdx-js/react@npm:^3.1.0":
"@mdx-js/react@npm:^3.0.0, @mdx-js/react@npm:^3.1.1":
version: 3.1.1
resolution: "@mdx-js/react@npm:3.1.1"
dependencies:
Expand Down Expand Up @@ -4068,7 +4068,7 @@ __metadata:
languageName: node
linkType: hard

"@types/shelljs@npm:^0":
"@types/shelljs@npm:^0.8.17":
version: 0.8.17
resolution: "@types/shelljs@npm:0.8.17"
dependencies:
Expand Down Expand Up @@ -6384,12 +6384,12 @@ __metadata:
"@docusaurus/theme-mermaid": "npm:^3.9.2"
"@docusaurus/tsconfig": "npm:^3.9.2"
"@docusaurus/types": "npm:^3.9.2"
"@mdx-js/react": "npm:^3.1.0"
"@types/shelljs": "npm:^0"
"@mdx-js/react": "npm:^3.1.1"
"@types/shelljs": "npm:^0.8.17"
clsx: "npm:^2.1.1"
prism-react-renderer: "npm:^2.4.1"
react: "npm:^19.2.0"
react-dom: "npm:^19.2.0"
react: "npm:^19.2.1"
react-dom: "npm:^19.2.1"
shelljs: "npm:^0.10.0"
typescript: "npm:~5.9.3"
languageName: unknown
Expand Down Expand Up @@ -10025,9 +10025,9 @@ __metadata:
linkType: hard

"node-forge@npm:^1":
version: 1.3.1
resolution: "node-forge@npm:1.3.1"
checksum: 10c0/e882819b251a4321f9fc1d67c85d1501d3004b4ee889af822fd07f64de3d1a8e272ff00b689570af0465d65d6bf5074df9c76e900e0aff23e60b847f2a46fbe8
version: 1.3.2
resolution: "node-forge@npm:1.3.2"
checksum: 10c0/1def35652c93a588718a6d0d0b4f33e3e7de283aa6f4c00d01d1605d6ccce23fb3b59bcbfb6434014acd23a251cfcc2736052b406f53d94e1b19c09d289d0176
languageName: node
linkType: hard

Expand Down Expand Up @@ -11608,14 +11608,14 @@ __metadata:
languageName: node
linkType: hard

"react-dom@npm:^19.2.0":
version: 19.2.0
resolution: "react-dom@npm:19.2.0"
"react-dom@npm:^19.2.1":
version: 19.2.1
resolution: "react-dom@npm:19.2.1"
dependencies:
scheduler: "npm:^0.27.0"
peerDependencies:
react: ^19.2.0
checksum: 10c0/fa2cae05248d01288e91523b590ce4e7635b1e13f1344e225f850d722a8da037bf0782f63b1c1d46353334e0c696909b82e582f8cad607948fde6f7646cc18d9
react: ^19.2.1
checksum: 10c0/e56b6b3d72314df580ca800b70a69a21c6372703c8f45d9b5451ca6519faefb2496d76ffa9c5adb94136d2bbf2fd303d0dfc208a2cd77ede3132877471af9470
languageName: node
linkType: hard

Expand Down Expand Up @@ -11729,10 +11729,10 @@ __metadata:
languageName: node
linkType: hard

"react@npm:^19.2.0":
version: 19.2.0
resolution: "react@npm:19.2.0"
checksum: 10c0/1b6d64eacb9324725bfe1e7860cb7a6b8a34bc89a482920765ebff5c10578eb487e6b46b2f0df263bd27a25edbdae2c45e5ea5d81ae61404301c1a7192c38330
"react@npm:^19.2.1":
version: 19.2.1
resolution: "react@npm:19.2.1"
checksum: 10c0/2b5eaf407abb3db84090434c20d6c5a8e447ab7abcd8fe9eaf1ddc299babcf31284ee9db7ea5671d21c85ac5298bd632fa1a7da1ed78d5b368a537f5e1cd5d62
languageName: node
linkType: hard

Expand Down
Loading