From 80f29f9b3b63ce119346ee19e67721a0b2483a69 Mon Sep 17 00:00:00 2001 From: cketti Date: Sat, 30 Oct 2021 03:55:09 +0200 Subject: [PATCH] Update Koin to version 3.1.3 --- app/autodiscovery/providersxml/build.gradle | 2 +- app/autodiscovery/srvrecords/build.gradle | 2 +- app/autodiscovery/thunderbird/build.gradle | 2 +- app/core/build.gradle | 4 ++-- app/k9mail-jmap/build.gradle | 2 +- .../test/java/com/fsck/k9/DependencyInjectionTest.kt | 12 ++++++------ app/k9mail/build.gradle | 2 +- .../test/java/com/fsck/k9/DependencyInjectionTest.kt | 12 ++++++------ app/storage/build.gradle | 4 ++-- app/testing/build.gradle | 2 +- app/ui/legacy/build.gradle | 2 +- app/ui/setup/build.gradle | 2 +- build.gradle | 2 +- 13 files changed, 25 insertions(+), 25 deletions(-) diff --git a/app/autodiscovery/providersxml/build.gradle b/app/autodiscovery/providersxml/build.gradle index f427e7836..18cc6a868 100644 --- a/app/autodiscovery/providersxml/build.gradle +++ b/app/autodiscovery/providersxml/build.gradle @@ -16,7 +16,7 @@ dependencies { testImplementation "com.google.truth:truth:${versions.truth}" testImplementation "org.mockito:mockito-core:${versions.mockito}" testImplementation "org.mockito.kotlin:mockito-kotlin:${versions.mockitoKotlin}" - testImplementation "org.koin:koin-test:${versions.koin}" + testImplementation "io.insert-koin:koin-test-junit4:${versions.koin}" } android { diff --git a/app/autodiscovery/srvrecords/build.gradle b/app/autodiscovery/srvrecords/build.gradle index 565bf3659..2ebb818f1 100644 --- a/app/autodiscovery/srvrecords/build.gradle +++ b/app/autodiscovery/srvrecords/build.gradle @@ -17,7 +17,7 @@ dependencies { testImplementation "com.google.truth:truth:${versions.truth}" testImplementation "org.mockito:mockito-core:${versions.mockito}" testImplementation "org.mockito.kotlin:mockito-kotlin:${versions.mockitoKotlin}" - testImplementation "org.koin:koin-test:${versions.koin}" + testImplementation "io.insert-koin:koin-test-junit4:${versions.koin}" } android { diff --git a/app/autodiscovery/thunderbird/build.gradle b/app/autodiscovery/thunderbird/build.gradle index afad77f1a..ed21e968f 100644 --- a/app/autodiscovery/thunderbird/build.gradle +++ b/app/autodiscovery/thunderbird/build.gradle @@ -17,7 +17,7 @@ dependencies { testImplementation "com.google.truth:truth:${versions.truth}" testImplementation "org.mockito:mockito-core:${versions.mockito}" testImplementation "org.mockito.kotlin:mockito-kotlin:${versions.mockitoKotlin}" - testImplementation "org.koin:koin-test:${versions.koin}" + testImplementation "io.insert-koin:koin-test-junit4:${versions.koin}" } android { diff --git a/app/core/build.gradle b/app/core/build.gradle index 068a8d9e9..91e1118cb 100644 --- a/app/core/build.gradle +++ b/app/core/build.gradle @@ -8,7 +8,7 @@ dependencies { implementation project(':plugins:openpgp-api-lib:openpgp-api') - api "org.koin:koin-androidx-viewmodel:${versions.koin}" + api "io.insert-koin:koin-android:${versions.koin}" api "androidx.annotation:annotation:${versions.androidxAnnotation}" @@ -37,7 +37,7 @@ dependencies { testImplementation "org.mockito:mockito-core:${versions.mockito}" testImplementation "org.mockito.kotlin:mockito-kotlin:${versions.mockitoKotlin}" testImplementation "org.jdom:jdom2:2.0.6" - testImplementation "org.koin:koin-test:${versions.koin}" + testImplementation "io.insert-koin:koin-test-junit4:${versions.koin}" } android { diff --git a/app/k9mail-jmap/build.gradle b/app/k9mail-jmap/build.gradle index b6a3cf29f..d29aea28a 100644 --- a/app/k9mail-jmap/build.gradle +++ b/app/k9mail-jmap/build.gradle @@ -36,7 +36,7 @@ dependencies { testImplementation "com.google.truth:truth:${versions.truth}" testImplementation "org.mockito:mockito-core:${versions.mockito}" testImplementation "org.mockito.kotlin:mockito-kotlin:${versions.mockitoKotlin}" - testImplementation "org.koin:koin-test:${versions.koin}" + testImplementation "io.insert-koin:koin-test-junit4:${versions.koin}" } android { diff --git a/app/k9mail-jmap/src/test/java/com/fsck/k9/DependencyInjectionTest.kt b/app/k9mail-jmap/src/test/java/com/fsck/k9/DependencyInjectionTest.kt index 880498b64..14a763039 100644 --- a/app/k9mail-jmap/src/test/java/com/fsck/k9/DependencyInjectionTest.kt +++ b/app/k9mail-jmap/src/test/java/com/fsck/k9/DependencyInjectionTest.kt @@ -10,7 +10,7 @@ import com.fsck.k9.ui.folders.FolderNameFormatter import com.fsck.k9.ui.helper.SizeFormatter import org.junit.Test import org.junit.runner.RunWith -import org.koin.core.annotation.KoinInternal +import org.koin.core.annotation.KoinInternalApi import org.koin.core.logger.PrintLogger import org.koin.core.parameter.parametersOf import org.koin.java.KoinJavaComponent @@ -31,17 +31,17 @@ class DependencyInjectionTest : AutoCloseKoinTest() { } val autocryptTransferView = mock() - @KoinInternal + @KoinInternalApi @Test fun testDependencyTree() { KoinJavaComponent.getKoin().setupLogger(PrintLogger()) getKoin().checkModules { - create { parametersOf(lifecycleOwner) } + withParameter { lifecycleOwner } create { parametersOf(lifecycleOwner, autocryptTransferView) } - create { parametersOf(RuntimeEnvironment.application) } - create { parametersOf(RuntimeEnvironment.application) } - create { parametersOf(ChangeLogMode.CHANGE_LOG) } + withParameter { RuntimeEnvironment.application } + withParameter { RuntimeEnvironment.application } + withParameter { ChangeLogMode.CHANGE_LOG } } } } diff --git a/app/k9mail/build.gradle b/app/k9mail/build.gradle index 45fcb4694..685f2cd8a 100644 --- a/app/k9mail/build.gradle +++ b/app/k9mail/build.gradle @@ -36,7 +36,7 @@ dependencies { testImplementation "com.google.truth:truth:${versions.truth}" testImplementation "org.mockito:mockito-core:${versions.mockito}" testImplementation "org.mockito.kotlin:mockito-kotlin:${versions.mockitoKotlin}" - testImplementation "org.koin:koin-test:${versions.koin}" + testImplementation "io.insert-koin:koin-test-junit4:${versions.koin}" } android { diff --git a/app/k9mail/src/test/java/com/fsck/k9/DependencyInjectionTest.kt b/app/k9mail/src/test/java/com/fsck/k9/DependencyInjectionTest.kt index 880498b64..14a763039 100644 --- a/app/k9mail/src/test/java/com/fsck/k9/DependencyInjectionTest.kt +++ b/app/k9mail/src/test/java/com/fsck/k9/DependencyInjectionTest.kt @@ -10,7 +10,7 @@ import com.fsck.k9.ui.folders.FolderNameFormatter import com.fsck.k9.ui.helper.SizeFormatter import org.junit.Test import org.junit.runner.RunWith -import org.koin.core.annotation.KoinInternal +import org.koin.core.annotation.KoinInternalApi import org.koin.core.logger.PrintLogger import org.koin.core.parameter.parametersOf import org.koin.java.KoinJavaComponent @@ -31,17 +31,17 @@ class DependencyInjectionTest : AutoCloseKoinTest() { } val autocryptTransferView = mock() - @KoinInternal + @KoinInternalApi @Test fun testDependencyTree() { KoinJavaComponent.getKoin().setupLogger(PrintLogger()) getKoin().checkModules { - create { parametersOf(lifecycleOwner) } + withParameter { lifecycleOwner } create { parametersOf(lifecycleOwner, autocryptTransferView) } - create { parametersOf(RuntimeEnvironment.application) } - create { parametersOf(RuntimeEnvironment.application) } - create { parametersOf(ChangeLogMode.CHANGE_LOG) } + withParameter { RuntimeEnvironment.application } + withParameter { RuntimeEnvironment.application } + withParameter { ChangeLogMode.CHANGE_LOG } } } } diff --git a/app/storage/build.gradle b/app/storage/build.gradle index db0391a5a..5a319dc5b 100644 --- a/app/storage/build.gradle +++ b/app/storage/build.gradle @@ -2,7 +2,7 @@ apply plugin: 'com.android.library' apply plugin: 'org.jetbrains.kotlin.android' dependencies { - api "org.koin:koin-core:${versions.koin}" + api "io.insert-koin:koin-core:${versions.koin}" implementation project(":app:core") implementation "androidx.core:core-ktx:${versions.androidxCore}" @@ -18,7 +18,7 @@ dependencies { testImplementation "com.google.truth:truth:${versions.truth}" testImplementation "org.mockito:mockito-core:${versions.mockito}" testImplementation "org.mockito.kotlin:mockito-kotlin:${versions.mockitoKotlin}" - testImplementation "org.koin:koin-test:${versions.koin}" + testImplementation "io.insert-koin:koin-test-junit4:${versions.koin}" testImplementation "commons-io:commons-io:${versions.commonsIo}" } diff --git a/app/testing/build.gradle b/app/testing/build.gradle index dcbf59e72..91d2eb8a2 100644 --- a/app/testing/build.gradle +++ b/app/testing/build.gradle @@ -6,7 +6,7 @@ dependencies { api "junit:junit:${versions.junit}" api "org.robolectric:robolectric:${versions.robolectric}" - api "org.koin:koin-core:${versions.koin}" + api "io.insert-koin:koin-core:${versions.koin}" api "org.mockito:mockito-core:${versions.mockito}" api "org.mockito.kotlin:mockito-kotlin:${versions.mockitoKotlin}" } diff --git a/app/ui/legacy/build.gradle b/app/ui/legacy/build.gradle index bb856b542..f252a3cff 100644 --- a/app/ui/legacy/build.gradle +++ b/app/ui/legacy/build.gradle @@ -62,7 +62,7 @@ dependencies { testImplementation "com.google.truth:truth:${versions.truth}" testImplementation "org.mockito:mockito-core:${versions.mockito}" testImplementation "org.mockito.kotlin:mockito-kotlin:${versions.mockitoKotlin}" - testImplementation "org.koin:koin-test:${versions.koin}" + testImplementation "io.insert-koin:koin-test-junit4:${versions.koin}" } android { diff --git a/app/ui/setup/build.gradle b/app/ui/setup/build.gradle index 31d37bcb4..42c10c833 100644 --- a/app/ui/setup/build.gradle +++ b/app/ui/setup/build.gradle @@ -22,7 +22,7 @@ dependencies { testImplementation "com.google.truth:truth:${versions.truth}" testImplementation "org.mockito:mockito-core:${versions.mockito}" testImplementation "org.mockito.kotlin:mockito-kotlin:${versions.mockitoKotlin}" - testImplementation "org.koin:koin-test:${versions.koin}" + testImplementation "io.insert-koin:koin-test-junit4:${versions.koin}" } android { diff --git a/build.gradle b/build.gradle index e97c05a1d..f827d16f2 100644 --- a/build.gradle +++ b/build.gradle @@ -34,7 +34,7 @@ buildscript { 'okio': '2.10.0', 'moshi': '1.12.0', 'timber': '5.0.1', - 'koin': '2.2.2', + 'koin': '3.1.3', 'commonsIo': '2.6', 'mime4j': '0.8.3', 'okhttp': '4.9.1',