Modernize Gradle build to AGP 9.1 / Kotlin 2.4

GenericApp/app/build.gradle

@@ -1,6 +1,7 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 plugins {
     id 'com.android.application'
-    id 'kotlin-android'
     id 'com.google.gms.google-services'
     id 'maven-publish'
     id 'signing'
@@ -9,9 +10,9 @@ plugins {
 android {
     defaultConfig {
         applicationId = "io.openremote.app"
-        minSdkVersion = 25
-        compileSdk = 35
-        targetSdkVersion = 35
+        minSdk = 25
+        compileSdk = 36
+        targetSdk = 36
         versionCode = 44
         versionName = version
 
@@ -43,17 +44,14 @@ android {
 
     buildFeatures {
         viewBinding = true
+        resValues = true
     }
 
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_17
         targetCompatibility = JavaVersion.VERSION_17
     }
 
-    kotlinOptions {
-        jvmTarget = '17'
-    }
-
     namespace = 'io.openremote.app'
 
     publishing {
@@ -62,24 +60,35 @@ android {
     }
 }
 
+kotlin {
+    compilerOptions {
+        jvmTarget.set(JvmTarget.JVM_17)
+    }
+}
+
 dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar"])
-    implementation 'androidx.core:core-ktx:1.16.0'
-    implementation 'androidx.appcompat:appcompat:1.7.0'
+    implementation 'androidx.core:core-ktx:1.18.0'
+    implementation 'androidx.appcompat:appcompat:1.7.1'
     implementation 'androidx.constraintlayout:constraintlayout:2.2.1'
     implementation 'androidx.preference:preference-ktx:1.2.1'
-    implementation "com.google.android.gms:play-services-location:21.3.0"
-    implementation "com.fasterxml.jackson.module:jackson-module-kotlin:2.13.1"
-    implementation platform('com.google.firebase:firebase-bom:33.12.0')
-    implementation 'com.google.firebase:firebase-messaging-ktx'
-    implementation 'com.google.android.material:material:1.12.0'
+    implementation "com.google.android.gms:play-services-location:21.4.0"
+    // Pinned below 2.20: 2.20+ emits MethodHandle.invokeExact value-class bytecode
+    // that D8 rejects for minSdk < 26 (this project is minSdk 25). `strictly` makes a
+    // transitive bump to >=2.20 fail resolution loudly instead of silently breaking dexing.
+    implementation("com.fasterxml.jackson.module:jackson-module-kotlin") {
+        version { strictly '2.19.4' }
+    }
+    implementation platform('com.google.firebase:firebase-bom:34.16.0')
+    implementation 'com.google.firebase:firebase-messaging'
+    implementation 'com.google.android.material:material:1.14.0'
     implementation project(':ORLib')
 
     // Unit testing framework
     testImplementation 'junit:junit:4.13.2'
 }
 
-task sourcesJar(type: Jar) {
+tasks.register('sourcesJar', Jar) {
     from android.sourceSets.main.java.srcDirs
     archiveClassifier = 'sources'
 }

ORLib/build.gradle

@@ -1,7 +1,7 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 plugins {
     id 'com.android.library'
-    id 'kotlin-android'
-    id 'org.jetbrains.kotlin.android'
     id 'maven-publish'
     id 'signing'
 }
@@ -10,9 +10,9 @@ android {
     namespace = 'io.openremote.orlib'
 
     defaultConfig {
-        minSdkVersion = 25
-        compileSdk = 35
-        targetSdkVersion = 35
+        minSdk = 25
+        compileSdk = 36
+        targetSdk = 36
         versionCode = 1
         versionName = version
 
@@ -36,14 +36,12 @@ android {
     }
     buildFeatures {
         viewBinding = true
+        buildConfig = true
     }
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_17
         targetCompatibility JavaVersion.VERSION_17
     }
-    kotlinOptions {
-        jvmTarget = '17'
-    }
     lint {
         disable 'ProtectedPermissions'
     }
@@ -53,27 +51,38 @@ android {
     }
 }
 
+kotlin {
+    compilerOptions {
+        jvmTarget.set(JvmTarget.JVM_17)
+    }
+}
+
 dependencies {
-    implementation 'androidx.core:core-ktx:1.16.0'
-    implementation 'androidx.appcompat:appcompat:1.7.0'
-    implementation 'com.google.android.material:material:1.12.0'
+    implementation 'androidx.core:core-ktx:1.18.0'
+    implementation 'androidx.appcompat:appcompat:1.7.1'
+    implementation 'com.google.android.material:material:1.14.0'
     implementation 'androidx.preference:preference-ktx:1.2.1'
-    implementation "com.google.android.gms:play-services-location:21.3.0"
+    implementation "com.google.android.gms:play-services-location:21.4.0"
     implementation 'com.google.android.gms:play-services-vision:20.1.3'
-    implementation "com.fasterxml.jackson.module:jackson-module-kotlin:2.13.1"
-    implementation platform('com.google.firebase:firebase-bom:33.12.0')
-    implementation 'com.google.firebase:firebase-messaging-ktx'
+    // Pinned below 2.20: 2.20+ emits MethodHandle.invokeExact value-class bytecode
+    // that D8 rejects for minSdk < 26 (this project is minSdk 25). `strictly` makes a
+    // transitive bump to >=2.20 fail resolution loudly instead of silently breaking dexing.
+    implementation("com.fasterxml.jackson.module:jackson-module-kotlin") {
+        version { strictly '2.19.4' }
+    }
+    implementation platform('com.google.firebase:firebase-bom:34.16.0')
+    implementation 'com.google.firebase:firebase-messaging'
     implementation 'androidx.constraintlayout:constraintlayout:2.2.1'
-    implementation 'com.github.espressif:esp-idf-provisioning-android:lib-2.2.3'
+    implementation 'com.github.espressif:esp-idf-provisioning-android:lib-2.4.4'
     implementation 'org.greenrobot:eventbus:3.3.1'
 
-    implementation 'com.google.protobuf:protobuf-javalite:4.33.2'
-    implementation('com.google.protobuf:protobuf-kotlin:4.33.2') {
+    implementation 'com.google.protobuf:protobuf-javalite:4.35.1'
+    implementation('com.google.protobuf:protobuf-kotlin:4.35.1') {
         exclude group: 'com.google.protobuf', module: 'protobuf-java'
     }
 
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3'
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.11.0'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.11.0'
 
     implementation 'com.github.iammohdzaki:Password-Generator:0.6'
 

ORLib/src/main/AndroidManifest.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="io.openremote.orlib">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.BROADCAST_CLOSE_SYSTEM_DIALOGS" />

build.gradle

@@ -1,24 +1,24 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
-    ext.kotlin_version = "2.1.20"
+    ext.kotlin_version = "2.4.10"
     repositories {
         google()
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.9.1'
+        classpath 'com.android.tools.build:gradle:9.1.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath 'com.google.gms:google-services:4.4.2'
+        classpath 'com.google.gms:google-services:4.5.0'
 
-        classpath "com.google.protobuf:protobuf-gradle-plugin:0.9.6"
+        classpath "com.google.protobuf:protobuf-gradle-plugin:0.10.0"
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }
 }
 
 plugins {
     id 'io.github.gradle-nexus.publish-plugin' version '2.0.0'
-    id 'pl.allegro.tech.build.axion-release' version '1.21.1'
+    id 'pl.allegro.tech.build.axion-release' version '1.21.2'
 }
 
 scmVersion {
@@ -61,6 +61,6 @@ allprojects {
     }
 }
 
-task clean(type: Delete) {
-    delete rootProject.buildDir
+tasks.register('clean', Delete) {
+    delete rootProject.layout.buildDirectory
 }

gradle.properties

@@ -15,11 +15,8 @@ org.gradle.jvmargs=-Xmx2048m
 # Android operating system, and which are packaged with your app"s APK
 # https://developer.android.com/topic/libraries/support-library/androidx-rn
 android.useAndroidX=true
-# Automatically convert third-party libraries to use AndroidX
-android.enableJetifier=true
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official
-android.defaults.buildfeatures.buildconfig=true
 android.nonTransitiveRClass=false
 android.nonFinalResIds=false
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,9 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.1-bin.zip
 networkTimeout=10000
+retries=2
+retryBackOffMs=500
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

protobuf/build.gradle

@@ -5,8 +5,8 @@ plugins {
 }
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_11
-    targetCompatibility = JavaVersion.VERSION_11
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
     withJavadocJar()
 }
 
@@ -18,7 +18,7 @@ apply plugin: 'com.google.protobuf'
 
 protobuf {
     protoc {
-        artifact = "com.google.protobuf:protoc:4.33.2"
+        artifact = "com.google.protobuf:protoc:4.35.1"
     }
     generateProtoTasks {
         all().each { task ->
@@ -32,22 +32,7 @@ protobuf {
 }
 
 dependencies {
-    implementation 'com.google.protobuf:protobuf-javalite:4.33.2'
-}
-
-sourceSets {
-    main {
-        java {
-            srcDir 'build/generated/source/proto/main/java'
-        }
-        proto {
-            srcDir 'src/main/proto'
-        }
-    }
-}
-
-tasks.withType(ProcessResources) {
-    duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+    implementation 'com.google.protobuf:protobuf-javalite:4.35.1'
 }
 
 task sourcesJar(type: Jar) {