Bump Android Gradle Plugin to 8.0.0 and move Kotlin compatibility to …

…build-plugins

.java-version

@@ -0,0 +1 @@
+17.0

app/k9mail/proguard-rules.pro

@@ -53,3 +53,8 @@
 
 # OkHttp platform used only on JVM and when Conscrypt dependency is available.
 -dontwarn okhttp3.internal.platform.ConscryptPlatform
+
+-dontwarn kotlinx.serialization.KSerializer
+-dontwarn kotlinx.serialization.Serializable
+-dontwarn org.apache.http.client.methods.CloseableHttpResponse
+-dontwarn org.slf4j.impl.StaticLoggerBinder

build-plugin/src/main/kotlin/AndroidExtension.kt

@@ -14,8 +14,8 @@ internal fun CommonExtension<*, *, *, *>.configureSharedConfig() {
     }
 
     compileOptions {
-        sourceCompatibility = ThunderbirdProjectConfig.javaVersion
-        targetCompatibility = ThunderbirdProjectConfig.javaVersion
+        sourceCompatibility = ThunderbirdProjectConfig.javaCompatibilityVersion
+        targetCompatibility = ThunderbirdProjectConfig.javaCompatibilityVersion
     }
 
     lint {
@@ -45,7 +45,7 @@ internal fun CommonExtension<*, *, *, *>.configureSharedComposeConfig(
         abortOnError = true
     }
 
-    packagingOptions {
+    packaging {
         resources {
             excludes += "/META-INF/{AL2.0,LGPL2.1}"
         }

build-plugin/src/main/kotlin/KotlinExtension.kt

@@ -0,0 +1,11 @@
+import org.gradle.api.Project
+import org.gradle.kotlin.dsl.withType
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+
+fun Project.configureKotlinJavaCompatibility() {
+    tasks.withType<KotlinCompile> {
+        kotlinOptions {
+            jvmTarget = ThunderbirdProjectConfig.javaCompatibilityVersion.toString()
+        }
+    }
+}

build-plugin/src/main/kotlin/ThunderbirdPlugins.kt

@@ -3,10 +3,13 @@ object ThunderbirdPlugins {
     object App {
         const val android = "thunderbird.app.android"
         const val androidCompose = "thunderbird.app.android.compose"
+
+        const val jvm = "thunderbird.app.jvm"
     }
     object Library {
-        const val jvm = "thunderbird.library.jvm"
         const val android = "thunderbird.library.android"
         const val androidCompose = "thunderbird.library.android.compose"
+
+        const val jvm = "thunderbird.library.jvm"
     }
 }

build-plugin/src/main/kotlin/ThunderbirdProjectConfig.kt

@@ -2,7 +2,7 @@ import org.gradle.api.JavaVersion
 
 object ThunderbirdProjectConfig {
 
-    val javaVersion = JavaVersion.VERSION_11
+    val javaCompatibilityVersion = JavaVersion.VERSION_11
 
     const val androidSdkMin = 21
     const val androidSdkTarget = 31

build-plugin/src/main/kotlin/thunderbird.app.android.gradle.kts

@@ -19,7 +19,7 @@ android {
     }
 
     kotlinOptions {
-        jvmTarget = ThunderbirdProjectConfig.javaVersion.toString()
+        jvmTarget = ThunderbirdProjectConfig.javaCompatibilityVersion.toString()
     }
 
     lint {

build-plugin/src/main/kotlin/thunderbird.app.jvm.gradle.kts

@@ -0,0 +1,16 @@
+plugins {
+    id("application")
+    id("org.jetbrains.kotlin.jvm")
+}
+
+java {
+    sourceCompatibility = ThunderbirdProjectConfig.javaCompatibilityVersion
+    targetCompatibility = ThunderbirdProjectConfig.javaCompatibilityVersion
+}
+
+configureKotlinJavaCompatibility()
+
+dependencies {
+    implementation(libs.bundles.shared.jvm.main)
+    testImplementation(libs.bundles.shared.jvm.test)
+}

build-plugin/src/main/kotlin/thunderbird.library.android.gradle.kts

@@ -11,7 +11,7 @@ android {
     }
 
     kotlinOptions {
-        jvmTarget = ThunderbirdProjectConfig.javaVersion.toString()
+        jvmTarget = ThunderbirdProjectConfig.javaCompatibilityVersion.toString()
     }
 
     lint {

build-plugin/src/main/kotlin/thunderbird.library.jvm.gradle.kts

@@ -4,10 +4,12 @@ plugins {
 }
 
 java {
-    sourceCompatibility = ThunderbirdProjectConfig.javaVersion
-    targetCompatibility = ThunderbirdProjectConfig.javaVersion
+    sourceCompatibility = ThunderbirdProjectConfig.javaCompatibilityVersion
+    targetCompatibility = ThunderbirdProjectConfig.javaCompatibilityVersion
 }
 
+configureKotlinJavaCompatibility()
+
 dependencies {
     implementation(libs.bundles.shared.jvm.main)
     testImplementation(libs.bundles.shared.jvm.test)

build-plugin/src/main/kotlin/thunderbird.quality.detekt.gradle.kts

@@ -16,7 +16,7 @@ configure<DetektExtension> {
 }
 
 tasks.withType<Detekt>().configureEach {
-    jvmTarget = ThunderbirdProjectConfig.javaVersion.toString()
+    jvmTarget = ThunderbirdProjectConfig.javaCompatibilityVersion.toString()
 
     exclude(
         "**/.gradle/**",

build.gradle.kts

@@ -1,5 +1,3 @@
-import org.jetbrains.kotlin.gradle.dsl.JvmTarget
-
 @Suppress("DSL_SCOPE_VIOLATION")
 plugins {
     alias(libs.plugins.android.application) apply false
@@ -17,9 +15,6 @@ plugins {
 
 val propertyTestCoverage: String? by extra
 
-val javaVersion = JavaVersion.VERSION_11
-val jvmTargetVersion = JvmTarget.JVM_11
-
 allprojects {
     extra.apply {
         set("testCoverageEnabled", propertyTestCoverage != null)
@@ -72,10 +67,6 @@ allprojects {
         }
     }
 
-    tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
-        kotlinOptions.jvmTarget = jvmTargetVersion.target
-    }
-
     tasks.withType<Test> {
         testLogging {
             exceptionFormat = org.gradle.api.tasks.testing.logging.TestExceptionFormat.FULL

cli/html-cleaner-cli/build.gradle.kts

@@ -1,7 +1,6 @@
 @Suppress("DSL_SCOPE_VIOLATION")
 plugins {
-    alias(libs.plugins.kotlin.jvm)
-    id("application")
+    id(ThunderbirdPlugins.App.jvm)
 }
 
 version = "unspecified"
@@ -16,8 +15,3 @@ dependencies {
     implementation(libs.clikt)
     implementation(libs.okio)
 }
-
-java {
-    sourceCompatibility = ThunderbirdProjectConfig.javaVersion
-    targetCompatibility = ThunderbirdProjectConfig.javaVersion
-}

gradle/libs.versions.toml

@@ -3,7 +3,7 @@
 
 [versions]
 gradle = "8.0.2"
-androidGradlePlugin = "7.4.2"
+androidGradlePlugin = "8.0.0"
 ktlint = "0.48.2"
 
 kotlin = "1.8.10"