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

Merge pull request #7944 from thunderbird/bump-dependencies

Browse Source 
Bump dependencies and introduce Kotlin 2.0
This commit is contained in:
Wolf-Martell Montwé 2024-06-14 14:41:10 +00:00 committed by GitHub
commit 1feb4c7c6b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
12 changed files with 95 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -5,6 +5,7 @@
.DS_Store
.settings
.classpath
.kotlin
bin
captures
coverage

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

@ -15,41 +15,41 @@ androidx.cardview:cardview:1.0.0
androidx.collection:collection-jvm:1.4.0
androidx.collection:collection-ktx:1.4.0
androidx.collection:collection:1.4.0
androidx.compose.animation:animation-android:1.6.7
androidx.compose.animation:animation-core-android:1.6.7
androidx.compose.animation:animation-core:1.6.7
androidx.compose.animation:animation:1.6.7
androidx.compose.foundation:foundation-android:1.6.7
androidx.compose.foundation:foundation-layout-android:1.6.7
androidx.compose.foundation:foundation-layout:1.6.7
androidx.compose.foundation:foundation:1.6.7
androidx.compose.animation:animation-android:1.6.8
androidx.compose.animation:animation-core-android:1.6.8
androidx.compose.animation:animation-core:1.6.8
androidx.compose.animation:animation:1.6.8
androidx.compose.foundation:foundation-android:1.6.8
androidx.compose.foundation:foundation-layout-android:1.6.8
androidx.compose.foundation:foundation-layout:1.6.8
androidx.compose.foundation:foundation:1.6.8
androidx.compose.material3:material3-android:1.2.1
androidx.compose.material3:material3:1.2.1
androidx.compose.material:material-icons-core-android:1.6.7
androidx.compose.material:material-icons-core:1.6.7
androidx.compose.material:material-icons-extended-android:1.6.7
androidx.compose.material:material-icons-extended:1.6.7
androidx.compose.material:material-ripple-android:1.6.7
androidx.compose.material:material-ripple:1.6.7
androidx.compose.runtime:runtime-android:1.6.7
androidx.compose.runtime:runtime-saveable-android:1.6.7
androidx.compose.runtime:runtime-saveable:1.6.7
androidx.compose.runtime:runtime:1.6.7
androidx.compose.ui:ui-android:1.6.7
androidx.compose.ui:ui-geometry-android:1.6.7
androidx.compose.ui:ui-geometry:1.6.7
androidx.compose.ui:ui-graphics-android:1.6.7
androidx.compose.ui:ui-graphics:1.6.7
androidx.compose.ui:ui-text-android:1.6.7
androidx.compose.ui:ui-text:1.6.7
androidx.compose.ui:ui-tooling-preview-android:1.6.7
androidx.compose.ui:ui-tooling-preview:1.6.7
androidx.compose.ui:ui-unit-android:1.6.7
androidx.compose.ui:ui-unit:1.6.7
androidx.compose.ui:ui-util-android:1.6.7
androidx.compose.ui:ui-util:1.6.7
androidx.compose.ui:ui:1.6.7
androidx.compose:compose-bom:2024.05.00
androidx.compose.material:material-icons-core-android:1.6.8
androidx.compose.material:material-icons-core:1.6.8
androidx.compose.material:material-icons-extended-android:1.6.8
androidx.compose.material:material-icons-extended:1.6.8
androidx.compose.material:material-ripple-android:1.6.8
androidx.compose.material:material-ripple:1.6.8
androidx.compose.runtime:runtime-android:1.6.8
androidx.compose.runtime:runtime-saveable-android:1.6.8
androidx.compose.runtime:runtime-saveable:1.6.8
androidx.compose.runtime:runtime:1.6.8
androidx.compose.ui:ui-android:1.6.8
androidx.compose.ui:ui-geometry-android:1.6.8
androidx.compose.ui:ui-geometry:1.6.8
androidx.compose.ui:ui-graphics-android:1.6.8
androidx.compose.ui:ui-graphics:1.6.8
androidx.compose.ui:ui-text-android:1.6.8
androidx.compose.ui:ui-text:1.6.8
androidx.compose.ui:ui-tooling-preview-android:1.6.8
androidx.compose.ui:ui-tooling-preview:1.6.8
androidx.compose.ui:ui-unit-android:1.6.8
androidx.compose.ui:ui-unit:1.6.8
androidx.compose.ui:ui-util-android:1.6.8
androidx.compose.ui:ui-util:1.6.8
androidx.compose.ui:ui:1.6.8
androidx.compose:compose-bom:2024.06.00
androidx.concurrent:concurrent-futures:1.1.0
androidx.constraintlayout:constraintlayout-core:1.0.4
androidx.constraintlayout:constraintlayout:2.1.4
@ -173,13 +173,13 @@ org.apache.httpcomponents.core5:httpcore5:5.2.4
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.12
org.jetbrains.kotlin:kotlin-android-extensions-runtime:1.9.24
org.jetbrains.kotlin:kotlin-bom:1.9.24
org.jetbrains.kotlin:kotlin-parcelize-runtime:1.9.24
org.jetbrains.kotlin:kotlin-stdlib-common:1.9.24
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.24
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.24
org.jetbrains.kotlin:kotlin-stdlib:1.9.24
org.jetbrains.kotlin:kotlin-android-extensions-runtime:2.0.0
org.jetbrains.kotlin:kotlin-bom:2.0.0
org.jetbrains.kotlin:kotlin-parcelize-runtime:2.0.0
org.jetbrains.kotlin:kotlin-stdlib-common:2.0.0
org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.0.0
org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.0.0
org.jetbrains.kotlin:kotlin-stdlib:2.0.0
org.jetbrains.kotlinx:kotlinx-collections-immutable-jvm:0.3.7
org.jetbrains.kotlinx:kotlinx-collections-immutable:0.3.7
org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.1

