Revert "chore(deps): bump kotlinBom from 2.2.0 to 2.3.0"

wmontwe · web-flow · commit 0fe9a0fbcb32 · 2026-01-08T16:07:30.000+01:00
diff --git a/app-k9mail/dependencies/fossReleaseRuntimeClasspath.txt b/app-k9mail/dependencies/fossReleaseRuntimeClasspath.txt
@@ -265,12 +265,12 @@ org.jetbrains.compose.ui:ui-tooling-preview:1.9.3
 org.jetbrains.compose.ui:ui-unit:1.9.3
 org.jetbrains.compose.ui:ui-util:1.9.3
 org.jetbrains.compose.ui:ui:1.9.3
-org.jetbrains.kotlin:kotlin-bom:2.3.0
-org.jetbrains.kotlin:kotlin-parcelize-runtime:2.3.0
-org.jetbrains.kotlin:kotlin-stdlib-common:2.3.0
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.3.0
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.3.0
-org.jetbrains.kotlin:kotlin-stdlib:2.3.0
+org.jetbrains.kotlin:kotlin-bom:2.2.21
+org.jetbrains.kotlin:kotlin-parcelize-runtime:2.2.21
+org.jetbrains.kotlin:kotlin-stdlib-common:2.2.21
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.2.21
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.2.21
+org.jetbrains.kotlin:kotlin-stdlib:2.2.21
 org.jetbrains.kotlinx:kotlinx-collections-immutable-jvm:0.4.0
 org.jetbrains.kotlinx:kotlinx-collections-immutable:0.4.0
 org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.2
diff --git a/app-k9mail/dependencies/fullReleaseRuntimeClasspath.txt b/app-k9mail/dependencies/fullReleaseRuntimeClasspath.txt
@@ -279,12 +279,12 @@ org.jetbrains.compose.ui:ui-tooling-preview:1.9.3
 org.jetbrains.compose.ui:ui-unit:1.9.3
 org.jetbrains.compose.ui:ui-util:1.9.3
 org.jetbrains.compose.ui:ui:1.9.3
-org.jetbrains.kotlin:kotlin-bom:2.3.0
-org.jetbrains.kotlin:kotlin-parcelize-runtime:2.3.0
-org.jetbrains.kotlin:kotlin-stdlib-common:2.3.0
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.3.0
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.3.0
-org.jetbrains.kotlin:kotlin-stdlib:2.3.0
+org.jetbrains.kotlin:kotlin-bom:2.2.21
+org.jetbrains.kotlin:kotlin-parcelize-runtime:2.2.21
+org.jetbrains.kotlin:kotlin-stdlib-common:2.2.21
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.2.21
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.2.21
+org.jetbrains.kotlin:kotlin-stdlib:2.2.21
 org.jetbrains.kotlinx:kotlinx-collections-immutable-jvm:0.4.0
 org.jetbrains.kotlinx:kotlinx-collections-immutable:0.4.0
 org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.2
diff --git a/app-thunderbird/dependencies/fossBetaRuntimeClasspath.txt b/app-thunderbird/dependencies/fossBetaRuntimeClasspath.txt
@@ -272,12 +272,12 @@ org.jetbrains.compose.ui:ui-tooling-preview:1.9.3
 org.jetbrains.compose.ui:ui-unit:1.9.3
 org.jetbrains.compose.ui:ui-util:1.9.3
 org.jetbrains.compose.ui:ui:1.9.3
-org.jetbrains.kotlin:kotlin-bom:2.3.0
-org.jetbrains.kotlin:kotlin-parcelize-runtime:2.3.0
-org.jetbrains.kotlin:kotlin-stdlib-common:2.3.0
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.3.0
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.3.0
-org.jetbrains.kotlin:kotlin-stdlib:2.3.0
+org.jetbrains.kotlin:kotlin-bom:2.2.21
+org.jetbrains.kotlin:kotlin-parcelize-runtime:2.2.21
+org.jetbrains.kotlin:kotlin-stdlib-common:2.2.21
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.2.21
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.2.21
+org.jetbrains.kotlin:kotlin-stdlib:2.2.21
 org.jetbrains.kotlinx:kotlinx-collections-immutable-jvm:0.4.0
 org.jetbrains.kotlinx:kotlinx-collections-immutable:0.4.0
 org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.2
