Migrate to Gradle's version catalog

app/autodiscovery/api/build.gradle

@@ -1,6 +1,8 @@
-apply plugin: 'java-library'
-apply plugin: 'kotlin'
-apply plugin: 'com.android.lint'
+plugins {
+    id 'java-library'
+    id 'kotlin'
+    alias(libs.plugins.android.lint)
+}
 
 dependencies {
     api project(":mail:common")

app/autodiscovery/providersxml/build.gradle

@@ -1,23 +1,25 @@
-apply plugin: 'com.android.library'
-apply plugin: 'org.jetbrains.kotlin.android'
+plugins {
+    alias(libs.plugins.android.library)
+    alias(libs.plugins.kotlin.android)
+}
 
 dependencies {
     implementation project(":app:core")
     implementation project(":mail:common")
     implementation project(":app:autodiscovery:api")
 
-    implementation "com.jakewharton.timber:timber:${versions.timber}"
+    implementation libs.timber
 
     testImplementation project(':app:testing')
     testImplementation project(":backend:imap")
-    testImplementation "org.robolectric:robolectric:${versions.robolectric}"
-    testImplementation "androidx.test:core:${versions.androidxTestCore}"
-    testImplementation "junit:junit:${versions.junit}"
-    testImplementation "com.google.truth:truth:${versions.truth}"
-    testImplementation "org.mockito:mockito-inline:${versions.mockito}"
-    testImplementation "org.mockito.kotlin:mockito-kotlin:${versions.mockitoKotlin}"
-    testImplementation "io.insert-koin:koin-test:${versions.koin}"
-    testImplementation "io.insert-koin:koin-test-junit4:${versions.koin}"
+    testImplementation libs.robolectric
+    testImplementation libs.androidx.test.core
+    testImplementation libs.junit
+    testImplementation libs.truth
+    testImplementation libs.mockito.inline
+    testImplementation libs.mockito.kotlin
+    testImplementation libs.koin.test
+    testImplementation libs.koin.test.junit4
 }
 
 android {

app/autodiscovery/srvrecords/build.gradle

@@ -1,14 +1,16 @@
-apply plugin: 'java-library'
-apply plugin: 'kotlin'
-apply plugin: 'com.android.lint'
+plugins {
+    id 'java-library'
+    id 'kotlin'
+    alias(libs.plugins.android.lint)
+}
 
 dependencies {
     api project(":app:autodiscovery:api")
 
-    implementation "org.minidns:minidns-hla:${versions.minidns}"
+    implementation libs.minidns.hla
 
-    testImplementation "junit:junit:${versions.junit}"
-    testImplementation "com.google.truth:truth:${versions.truth}"
-    testImplementation "org.mockito:mockito-inline:${versions.mockito}"
-    testImplementation "org.mockito.kotlin:mockito-kotlin:${versions.mockitoKotlin}"
+    testImplementation libs.junit
+    testImplementation libs.truth
+    testImplementation libs.mockito.inline
+    testImplementation libs.mockito.kotlin
 }

app/autodiscovery/thunderbird/build.gradle

@@ -1,16 +1,18 @@
-apply plugin: 'java-library'
-apply plugin: 'kotlin'
-apply plugin: 'com.android.lint'
+plugins {
+    id 'java-library'
+    id 'kotlin'
+    alias(libs.plugins.android.lint)
+}
 
 dependencies {
     api project(":app:autodiscovery:api")
 
-    compileOnly 'com.github.cketti:xmlpull-extracted-from-android:1.0'
-    implementation "com.squareup.okhttp3:okhttp:${versions.okhttp}"
+    compileOnly libs.xmlpull.extracted.from.android
+    implementation libs.okhttp
 
-    testImplementation "junit:junit:${versions.junit}"
-    testImplementation "com.google.truth:truth:${versions.truth}"
-    testImplementation "org.mockito:mockito-inline:${versions.mockito}"
-    testImplementation "org.mockito.kotlin:mockito-kotlin:${versions.mockitoKotlin}"
-    testImplementation 'com.github.cketti:kxml2-extracted-from-android:1.0'
+    testImplementation libs.junit
+    testImplementation libs.truth
+    testImplementation libs.mockito.inline
+    testImplementation libs.mockito.kotlin
+    testImplementation libs.kxml2.extracted.from.android
 }

app/core/build.gradle

@@ -1,6 +1,8 @@
-apply plugin: 'com.android.library'
-apply plugin: 'org.jetbrains.kotlin.android'
-apply plugin: 'org.jetbrains.kotlin.plugin.parcelize'
+plugins {
+    alias(libs.plugins.android.library)
+    alias(libs.plugins.kotlin.android)
+    alias(libs.plugins.kotlin.parcelize)
+}
 
 dependencies {
     api project(":mail:common")
@@ -9,37 +11,37 @@ dependencies {
 
     implementation project(':plugins:openpgp-api-lib:openpgp-api')
 
-    api "io.insert-koin:koin-android:${versions.koin}"
+    api libs.koin.android
 
-    api "androidx.annotation:annotation:${versions.androidxAnnotation}"
+    api libs.androidx.annotation
 
-    implementation "com.squareup.okio:okio:${versions.okio}"
-    implementation "commons-io:commons-io:${versions.commonsIo}"
-    implementation "androidx.core:core-ktx:${versions.androidxCore}"
-    implementation "androidx.work:work-runtime-ktx:${versions.androidxWorkManager}"
-    implementation "androidx.fragment:fragment:${versions.androidxFragment}"
-    implementation "androidx.localbroadcastmanager:localbroadcastmanager:${versions.androidxLocalBroadcastManager}"
-    implementation "org.jsoup:jsoup:${versions.jsoup}"
-    implementation "com.squareup.moshi:moshi:${versions.moshi}"
-    implementation "com.jakewharton.timber:timber:${versions.timber}"
-    implementation "org.apache.james:apache-mime4j-core:${versions.mime4j}"
+    implementation libs.okio
+    implementation libs.commons.io
+    implementation libs.androidx.core.ktx
+    implementation libs.androidx.work.ktx
+    implementation libs.androidx.fragment
+    implementation libs.androidx.localbroadcastmanager
+    implementation libs.jsoup
+    implementation libs.moshi
+    implementation libs.timber
+    implementation libs.apache.mime4j.core
 
     testImplementation project(':mail:testing')
     testImplementation project(":backend:imap")
     testImplementation project(":mail:protocols:smtp")
     testImplementation project(":app:storage")
     testImplementation project(":app:testing")
-    testImplementation "org.jetbrains.kotlin:kotlin-test:${versions.kotlin}"
-    testImplementation "org.jetbrains.kotlin:kotlin-reflect:${versions.kotlin}"
-    testImplementation "org.robolectric:robolectric:${versions.robolectric}"
-    testImplementation "androidx.test:core:${versions.androidxTestCore}"
-    testImplementation "junit:junit:${versions.junit}"
-    testImplementation "com.google.truth:truth:${versions.truth}"
-    testImplementation "org.mockito:mockito-inline:${versions.mockito}"
-    testImplementation "org.mockito.kotlin:mockito-kotlin:${versions.mockitoKotlin}"
-    testImplementation "org.jdom:jdom2:2.0.6"
-    testImplementation "io.insert-koin:koin-test:${versions.koin}"
-    testImplementation "io.insert-koin:koin-test-junit4:${versions.koin}"
+    testImplementation libs.kotlin.test
+    testImplementation libs.kotlin.reflect
+    testImplementation libs.robolectric
+    testImplementation libs.androidx.test.core
+    testImplementation libs.junit
+    testImplementation libs.truth
+    testImplementation libs.mockito.inline
+    testImplementation libs.mockito.kotlin
+    testImplementation libs.jdom2
+    testImplementation libs.koin.test
+    testImplementation libs.koin.test.junit4
 }
 
 android {

app/crypto-openpgp/build.gradle

@@ -1,11 +1,13 @@
-apply plugin: 'com.android.library'
-apply plugin: 'org.jetbrains.kotlin.android'
+plugins {
+    alias(libs.plugins.android.library)
+    alias(libs.plugins.kotlin.android)
+}
 
 dependencies {
     implementation project(":app:core")
 
-    testImplementation "junit:junit:${versions.junit}"
-    testImplementation "org.mockito:mockito-core:${versions.mockito}"
+    testImplementation libs.junit
+    testImplementation libs.mockito.core
 }
 
 android {

app/html-cleaner/build.gradle

@@ -1,10 +1,12 @@
-apply plugin: 'java-library'
-apply plugin: 'kotlin'
-apply plugin: 'com.android.lint'
+plugins {
+    id 'java-library'
+    id 'kotlin'
+    alias(libs.plugins.android.lint)
+}
 
 dependencies {
-    implementation "org.jsoup:jsoup:${versions.jsoup}"
+    implementation libs.jsoup
 
-    testImplementation "junit:junit:${versions.junit}"
-    testImplementation "com.google.truth:truth:${versions.truth}"
+    testImplementation libs.junit
+    testImplementation libs.truth
 }

app/k9mail/build.gradle

@@ -1,5 +1,7 @@
-apply plugin: 'com.android.application'
-apply plugin: 'org.jetbrains.kotlin.android'
+plugins {
+    alias(libs.plugins.android.application)
+    alias(libs.plugins.kotlin.android)
+}
 
 if (rootProject.testCoverage) {
     apply plugin: 'jacoco'
@@ -16,30 +18,30 @@ dependencies {
     implementation project(":backend:webdav")
     debugImplementation project(":backend:demo")
 
-    implementation "androidx.appcompat:appcompat:${versions.androidxAppCompat}"
-    implementation "androidx.core:core-ktx:${versions.androidxCore}"
-    implementation "androidx.work:work-runtime-ktx:${versions.androidxWorkManager}"
-    implementation "com.takisoft.preferencex:preferencex:${versions.preferencesFix}"
-    implementation "com.jakewharton.timber:timber:${versions.timber}"
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:${versions.kotlinCoroutines}"
+    implementation libs.androidx.appcompat
+    implementation libs.androidx.core.ktx
+    implementation libs.androidx.work.ktx
+    implementation libs.preferencex
+    implementation libs.timber
+    implementation libs.kotlinx.coroutines.core
 
-    implementation "com.github.bumptech.glide:glide:${versions.glide}"
-    annotationProcessor "com.github.bumptech.glide:compiler:${versions.glide}"
+    implementation libs.glide
+    annotationProcessor libs.glide.compiler
 
     if (project.hasProperty('k9mail.enableLeakCanary') && project.property('k9mail.enableLeakCanary') == "true") {
-        debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.9.1'
+        debugImplementation libs.leakcanary.android
     }
 
     // Required for DependencyInjectionTest to be able to resolve OpenPgpApiManager
     testImplementation project(':plugins:openpgp-api-lib:openpgp-api')
 
-    testImplementation "org.robolectric:robolectric:${versions.robolectric}"
-    testImplementation "junit:junit:${versions.junit}"
-    testImplementation "com.google.truth:truth:${versions.truth}"
-    testImplementation "org.mockito:mockito-inline:${versions.mockito}"
-    testImplementation "org.mockito.kotlin:mockito-kotlin:${versions.mockitoKotlin}"
-    testImplementation "io.insert-koin:koin-test:${versions.koin}"
-    testImplementation "io.insert-koin:koin-test-junit4:${versions.koin}"
+    testImplementation libs.robolectric
+    testImplementation libs.junit
+    testImplementation libs.truth
+    testImplementation libs.mockito.inline
+    testImplementation libs.mockito.kotlin
+    testImplementation libs.koin.test
+    testImplementation libs.koin.test.junit4
 }
 
 android {

app/storage/build.gradle

@@ -1,26 +1,28 @@
-apply plugin: 'com.android.library'
-apply plugin: 'org.jetbrains.kotlin.android'
+plugins {
+    alias(libs.plugins.android.library)
+    alias(libs.plugins.kotlin.android)
+}
 
 dependencies {
-    api "io.insert-koin:koin-core:${versions.koin}"
+    api libs.koin.core
 
     implementation project(":app:core")
-    implementation "androidx.core:core-ktx:${versions.androidxCore}"
-    implementation "com.jakewharton.timber:timber:${versions.timber}"
-    implementation "org.apache.james:apache-mime4j-core:${versions.mime4j}"
-    implementation "commons-io:commons-io:${versions.commonsIo}"
-    implementation "com.squareup.moshi:moshi:${versions.moshi}"
+    implementation libs.androidx.core.ktx
+    implementation libs.timber
+    implementation libs.apache.mime4j.core
+    implementation libs.commons.io
+    implementation libs.moshi
 
     testImplementation project(':mail:testing')
     testImplementation project(':app:testing')
-    testImplementation "org.robolectric:robolectric:${versions.robolectric}"
-    testImplementation "junit:junit:${versions.junit}"
-    testImplementation "com.google.truth:truth:${versions.truth}"
-    testImplementation "org.mockito:mockito-inline:${versions.mockito}"
-    testImplementation "org.mockito.kotlin:mockito-kotlin:${versions.mockitoKotlin}"
-    testImplementation "io.insert-koin:koin-test:${versions.koin}"
-    testImplementation "io.insert-koin:koin-test-junit4:${versions.koin}"
-    testImplementation "commons-io:commons-io:${versions.commonsIo}"
+    testImplementation libs.robolectric
+    testImplementation libs.junit
+    testImplementation libs.truth
+    testImplementation libs.mockito.inline
+    testImplementation libs.mockito.kotlin
+    testImplementation libs.koin.test
+    testImplementation libs.koin.test.junit4
+    testImplementation libs.commons.io
 }
 
 android {

app/testing/build.gradle

@@ -1,14 +1,16 @@
-apply plugin: 'com.android.library'
-apply plugin: 'org.jetbrains.kotlin.android'
+plugins {
+    alias(libs.plugins.android.library)
+    alias(libs.plugins.kotlin.android)
+}
 
 dependencies {
     implementation project(':app:core')
 
-    api "junit:junit:${versions.junit}"
-    api "org.robolectric:robolectric:${versions.robolectric}"
-    api "io.insert-koin:koin-core:${versions.koin}"
-    api "org.mockito:mockito-core:${versions.mockito}"
-    api "org.mockito.kotlin:mockito-kotlin:${versions.mockitoKotlin}"
+    api libs.junit
+    api libs.robolectric
+    api libs.koin.core
+    api libs.mockito.core
+    api libs.mockito.kotlin
 }
 
 android {

app/ui/base/build.gradle

@@ -1,20 +1,22 @@
-apply plugin: 'com.android.library'
-apply plugin: 'org.jetbrains.kotlin.android'
+plugins {
+    alias(libs.plugins.android.library)
+    alias(libs.plugins.kotlin.android)
+}
 
 dependencies {
     implementation project(":app:core")
 
-    api "androidx.appcompat:appcompat:${versions.androidxAppCompat}"
-    api "androidx.activity:activity:${versions.androidxActivity}"
-    api "com.google.android.material:material:${versions.materialComponents}"
-    api "androidx.navigation:navigation-fragment:${versions.androidxNavigation}"
-    api "androidx.navigation:navigation-ui:${versions.androidxNavigation}"
-    api "androidx.lifecycle:lifecycle-livedata-ktx:${versions.androidxLifecycle}"
+    api libs.androidx.appcompat
+    api libs.androidx.activity
+    api libs.android.material
+    api libs.androidx.navigation.fragment
+    api libs.androidx.navigation.ui
+    api libs.androidx.lifecycle.livedata.ktx
 
-    implementation "androidx.core:core-ktx:${versions.androidxCore}"
-    implementation "androidx.biometric:biometric:${versions.androidxBiometric}"
-    implementation "com.jakewharton.timber:timber:${versions.timber}"
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:${versions.kotlinCoroutines}"
+    implementation libs.androidx.core.ktx
+    implementation libs.androidx.biometric
+    implementation libs.timber
+    implementation libs.kotlinx.coroutines.core
 }
 
 android {