Merge pull request #6672 from thundernest/add-jvm-build-plugin

Add JVM build plugin

app/autodiscovery/api/build.gradle

@@ -1,6 +1,5 @@
 plugins {
-    id 'java-library'
-    id 'kotlin'
+    id "thunderbird.library.jvm"
     alias(libs.plugins.android.lint)
 }
 

app/autodiscovery/srvrecords/build.gradle

@@ -1,6 +1,5 @@
 plugins {
-    id 'java-library'
-    id 'kotlin'
+    id "thunderbird.library.jvm"
     alias(libs.plugins.android.lint)
 }
 
@@ -8,9 +7,4 @@ dependencies {
     api project(":app:autodiscovery:api")
 
     implementation libs.minidns.hla
-
-    testImplementation libs.junit
-    testImplementation libs.truth
-    testImplementation libs.mockito.inline
-    testImplementation libs.mockito.kotlin
 }

app/autodiscovery/thunderbird/build.gradle

@@ -1,6 +1,5 @@
 plugins {
-    id 'java-library'
-    id 'kotlin'
+    id "thunderbird.library.jvm"
     alias(libs.plugins.android.lint)
 }
 
@@ -10,9 +9,5 @@ dependencies {
     compileOnly libs.xmlpull
     implementation libs.okhttp
 
-    testImplementation libs.junit
-    testImplementation libs.truth
-    testImplementation libs.mockito.inline
-    testImplementation libs.mockito.kotlin
     testImplementation libs.kxml2
 }

app/html-cleaner/build.gradle

@@ -1,12 +1,8 @@
 plugins {
-    id 'java-library'
-    id 'kotlin'
+    id "thunderbird.library.jvm"
     alias(libs.plugins.android.lint)
 }
 
 dependencies {
     implementation libs.jsoup
-
-    testImplementation libs.junit
-    testImplementation libs.truth
 }

backend/api/build.gradle

@@ -1,6 +1,5 @@
 plugins {
-    id 'java-library'
-    id 'kotlin'
+    id "thunderbird.library.jvm"
     alias(libs.plugins.android.lint)
 }
 

backend/demo/build.gradle

@@ -1,6 +1,5 @@
 plugins {
-    id 'java-library'
-    id 'kotlin'
+    id "thunderbird.library.jvm"
     alias(libs.plugins.ksp)
     alias(libs.plugins.android.lint)
 }
@@ -13,7 +12,4 @@ dependencies {
     ksp libs.moshi.kotlin.codegen
 
     testImplementation project(":mail:testing")
-    testImplementation libs.junit
-    testImplementation libs.mockito.core
-    testImplementation libs.truth
 }

backend/imap/build.gradle

@@ -1,6 +1,5 @@
 plugins {
-    id 'java-library'
-    id 'kotlin'
+    id "thunderbird.library.jvm"
     alias(libs.plugins.android.lint)
 }
 
@@ -13,9 +12,5 @@ dependencies {
 
     testImplementation project(":mail:testing")
     testImplementation project(":backend:testing")
-    testImplementation libs.junit
-    testImplementation libs.mockito.inline
-    testImplementation libs.mockito.kotlin
-    testImplementation libs.truth
     testImplementation libs.mime4j.dom
 }

backend/jmap/build.gradle

@@ -1,6 +1,5 @@
 plugins {
-    id 'java-library'
-    id 'kotlin'
+    id "thunderbird.library.jvm"
     alias(libs.plugins.ksp)
     alias(libs.plugins.android.lint)
 }
@@ -15,6 +14,5 @@ dependencies {
 
     testImplementation project(":mail:testing")
     testImplementation project(':backend:testing')
-    testImplementation libs.mockito.core
     testImplementation libs.okhttp.mockwebserver
 }

backend/pop3/build.gradle

@@ -1,6 +1,5 @@
 plugins {
-    id 'java-library'
-    id 'kotlin'
+    id "thunderbird.library.jvm"
     alias(libs.plugins.android.lint)
 }
 
@@ -10,6 +9,4 @@ dependencies {
     api project(":mail:protocols:smtp")
 
     testImplementation project(":mail:testing")
-    testImplementation libs.junit
-    testImplementation libs.mockito.core
 }

backend/testing/build.gradle

@@ -1,6 +1,5 @@
 plugins {
-    id 'java-library'
-    id 'kotlin'
+    id "thunderbird.library.jvm"
     alias(libs.plugins.android.lint)
 }
 

backend/webdav/build.gradle

@@ -1,6 +1,5 @@
 plugins {
-    id 'java-library'
-    id 'kotlin'
+    id "thunderbird.library.jvm"
     alias(libs.plugins.android.lint)
 }
 
@@ -9,6 +8,4 @@ dependencies {
     api project(":mail:protocols:webdav")
 
     testImplementation project(":mail:testing")
-    testImplementation libs.junit
-    testImplementation libs.mockito.core
 }

build-plugin/build.gradle.kts

