Update MapLibre Android, update Kotlin, update AGP (#65)

maplibre · Sep 6, 2024 · 6d85aac · 6d85aac
1 parent 792e693
commit 6d85aac
Show file tree

Hide file tree

Showing 34 changed files with 71 additions and 113 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -29,12 +29,11 @@ jobs:
           submodules: recursive
           fetch-depth: 0
 
-      - name: Set up JDK 11
-        uses: actions/setup-java@v3
+      - uses: actions/setup-java@v4
         with:
-          java-version: '11'
-          distribution: 'temurin'
-
+          distribution: "temurin"
+          java-version: "17"
+  
       - name: Download Dependencies
         run: ./gradlew androidDependencies
 

diff --git a/app/build.gradle b/app/build.gradle
@@ -33,33 +33,18 @@ android {
     abortOnError false
   }
 
-  compileOptions {
-    sourceCompatibility JavaVersion.VERSION_1_8
-    targetCompatibility JavaVersion.VERSION_1_8
-  }
-
   buildFeatures {
     viewBinding true
+    buildConfig true
   }
+  namespace 'org.maplibre.android.plugins.testapp'
 }
 
-// Disable Leak Canary for UI and unit test.
-configurations.all { config ->
-  if (config.name.contains('UnitTest') || config.name.contains('AndroidTest')) {
-    config.resolutionStrategy.eachDependency { details ->
-      if (details.requested.group == 'com.squareup.leakcanary'
-          && details.requested.name == 'leakcanary-android') {
-        details.useTarget(group: details.requested.group, name: 'leakcanary-android-no-op',
-            version: details.requested.version)
-      }
-    }
-  }
+kotlin {
+  jvmToolchain(11)
 }
 
 dependencies {
-  // Kotlin
-  implementation dependenciesList.kotlin
-
   // MapLibre
   implementation(dependenciesList.mapLibreAndroidSdk, {
     exclude group: 'android.arch.lifecycle'
@@ -88,24 +73,22 @@ dependencies {
   testImplementation dependenciesList.mockito
 
   // Instrumentation testing
-  androidTestImplementation dependenciesList.mockitoAndroid
+  androidTestImplementation "org.mockito:mockito-android:5.13.0"
   androidTestImplementation dependenciesList.supportAppcompatV7
   androidTestImplementation dependenciesList.testRunner
   androidTestImplementation dependenciesList.testRules
   androidTestImplementation dependenciesList.testEspressoCore
   androidTestImplementation dependenciesList.testRoom
   androidTestImplementation dependenciesList.testArchCore
-  androidTestImplementation(dependenciesList.mockitoCore, {
+  androidTestImplementation("org.mockito:mockito-core:5.13.0", {
     exclude group: 'net.bytebuddy'
   })
 
   // Square crew
   implementation dependenciesList.timber
 
   // Leak canary
-  debugImplementation dependenciesList.leakCanaryDebug
-  releaseImplementation dependenciesList.leakCanaryRelease
-  testImplementation dependenciesList.leakCanaryTest
+  debugImplementation "com.squareup.leakcanary:leakcanary-android:2.14"
 
   // Plugin modules
   implementation project(':plugin-offline')

diff --git a/app/src/debug/AndroidManifest.xml b/app/src/debug/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="org.maplibre.android.plugins.testapp">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
   <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
   <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          xmlns:tools="http://schemas.android.com/tools" package="org.maplibre.android.plugins.testapp">
+          xmlns:tools="http://schemas.android.com/tools">
 
   <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
   <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>

diff --git a/app/src/main/java/org/maplibre/android/plugins/testapp/PluginApplication.kt b/app/src/main/java/org/maplibre/android/plugins/testapp/PluginApplication.kt
@@ -1,19 +1,13 @@
 package org.maplibre.android.plugins.testapp
 
 import android.app.Application
-import com.squareup.leakcanary.LeakCanary
 import org.maplibre.android.MapLibre
 import timber.log.Timber
 
 class PluginApplication : Application() {
 
     override fun onCreate() {
         super.onCreate()
-        if (LeakCanary.isInAnalyzerProcess(this)) {
-            return
-        }
-
-        LeakCanary.install(this)
         initializeLogger()
         MapLibre.getInstance(this)
     }

diff --git a/build.gradle b/build.gradle
@@ -12,10 +12,10 @@ buildscript {
   }
 
   dependencies {
-    classpath pluginDependencies.gradle
-    classpath pluginDependencies.kotlin
-    classpath pluginDependencies.kotlinLint
-    classpath pluginDependencies.gradleNexus    
+    classpath 'com.android.tools.build:gradle:8.6.0'
+    classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.0"
+    classpath "org.jlleitschuh.gradle:ktlint-gradle:8.1.0"
+    classpath "io.github.gradle-nexus:publish-plugin:1.1.0"
   }
 }
 

diff --git a/gradle.properties b/gradle.properties
@@ -25,6 +25,8 @@ POM_DEVELOPER_NAME=MapLibre
 org.gradle.jvmargs=-Xmx2560M
 android.useAndroidX=true
 android.enableJetifier=true
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false
 
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit

diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
@@ -3,11 +3,11 @@
   androidVersions = [
       minSdkVersion    : 21,
       targetSdkVersion : 30,
-      compileSdkVersion: 33,
+      compileSdkVersion: 34,
   ]
 
   version = [
-      mapLibreAndroidSdk : '11.0.0',
+      mapLibreAndroidSdk : '11.3.0',
       mapLibreJava       : '5.9.0',
       mapLibreTurf       : '5.9.0',
       playLocation       : '16.0.0',
@@ -18,7 +18,6 @@
       constraintLayout   : '1.1.2',
       mockito            : '5.2.0',
       mockk              : '1.9.3',
-      leakCanary         : '1.6.3',
       timber             : '4.7.1',
       testRunner         : '1.0.2',
       espresso           : '3.0.2',
@@ -30,15 +29,6 @@
       robolectric        : '4.10.3'
   ]
 
-  pluginVersion = [
-      checkstyle: '8.10.1',
-      gradle    : '7.4.0',
-      kotlin    : '1.8.10',
-      dokka     : '0.9.17',
-      kotlinLint: '8.1.0',
-      gradleNexus: "1.1.0"
-  ]
-
   dependenciesList = [
           // MapLibre
           mapLibreAndroidSdk     : "org.maplibre.gl:android-sdk:${version.mapLibreAndroidSdk}",
@@ -57,7 +47,7 @@
 
           // support
           supportAnnotation      : 'androidx.annotation:annotation:1.0.0',
-          supportAppcompatV7     : 'androidx.appcompat:appcompat:1.0.0',
+          supportAppcompatV7     : 'androidx.appcompat:appcompat:1.7.0',
           supportV4              : 'androidx.legacy:legacy-support-v4:1.0.0',
           supportDesign          : 'com.google.android.material:material:1.0.0',
           supportRecyclerView    : 'androidx.recyclerview:recyclerview:1.0.0',
@@ -72,9 +62,6 @@
 
           // square crew
           timber                 : "com.jakewharton.timber:timber:${version.timber}",
-          leakCanaryDebug        : "com.squareup.leakcanary:leakcanary-android:${version.leakCanary}",
-          leakCanaryRelease      : "com.squareup.leakcanary:leakcanary-android-no-op:${version.leakCanary}",
-          leakCanaryTest         : "com.squareup.leakcanary:leakcanary-android-no-op:${version.leakCanary}",
 
           // instrumentation test
           testRunner             : 'androidx.test.ext:junit:1.1.1',
@@ -91,16 +78,6 @@
           junit                  : "junit:junit:${version.junit}",
           mockito                : "org.mockito:mockito-inline:${version.mockito}",
           androidArchCore        : 'androidx.arch.core:core-testing:2.0.0',
-          robolectric            : "org.robolectric:robolectric:${version.robolectric}",
-          kotlin                 : "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${pluginVersion.kotlin}",
-  ]
-
-  pluginDependencies = [
-      gradle    : "com.android.tools.build:gradle:${pluginVersion.gradle}",
-      checkstyle: "com.puppycrawl.tools:checkstyle:${pluginVersion.checkstyle}",
-      kotlin    : "org.jetbrains.kotlin:kotlin-gradle-plugin:${pluginVersion.kotlin}",
-      dokka     : "org.jetbrains.dokka:dokka-android-gradle-plugin:${pluginVersion.dokka}",
-      kotlinLint: "org.jlleitschuh.gradle:ktlint-gradle:${pluginVersion.kotlinLint}",
-      gradleNexus: "io.github.gradle-nexus:publish-plugin:${pluginVersion.gradleNexus}"
+          robolectric            : "org.robolectric:robolectric:${version.robolectric}"
   ]
 }
diff --git a/gradle/publish.gradle b/gradle/publish.gradle
@@ -13,12 +13,12 @@ task androidJavadocs(type: Javadoc) {
 }
 
 task androidJavadocsJar(type: Jar, dependsOn: androidJavadocs) {
-    classifier = 'dokka'
+    archiveClassifier = 'dokka'
     from androidJavadocs.destinationDir
 }
 
 task androidSourcesJar(type: Jar) {
-    classifier = 'sources'
+    archiveClassifier = 'sources'
     from android.sourceSets.main.java.sourceFiles
 }
 
@@ -35,7 +35,7 @@ afterEvaluate {
                 groupId this.group
                 artifactId project.ext.mapLibreArtifactId
 
-                from components.release
+                from components.findByName('release')
 
                 artifact androidSourcesJar
                 artifact androidJavadocsJar  

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/ktx-mapbox-maps/build.gradle b/ktx-mapbox-maps/build.gradle
@@ -1,5 +1,7 @@
-apply plugin: 'com.android.library'
-apply plugin: 'kotlin-android'
+plugins {
+    id 'com.android.library'
+    id 'kotlin-android'
+}
 
 android {
     compileSdkVersion androidVersions.compileSdkVersion
@@ -21,20 +23,23 @@ android {
     testOptions {
         unitTests.returnDefaultValues true
     }
+    namespace 'org.maplibre.android.plugins.maps'
 
     tasks.withType(Javadoc).all {
         enabled = false
     }
 }
 
+kotlin {
+    jvmToolchain(11)
+}
+
 dependencies {
-    implementation dependenciesList.kotlin
     implementation dependenciesList.mapLibreAndroidSdk
     javadocDeps dependenciesList.mapLibreAndroidSdk
     testImplementation dependenciesList.junit
     testImplementation dependenciesList.mockito
     testImplementation dependenciesList.robolectric
-    testImplementation dependenciesList.kotlin
 }
 
 apply from: "${rootDir}/gradle/javadoc.gradle"

diff --git a/ktx-mapbox-maps/src/main/AndroidManifest.xml b/ktx-mapbox-maps/src/main/AndroidManifest.xml
@@ -1,2 +1 @@
-<manifest
-        package="org.maplibre.android.plugins.maps"/>
+<manifest />
diff --git a/plugin-annotation/README.md b/plugin-annotation/README.md
@@ -20,16 +20,6 @@ repositories {
 In the app-level `build.gradle` file:
 
 ```groovy
-android {
-
-	// The Annotation Plugin requires Java 8 usage
-	compileOptions {
-	    sourceCompatibility JavaVersion.VERSION_1_8
-	    targetCompatibility JavaVersion.VERSION_1_8
-	}
-
-}
-
 dependencies {
     implementation 'com.maplibre.maplibresdk:maplibre-android-plugin-annotation-v9:0.9.0'
 }

diff --git a/plugin-annotation/build.gradle b/plugin-annotation/build.gradle
@@ -20,6 +20,7 @@ android {
     testOptions {
         unitTests.returnDefaultValues true
     }
+    namespace 'org.maplibre.android.plugins.annotation'
 }
 
 dependencies {

diff --git a/plugin-annotation/scripts/annotation.java.ejs b/plugin-annotation/scripts/annotation.java.ejs
@@ -22,7 +22,7 @@ import org.maplibre.android.geometry.LatLng;
 import org.maplibre.android.style.layers.Property;
 import org.maplibre.android.style.layers.PropertyFactory;
 import org.maplibre.android.utils.ColorUtils;
-import com.mapbox.android.gestures.MoveDistancesObject;
+import org.maplibre.android.gestures.MoveDistancesObject;
 import org.maplibre.android.maps.Projection;
 
 import java.util.ArrayList;

diff --git a/plugin-annotation/src/main/AndroidManifest.xml b/plugin-annotation/src/main/AndroidManifest.xml
@@ -1 +1 @@
-<manifest package="org.maplibre.android.plugins.annotation" />
+<manifest />
diff --git a/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/Annotation.java b/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/Annotation.java
@@ -4,7 +4,7 @@
 import androidx.annotation.Nullable;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
-import com.mapbox.android.gestures.MoveDistancesObject;
+import org.maplibre.android.gestures.MoveDistancesObject;
 import org.maplibre.android.maps.Projection;
 import org.maplibre.geojson.Geometry;
 

diff --git a/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/Circle.java b/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/Circle.java
@@ -17,7 +17,7 @@
 import org.maplibre.android.style.layers.Property;
 import org.maplibre.android.style.layers.PropertyFactory;
 import org.maplibre.android.utils.ColorUtils;
-import com.mapbox.android.gestures.MoveDistancesObject;
+import org.maplibre.android.gestures.MoveDistancesObject;
 import org.maplibre.android.maps.Projection;
 
 import java.util.ArrayList;

diff --git a/.../src/main/java/org/maplibre/android/plugins/annotation/DraggableAnnotationController.java b/.../src/main/java/org/maplibre/android/plugins/annotation/DraggableAnnotationController.java
@@ -8,9 +8,9 @@
 import androidx.annotation.Nullable;
 import androidx.annotation.UiThread;
 import androidx.annotation.VisibleForTesting;
-import com.mapbox.android.gestures.AndroidGesturesManager;
-import com.mapbox.android.gestures.MoveDistancesObject;
-import com.mapbox.android.gestures.MoveGestureDetector;
+import org.maplibre.android.gestures.AndroidGesturesManager;
+import org.maplibre.android.gestures.MoveDistancesObject;
+import org.maplibre.android.gestures.MoveGestureDetector;
 import org.maplibre.android.maps.MapLibreMap;
 import org.maplibre.android.maps.MapView;
 import org.maplibre.geojson.Geometry;

diff --git a/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/Fill.java b/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/Fill.java
@@ -17,7 +17,7 @@
 import org.maplibre.android.style.layers.Property;
 import org.maplibre.android.style.layers.PropertyFactory;
 import org.maplibre.android.utils.ColorUtils;
-import com.mapbox.android.gestures.MoveDistancesObject;
+import org.maplibre.android.gestures.MoveDistancesObject;
 import org.maplibre.android.maps.Projection;
 
 import java.util.ArrayList;

diff --git a/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/Line.java b/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/Line.java
@@ -17,7 +17,7 @@
 import org.maplibre.android.style.layers.Property;
 import org.maplibre.android.style.layers.PropertyFactory;
 import org.maplibre.android.utils.ColorUtils;
-import com.mapbox.android.gestures.MoveDistancesObject;
+import org.maplibre.android.gestures.MoveDistancesObject;
 import org.maplibre.android.maps.Projection;
 
 import java.util.ArrayList;

diff --git a/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/Symbol.java b/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/Symbol.java
@@ -17,7 +17,7 @@
 import org.maplibre.android.style.layers.Property;
 import org.maplibre.android.style.layers.PropertyFactory;
 import org.maplibre.android.utils.ColorUtils;
-import com.mapbox.android.gestures.MoveDistancesObject;
+import org.maplibre.android.gestures.MoveDistancesObject;
 import org.maplibre.android.maps.Projection;
 
 import java.util.ArrayList;

diff --git a/.../test/java/org/maplibre/android/plugins/annotation/DraggableAnnotationControllerTest.java b/.../test/java/org/maplibre/android/plugins/annotation/DraggableAnnotationControllerTest.java
@@ -1,9 +1,9 @@
 package org.maplibre.android.plugins.annotation;
 
 import android.graphics.PointF;
-import com.mapbox.android.gestures.AndroidGesturesManager;
-import com.mapbox.android.gestures.MoveDistancesObject;
-import com.mapbox.android.gestures.MoveGestureDetector;
+import org.maplibre.android.gestures.AndroidGesturesManager;
+import org.maplibre.android.gestures.MoveDistancesObject;
+import org.maplibre.android.gestures.MoveGestureDetector;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;