diff --git a/app-thunderbird/dependencies/fossDailyRuntimeClasspath.txt b/app-thunderbird/dependencies/fossDailyRuntimeClasspath.txt
@@ -272,12 +272,12 @@ org.jetbrains.compose.ui:ui-tooling-preview:1.9.3
 org.jetbrains.compose.ui:ui-unit:1.9.3
 org.jetbrains.compose.ui:ui-util:1.9.3
 org.jetbrains.compose.ui:ui:1.9.3
-org.jetbrains.kotlin:kotlin-bom:2.3.0
-org.jetbrains.kotlin:kotlin-parcelize-runtime:2.3.0
-org.jetbrains.kotlin:kotlin-stdlib-common:2.3.0
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.3.0
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.3.0
-org.jetbrains.kotlin:kotlin-stdlib:2.3.0
+org.jetbrains.kotlin:kotlin-bom:2.2.21
+org.jetbrains.kotlin:kotlin-parcelize-runtime:2.2.21
+org.jetbrains.kotlin:kotlin-stdlib-common:2.2.21
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.2.21
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.2.21
+org.jetbrains.kotlin:kotlin-stdlib:2.2.21
 org.jetbrains.kotlinx:kotlinx-collections-immutable-jvm:0.4.0
 org.jetbrains.kotlinx:kotlinx-collections-immutable:0.4.0
 org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.2
diff --git a/app-thunderbird/dependencies/fossReleaseRuntimeClasspath.txt b/app-thunderbird/dependencies/fossReleaseRuntimeClasspath.txt
@@ -272,12 +272,12 @@ org.jetbrains.compose.ui:ui-tooling-preview:1.9.3
 org.jetbrains.compose.ui:ui-unit:1.9.3
 org.jetbrains.compose.ui:ui-util:1.9.3
 org.jetbrains.compose.ui:ui:1.9.3
-org.jetbrains.kotlin:kotlin-bom:2.3.0
-org.jetbrains.kotlin:kotlin-parcelize-runtime:2.3.0
-org.jetbrains.kotlin:kotlin-stdlib-common:2.3.0
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.3.0
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.3.0
-org.jetbrains.kotlin:kotlin-stdlib:2.3.0
+org.jetbrains.kotlin:kotlin-bom:2.2.21
+org.jetbrains.kotlin:kotlin-parcelize-runtime:2.2.21
+org.jetbrains.kotlin:kotlin-stdlib-common:2.2.21
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.2.21
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.2.21
+org.jetbrains.kotlin:kotlin-stdlib:2.2.21
 org.jetbrains.kotlinx:kotlinx-collections-immutable-jvm:0.4.0
 org.jetbrains.kotlinx:kotlinx-collections-immutable:0.4.0
 org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.2
diff --git a/app-thunderbird/dependencies/fullBetaRuntimeClasspath.txt b/app-thunderbird/dependencies/fullBetaRuntimeClasspath.txt
@@ -286,12 +286,12 @@ org.jetbrains.compose.ui:ui-tooling-preview:1.9.3
 org.jetbrains.compose.ui:ui-unit:1.9.3
 org.jetbrains.compose.ui:ui-util:1.9.3
 org.jetbrains.compose.ui:ui:1.9.3
-org.jetbrains.kotlin:kotlin-bom:2.3.0
-org.jetbrains.kotlin:kotlin-parcelize-runtime:2.3.0
-org.jetbrains.kotlin:kotlin-stdlib-common:2.3.0
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.3.0
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.3.0
-org.jetbrains.kotlin:kotlin-stdlib:2.3.0
+org.jetbrains.kotlin:kotlin-bom:2.2.21
+org.jetbrains.kotlin:kotlin-parcelize-runtime:2.2.21
+org.jetbrains.kotlin:kotlin-stdlib-common:2.2.21
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.2.21
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.2.21
+org.jetbrains.kotlin:kotlin-stdlib:2.2.21
 org.jetbrains.kotlinx:kotlinx-collections-immutable-jvm:0.4.0
 org.jetbrains.kotlinx:kotlinx-collections-immutable:0.4.0
 org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.2
