Skip to content
Merged
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
20 changes: 10 additions & 10 deletions .github/workflows/on-commit-main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -96,25 +96,25 @@ jobs:
- name: Check package score for all
run: |
cd flutter_map_cache
pana --exit-code-threshold 0 --no-dartdoc .
pana --exit-code-threshold 10 --no-dartdoc .
cd ..
cd flutter_map_compass
pana --exit-code-threshold 0 --no-dartdoc .
pana --exit-code-threshold 10 --no-dartdoc .
cd ..
cd flutter_map_maplibre
pana --exit-code-threshold 0 --no-dartdoc .
pana --exit-code-threshold 10 --no-dartdoc .
cd ..
cd flutter_map_mbtiles
pana --exit-code-threshold 0 --no-dartdoc .
pana --exit-code-threshold 10 --no-dartdoc .
cd ..
cd flutter_map_pmtiles
pana --exit-code-threshold 0 --no-dartdoc .
pana --exit-code-threshold 10 --no-dartdoc .
cd ..
# cd vector_map_tiles_mbtiles
# pana --exit-code-threshold 0 --no-dartdoc .
# pana --exit-code-threshold 10 --no-dartdoc .
# cd ..
# cd vector_map_tiles_pmtiles
# pana --exit-code-threshold 0 --no-dartdoc .
# pana --exit-code-threshold 10 --no-dartdoc .
# cd ..
build-android:
runs-on: ubuntu-latest
Expand All @@ -136,7 +136,7 @@ jobs:
working-directory: example
run: flutter build apk
- name: Upload apk as artifact
uses: actions/upload-artifact@v6
uses: actions/upload-artifact@v7
with:
name: flutter_map_plugins_example_apk
path: example/build/app/outputs/flutter-apk/app-release.apk
Expand All @@ -160,7 +160,7 @@ jobs:
# - name: Build iOS package
# run: flutter build ios --simulator
# - name: Upload Runner.app as artifact
# uses: actions/upload-artifact@v6
# uses: actions/upload-artifact@v7
# with:
# name: flutter_map_plugins_example.app
# path: example/build/ios/iphonesimulator
Expand All @@ -181,7 +181,7 @@ jobs:
- name: Build Web
run: flutter build web
- name: Upload web as artifact
uses: actions/upload-artifact@v6
uses: actions/upload-artifact@v7
with:
name: flutter_map_plugins_example_web
path: example/build/web
Expand Down
72 changes: 38 additions & 34 deletions .github/workflows/on-pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,47 +34,51 @@ jobs:
uses: subosito/flutter-action@v2
with:
cache: true
- name: Install lcov
run: sudo apt-get update && sudo apt-get install -y lcov
- name: Install coverde
run: dart pub global activate coverde
- name: Run Test with Coverage
run: |
rm -rf coverage
cd flutter_map_cache
flutter pub get
flutter test --no-pub -r expanded --coverage
coverde filter --input ./coverage/lcov.info --output ../coverage/filtered.lcov.info --filters \.g\.dart
flutter test --no-pub -r expanded --coverage --coverage-path=../coverage/flutter_map_cache.lcov.info
cd ..
cd flutter_map_compass
flutter pub get
flutter test --no-pub -r expanded --coverage
coverde filter --input ./coverage/lcov.info --output ../coverage/filtered.lcov.info --filters \.g\.dart
flutter test --no-pub -r expanded --coverage --coverage-path=../coverage/flutter_map_compass.lcov.info
cd ..
# cd flutter_map_maplibre
# flutter pub get
# flutter test --no-pub -r expanded --coverage
# coverde filter --input ./coverage/lcov.info --output ../coverage/filtered.lcov.info --filters \.g\.dart
# cd ..
# cd flutter_map_maplibre
# flutter pub get
# flutter test --no-pub -r expanded --coverage --coverage-path=../coverage/flutter_map_maplibre.lcov.info
# cd ..
cd flutter_map_mbtiles
flutter pub get
flutter test --no-pub -r expanded --coverage
coverde filter --input ./coverage/lcov.info --output ../coverage/filtered.lcov.info --filters \.g\.dart
flutter test --no-pub -r expanded --coverage --coverage-path=../coverage/flutter_map_mbtiles.lcov.info
cd ..
cd flutter_map_pmtiles
flutter pub get
flutter test --no-pub -r expanded --coverage
coverde filter --input ./coverage/lcov.info --output ../coverage/filtered.lcov.info --filters \.g\.dart
flutter test --no-pub -r expanded --coverage --coverage-path=../coverage/flutter_map_pmtiles.lcov.info
cd ..
# cd vector_map_tiles_mbtiles
# flutter pub get
# flutter test --no-pub -r expanded --coverage
# coverde filter --input ./coverage/lcov.info --output ../coverage/filtered.lcov.info --filters \.g\.dart
# cd ..
# cd vector_map_tiles_pmtiles
# flutter pub get
# flutter test --no-pub -r expanded --coverage
# coverde filter --input ./coverage/lcov.info --output ../coverage/filtered.lcov.info --filters \.g\.dart
# cd ..
coverde value -i coverage/filtered.lcov.info > coverage/result.txt
# cd vector_map_tiles_mbtiles
# flutter pub get
# flutter test --no-pub -r expanded --coverage --coverage-path=../coverage/vector_map_tiles_mbtiles.lcov.info
# cd ..
# cd vector_map_tiles_pmtiles
# flutter pub get
# flutter test --no-pub -r expanded --coverage --coverage-path=../coverage/vector_map_tiles_pmtiles.lcov.info
# cd ..
lcov \
-a coverage/flutter_map_cache.lcov.info \
-a coverage/flutter_map_compass.lcov.info \
-a coverage/flutter_map_mbtiles.lcov.info \
-a coverage/flutter_map_pmtiles.lcov.info \
-o coverage/lcov.info
coverde filter \
--input coverage/lcov.info \
--output coverage/filtered.lcov.info \
--filters \.g\.dart
- name: Run Codecov
uses: codecov/codecov-action@v5
env:
Expand All @@ -97,31 +101,31 @@ jobs:
run: |
cd flutter_map_cache
flutter pub get
pana --exit-code-threshold 0 --no-dartdoc .
pana --exit-code-threshold 10 --no-dartdoc .
cd ..
cd flutter_map_compass
flutter pub get
pana --exit-code-threshold 0 --no-dartdoc .
pana --exit-code-threshold 10 --no-dartdoc .
cd ..
cd flutter_map_maplibre
flutter pub get
pana --exit-code-threshold 0 --no-dartdoc .
pana --exit-code-threshold 10 --no-dartdoc .
cd ..
cd flutter_map_mbtiles
flutter pub get
pana --exit-code-threshold 0 --no-dartdoc .
pana --exit-code-threshold 10 --no-dartdoc .
cd ..
cd flutter_map_pmtiles
flutter pub get
pana --exit-code-threshold 0 --no-dartdoc .
pana --exit-code-threshold 10 --no-dartdoc .
cd ..
# cd vector_map_tiles_mbtiles
# flutter pub get
# pana --exit-code-threshold 0 --no-dartdoc .
# pana --exit-code-threshold 10 --no-dartdoc .
# cd ..
# cd vector_map_tiles_pmtiles
# flutter pub get
# pana --exit-code-threshold 0 --no-dartdoc .
# pana --exit-code-threshold 10 --no-dartdoc .
# cd ..
build-android:
runs-on: ubuntu-latest
Expand All @@ -142,7 +146,7 @@ jobs:
working-directory: example
run: flutter build apk
- name: Upload apk as artifact
uses: actions/upload-artifact@v6
uses: actions/upload-artifact@v7
with:
name: flutter_map_plugins_example_apk
path: example/build/app/outputs/flutter-apk/app-release.apk
Expand All @@ -165,7 +169,7 @@ jobs:
# - name: Build iOS package
# run: flutter build ios --simulator
# - name: Upload Runner.app as artifact
# uses: actions/upload-artifact@v6
# uses: actions/upload-artifact@v7
# with:
# name: flutter_map_plugins_example.app
# path: example/build/ios/iphonesimulator
Expand All @@ -185,7 +189,7 @@ jobs:
- name: Build Web
run: flutter build web
- name: Upload web as artifact
uses: actions/upload-artifact@v6
uses: actions/upload-artifact@v7
with:
name: flutter_map_plugins_example_web
path: example/build/web
4 changes: 0 additions & 4 deletions example/linux/flutter/generated_plugin_registrant.cc
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,10 @@

