Skip to content
Merged
Show file tree
Hide file tree
Changes from 16 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
2 changes: 1 addition & 1 deletion .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ jobs:
id-token: write
uses: dart-lang/setup-dart/.github/workflows/publish.yml@v1
with:
working-directory: .
working-directory: maplibre
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
1 change: 1 addition & 0 deletions docs/.gitignore → website/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,4 @@
npm-debug.log*
yarn-debug.log*
yarn-error.log*
.yarn/install-state.gz
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.
3 changes: 3 additions & 0 deletions website/upgrade_dependencies.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#!/usr/bin/env bash

yarn up -R "*"
File renamed without changes.
Loading
Loading