mirror/thunderbird-android
0
0
Fork 0
mirror of https://github.com/thunderbird/thunderbird-android.git synced 2024-09-19 19:52:14 +02:00
Code

Add Kotlin BOM as the Material library ships with an old version

Browse Source
This commit is contained in:
Wolf-Martell Montwé 2024-02-23 12:14:54 +01:00
parent 358b9d3d1e
commit 72cf7f36f4
No known key found for this signature in database
GPG Key ID: 6D45B21512ACBF72
8 changed files with 24 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app-k9mail/dependencies/releaseRuntimeClasspath.txt
View File

@ -167,6 +167,7 @@ org.apache.james:apache-mime4j-core:0.8.9
org.apache.james:apache-mime4j-dom:0.8.9
org.jetbrains.compose.runtime:runtime:1.5.11
org.jetbrains.kotlin:kotlin-android-extensions-runtime:1.9.22
org.jetbrains.kotlin:kotlin-bom:1.9.22
org.jetbrains.kotlin:kotlin-parcelize-runtime:1.9.22
org.jetbrains.kotlin:kotlin-stdlib-common:1.9.22
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.22

4
build-plugin/build.gradle.kts
View File

@ -18,6 +18,10 @@ dependencies {
implementation(libs.diff.utils)
compileOnly(libs.android.tools.common)
// This defines the used Kotlin version for all Plugin dependencies
// and ensures that transitive dependencies are aligned on one version.
implementation(platform(libs.kotlin.gradle.bom))
}
fun plugin(provider: Provider<PluginDependency>) = with(provider.get()) {

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

@ -37,6 +37,8 @@ android {
dependencies {
coreLibraryDesugaring(libs.android.desugar)
implementation(platform(libs.kotlin.bom))
implementation(libs.bundles.shared.jvm.android.app)
testImplementation(libs.bundles.shared.jvm.test)

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

@ -12,6 +12,8 @@ java {
configureKotlinJavaCompatibility()
dependencies {
implementation(platform(libs.kotlin.bom))
implementation(libs.bundles.shared.jvm.main)
testImplementation(libs.bundles.shared.jvm.test)
}

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

@ -27,6 +27,8 @@ android {
}
dependencies {
implementation(platform(libs.kotlin.bom))
implementation(libs.bundles.shared.jvm.main)
implementation(libs.bundles.shared.jvm.android)

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

@ -21,6 +21,8 @@ tasks.withType<Jar> {
configureKotlinJavaCompatibility()
dependencies {
implementation(platform(libs.kotlin.bom))
implementation(libs.bundles.shared.jvm.main)
testImplementation(libs.bundles.shared.jvm.test)
}

6
build.gradle.kts
View File

@ -45,12 +45,6 @@ allprojects {
.using(module("androidx.transition:transition:${libs.versions.androidxTransition.get()}"))
substitute(module("org.jetbrains:annotations"))
.using(module("org.jetbrains:annotations:${libs.versions.jetbrainsAnnotations.get()}"))
substitute(module("org.jetbrains.kotlin:kotlin-stdlib"))
.using(module("org.jetbrains.kotlin:kotlin-stdlib:${libs.versions.kotlin.get()}"))
substitute(module("org.jetbrains.kotlin:kotlin-stdlib-jdk7"))
.using(module("org.jetbrains.kotlin:kotlin-stdlib-jdk7:${libs.versions.kotlin.get()}"))
substitute(module("org.jetbrains.kotlin:kotlin-stdlib-jdk8"))
.using(module("org.jetbrains.kotlin:kotlin-stdlib-jdk8:${libs.versions.kotlin.get()}"))
substitute(module("org.jetbrains.kotlinx:kotlinx-coroutines-android"))
.using(
module(

18
gradle/libs.versions.toml
View File

@ -72,7 +72,9 @@ koinCore = "3.5.3"
koinAndroid = "3.5.3"
koinAndroidCompose = "3.5.3"
koinTest = "3.5.3"
kotlin = "1.9.22"
kotlinBom = "1.9.22"
# Needs to match the version used by Gradle, just check with `./gradlew --version`
kotlinGradleBom = "1.9.20"
kotlinKsp = "1.9.22-1.0.17"
kotlinxCoroutines = "1.8.0"
kotlinxDateTime = "0.5.0"
@ -105,9 +107,9 @@ android-test = { id = "com.android.test", version.ref = "androidGradlePlugin" }
dependency-check = { id = "com.github.ben-manes.versions", version.ref = "dependencyCheckPlugin" }
dependency-guard = { id = "com.dropbox.dependency-guard", version.ref = "dependencyGuardPlugin" }
detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detektPlugin" }
kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
kotlin-parcelize = { id = "org.jetbrains.kotlin.plugin.parcelize", version.ref = "kotlin" }
kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlinBom" }
kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlinBom" }
kotlin-parcelize = { id = "org.jetbrains.kotlin.plugin.parcelize", version.ref = "kotlinBom" }
ksp = { id = "com.google.devtools.ksp", version.ref = "kotlinKsp" }
spotless = { id = "com.diffplug.spotless", version.ref = "spotlessPlugin" }
@ -194,9 +196,11 @@ koin-android = { module = "io.insert-koin:koin-android", version.ref = "koinAndr
koin-androidx-compose = { module = "io.insert-koin:koin-androidx-compose", version.ref = "koinAndroidCompose" }
koin-test = { module = "io.insert-koin:koin-test", version.ref = "koinTest" }
koin-test-junit4 = { module = "io.insert-koin:koin-test-junit4", version.ref = "koinTest" }
kotlin-reflect = { module = "org.jetbrains.kotlin:kotlin-reflect", version.ref = "kotlin" }
kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlin" }
kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlin" }
kotlin-bom = { module = "org.jetbrains.kotlin:kotlin-bom", version.ref = "kotlinBom" }
kotlin-gradle-bom = { module = "org.jetbrains.kotlin:kotlin-bom", version.ref = "kotlinGradleBom" }
kotlin-reflect = { module = "org.jetbrains.kotlin:kotlin-reflect" }
kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib" }
kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test" }
kotlinx-collections-immutable = "org.jetbrains.kotlinx:kotlinx-collections-immutable:0.3.7"
kotlinx-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "kotlinxCoroutines" }
kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlinxCoroutines" }