diff --git a/example/android/settings.gradle.kts b/example/android/settings.gradle.kts index 0847c946..4674842c 100644 --- a/example/android/settings.gradle.kts +++ b/example/android/settings.gradle.kts @@ -22,7 +22,7 @@ plugins { id("dev.flutter.flutter-plugin-loader") version "1.0.0" id("com.android.application") version "8.12.0" apply false id("org.jetbrains.kotlin.android") version "2.1.21" apply false - id("org.jlleitschuh.gradle.ktlint") version "13.1.+" apply false + id("org.jlleitschuh.gradle.ktlint") version "14.0.+" apply false } include(":app") diff --git a/maplibre/CHANGELOG.md b/maplibre/CHANGELOG.md index 244fd75f..0f396614 100644 --- a/maplibre/CHANGELOG.md +++ b/maplibre/CHANGELOG.md @@ -5,6 +5,7 @@ in release builds on Android. ### New Features +- Upgrade MapLibre Native on Android to [12.2](https://github.com/maplibre/maplibre-native/blob/main/platform/android/CHANGELOG.md#1220). - Optimize package size on `pub.dev` by restructuring the repository. - Upgrade `jni` / `jnigen` to ^0.15.1. diff --git a/maplibre/android/build.gradle b/maplibre/android/build.gradle index e55e5074..f76236ff 100644 --- a/maplibre/android/build.gradle +++ b/maplibre/android/build.gradle @@ -12,10 +12,10 @@ buildscript { } dependencies { - classpath("com.android.tools.build:gradle:8.12.3") + classpath("com.android.tools.build:gradle:8.13.1") classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version") // noinspection GradleDynamicVersion - classpath("org.jlleitschuh.gradle:ktlint-gradle:13.1.+") + classpath("org.jlleitschuh.gradle:ktlint-gradle:14.0.+") } } @@ -67,7 +67,7 @@ android { dependencies { // jnigen picks up api dependencies - api 'org.maplibre.gl:android-sdk:12.0.+' + api 'org.maplibre.gl:android-sdk:12.2.+' testImplementation "org.jetbrains.kotlin:kotlin-test" testImplementation "org.mockito:mockito-core:5.20.+" } @@ -95,7 +95,7 @@ ktlint { } dependencies { // noinspection GradleDynamicVersion - ktlintRuleset("io.nlopez.compose.rules:ktlint:0.4.27") + ktlintRuleset("io.nlopez.compose.rules:ktlint:0.5.0") } filter { exclude("**/*.g.kt") diff --git a/maplibre/lib/src/platform/android/jni.g.dart b/maplibre/lib/src/platform/android/jni.g.dart index cf625738..2c5190f1 100644 --- a/maplibre/lib/src/platform/android/jni.g.dart +++ b/maplibre/lib/src/platform/android/jni.g.dart @@ -64704,6 +64704,41 @@ class MapLibreMap extends jni$_.JObject { ).check(); } + static final _id_setFrustumOffset = _class.instanceMethodId( + r'setFrustumOffset', + r'(Landroid/graphics/RectF;)V', + ); + + static final _setFrustumOffset = + jni$_.ProtectedJniExtensions.lookup< + jni$_.NativeFunction< + jni$_.JThrowablePtr Function( + jni$_.Pointer, + jni$_.JMethodIDPtr, + jni$_.VarArgs<(jni$_.Pointer,)>, + ) + > + >('globalEnv_CallVoidMethod') + .asFunction< + jni$_.JThrowablePtr Function( + jni$_.Pointer, + jni$_.JMethodIDPtr, + jni$_.Pointer, + ) + >(); + + /// from: `public void setFrustumOffset(android.graphics.RectF rectF)` + void setFrustumOffset( + RectF rectF, + ) { + final _$rectF = rectF.reference; + _setFrustumOffset( + reference.pointer, + _id_setFrustumOffset as jni$_.JMethodIDPtr, + _$rectF.pointer, + ).check(); + } + static final _id_setSwapBehaviorFlush = _class.instanceMethodId( r'setSwapBehaviorFlush', r'(Z)V',