diff --git a/app-thunderbird/dependencies/fullDailyRuntimeClasspath.txt b/app-thunderbird/dependencies/fullDailyRuntimeClasspath.txt
@@ -286,12 +286,12 @@ org.jetbrains.compose.ui:ui-tooling-preview:1.9.3
 org.jetbrains.compose.ui:ui-unit:1.9.3
 org.jetbrains.compose.ui:ui-util:1.9.3
 org.jetbrains.compose.ui:ui:1.9.3
-org.jetbrains.kotlin:kotlin-bom:2.3.0
-org.jetbrains.kotlin:kotlin-parcelize-runtime:2.3.0
-org.jetbrains.kotlin:kotlin-stdlib-common:2.3.0
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.3.0
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.3.0
-org.jetbrains.kotlin:kotlin-stdlib:2.3.0
+org.jetbrains.kotlin:kotlin-bom:2.2.21
+org.jetbrains.kotlin:kotlin-parcelize-runtime:2.2.21
+org.jetbrains.kotlin:kotlin-stdlib-common:2.2.21
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.2.21
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.2.21
+org.jetbrains.kotlin:kotlin-stdlib:2.2.21
 org.jetbrains.kotlinx:kotlinx-collections-immutable-jvm:0.4.0
 org.jetbrains.kotlinx:kotlinx-collections-immutable:0.4.0
 org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.2
diff --git a/app-thunderbird/dependencies/fullReleaseRuntimeClasspath.txt b/app-thunderbird/dependencies/fullReleaseRuntimeClasspath.txt
@@ -286,12 +286,12 @@ org.jetbrains.compose.ui:ui-tooling-preview:1.9.3
 org.jetbrains.compose.ui:ui-unit:1.9.3
 org.jetbrains.compose.ui:ui-util:1.9.3
 org.jetbrains.compose.ui:ui:1.9.3
-org.jetbrains.kotlin:kotlin-bom:2.3.0
-org.jetbrains.kotlin:kotlin-parcelize-runtime:2.3.0
-org.jetbrains.kotlin:kotlin-stdlib-common:2.3.0
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.3.0
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.3.0
-org.jetbrains.kotlin:kotlin-stdlib:2.3.0
+org.jetbrains.kotlin:kotlin-bom:2.2.21
+org.jetbrains.kotlin:kotlin-parcelize-runtime:2.2.21
+org.jetbrains.kotlin:kotlin-stdlib-common:2.2.21
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.2.21
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.2.21
+org.jetbrains.kotlin:kotlin-stdlib:2.2.21
 org.jetbrains.kotlinx:kotlinx-collections-immutable-jvm:0.4.0
 org.jetbrains.kotlinx:kotlinx-collections-immutable:0.4.0
 org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.2
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -78,7 +78,7 @@ jutf7 = "1.0.0"
 jzlib = "1.0.7"
 koinBom = "4.1.1"
 konsist = "0.17.3"
-kotlinBom = "2.3.0"
+kotlinBom = "2.2.21"
 # Needs to match the version used by Gradle, just check with `./gradlew --version`
 kotlinGradleBom = "2.2.0"
 kotlinKsp = "2.3.4"
@@ -97,7 +97,7 @@ mime4j = "0.8.13"
 minidns = "1.1.1"
 mockito = "5.21.0"
 mockitoKotlin = "6.1.0"
-mokkery = "3.1.1"
+mokkery = "3.0.0"
 moshi = "1.15.2"
 mozillaAndroidComponents = "145.0.2"
 okhttp = "5.3.2"
