Skip to content
Merged
Show file tree
Hide file tree
Changes from 7 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
7 changes: 7 additions & 0 deletions .github/workflows/on-commit-main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,30 +40,37 @@ jobs:
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
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
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_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 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
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 ..
Expand Down
16 changes: 15 additions & 1 deletion .github/workflows/on-pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,34 +40,41 @@ jobs:
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
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
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_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 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
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
coverde value -i coverage/filtered.lcov.info > coverage/result.txt
- name: Run Codecov
uses: codecov/codecov-action@v5
env:
Expand All @@ -89,24 +96,31 @@ jobs:
- name: Check package score for all
run: |
cd flutter_map_cache
flutter pub get
pana --exit-code-threshold 0 --no-dartdoc .
cd ..
cd flutter_map_compass
flutter pub get
pana --exit-code-threshold 0 --no-dartdoc .
cd ..
cd flutter_map_maplibre
flutter pub get
pana --exit-code-threshold 0 --no-dartdoc .
cd ..
cd flutter_map_mbtiles
flutter pub get
pana --exit-code-threshold 0 --no-dartdoc .
cd ..
cd flutter_map_pmtiles
flutter pub get
pana --exit-code-threshold 0 --no-dartdoc .
cd ..
# cd vector_map_tiles_mbtiles
# flutter pub get
# pana --exit-code-threshold 0 --no-dartdoc .
# cd ..
# cd vector_map_tiles_pmtiles
# flutter pub get
# pana --exit-code-threshold 0 --no-dartdoc .
# cd ..
build-android:
Expand Down
32 changes: 16 additions & 16 deletions example/.metadata
Original file line number Diff line number Diff line change
Expand Up @@ -4,35 +4,35 @@
# This file should be version controlled and should not be manually edited.

version:
revision: "5dcb86f68f239346676ceb1ed1ea385bd215fba1"
channel: "stable"
revision: "80233283c31e8024af71055b6ce7fc1719833679"
channel: "main"

project_type: app

# Tracks metadata for the flutter migrate command
migration:
platforms:
- platform: root
create_revision: 5dcb86f68f239346676ceb1ed1ea385bd215fba1
base_revision: 5dcb86f68f239346676ceb1ed1ea385bd215fba1
create_revision: 80233283c31e8024af71055b6ce7fc1719833679
base_revision: 80233283c31e8024af71055b6ce7fc1719833679
- platform: android
create_revision: 5dcb86f68f239346676ceb1ed1ea385bd215fba1
base_revision: 5dcb86f68f239346676ceb1ed1ea385bd215fba1
create_revision: 80233283c31e8024af71055b6ce7fc1719833679
base_revision: 80233283c31e8024af71055b6ce7fc1719833679
- platform: ios
create_revision: 5dcb86f68f239346676ceb1ed1ea385bd215fba1
base_revision: 5dcb86f68f239346676ceb1ed1ea385bd215fba1
create_revision: 80233283c31e8024af71055b6ce7fc1719833679
base_revision: 80233283c31e8024af71055b6ce7fc1719833679
- platform: linux
create_revision: 5dcb86f68f239346676ceb1ed1ea385bd215fba1
base_revision: 5dcb86f68f239346676ceb1ed1ea385bd215fba1
create_revision: 80233283c31e8024af71055b6ce7fc1719833679
base_revision: 80233283c31e8024af71055b6ce7fc1719833679
- platform: macos
create_revision: 5dcb86f68f239346676ceb1ed1ea385bd215fba1
base_revision: 5dcb86f68f239346676ceb1ed1ea385bd215fba1
create_revision: 80233283c31e8024af71055b6ce7fc1719833679
base_revision: 80233283c31e8024af71055b6ce7fc1719833679
- platform: web
create_revision: 5dcb86f68f239346676ceb1ed1ea385bd215fba1
base_revision: 5dcb86f68f239346676ceb1ed1ea385bd215fba1
create_revision: 80233283c31e8024af71055b6ce7fc1719833679
base_revision: 80233283c31e8024af71055b6ce7fc1719833679
- platform: windows
create_revision: 5dcb86f68f239346676ceb1ed1ea385bd215fba1
base_revision: 5dcb86f68f239346676ceb1ed1ea385bd215fba1
create_revision: 80233283c31e8024af71055b6ce7fc1719833679
base_revision: 80233283c31e8024af71055b6ce7fc1719833679