#include "generated_plugin_registrant.h"

#include <maplibre/maplibre_plugin.h>
#include <sqlite3_flutter_libs/sqlite3_flutter_libs_plugin.h>
#include <url_launcher_linux/url_launcher_plugin.h>

void fl_register_plugins(FlPluginRegistry* registry) {
g_autoptr(FlPluginRegistrar) maplibre_registrar =
fl_plugin_registry_get_registrar_for_plugin(registry, "MaplibrePlugin");
maplibre_plugin_register_with_registrar(maplibre_registrar);
g_autoptr(FlPluginRegistrar) sqlite3_flutter_libs_registrar =
fl_plugin_registry_get_registrar_for_plugin(registry, "Sqlite3FlutterLibsPlugin");
sqlite3_flutter_libs_plugin_register_with_registrar(sqlite3_flutter_libs_registrar);
Expand Down
1 change: 0 additions & 1 deletion example/linux/flutter/generated_plugins.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
#

list(APPEND FLUTTER_PLUGIN_LIST
maplibre
sqlite3_flutter_libs
url_launcher_linux
)
Expand Down
4 changes: 0 additions & 4 deletions example/macos/Flutter/GeneratedPluginRegistrant.swift
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,11 @@ import FlutterMacOS
import Foundation

import connectivity_plus
import maplibre
import path_provider_foundation
import sqlite3_flutter_libs
import url_launcher_macos

func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
ConnectivityPlusPlugin.register(with: registry.registrar(forPlugin: "ConnectivityPlusPlugin"))
MaplibrePlugin.register(with: registry.registrar(forPlugin: "MaplibrePlugin"))
PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin"))
Sqlite3FlutterLibsPlugin.register(with: registry.registrar(forPlugin: "Sqlite3FlutterLibsPlugin"))
UrlLauncherPlugin.register(with: registry.registrar(forPlugin: "UrlLauncherPlugin"))
}
3 changes: 0 additions & 3 deletions example/windows/flutter/generated_plugin_registrant.cc
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,12 @@
#include "generated_plugin_registrant.h"