diff --git a/legacy/storage/src/main/java/com/fsck/k9/storage/notifications/K9NotificationStore.kt b/legacy/storage/src/main/java/com/fsck/k9/storage/notifications/K9NotificationStore.kt
@@ -43,30 +43,30 @@ class K9NotificationStore(private val lockableDatabase: LockableDatabase) : Noti
         database.execSQL(
             "INSERT INTO notifications(message_id, notification_id, timestamp) " +
                 "SELECT id, ?, ? FROM messages WHERE folder_id = ? AND uid = ?",
-            arrayOf<Any>(notificationId, timestamp, messageReference.folderId, messageReference.uid),
+            arrayOf(notificationId, timestamp, messageReference.folderId, messageReference.uid),
         )
     }
 
     private fun setNotificationId(database: SQLiteDatabase, messageReference: MessageReference, notificationId: Int) {
         database.execSQL(
             "UPDATE notifications SET notification_id = ? WHERE message_id IN " +
                 "(SELECT id FROM messages WHERE folder_id = ? AND uid = ?)",
-            arrayOf<Any>(notificationId, messageReference.folderId, messageReference.uid),
+            arrayOf(notificationId, messageReference.folderId, messageReference.uid),
         )
     }
 
     private fun clearNotificationId(database: SQLiteDatabase, messageReference: MessageReference) {
         database.execSQL(
             "UPDATE notifications SET notification_id = NULL WHERE message_id IN " +
                 "(SELECT id FROM messages WHERE folder_id = ? AND uid = ?)",
-            arrayOf<Any>(messageReference.folderId, messageReference.uid),
+            arrayOf(messageReference.folderId, messageReference.uid),
         )
     }
 
     private fun removeNotification(database: SQLiteDatabase, messageReference: MessageReference) {
         database.execSQL(
             "DELETE FROM notifications WHERE message_id IN (SELECT id FROM messages WHERE folder_id = ? AND uid = ?)",
-            arrayOf<Any>(messageReference.folderId, messageReference.uid),
+            arrayOf(messageReference.folderId, messageReference.uid),
         )
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -43,30 +43,30 @@ class K9NotificationStore(private val lockableDatabase: LockableDatabase) : Noti`
`43`	`43`	`database.execSQL(`
`44`	`44`	`"INSERT INTO notifications(message_id, notification_id, timestamp) " +`
`45`	`45`	`"SELECT id, ?, ? FROM messages WHERE folder_id = ? AND uid = ?",`
`46`		`- arrayOf<Any>(notificationId, timestamp, messageReference.folderId, messageReference.uid),`
	`46`	`+ arrayOf(notificationId, timestamp, messageReference.folderId, messageReference.uid),`
`47`	`47`	`)`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`private fun setNotificationId(database: SQLiteDatabase, messageReference: MessageReference, notificationId: Int) {`
`51`	`51`	`database.execSQL(`
`52`	`52`	`"UPDATE notifications SET notification_id = ? WHERE message_id IN " +`
`53`	`53`	`"(SELECT id FROM messages WHERE folder_id = ? AND uid = ?)",`
`54`		`- arrayOf<Any>(notificationId, messageReference.folderId, messageReference.uid),`
	`54`	`+ arrayOf(notificationId, messageReference.folderId, messageReference.uid),`
`55`	`55`	`)`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`private fun clearNotificationId(database: SQLiteDatabase, messageReference: MessageReference) {`
`59`	`59`	`database.execSQL(`
`60`	`60`	`"UPDATE notifications SET notification_id = NULL WHERE message_id IN " +`
`61`	`61`	`"(SELECT id FROM messages WHERE folder_id = ? AND uid = ?)",`
`62`		`- arrayOf<Any>(messageReference.folderId, messageReference.uid),`
	`62`	`+ arrayOf(messageReference.folderId, messageReference.uid),`
`63`	`63`	`)`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`private fun removeNotification(database: SQLiteDatabase, messageReference: MessageReference) {`
`67`	`67`	`database.execSQL(`
`68`	`68`	`"DELETE FROM notifications WHERE message_id IN (SELECT id FROM messages WHERE folder_id = ? AND uid = ?)",`
`69`		`- arrayOf<Any>(messageReference.folderId, messageReference.uid),`
	`69`	`+ arrayOf(messageReference.folderId, messageReference.uid),`
`70`	`70`	`)`
`71`	`71`	`}`
`72`	`72`	`}`