80
app-thunderbird/dependencies/releaseRuntimeClasspath.txt
View File

@ -15,41 +15,41 @@ androidx.cardview:cardview:1.0.0
androidx.collection:collection-jvm:1.4.0
androidx.collection:collection-ktx:1.4.0
androidx.collection:collection:1.4.0
androidx.compose.animation:animation-android:1.6.7
androidx.compose.animation:animation-core-android:1.6.7
androidx.compose.animation:animation-core:1.6.7
androidx.compose.animation:animation:1.6.7
androidx.compose.foundation:foundation-android:1.6.7
androidx.compose.foundation:foundation-layout-android:1.6.7
androidx.compose.foundation:foundation-layout:1.6.7
androidx.compose.foundation:foundation:1.6.7
androidx.compose.animation:animation-android:1.6.8
androidx.compose.animation:animation-core-android:1.6.8
androidx.compose.animation:animation-core:1.6.8
androidx.compose.animation:animation:1.6.8
androidx.compose.foundation:foundation-android:1.6.8
androidx.compose.foundation:foundation-layout-android:1.6.8
androidx.compose.foundation:foundation-layout:1.6.8
androidx.compose.foundation:foundation:1.6.8
androidx.compose.material3:material3-android:1.2.1
androidx.compose.material3:material3:1.2.1
androidx.compose.material:material-icons-core-android:1.6.7
androidx.compose.material:material-icons-core:1.6.7
androidx.compose.material:material-icons-extended-android:1.6.7
androidx.compose.material:material-icons-extended:1.6.7
androidx.compose.material:material-ripple-android:1.6.7
androidx.compose.material:material-ripple:1.6.7
androidx.compose.runtime:runtime-android:1.6.7
androidx.compose.runtime:runtime-saveable-android:1.6.7
androidx.compose.runtime:runtime-saveable:1.6.7
androidx.compose.runtime:runtime:1.6.7
androidx.compose.ui:ui-android:1.6.7
androidx.compose.ui:ui-geometry-android:1.6.7
androidx.compose.ui:ui-geometry:1.6.7
androidx.compose.ui:ui-graphics-android:1.6.7
androidx.compose.ui:ui-graphics:1.6.7
androidx.compose.ui:ui-text-android:1.6.7
androidx.compose.ui:ui-text:1.6.7
androidx.compose.ui:ui-tooling-preview-android:1.6.7
androidx.compose.ui:ui-tooling-preview:1.6.7
androidx.compose.ui:ui-unit-android:1.6.7
androidx.compose.ui:ui-unit:1.6.7
androidx.compose.ui:ui-util-android:1.6.7
androidx.compose.ui:ui-util:1.6.7
androidx.compose.ui:ui:1.6.7
androidx.compose:compose-bom:2024.05.00
androidx.compose.material:material-icons-core-android:1.6.8
androidx.compose.material:material-icons-core:1.6.8
androidx.compose.material:material-icons-extended-android:1.6.8
androidx.compose.material:material-icons-extended:1.6.8
androidx.compose.material:material-ripple-android:1.6.8
androidx.compose.material:material-ripple:1.6.8
androidx.compose.runtime:runtime-android:1.6.8
androidx.compose.runtime:runtime-saveable-android:1.6.8
androidx.compose.runtime:runtime-saveable:1.6.8
androidx.compose.runtime:runtime:1.6.8
androidx.compose.ui:ui-android:1.6.8
androidx.compose.ui:ui-geometry-android:1.6.8
androidx.compose.ui:ui-geometry:1.6.8
androidx.compose.ui:ui-graphics-android:1.6.8
androidx.compose.ui:ui-graphics:1.6.8
androidx.compose.ui:ui-text-android:1.6.8
androidx.compose.ui:ui-text:1.6.8
androidx.compose.ui:ui-tooling-preview-android:1.6.8
androidx.compose.ui:ui-tooling-preview:1.6.8
androidx.compose.ui:ui-unit-android:1.6.8
androidx.compose.ui:ui-unit:1.6.8
androidx.compose.ui:ui-util-android:1.6.8
androidx.compose.ui:ui-util:1.6.8
androidx.compose.ui:ui:1.6.8
androidx.compose:compose-bom:2024.06.00
androidx.concurrent:concurrent-futures:1.1.0
androidx.constraintlayout:constraintlayout-core:1.0.4
androidx.constraintlayout:constraintlayout:2.1.4
@ -173,13 +173,13 @@ org.apache.httpcomponents.core5:httpcore5:5.2.4
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.12
org.jetbrains.kotlin:kotlin-android-extensions-runtime:1.9.24
org.jetbrains.kotlin:kotlin-bom:1.9.24
org.jetbrains.kotlin:kotlin-parcelize-runtime:1.9.24
org.jetbrains.kotlin:kotlin-stdlib-common:1.9.24
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.24
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.24
org.jetbrains.kotlin:kotlin-stdlib:1.9.24
org.jetbrains.kotlin:kotlin-android-extensions-runtime:2.0.0
org.jetbrains.kotlin:kotlin-bom:2.0.0
org.jetbrains.kotlin:kotlin-parcelize-runtime:2.0.0
org.jetbrains.kotlin:kotlin-stdlib-common:2.0.0
org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.0.0
org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.0.0
org.jetbrains.kotlin:kotlin-stdlib:2.0.0
org.jetbrains.kotlinx:kotlinx-collections-immutable-jvm:0.3.7
org.jetbrains.kotlinx:kotlinx-collections-immutable:0.3.7
org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.1

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

