Skip to content

Commit d680bd1

Browse files
authored
chore: update project files (#258)
- regenerate most platform specific project files for the package and example project - use kotlin gradle DSL for package - fix #257
1 parent 7cfe380 commit d680bd1

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+506
-296
lines changed

.metadata

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

66
version:
7-
revision: "5dcb86f68f239346676ceb1ed1ea385bd215fba1"
7+
revision: "c23637390482d4cf9598c3ce3f2be31aa7332daf"
88
channel: "stable"
99

1010
project_type: plugin
@@ -13,26 +13,26 @@ project_type: plugin
1313
migration:
1414
platforms:
1515
- platform: root
16-
create_revision: 5dcb86f68f239346676ceb1ed1ea385bd215fba1
17-
base_revision: 5dcb86f68f239346676ceb1ed1ea385bd215fba1
16+
create_revision: c23637390482d4cf9598c3ce3f2be31aa7332daf
17+
base_revision: c23637390482d4cf9598c3ce3f2be31aa7332daf
1818
- platform: android
19-
create_revision: 5dcb86f68f239346676ceb1ed1ea385bd215fba1
20-
base_revision: 5dcb86f68f239346676ceb1ed1ea385bd215fba1
19+
create_revision: c23637390482d4cf9598c3ce3f2be31aa7332daf
20+
base_revision: c23637390482d4cf9598c3ce3f2be31aa7332daf
2121
- platform: ios
22-
create_revision: 5dcb86f68f239346676ceb1ed1ea385bd215fba1
23-
base_revision: 5dcb86f68f239346676ceb1ed1ea385bd215fba1
22+
create_revision: c23637390482d4cf9598c3ce3f2be31aa7332daf
23+
base_revision: c23637390482d4cf9598c3ce3f2be31aa7332daf
2424
- platform: linux
25-
create_revision: 5dcb86f68f239346676ceb1ed1ea385bd215fba1
26-
base_revision: 5dcb86f68f239346676ceb1ed1ea385bd215fba1
25+
create_revision: c23637390482d4cf9598c3ce3f2be31aa7332daf
26+
base_revision: c23637390482d4cf9598c3ce3f2be31aa7332daf
2727
- platform: macos
28-
create_revision: 5dcb86f68f239346676ceb1ed1ea385bd215fba1
29-
base_revision: 5dcb86f68f239346676ceb1ed1ea385bd215fba1
28+
create_revision: c23637390482d4cf9598c3ce3f2be31aa7332daf
29+
base_revision: c23637390482d4cf9598c3ce3f2be31aa7332daf
3030
- platform: web
31-
create_revision: 5dcb86f68f239346676ceb1ed1ea385bd215fba1
32-
base_revision: 5dcb86f68f239346676ceb1ed1ea385bd215fba1
31+
create_revision: c23637390482d4cf9598c3ce3f2be31aa7332daf
32+
base_revision: c23637390482d4cf9598c3ce3f2be31aa7332daf
3333
- platform: windows
34-
create_revision: 5dcb86f68f239346676ceb1ed1ea385bd215fba1
35-
base_revision: 5dcb86f68f239346676ceb1ed1ea385bd215fba1
34+
create_revision: c23637390482d4cf9598c3ce3f2be31aa7332daf
35+
base_revision: c23637390482d4cf9598c3ce3f2be31aa7332daf
3636

3737
# User provided section
3838

android/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ android {
4545
namespace = "com.github.josxha.maplibre"
4646
}
4747

48-
compileSdk = 34
48+
compileSdk = 35
4949

5050
compileOptions {
5151
sourceCompatibility = JavaVersion.VERSION_11
@@ -74,7 +74,7 @@ android {
7474
// JNIGEN implementation 'org.maplibre.gl:android-sdk-turf:6.0.1'
7575
// JNIGEN implementation 'com.jakewharton.timber:timber:5.0.1'
7676
// JNIGEN implementation 'androidx.annotation:annotation:1.9.0'
77-
implementation 'org.maplibre.gl:android-sdk:11.8.+' // JNIGEN
77+
implementation 'org.maplibre.gl:android-sdk:11.8.+' // JNIGEN
7878
// implementation 'org.maplibre.gl:android-plugin-offline-v9:3.0.2'
7979
// JNIGEN implementation 'com.squareup.okhttp3:okhttp:4.12.0'
8080
testImplementation("org.jetbrains.kotlin:kotlin-test")

android/gradlew

100644100755
File mode changed.

example/.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,11 @@
55
*.swp
66
.DS_Store
77
.atom/
8+
.build/
89
.buildlog/
910
.history
1011
.svn/
12+
.swiftpm/
1113
migrate_working_dir/
1214

1315
# IntelliJ related

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-
app/.cxx/
8+
.cxx/
99

1010
# Remember to never publicly share your keystore.
11-
# See https://flutter.dev/docs/deployment/android#reference-the-keystore-from-the-app
11+
# See https://flutter.dev/to/reference-keystore
1212
key.properties
1313
**/*.keystore
1414
**/*.jks

example/android/app/build.gradle

Lines changed: 0 additions & 59 deletions
This file was deleted.
Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
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.github.josxha.maplibre_example"
10+
compileSdk = flutter.compileSdkVersion
11+
ndkVersion = "26.3.11579264" // 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.maplibre_example"
24+
// minSdk 21 required by maplibre
25+
minSdk = 21 // flutter.minSdkVersion
26+
targetSdk = flutter.targetSdkVersion
27+
versionCode = flutter.versionCode
28+
versionName = flutter.versionName
29+
}
30+
31+
buildTypes {
32+
release {
33+
// TODO: Add your own signing config for the release build.
34+
// Signing with the debug keys for now, so `flutter run --release` works.
35+
signingConfig = signingConfigs.getByName("debug")
36+
}
37+
}
38+
39+
dependencies {
40+
// JNIGEN implementation(project(":MapLibreAndroid"))
41+
}
42+
}
43+
44+
flutter {
45+
source = "../.."
46+
}

example/android/app/src/main/kotlin/com/example/maplibre_example/MainActivity.kt renamed to example/android/app/src/main/kotlin/com/github/josxha/maplibre_example/MainActivity.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
@file:Suppress("ktlint:standard:package-name")
22

3-
package com.example.maplibre_example
3+
package com.github.josxha.maplibre_example
44

55
import io.flutter.embedding.android.FlutterActivity
66

example/android/build.gradle

Lines changed: 0 additions & 37 deletions
This file was deleted.

example/android/build.gradle.kts

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
import org.jlleitschuh.gradle.ktlint.KtlintExtension
2+
3+
allprojects {
4+
repositories {
5+
google()
6+
mavenCentral()
7+
maven("https://plugins.gradle.org/m2/")
8+
}
9+
}
10+
11+
val newBuildDir: Directory =
12+
rootProject.layout.buildDirectory
13+
.dir("../../build")
14+
.get()
15+
rootProject.layout.buildDirectory.value(newBuildDir)
16+
17+
subprojects {
18+
val newSubprojectBuildDir: Directory = newBuildDir.dir(project.name)
19+
project.layout.buildDirectory.value(newSubprojectBuildDir)
20+
}
21+
subprojects {
22+
project.evaluationDependsOn(":app")
23+
}
24+
25+
tasks.register<Delete>("clean") {
26+
delete(rootProject.layout.buildDirectory)
27+
}
28+
29+
plugins.apply("org.jlleitschuh.gradle.ktlint")
30+
31+
configure<KtlintExtension> {
32+
android.set(true)
33+
ignoreFailures.set(false)
34+
35+
reporters {
36+
reporter(org.jlleitschuh.gradle.ktlint.reporter.ReporterType.PLAIN)
37+
reporter(org.jlleitschuh.gradle.ktlint.reporter.ReporterType.CHECKSTYLE)
38+
}
39+
40+
filter {
41+
exclude("**/*.g.kt")
42+
}
43+
}

0 commit comments

Comments
 (0)