Merge pull request #3531 from owncloud/Koin-3.1

abelgardep · web-flow · commit 19c06c4a4f1d · 2022-05-04T16:35:01.000+02:00
Bump Koin 3.1
diff --git a/build.gradle b/build.gradle
@@ -19,7 +19,7 @@ buildscript {
         coroutinesVersion = "1.6.1"
 
         // Koin
-        koinVersion = '2.1.6'
+        koinVersion = '3.1.6'
 
         // Testing
         mockkVersion = '1.12.3'
diff --git a/owncloudApp/build.gradle b/owncloudApp/build.gradle
@@ -14,7 +14,7 @@ dependencies {
     // Dependencies for app building
     implementation "androidx.legacy:legacy-support-v4:$androidX"
     implementation "androidx.annotation:annotation:1.3.0"
-    implementation 'com.google.android.material:material:1.4.0'
+    implementation 'com.google.android.material:material:1.5.0'
     implementation 'com.jakewharton:disklrucache:2.0.2'
     implementation 'com.google.android.exoplayer:exoplayer:2.16.1'
     implementation 'com.github.aritraroy.PatternLockView:patternlockview:a90b0d4bf0'
@@ -46,7 +46,7 @@ dependencies {
 
     // Koin dependency injector
     implementation "io.insert-koin:koin-core:$koinVersion"
-    implementation "io.insert-koin:koin-androidx-viewmodel:$koinVersion"
+    implementation "io.insert-koin:koin-androidx-workmanager:$koinVersion"
 
     // WorkManager
     implementation "androidx.work:work-runtime-ktx:2.7.1"
diff --git a/owncloudApp/src/androidTest/java/com/owncloud/android/authentication/LoginActivityTest.kt b/owncloudApp/src/androidTest/java/com/owncloud/android/authentication/LoginActivityTest.kt
@@ -129,8 +129,9 @@ class LoginActivityTest {
 
         startKoin {
             context
+            allowOverride(override = true)
             modules(
-                module(override = true) {
+                module {
                     viewModel {
                         ocAuthenticationViewModel
                     }
diff --git a/owncloudApp/src/androidTest/java/com/owncloud/android/logging/LogsListActivityTest.kt b/owncloudApp/src/androidTest/java/com/owncloud/android/logging/LogsListActivityTest.kt
@@ -59,8 +59,9 @@ class LogsListActivityTest {
         stopKoin()
 
         startKoin {
+            allowOverride(override = true)
             modules(
-                module(override = true) {
+                module {
                     viewModel {
                         logListViewModel
                     }
diff --git a/owncloudApp/src/androidTest/java/com/owncloud/android/settings/SettingsFragmentTest.kt b/owncloudApp/src/androidTest/java/com/owncloud/android/settings/SettingsFragmentTest.kt
@@ -79,16 +79,17 @@ class SettingsFragmentTest {
     @Before
     fun setUp() {
         context = InstrumentationRegistry.getInstrumentation().targetContext
-        settingsViewModel = mockk(relaxUnitFun = true)
-        moreViewModel = mockk(relaxUnitFun = true)
-        releaseNotesViewModel = mockk(relaxUnitFun = true)
+        settingsViewModel = mockk(relaxed = true)
+        moreViewModel = mockk(relaxed = true)
+        releaseNotesViewModel = mockk(relaxed = true)
 
         stopKoin()
 
         startKoin {
             context
+            allowOverride(override = true)
             modules(
-                module(override = true) {
+                module {
                     viewModel {
                         settingsViewModel
                     }
diff --git a/owncloudApp/src/androidTest/java/com/owncloud/android/settings/advanced/SettingsAdvancedFragmentTest.kt b/owncloudApp/src/androidTest/java/com/owncloud/android/settings/advanced/SettingsAdvancedFragmentTest.kt
@@ -57,14 +57,15 @@ class SettingsAdvancedFragmentTest {
     @Before
     fun setUp() {
         context = InstrumentationRegistry.getInstrumentation().targetContext
-        advancedViewModel = mockk(relaxUnitFun = true)
+        advancedViewModel = mockk(relaxed = true)
 
         stopKoin()
 
         startKoin {
             context
+            allowOverride(override = true)
             modules(
-                module(override = true) {
+                module {
                     viewModel {
                         advancedViewModel
                     }
@@ -105,4 +106,4 @@ class SettingsAdvancedFragmentTest {
 
         prefShowHiddenFiles?.isChecked?.let { assertFalse(it) }
     }
-}
+}
diff --git a/owncloudApp/src/androidTest/java/com/owncloud/android/settings/logs/SettingsLogsFragmentTest.kt b/owncloudApp/src/androidTest/java/com/owncloud/android/settings/logs/SettingsLogsFragmentTest.kt
@@ -68,15 +68,16 @@ class SettingsLogsFragmentTest {
     @Before
     fun setUp() {
         context = InstrumentationRegistry.getInstrumentation().targetContext
-        logsViewModel = mockk(relaxUnitFun = true)
+        logsViewModel = mockk(relaxed = true)
         logListViewModel = mockk(relaxed = true)
 
         stopKoin()
 
         startKoin {
             context
+            allowOverride(override = true)
             modules(
-                module(override = true) {
+                module {
                     viewModel {
                         logsViewModel
                     }
diff --git a/owncloudApp/src/androidTest/java/com/owncloud/android/settings/more/SettingsMoreFragmentTest.kt b/owncloudApp/src/androidTest/java/com/owncloud/android/settings/more/SettingsMoreFragmentTest.kt
@@ -74,14 +74,15 @@ class SettingsMoreFragmentTest {
     @Before
     fun setUp() {
         context = InstrumentationRegistry.getInstrumentation().targetContext
-        moreViewModel = mockk(relaxUnitFun = true)
+        moreViewModel = mockk(relaxed = true)
 
         stopKoin()
 
         startKoin {
             context
+            allowOverride(override = true)
             modules(
-                module(override = true) {
+                module {
                     viewModel {
                         moreViewModel
                     }
diff --git a/owncloudApp/src/androidTest/java/com/owncloud/android/settings/security/PassCodeActivityTest.kt b/owncloudApp/src/androidTest/java/com/owncloud/android/settings/security/PassCodeActivityTest.kt
@@ -75,21 +75,21 @@ class PassCodeActivityTest {
     @Before
     fun setUp() {
         context = ApplicationProvider.getApplicationContext()
-        passCodeViewModel = mockk(relaxUnitFun = true)
-        biometricViewModel = mockk(relaxUnitFun = true)
+        passCodeViewModel = mockk(relaxed = true)
+        biometricViewModel = mockk(relaxed = true)
 
         timeToUnlockLiveData = MutableLiveData()
         finishTimeToUnlockLiveData = MutableLiveData()
         statusLiveData = MutableLiveData()
         passcodeLiveData = MutableLiveData()
 
-
         stopKoin()
 
         startKoin {
+            allowOverride(override = true)
             context
             modules(
-                module(override = true) {
+                module {
                     viewModel {
                         passCodeViewModel
                     }
@@ -107,7 +107,6 @@ class PassCodeActivityTest {
         every { passCodeViewModel.getFinishedTimeToUnlockLiveData } returns finishTimeToUnlockLiveData
         every { passCodeViewModel.status } returns statusLiveData
         every { passCodeViewModel.passcode } returns passcodeLiveData
-
     }
 
     @After
diff --git a/owncloudApp/src/androidTest/java/com/owncloud/android/settings/security/PatternActivityTest.kt b/owncloudApp/src/androidTest/java/com/owncloud/android/settings/security/PatternActivityTest.kt
@@ -58,8 +58,9 @@ class PatternActivityTest {
 
         startKoin {
             context
+            allowOverride(override = true)
             modules(
-                module(override = true) {
+                module {
                     viewModel {
                         patternViewModel
                     }
diff --git a/owncloudApp/src/androidTest/java/com/owncloud/android/settings/security/SettingsSecurityFragmentTest.kt b/owncloudApp/src/androidTest/java/com/owncloud/android/settings/security/SettingsSecurityFragmentTest.kt
@@ -42,8 +42,8 @@ import com.owncloud.android.R
 import com.owncloud.android.presentation.ui.security.BiometricActivity
 import com.owncloud.android.presentation.ui.security.BiometricManager
 import com.owncloud.android.presentation.ui.security.PREFERENCE_LOCK_TIMEOUT
-import com.owncloud.android.presentation.ui.security.passcode.PassCodeActivity
 import com.owncloud.android.presentation.ui.security.PatternActivity
+import com.owncloud.android.presentation.ui.security.passcode.PassCodeActivity
 import com.owncloud.android.presentation.ui.settings.fragments.SettingsSecurityFragment
 import com.owncloud.android.presentation.ui.settings.fragments.SettingsSecurityFragment.Companion.PREFERENCE_LOCK_ACCESS_FROM_DOCUMENT_PROVIDER
 import com.owncloud.android.presentation.viewmodels.settings.SettingsSecurityViewModel
@@ -84,16 +84,17 @@ class SettingsSecurityFragmentTest {
     @Before
     fun setUp() {
         context = InstrumentationRegistry.getInstrumentation().targetContext
-        securityViewModel = mockk(relaxUnitFun = true)
-        biometricViewModel = mockk(relaxUnitFun = true)
+        securityViewModel = mockk(relaxed = true)
+        biometricViewModel = mockk(relaxed = true)
         mockkObject(BiometricManager)
 
         stopKoin()
 
         startKoin {
             context
+            allowOverride(override = true)
             modules(
-                module(override = true) {
+                module {
                     viewModel {
                         securityViewModel
                     }
diff --git a/owncloudApp/src/androidTest/java/com/owncloud/android/sharing/sharees/ui/SearchShareesFragmentTest.kt b/owncloudApp/src/androidTest/java/com/owncloud/android/sharing/sharees/ui/SearchShareesFragmentTest.kt
@@ -61,8 +61,9 @@ class SearchShareesFragmentTest {
 
         startKoin {
             androidContext(ApplicationProvider.getApplicationContext())
+            allowOverride(override = true)
             modules(
-                module(override = true) {
+                module {
                     viewModel {
                         ocShareViewModel
                     }
diff --git a/owncloudApp/src/androidTest/java/com/owncloud/android/sharing/shares/ui/EditPrivateShareFragmentTest.kt b/owncloudApp/src/androidTest/java/com/owncloud/android/sharing/shares/ui/EditPrivateShareFragmentTest.kt
@@ -70,8 +70,9 @@ class EditPrivateShareFragmentTest {
 
         startKoin {
             androidContext(ApplicationProvider.getApplicationContext())
+            allowOverride(override = true)
             modules(
-                module(override = true) {
+                module {
                     viewModel {
                         ocShareViewModel
                     }
diff --git a/owncloudApp/src/androidTest/java/com/owncloud/android/sharing/shares/ui/PublicShareCreationDialogFragmentTest.kt b/owncloudApp/src/androidTest/java/com/owncloud/android/sharing/shares/ui/PublicShareCreationDialogFragmentTest.kt
@@ -77,8 +77,9 @@ class PublicShareCreationDialogFragmentTest {
 
         startKoin {
             androidContext(ApplicationProvider.getApplicationContext())
+            allowOverride(override = true)
             modules(
-                module(override = true) {
+                module {
                     viewModel {
                         ocCapabilityViewModel
                     }
diff --git a/owncloudApp/src/androidTest/java/com/owncloud/android/sharing/shares/ui/PublicShareEditionDialogFragmentTest.kt b/owncloudApp/src/androidTest/java/com/owncloud/android/sharing/shares/ui/PublicShareEditionDialogFragmentTest.kt
@@ -68,25 +68,13 @@ class PublicShareEditionDialogFragmentTest {
     fun setUp() {
         every { ocCapabilityViewModel.capabilities } returns capabilitiesLiveData
 
-        val publicShareDialogFragment = PublicShareDialogFragment.newInstanceToUpdate(
-            OC_FILE,
-            OC_ACCOUNT,
-            OC_SHARE.copy(
-                shareType = ShareType.PUBLIC_LINK,
-                shareWith = "user",
-                name = "Docs link",
-                permissions = RemoteShare.CREATE_PERMISSION_FLAG,
-                expirationDate = expirationDate,
-                isFolder = true
-            )
-        )
-
         stopKoin()
 
         startKoin {
             androidContext(ApplicationProvider.getApplicationContext())
+            allowOverride(override = true)
             modules(
-                module(override = true) {
+                module {
                     viewModel {
                         ocCapabilityViewModel
                     }
@@ -97,6 +85,19 @@ class PublicShareEditionDialogFragmentTest {
             )
         }
 
+        val publicShareDialogFragment = PublicShareDialogFragment.newInstanceToUpdate(
+            OC_FILE,
+            OC_ACCOUNT,
+            OC_SHARE.copy(
+                shareType = ShareType.PUBLIC_LINK,
+                shareWith = "user",
+                name = "Docs link",
+                permissions = RemoteShare.CREATE_PERMISSION_FLAG,
+                expirationDate = expirationDate,
+                isFolder = true
+            )
+        )
+
         ActivityScenario.launch(TestShareFileActivity::class.java).onActivity {
             it.startFragment(publicShareDialogFragment)
         }
diff --git a/owncloudApp/src/androidTest/java/com/owncloud/android/sharing/shares/ui/ShareFileFragmentTest.kt b/owncloudApp/src/androidTest/java/com/owncloud/android/sharing/shares/ui/ShareFileFragmentTest.kt
@@ -71,8 +71,9 @@ class ShareFileFragmentTest {
 
         startKoin {
             androidContext(ApplicationProvider.getApplicationContext())
+            allowOverride(override = true)
             modules(
-                module(override = true) {
+                module {
                     viewModel {
                         ocCapabilityViewModel
                     }
diff --git a/owncloudApp/src/androidTest/java/com/owncloud/android/sharing/shares/ui/ShareFolderFragmentTest.kt b/owncloudApp/src/androidTest/java/com/owncloud/android/sharing/shares/ui/ShareFolderFragmentTest.kt
@@ -65,8 +65,9 @@ class ShareFolderFragmentTest {
 
         startKoin {
             androidContext(ApplicationProvider.getApplicationContext())
+            allowOverride(override = true)
             modules(
-                module(override = true) {
+                module {
                     viewModel {
                         ocCapabilityViewModel
                     }
diff --git a/owncloudApp/src/androidTest/java/com/owncloud/android/ui/activity/ReleaseNotesActivityTest.kt b/owncloudApp/src/androidTest/java/com/owncloud/android/ui/activity/ReleaseNotesActivityTest.kt
@@ -26,12 +26,12 @@ import androidx.test.core.app.ActivityScenario
 import androidx.test.core.app.ApplicationProvider
 import com.owncloud.android.R
 import com.owncloud.android.presentation.ui.releasenotes.ReleaseNotesActivity
-import com.owncloud.android.utils.releaseNotesList
 import com.owncloud.android.presentation.viewmodels.releasenotes.ReleaseNotesViewModel
 import com.owncloud.android.utils.click
 import com.owncloud.android.utils.matchers.assertChildCount
 import com.owncloud.android.utils.matchers.isDisplayed
 import com.owncloud.android.utils.matchers.withText
+import com.owncloud.android.utils.releaseNotesList
 import io.mockk.every
 import io.mockk.mockk
 import org.junit.Assert.assertEquals
@@ -51,14 +51,15 @@ class ReleaseNotesActivityTest {
     @Before
     fun setUp() {
         context = ApplicationProvider.getApplicationContext()
-        releaseNotesViewModel = mockk(relaxUnitFun = true)
+        releaseNotesViewModel = mockk(relaxed = true)
 
         stopKoin()
 
         startKoin {
             context
+            allowOverride(override = true)
             modules(
-                module(override = true) {
+                module {
                     viewModel {
                         releaseNotesViewModel
                     }
diff --git a/owncloudApp/src/main/java/com/owncloud/android/extensions/ViewModelExt.kt b/owncloudApp/src/main/java/com/owncloud/android/extensions/ViewModelExt.kt
@@ -29,8 +29,8 @@ import com.owncloud.android.presentation.UIResult
 import com.owncloud.android.providers.ContextProvider
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.launch
-import org.koin.core.KoinComponent
-import org.koin.core.inject
+import org.koin.core.component.KoinComponent
+import org.koin.core.component.inject
 import timber.log.Timber
 
 object ViewModelExt : KoinComponent {
diff --git a/owncloudApp/src/main/java/com/owncloud/android/operations/SyncProfileOperation.kt b/owncloudApp/src/main/java/com/owncloud/android/operations/SyncProfileOperation.kt
@@ -31,8 +31,8 @@ import com.owncloud.android.presentation.manager.AvatarManager
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
-import org.koin.core.KoinComponent
-import org.koin.core.inject
+import org.koin.core.component.KoinComponent
+import org.koin.core.component.inject
 import timber.log.Timber
 
 /**
diff --git a/owncloudApp/src/main/java/com/owncloud/android/presentation/manager/AvatarManager.kt b/owncloudApp/src/main/java/com/owncloud/android/presentation/manager/AvatarManager.kt
@@ -33,9 +33,9 @@ import com.owncloud.android.domain.user.model.UserAvatar
 import com.owncloud.android.domain.user.usecases.GetUserAvatarAsyncUseCase
 import com.owncloud.android.ui.DefaultAvatarTextDrawable
 import com.owncloud.android.utils.BitmapUtils
-import org.koin.core.KoinComponent
+import org.koin.core.component.KoinComponent
 import org.koin.core.error.InstanceCreationException
-import org.koin.core.inject
+import org.koin.core.component.inject
 import timber.log.Timber
 import kotlin.math.roundToInt
 
diff --git a/owncloudApp/src/main/java/com/owncloud/android/utils/AvatarUtils.kt b/owncloudApp/src/main/java/com/owncloud/android/utils/AvatarUtils.kt
@@ -28,8 +28,8 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
-import org.koin.core.KoinComponent
-import org.koin.core.inject
+import org.koin.core.component.KoinComponent
+import org.koin.core.component.inject
 
 class AvatarUtils : KoinComponent {
 
diff --git a/owncloudApp/src/main/java/com/owncloud/android/workers/CameraUploadsWorker.kt b/owncloudApp/src/main/java/com/owncloud/android/workers/CameraUploadsWorker.kt
@@ -42,8 +42,8 @@ import com.owncloud.android.usecases.UploadFileFromContentUriUseCase
 import com.owncloud.android.utils.MimetypeIconUtil
 import com.owncloud.android.utils.NotificationUtils
 import com.owncloud.android.utils.UPLOAD_NOTIFICATION_CHANNEL_ID
-import org.koin.core.KoinComponent
-import org.koin.core.inject
+import org.koin.core.component.KoinComponent
+import org.koin.core.component.inject
 
 import timber.log.Timber
 import java.io.File
diff --git a/owncloudApp/src/main/java/com/owncloud/android/workers/OldLogsCollectorWorker.kt b/owncloudApp/src/main/java/com/owncloud/android/workers/OldLogsCollectorWorker.kt
diff --git a/owncloudApp/src/main/java/com/owncloud/android/workers/UploadFileFromContentUriWorker.kt b/owncloudApp/src/main/java/com/owncloud/android/workers/UploadFileFromContentUriWorker.kt
diff --git a/owncloudApp/src/test/java/com/owncloud/android/presentation/viewmodels/DrawerViewModelTest.kt b/owncloudApp/src/test/java/com/owncloud/android/presentation/viewmodels/DrawerViewModelTest.kt
diff --git a/owncloudApp/src/test/java/com/owncloud/android/presentation/viewmodels/authentication/OAuthViewModelTest.kt b/owncloudApp/src/test/java/com/owncloud/android/presentation/viewmodels/authentication/OAuthViewModelTest.kt
diff --git a/owncloudApp/src/test/java/com/owncloud/android/presentation/viewmodels/authentication/OCAuthenticationViewModelTest.kt b/owncloudApp/src/test/java/com/owncloud/android/presentation/viewmodels/authentication/OCAuthenticationViewModelTest.kt
diff --git a/owncloudApp/src/test/java/com/owncloud/android/presentation/viewmodels/capabilities/OCCapabilityViewModelTest.kt b/owncloudApp/src/test/java/com/owncloud/android/presentation/viewmodels/capabilities/OCCapabilityViewModelTest.kt
diff --git a/owncloudApp/src/test/java/com/owncloud/android/presentation/viewmodels/sharing/OCShareViewModelTest.kt b/owncloudApp/src/test/java/com/owncloud/android/presentation/viewmodels/sharing/OCShareViewModelTest.kt