#include <connectivity_plus/connectivity_plus_windows_plugin.h>
#include <maplibre/maplibre_plugin_c_api.h>
#include <sqlite3_flutter_libs/sqlite3_flutter_libs_plugin.h>
#include <url_launcher_windows/url_launcher_windows.h>

void RegisterPlugins(flutter::PluginRegistry* registry) {
ConnectivityPlusWindowsPluginRegisterWithRegistrar(
registry->GetRegistrarForPlugin("ConnectivityPlusWindowsPlugin"));
MaplibrePluginCApiRegisterWithRegistrar(
registry->GetRegistrarForPlugin("MaplibrePluginCApi"));
Sqlite3FlutterLibsPluginRegisterWithRegistrar(
registry->GetRegistrarForPlugin("Sqlite3FlutterLibsPlugin"));
UrlLauncherWindowsRegisterWithRegistrar(
Expand Down
1 change: 0 additions & 1 deletion example/windows/flutter/generated_plugins.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

list(APPEND FLUTTER_PLUGIN_LIST
connectivity_plus
maplibre
sqlite3_flutter_libs
url_launcher_windows
)
Expand Down
14 changes: 0 additions & 14 deletions flutter_map_cache/test/integration_test.dart

This file was deleted.

36 changes: 0 additions & 36 deletions flutter_map_cache/test/utils/test_app.dart

This file was deleted.

30 changes: 0 additions & 30 deletions melos.yaml

This file was deleted.

29 changes: 29 additions & 0 deletions pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,32 @@ workspace:
- flutter_map_pmtiles
- vector_map_tiles_mbtiles
- vector_map_tiles_pmtiles

dev_dependencies:
melos: ^7.0.0

melos:
scripts:
test:
description: Run tests of all packages
run: melos exec --dir-exists="test"--fail-fast flutter test --no-pub
pub_get:
description: Run `pub get` for all packages
run: melos exec --file-exists="pubspec.yaml" --concurrency 1 --fail-fast flutter pub get
pub_upgrade:
description: Run `pub upgrade` for all packages
run: melos exec --file-exists="pubspec.yaml" --concurrency 1 --fail-fast flutter pub upgrade
pub_outdated:
description: Run `pub outdated` for all packages
run: melos exec --file-exists="pubspec.yaml" --concurrency 1 --fail-fast flutter pub outdated
package_score:
description: Run pana for all packages
run: melos exec --fail-fast --concurrency 1 --no-private pana --exit-code-threshold 0 --no-dartdoc .
test_with_coverage:
description: Run tests of all packages with coverage and merge its results
run: |
melos exec rm -rf coverage
melos exec --dir-exists="test" --fail-fast flutter pub get
melos exec --dir-exists="test" --fail-fast flutter test --no-pub -r expanded --coverage
melos exec -c 1 --file-exists=coverage/lcov.info coverde filter --input ./coverage/lcov.info --output MELOS_ROOT_PATH/coverage/filtered.lcov.info --filters \.g\.dart
coverde value -i coverage/filtered.lcov.info > MELOS_ROOT_PATH/coverage/result.txt
2 changes: 1 addition & 1 deletion vector_map_tiles_mbtiles/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ dev_dependencies:
flutter_test:
sdk: flutter
test: ^1.24.9
mockito: ^5.4.4
mocktail: ^1.0.5
build_runner: ^2.4.8
latlong2: ^0.9.0
flutter_map: ^8.0.0
Expand Down
Loading
Loading