Skip to content

Commit 3d346e5

Browse files
authored
chore: update android example files, fix ci (#83)
- dart format - completely disable vector_map_tiles plugins - update ci
1 parent 7fcb3cd commit 3d346e5

40 files changed

+410
-265
lines changed

.github/workflows/on-commit-main.yml

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -40,30 +40,37 @@ jobs:
4040
run: |
4141
rm -rf coverage
4242
cd flutter_map_cache
43+
flutter pub get
4344
flutter test --no-pub -r expanded --coverage
4445
coverde filter --input ./coverage/lcov.info --output ../coverage/filtered.lcov.info --filters \.g\.dart
4546
cd ..
4647
cd flutter_map_compass
48+
flutter pub get
4749
flutter test --no-pub -r expanded --coverage
4850
coverde filter --input ./coverage/lcov.info --output ../coverage/filtered.lcov.info --filters \.g\.dart
4951
cd ..
5052
# cd flutter_map_maplibre
53+
# flutter pub get
5154
# flutter test --no-pub -r expanded --coverage
5255
# coverde filter --input ./coverage/lcov.info --output ../coverage/filtered.lcov.info --filters \.g\.dart
5356
# cd ..
5457
cd flutter_map_mbtiles
58+
flutter pub get
5559
flutter test --no-pub -r expanded --coverage
5660
coverde filter --input ./coverage/lcov.info --output ../coverage/filtered.lcov.info --filters \.g\.dart
5761
cd ..
5862
cd flutter_map_pmtiles
63+
flutter pub get
5964
flutter test --no-pub -r expanded --coverage
6065
coverde filter --input ./coverage/lcov.info --output ../coverage/filtered.lcov.info --filters \.g\.dart
6166
cd ..
6267
# cd vector_map_tiles_mbtiles
68+
# flutter pub get
6369
# flutter test --no-pub -r expanded --coverage
6470
# coverde filter --input ./coverage/lcov.info --output ../coverage/filtered.lcov.info --filters \.g\.dart
6571
# cd ..
6672
# cd vector_map_tiles_pmtiles
73+
# flutter pub get
6774
# flutter test --no-pub -r expanded --coverage
6875
# coverde filter --input ./coverage/lcov.info --output ../coverage/filtered.lcov.info --filters \.g\.dart
6976
# cd ..
@@ -128,15 +135,10 @@ jobs:
128135
- name: Build APK
129136
working-directory: example
130137
run: flutter build apk
131-
- name: Upload artifact
132-
uses: actions/upload-artifact@v4
133-
with:
134-
name: apk
135-
path: example/build/app/outputs/flutter-apk/app-release.apk
136138
- name: Upload apk as artifact
137139
uses: actions/upload-artifact@v4
138140
with:
139-
name: flutter_map_plugins_example.apk
141+
name: flutter_map_plugins_example_apk
140142
path: example/build/app/outputs/flutter-apk/app-release.apk
141143
# build-ios:
142144
# runs-on: macos-latest
@@ -181,7 +183,7 @@ jobs:
181183
- name: Upload web as artifact
182184
uses: actions/upload-artifact@v4
183185
with:
184-
name: flutter_map_plugins_example.web
186+
name: flutter_map_plugins_example_web
185187
path: example/build/web
186188
- uses: FirebaseExtended/action-hosting-deploy@v0
187189
if: github.repository_owner == 'josxha'

.github/workflows/on-pull-request.yml

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -40,34 +40,41 @@ jobs:
4040
run: |
4141
rm -rf coverage
4242
cd flutter_map_cache
43+
flutter pub get
4344
flutter test --no-pub -r expanded --coverage
4445
coverde filter --input ./coverage/lcov.info --output ../coverage/filtered.lcov.info --filters \.g\.dart
4546
cd ..
4647
cd flutter_map_compass
48+
flutter pub get
4749
flutter test --no-pub -r expanded --coverage
4850
coverde filter --input ./coverage/lcov.info --output ../coverage/filtered.lcov.info --filters \.g\.dart
4951
cd ..
5052
# cd flutter_map_maplibre
53+
# flutter pub get
5154
# flutter test --no-pub -r expanded --coverage
5255
# coverde filter --input ./coverage/lcov.info --output ../coverage/filtered.lcov.info --filters \.g\.dart
5356
# cd ..
5457
cd flutter_map_mbtiles
58+
flutter pub get
5559
flutter test --no-pub -r expanded --coverage
5660
coverde filter --input ./coverage/lcov.info --output ../coverage/filtered.lcov.info --filters \.g\.dart
5761
cd ..
5862
cd flutter_map_pmtiles
63+
flutter pub get
5964
flutter test --no-pub -r expanded --coverage
6065
coverde filter --input ./coverage/lcov.info --output ../coverage/filtered.lcov.info --filters \.g\.dart
6166
cd ..
6267
# cd vector_map_tiles_mbtiles
68+
# flutter pub get
6369
# flutter test --no-pub -r expanded --coverage
6470
# coverde filter --input ./coverage/lcov.info --output ../coverage/filtered.lcov.info --filters \.g\.dart
6571
# cd ..
6672
# cd vector_map_tiles_pmtiles
73+
# flutter pub get
6774
# flutter test --no-pub -r expanded --coverage
6875
# coverde filter --input ./coverage/lcov.info --output ../coverage/filtered.lcov.info --filters \.g\.dart
6976
# cd ..
70-
coverde value -i coverage/filtered.lcov.info > coverage/result.txt
77+
coverde value -i coverage/filtered.lcov.info > coverage/result.txt
7178
- name: Run Codecov
7279
uses: codecov/codecov-action@v5
7380
env:
@@ -89,24 +96,31 @@ jobs:
8996
- name: Check package score for all
9097
run: |
9198
cd flutter_map_cache
99+
flutter pub get
92100
pana --exit-code-threshold 0 --no-dartdoc .
93101
cd ..
94102
cd flutter_map_compass
103+
flutter pub get
95104
pana --exit-code-threshold 0 --no-dartdoc .
96105
cd ..
97106
cd flutter_map_maplibre
107+
flutter pub get
98108
pana --exit-code-threshold 0 --no-dartdoc .
99109
cd ..
100110
cd flutter_map_mbtiles
111+
flutter pub get
101112
pana --exit-code-threshold 0 --no-dartdoc .
102113
cd ..
103114
cd flutter_map_pmtiles
115+
flutter pub get
104116
pana --exit-code-threshold 0 --no-dartdoc .
105117
cd ..
106118
# cd vector_map_tiles_mbtiles
119+
# flutter pub get
107120
# pana --exit-code-threshold 0 --no-dartdoc .
108121
# cd ..
109122
# cd vector_map_tiles_pmtiles
123+
# flutter pub get
110124
# pana --exit-code-threshold 0 --no-dartdoc .
111125
# cd ..
112126
build-android:
@@ -127,15 +141,10 @@ jobs:
127141
- name: Build APK
128142
working-directory: example
129143
run: flutter build apk
130-
- name: Upload artifact
131-
uses: actions/upload-artifact@v4
132-
with:
133-
name: apk
134-
path: example/build/app/outputs/flutter-apk/app-release.apk
135144
- name: Upload apk as artifact
136145
uses: actions/upload-artifact@v4
137146
with:
138-
name: flutter_map_plugins_example.apk
147+
name: flutter_map_plugins_example_apk
139148
path: example/build/app/outputs/flutter-apk/app-release.apk
140149
# build-ios:
141150
# runs-on: macos-latest
@@ -178,5 +187,5 @@ jobs:
178187
- name: Upload web as artifact
179188
uses: actions/upload-artifact@v4
180189
with:
181-
name: flutter_map_plugins_example.web
190+
name: flutter_map_plugins_example_web
182191
path: example/build/web

example/.metadata

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,35 +4,35 @@
44
# This file should be version controlled and should not be manually edited.
55

66
version:
7-
revision: "5dcb86f68f239346676ceb1ed1ea385bd215fba1"
8-
channel: "stable"
7+
revision: "80233283c31e8024af71055b6ce7fc1719833679"
8+
channel: "main"
99

1010
project_type: app
1111

1212
# Tracks metadata for the flutter migrate command
1313
migration:
1414
platforms:
1515
- platform: root
16-
create_revision: 5dcb86f68f239346676ceb1ed1ea385bd215fba1
17-
base_revision: 5dcb86f68f239346676ceb1ed1ea385bd215fba1
16+
create_revision: 80233283c31e8024af71055b6ce7fc1719833679
17+
base_revision: 80233283c31e8024af71055b6ce7fc1719833679
1818
- platform: android
19-
create_revision: 5dcb86f68f239346676ceb1ed1ea385bd215fba1
20-
base_revision: 5dcb86f68f239346676ceb1ed1ea385bd215fba1
19+
create_revision: 80233283c31e8024af71055b6ce7fc1719833679
20+
base_revision: 80233283c31e8024af71055b6ce7fc1719833679
2121
- platform: ios
22-
create_revision: 5dcb86f68f239346676ceb1ed1ea385bd215fba1
23-
base_revision: 5dcb86f68f239346676ceb1ed1ea385bd215fba1
22+
create_revision: 80233283c31e8024af71055b6ce7fc1719833679
23+
base_revision: 80233283c31e8024af71055b6ce7fc1719833679
2424
- platform: linux
25-
create_revision: 5dcb86f68f239346676ceb1ed1ea385bd215fba1
26-
base_revision: 5dcb86f68f239346676ceb1ed1ea385bd215fba1
25+
create_revision: 80233283c31e8024af71055b6ce7fc1719833679
26+
base_revision: 80233283c31e8024af71055b6ce7fc1719833679
2727
- platform: macos
28-
create_revision: 5dcb86f68f239346676ceb1ed1ea385bd215fba1
29-
base_revision: 5dcb86f68f239346676ceb1ed1ea385bd215fba1
28+
create_revision: 80233283c31e8024af71055b6ce7fc1719833679
29+
base_revision: 80233283c31e8024af71055b6ce7fc1719833679
3030
- platform: web
31-
create_revision: 5dcb86f68f239346676ceb1ed1ea385bd215fba1
32-
base_revision: 5dcb86f68f239346676ceb1ed1ea385bd215fba1
31+
create_revision: 80233283c31e8024af71055b6ce7fc1719833679
32+
base_revision: 80233283c31e8024af71055b6ce7fc1719833679
3333
- platform: windows
34-
create_revision: 5dcb86f68f239346676ceb1ed1ea385bd215fba1
35-
base_revision: 5dcb86f68f239346676ceb1ed1ea385bd215fba1
34+
create_revision: 80233283c31e8024af71055b6ce7fc1719833679
35+
base_revision: 80233283c31e8024af71055b6ce7fc1719833679
3636

3737
# User provided section
3838

example/android/.gitignore

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ gradle-wrapper.jar
55
/gradlew.bat
66
/local.properties
77
GeneratedPluginRegistrant.java
8+
.cxx/
89

910
# Remember to never publicly share your keystore.
10-
# See https://flutter.dev/docs/deployment/android#reference-the-keystore-from-the-app
11+
# See https://flutter.dev/to/reference-keystore
1112
key.properties
1213
**/*.keystore
1314
**/*.jks
14-
app/.cxx/

example/android/app/build.gradle

Lines changed: 0 additions & 67 deletions
This file was deleted.
Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
plugins {
2+
id("com.android.application")
3+
id("kotlin-android")
4+
// The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins.
5+
id("dev.flutter.flutter-gradle-plugin")
6+
}
7+
8+
android {
9+
namespace = "com.example.flutter_map_plugins_example"
10+
compileSdk = flutter.compileSdkVersion
11+
ndkVersion = "27.0.12077973" // flutter.ndkVersion
12+
13+
compileOptions {
14+
sourceCompatibility = JavaVersion.VERSION_11
15+
targetCompatibility = JavaVersion.VERSION_11
16+
}
17+
18+
kotlinOptions {
19+
jvmTarget = JavaVersion.VERSION_11.toString()
20+
}
21+
22+
defaultConfig {
23+
applicationId = "com.github.josxha.flutter_map_plugins"
24+
// You can update the following values to match your application needs.
25+
// For more information, see: https://flutter.dev/to/review-gradle-config.
26+
minSdk = flutter.minSdkVersion
27+
targetSdk = flutter.targetSdkVersion
28+
versionCode = flutter.versionCode
29+
versionName = flutter.versionName
30+
}
31+
32+
buildTypes {
33+
release {
34+
// TODO: Add your own signing config for the release build.
35+
// Signing with the debug keys for now, so `flutter run --release` works.
36+
signingConfig = signingConfigs.getByName("debug")
37+
}
38+
}
39+
}
40+
41+
flutter {
42+
source = "../.."
43+
}

example/android/app/src/main/AndroidManifest.xml

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
22
<application
3-
android:label="example"
3+
android:label="flutter_map_plugins_example"
44
android:name="${applicationName}"
55
android:icon="@mipmap/ic_launcher">
66
<activity
77
android:name=".MainActivity"
88
android:exported="true"
99
android:launchMode="singleTop"
10+
android:taskAffinity=""
1011
android:theme="@style/LaunchTheme"
1112
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
1213
android:hardwareAccelerated="true"
@@ -30,4 +31,15 @@
3031
android:name="flutterEmbedding"
3132
android:value="2" />
3233
</application>
34+
<!-- Required to query activities that can process text, see:
35+
https://developer.android.com/training/package-visibility and
36+
https://developer.android.com/reference/android/content/Intent#ACTION_PROCESS_TEXT.
37+
38+
In particular, this is used by the Flutter engine in io.flutter.plugin.text.ProcessTextPlugin. -->
39+
<queries>
40+
<intent>
41+
<action android:name="android.intent.action.PROCESS_TEXT"/>
42+
<data android:mimeType="text/plain"/>
43+
</intent>
44+
</queries>
3345
</manifest>

example/android/app/src/main/kotlin/com/example/example/MainActivity.kt

Lines changed: 0 additions & 6 deletions
This file was deleted.
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
package com.example.flutter_map_plugins_example
2+
3+
import io.flutter.embedding.android.FlutterActivity
4+
5+
class MainActivity : FlutterActivity()

0 commit comments

Comments
 (0)