# User provided section

Expand Down
4 changes: 2 additions & 2 deletions example/android/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ gradle-wrapper.jar
/gradlew.bat
/local.properties
GeneratedPluginRegistrant.java
.cxx/

# Remember to never publicly share your keystore.
# See https://flutter.dev/docs/deployment/android#reference-the-keystore-from-the-app
# See https://flutter.dev/to/reference-keystore
key.properties
**/*.keystore
**/*.jks
app/.cxx/
67 changes: 0 additions & 67 deletions example/android/app/build.gradle

This file was deleted.

43 changes: 43 additions & 0 deletions example/android/app/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
plugins {
id("com.android.application")
id("kotlin-android")
// The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins.
id("dev.flutter.flutter-gradle-plugin")
}

android {
namespace = "com.example.flutter_map_plugins_example"
compileSdk = flutter.compileSdkVersion
ndkVersion = "27.0.12077973" // flutter.ndkVersion

compileOptions {
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
}

kotlinOptions {
jvmTarget = JavaVersion.VERSION_11.toString()
}

defaultConfig {
applicationId = "com.github.josxha.flutter_map_plugins"
// You can update the following values to match your application needs.
// For more information, see: https://flutter.dev/to/review-gradle-config.
minSdk = flutter.minSdkVersion
targetSdk = flutter.targetSdkVersion
versionCode = flutter.versionCode
versionName = flutter.versionName
}

buildTypes {
release {
// TODO: Add your own signing config for the release build.
// Signing with the debug keys for now, so `flutter run --release` works.
signingConfig = signingConfigs.getByName("debug")
}
}
}

flutter {
source = "../.."
}
14 changes: 13 additions & 1 deletion example/android/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application
android:label="example"
android:label="flutter_map_plugins_example"
android:name="${applicationName}"
android:icon="@mipmap/ic_launcher">
<activity
android:name=".MainActivity"
android:exported="true"
android:launchMode="singleTop"
android:taskAffinity=""
android:theme="@style/LaunchTheme"
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
android:hardwareAccelerated="true"
Expand All @@ -30,4 +31,15 @@
android:name="flutterEmbedding"
android:value="2" />
</application>
<!-- Required to query activities that can process text, see:
https://developer.android.com/training/package-visibility and
https://developer.android.com/reference/android/content/Intent#ACTION_PROCESS_TEXT.

In particular, this is used by the Flutter engine in io.flutter.plugin.text.ProcessTextPlugin. -->
<queries>
<intent>
<action android:name="android.intent.action.PROCESS_TEXT"/>
<data android:mimeType="text/plain"/>
</intent>
</queries>
</manifest>

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
package com.example.flutter_map_plugins_example

import io.flutter.embedding.android.FlutterActivity

class MainActivity : FlutterActivity()
30 changes: 0 additions & 30 deletions example/android/build.gradle

This file was deleted.

21 changes: 21 additions & 0 deletions example/android/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
allprojects {
repositories {
google()
mavenCentral()
}
}

val newBuildDir: Directory = rootProject.layout.buildDirectory.dir("../../build").get()
rootProject.layout.buildDirectory.value(newBuildDir)

subprojects {
val newSubprojectBuildDir: Directory = newBuildDir.dir(project.name)
project.layout.buildDirectory.value(newSubprojectBuildDir)
}
subprojects {
project.evaluationDependsOn(":app")
}

tasks.register<Delete>("clean") {
delete(rootProject.layout.buildDirectory)
}
5 changes: 1 addition & 4 deletions example/android/gradle.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
org.gradle.jvmargs=-Xmx4G
org.gradle.jvmargs=-Xmx8G -XX:MaxMetaspaceSize=4G -XX:ReservedCodeCacheSize=512m -XX:+HeapDumpOnOutOfMemoryError
android.useAndroidX=true
android.enableJetifier=true
android.defaults.buildfeatures.buildconfig=true
android.nonTransitiveRClass=false
android.nonFinalResIds=false
Loading