@ -12,6 +12,8 @@ dependencies {
implementation(plugin(libs.plugins.android.application))
implementation(plugin(libs.plugins.android.library))
implementation(plugin(libs.plugins.compose.compiler))
implementation(plugin(libs.plugins.spotless))
implementation(plugin(libs.plugins.detekt))
implementation(plugin(libs.plugins.dependency.check))

4
build-plugin/src/main/kotlin/AndroidExtension.kt
View File

@ -51,10 +51,6 @@ internal fun CommonExtension<*, *, *, *, *>.configureSharedComposeConfig(libs: L
compose = true
}
composeOptions {
kotlinCompilerExtensionVersion = libs.versions.androidxComposeCompiler.get()
}
lint {
warningsAsErrors = false
abortOnError = true

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

@ -1,5 +1,6 @@
plugins {
id("thunderbird.app.android")
id("org.jetbrains.kotlin.plugin.compose")
id("thunderbird.quality.detekt.typed")
}

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

@ -1,5 +1,6 @@
plugins {
id("thunderbird.library.android")
id("org.jetbrains.kotlin.plugin.compose")
id("thunderbird.quality.detekt.typed")
}

1
build.gradle.kts
View File

@ -3,6 +3,7 @@ plugins {
alias(libs.plugins.android.library) apply false
alias(libs.plugins.android.lint) apply false
alias(libs.plugins.android.test) apply false
alias(libs.plugins.compose.compiler) apply false
alias(libs.plugins.kotlin.android) apply false
alias(libs.plugins.kotlin.jvm) apply false
alias(libs.plugins.kotlin.parcelize) apply false

4
core/ui/compose/designsystem/src/main/kotlin/app/k9mail/core/ui/compose/designsystem/organism/drawer/ModalNavigationDrawer.kt
View File

@ -19,8 +19,8 @@ fun ModalNavigationDrawer(
val drawerState = rememberDrawerState(initialValue = DrawerValue.Closed)
val scope = rememberCoroutineScope()
val openDrawer = { scope.launch { drawerState.open() } }
val closeDrawer = {
val openDrawer: () -> Unit = { scope.launch { drawerState.open() } }
val closeDrawer: () -> Unit = {
scope.launch {
delay(DRAWER_CLOSE_DELAY)
drawerState.close()

10
gradle/libs.versions.toml
View File

@ -21,8 +21,7 @@ androidxAnnotation = "1.8.0"
androidxAppCompat = "1.6.1"
androidxBiometric = "1.1.0"
# https://developer.android.com/jetpack/compose/bom/bom-mapping
androidxComposeBom = "2024.05.00"
androidxComposeCompiler = "1.5.14"
androidxComposeBom = "2024.06.00"
androidxConstraintLayout = "2.1.4"
androidxCoordinatorLayout = "1.2.0"
androidxCore = "1.13.1"
@ -55,7 +54,7 @@ detektPluginCompose = "0.3.21"
fastAdapter = "5.7.0"
forkhandlesBom = "2.18.0.1"
glide = "4.16.0"
gradle = "8.7"
gradle = "8.8"
http4kBom = "5.20.0.0"
icu4j = "72.1"
javaDiffUtils = "4.12"
@ -68,11 +67,11 @@ junit = "4.13.2"
jutf7 = "1.0.0"
jzlib = "1.0.7"
koinBom = "3.5.6"
kotlinBom = "1.9.24"
kotlinBom = "2.0.0"
# Needs to match the version used by Gradle, just check with `./gradlew --version`
kotlinGradleBom = "1.9.22"
kotlinxCoroutines = "1.8.1"
kotlinKsp = "1.9.24-1.0.20"
kotlinKsp = "2.0.0-1.0.22"
kotlinxDateTime = "0.6.0"
ktlint = "1.1.1"
kxml2 = "1.0"
@ -100,6 +99,7 @@ android-application = { id = "com.android.application", version.ref = "androidGr
android-library = { id = "com.android.library", version.ref = "androidGradlePlugin" }
android-lint = { id = "com.android.lint", version.ref = "androidGradlePlugin" }
android-test = { id = "com.android.test", version.ref = "androidGradlePlugin" }
compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlinBom" }
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" }

2
gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-all.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME

2
gradlew vendored
View File

@ -55,7 +55,7 @@
# Darwin, MinGW, and NonStop.
#
# (3) This script is generated from the Groovy template
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# within the Gradle project.
#
# You can find Gradle at https://github.com/gradle/gradle/.