Merge branch 'master' into feature/backgesture

Author: alexknop

changelog/unreleased/4922

@@ -0,0 +1,6 @@
+Bugfix: Spaces search filter for multi-personal accounts (Kiteworks accounts)
+
+All matching personal spaces have been included in the spaces search filter for multi-personal accounts.
+
+https://github.com/owncloud/android/issues/4674
+https://github.com/owncloud/android/pull/4922

gradle/libs.versions.toml

@@ -32,7 +32,7 @@ floatingactionbutton = "1.10.1"
 glide = "4.15.1"
 glideToVectorYou = "v2.0.0"
 junit4 = "4.13.2"
-koin = "3.3.3"
+koin = "4.2.2"
 kotlin = "2.3.10"
 kotlinxCoroutines = "1.9.0"
 ksp = "2.3.10"

owncloudApp/src/androidTest/java/com/owncloud/android/authentication/LoginActivityTest.kt

@@ -144,8 +144,8 @@ class LoginActivityTest {
         stopKoin()
 
         startKoin {
+            allowOverride(true)
             context
-            allowOverride(override = true)
             modules(
                 module {
                     viewModel {

owncloudApp/src/androidTest/java/com/owncloud/android/files/details/FileDetailsFragmentTest.kt

@@ -55,8 +55,8 @@ class FileDetailsFragmentTest {
         stopKoin()
 
         startKoin {
+            allowOverride(true)
             context
-            allowOverride(override = true)
             modules(
                 module {
                     viewModel {

owncloudApp/src/androidTest/java/com/owncloud/android/logging/LogsListActivityTest.kt

@@ -59,7 +59,7 @@ class LogsListActivityTest {
         stopKoin()
 
         startKoin {
-            allowOverride(override = true)
+            allowOverride(true)
             modules(
                 module {
                     viewModel {

owncloudApp/src/androidTest/java/com/owncloud/android/settings/SettingsFragmentTest.kt

@@ -86,8 +86,8 @@ class SettingsFragmentTest {
         stopKoin()
 
         startKoin {
+            allowOverride(true)
             context
-            allowOverride(override = true)
             modules(
                 module {
                     viewModel {

owncloudApp/src/androidTest/java/com/owncloud/android/settings/advanced/SettingsAdvancedFragmentTest.kt

@@ -62,8 +62,8 @@ class SettingsAdvancedFragmentTest {
         stopKoin()
 
         startKoin {
+            allowOverride(true)
             context
-            allowOverride(override = true)
             modules(
                 module {
                     viewModel {

owncloudApp/src/androidTest/java/com/owncloud/android/settings/logs/SettingsLogsFragmentTest.kt

@@ -74,8 +74,8 @@ class SettingsLogsFragmentTest {
         stopKoin()
 
         startKoin {
+            allowOverride(true)
             context
-            allowOverride(override = true)
             modules(
                 module {
                     viewModel {

owncloudApp/src/androidTest/java/com/owncloud/android/settings/more/SettingsMoreFragmentTest.kt

@@ -82,8 +82,8 @@ class SettingsMoreFragmentTest {
         stopKoin()
 
         startKoin {
+            allowOverride(true)
             context
-            allowOverride(override = true)
             modules(
                 module {
                     viewModel {

owncloudApp/src/androidTest/java/com/owncloud/android/settings/security/PassCodeActivityTest.kt

@@ -86,7 +86,7 @@ class PassCodeActivityTest {
         stopKoin()
 
         startKoin {
-            allowOverride(override = true)
+            allowOverride(true)
             context
             modules(
                 module {