diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 6bcfbdc6..aacca7a5 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -71,8 +71,8 @@ dependencies { implementation(libs.compose.ui.tooling) implementation(libs.dagger.hilt.android) - implementation(libs.kotlin.coroutines.android) - implementation(libs.kotlin.coroutines.core) + implementation(libs.kotlinx.coroutines.android) + implementation(libs.kotlinx.coroutines.core) implementation(libs.aps.sublimeFuzzy) implementation(libs.aps.zxingAndroidEmbedded) diff --git a/autofill-parser/build.gradle.kts b/autofill-parser/build.gradle.kts index b3a2703c..814c3cc0 100644 --- a/autofill-parser/build.gradle.kts +++ b/autofill-parser/build.gradle.kts @@ -23,7 +23,7 @@ dependencies { implementation(libs.androidx.annotation) implementation(libs.androidx.autofill) implementation(libs.androidx.core.ktx) - implementation(libs.kotlin.coroutines.core) + implementation(libs.kotlinx.coroutines.core) implementation(libs.thirdparty.logcat) testImplementation(libs.bundles.testDependencies) } diff --git a/build-logic/build.gradle.kts b/build-logic/build.gradle.kts index 6f7a78c0..21ca91bd 100644 --- a/build-logic/build.gradle.kts +++ b/build-logic/build.gradle.kts @@ -95,5 +95,5 @@ dependencies { implementation(libs.build.sentry) implementation(libs.build.vcu) implementation(libs.build.versions) - implementation(libs.kotlin.coroutines.core) + implementation(libs.kotlinx.coroutines.core) } diff --git a/coroutine-utils/build.gradle.kts b/coroutine-utils/build.gradle.kts index 65ed2d9d..37149ea5 100644 --- a/coroutine-utils/build.gradle.kts +++ b/coroutine-utils/build.gradle.kts @@ -5,7 +5,7 @@ plugins { id("com.github.android-password-store.kotlin-jvm-library") } dependencies { - implementation(libs.kotlin.coroutines.core) + implementation(libs.kotlinx.coroutines.core) implementation(libs.dagger.hilt.core) api(libs.thirdparty.kotlinResult) } diff --git a/crypto-pgpainless/build.gradle.kts b/crypto-pgpainless/build.gradle.kts index 6c424e08..22363f23 100644 --- a/crypto-pgpainless/build.gradle.kts +++ b/crypto-pgpainless/build.gradle.kts @@ -9,10 +9,10 @@ dependencies { implementation(projects.coroutineUtils) implementation(libs.androidx.annotation) implementation(libs.dagger.hilt.core) - implementation(libs.kotlin.coroutines.core) + implementation(libs.kotlinx.coroutines.core) implementation(libs.thirdparty.kotlinResult) implementation(libs.thirdparty.pgpainless) testImplementation(libs.bundles.testDependencies) - testImplementation(libs.kotlin.coroutines.test) + testImplementation(libs.kotlinx.coroutines.test) testImplementation(libs.testing.testparameterinjector) } diff --git a/format-common/build.gradle.kts b/format-common/build.gradle.kts index 01009ab8..b4ac58b6 100644 --- a/format-common/build.gradle.kts +++ b/format-common/build.gradle.kts @@ -5,7 +5,7 @@ plugins { id("com.github.android-password-store.kotlin-jvm-library") } dependencies { - api(libs.kotlin.coroutines.core) + api(libs.kotlinx.coroutines.core) api(libs.thirdparty.kotlinResult) implementation(projects.coroutineUtils) implementation(libs.androidx.annotation) @@ -13,6 +13,6 @@ dependencies { implementation(libs.thirdparty.commons.codec) implementation(libs.thirdparty.uri) testImplementation(libs.bundles.testDependencies) - testImplementation(libs.kotlin.coroutines.test) + testImplementation(libs.kotlinx.coroutines.test) testImplementation(libs.testing.turbine) } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index a9b8ea81..34114e80 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -67,9 +67,9 @@ dagger-hilt-android = { module = "com.google.dagger:hilt-android", version.ref = dagger-hilt-compiler = { module = "com.google.dagger:hilt-compiler", version.ref = "hilt" } dagger-hilt-core = { module = "com.google.dagger:hilt-core", version.ref = "hilt" } kotlin-bom = { module = "org.jetbrains.kotlin:kotlin-bom", version.ref = "kotlin" } -kotlin-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "coroutines" } -kotlin-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutines" } -kotlin-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "coroutines" } +kotlinx-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "coroutines" } +kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutines" } +kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "coroutines" } testing-junit = "junit:junit:4.13.2" testing-kotlintest-junit = { module = "org.jetbrains.kotlin:kotlin-test-junit", version.ref = "kotlin" } testing-robolectric = "org.robolectric:robolectric:4.10.3" diff --git a/openpgp-ktx/build.gradle.kts b/openpgp-ktx/build.gradle.kts index b16a1d03..dd449e43 100644 --- a/openpgp-ktx/build.gradle.kts +++ b/openpgp-ktx/build.gradle.kts @@ -13,4 +13,4 @@ android { namespace = "me.msfjarvis.openpgpktx" } -dependencies { implementation(libs.kotlin.coroutines.core) } +dependencies { implementation(libs.kotlinx.coroutines.core) } diff --git a/ssh/build.gradle.kts b/ssh/build.gradle.kts index bfba59f5..998d5735 100644 --- a/ssh/build.gradle.kts +++ b/ssh/build.gradle.kts @@ -17,8 +17,8 @@ android { dependencies { implementation(libs.androidx.core.ktx) - implementation(libs.kotlin.coroutines.android) - implementation(libs.kotlin.coroutines.core) + implementation(libs.kotlinx.coroutines.android) + implementation(libs.kotlinx.coroutines.core) implementation(libs.thirdparty.sshj) { exclude(group = "org.bouncycastle") } implementation(libs.thirdparty.logcat) implementation(libs.androidx.security)