@@ -5,6 +5,8 @@ plugins {
 dependencies {
     implementation(files(libs.javaClass.superclass.protectionDomain.codeSource.location))
 
+    implementation(plugin(libs.plugins.kotlin.jvm))
+
     implementation(plugin(libs.plugins.spotless))
 }
 

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

@@ -0,0 +1,6 @@
+object ThunderbirdPlugins {
+
+    object Library {
+        const val jvm = "thunderbird.library.jvm"
+    }
+}

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

@@ -0,0 +1,6 @@
+import org.gradle.api.JavaVersion
+
+object ThunderbirdProjectConfig {
+
+    val javaVersion = JavaVersion.VERSION_11
+}

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

@@ -0,0 +1,13 @@
+plugins {
+    `java-library`
+    id("org.jetbrains.kotlin.jvm")
+}
+
+java {
+    sourceCompatibility = ThunderbirdProjectConfig.javaVersion
+    targetCompatibility = ThunderbirdProjectConfig.javaVersion
+}
+
+dependencies {
+    testImplementation(libs.bundles.library.jvm.test)
+}

gradle/libs.versions.toml

@@ -121,3 +121,11 @@ jdom2 = "org.jdom:jdom2:2.0.6.1"
 icu4j-charset = "com.ibm.icu:icu4j-charset:72.1"
 
 leakcanary-android = "com.squareup.leakcanary:leakcanary-android:2.9.1"
+
+[bundles]
+library-jvm-test = [
+  "junit",
+  "truth",
+  "mockito-inline",
+  "mockito-kotlin",
+]

mail/common/build.gradle

@@ -1,6 +1,5 @@
 plugins {
-    id 'java-library'
-    id 'kotlin'
+    id "thunderbird.library.jvm"
     alias(libs.plugins.android.lint)
 }
 
@@ -21,9 +20,5 @@ dependencies {
     implementation libs.apache.httpclient5
 
     testImplementation project(":mail:testing")
-    testImplementation libs.junit
-    testImplementation libs.truth
-    testImplementation libs.mockito.inline
-    testImplementation libs.mockito.kotlin
     testImplementation libs.icu4j.charset
 }

mail/protocols/imap/build.gradle

@@ -1,6 +1,5 @@
 plugins {
-    id 'java-library'
-    id 'kotlin'
+    id "thunderbird.library.jvm"
     alias(libs.plugins.android.lint)
 }
 
@@ -17,10 +16,6 @@ dependencies {
     implementation libs.okio
 
     testImplementation project(":mail:testing")
-    testImplementation libs.junit
-    testImplementation libs.truth
-    testImplementation libs.mockito.core
-    testImplementation libs.mockito.kotlin
     testImplementation libs.okio
     testImplementation libs.mime4j.core
 }

mail/protocols/pop3/build.gradle

@@ -1,6 +1,5 @@
 plugins {
-    id 'java-library'
-    id 'kotlin'
+    id "thunderbird.library.jvm"
     alias(libs.plugins.android.lint)
 }
 
@@ -12,10 +11,6 @@ dependencies {
     api project(":mail:common")
 
     testImplementation project(":mail:testing")
-    testImplementation libs.junit
-    testImplementation libs.truth
-    testImplementation libs.mockito.core
-    testImplementation libs.mockito.kotlin
     testImplementation libs.okio
     testImplementation libs.jzlib
     testImplementation libs.commons.io

mail/protocols/smtp/build.gradle

@@ -1,6 +1,5 @@
 plugins {
-    id 'java-library'
-    id 'kotlin'
+    id "thunderbird.library.jvm"
     alias(libs.plugins.android.lint)
 }
 
@@ -15,9 +14,6 @@ dependencies {
     implementation libs.okio
 
     testImplementation project(":mail:testing")
-    testImplementation libs.junit
-    testImplementation libs.truth
-    testImplementation libs.mockito.kotlin
     testImplementation libs.okio
     testImplementation libs.jzlib
 }

mail/protocols/webdav/build.gradle

@@ -1,5 +1,5 @@
 plugins {
-    id 'java-library'
+    id "thunderbird.library.jvm"
     alias(libs.plugins.android.lint)
 }
 
@@ -14,8 +14,5 @@ dependencies {
     compileOnly libs.apache.httpclient
 
     testImplementation project(":mail:testing")
-    testImplementation libs.junit
-    testImplementation libs.truth
-    testImplementation libs.mockito.inline
     testImplementation libs.apache.httpclient
 }

mail/testing/build.gradle

@@ -1,6 +1,5 @@
 plugins {
-    id 'java-library'
-    id 'kotlin'
+    id "thunderbird.library.jvm"
     alias(libs.plugins.android.lint)
 }
 

settings.gradle.kts

@@ -17,6 +17,8 @@ dependencyResolutionManagement {
 
 enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
 
+rootProject.name = "k-9"
+
 includeBuild("build-plugin")
 
 include(