Skip to content

Commit 4b3b14b

Browse files
committed
chore(deps): update Kotlin and Android Gradle plugin versions to 2.1.0 and 8.12.0 respectively. Bump compileSdkVersion and buildToolsVersion to 36
1 parent 8cb9b90 commit 4b3b14b

File tree

4 files changed

+21
-14
lines changed

4 files changed

+21
-14
lines changed

maplibre_gl/android/build.gradle

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@ group 'org.maplibre.maplibregl'
22
version '1.0-SNAPSHOT'
33

44
buildscript {
5-
ext.kotlin_version = '1.9.0'
5+
ext.kotlin_version = '2.1.0'
66
repositories {
77
google()
88
mavenCentral()
99
}
1010

1111
dependencies {
12-
classpath 'com.android.tools.build:gradle:8.8.2'
12+
classpath 'com.android.tools.build:gradle:8.12.0'
1313
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1414
}
1515
}
@@ -28,24 +28,26 @@ android {
2828
if (project.android.hasProperty("namespace")) {
2929
namespace 'org.maplibre.maplibregl'
3030
}
31+
compileSdkVersion 36
32+
buildToolsVersion "36.0.0"
3133

3234
ndkVersion "28.1.13356709"
3335

3436
defaultConfig {
3537
minSdkVersion 21
36-
compileSdk 35
38+
compileSdk 36
3739
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
3840
multiDexEnabled true
3941
}
4042
lintOptions {
4143
disable 'InvalidPackage'
4244
}
4345
compileOptions {
44-
sourceCompatibility JavaVersion.VERSION_1_8
45-
targetCompatibility JavaVersion.VERSION_1_8
46+
sourceCompatibility JavaVersion.VERSION_21
47+
targetCompatibility JavaVersion.VERSION_21
4648
}
4749
kotlinOptions {
48-
jvmTarget = JavaVersion.VERSION_1_8
50+
jvmTarget = JavaVersion.VERSION_21.toString()
4951
}
5052
dependencies {
5153
implementation 'org.maplibre.gl:android-sdk:11.9.0'

maplibre_gl/lib/src/maplibre_map.dart

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -317,11 +317,14 @@ class _MapLibreMapState extends State<MapLibreMap> {
317317
}
318318

319319
@override
320-
Future<void> didUpdateWidget(MapLibreMap oldWidget) async {
320+
void didUpdateWidget(MapLibreMap oldWidget) {
321321
super.didUpdateWidget(oldWidget);
322322
final newOptions = _MapLibreMapOptions.fromWidget(widget);
323323
final updates = _maplibreMapOptions.updatesMap(newOptions);
324-
await _updateOptions(updates);
324+
325+
if (updates.isNotEmpty) {
326+
unawaited(_updateOptions(updates));
327+
}
325328
_maplibreMapOptions = newOptions;
326329
}
327330

maplibre_gl_example/android/app/build.gradle

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,16 +24,18 @@ if (flutterVersionName == null) {
2424

2525
android {
2626
namespace "org.maplibre.example"
27-
compileSdkVersion 35
27+
compileSdkVersion 36
28+
buildToolsVersion "36.0.0"
29+
2830
ndkVersion "28.1.13356709"
2931

3032
compileOptions {
31-
sourceCompatibility JavaVersion.VERSION_17
32-
targetCompatibility JavaVersion.VERSION_17
33+
sourceCompatibility JavaVersion.VERSION_21
34+
targetCompatibility JavaVersion.VERSION_21
3335
}
3436

3537
kotlinOptions {
36-
jvmTarget = JavaVersion.VERSION_17
38+
jvmTarget = JavaVersion.VERSION_21.toString()
3739
}
3840

3941
sourceSets {

maplibre_gl_example/android/settings.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ pluginManagement {
1818

1919
plugins {
2020
id "dev.flutter.flutter-plugin-loader" version "1.0.0"
21-
id "com.android.application" version "8.9.0" apply false
22-
id "org.jetbrains.kotlin.android" version "2.0.20" apply false
21+
id "com.android.application" version "8.12.0" apply false
22+
id "org.jetbrains.kotlin.android" version "2.1.0" apply false
2323
}
2424

2525
include ":app"

0 commit comments

Comments
 (0)