From e612fabde9101bf18969fb88aed2e16ff7f4e257 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 18 Jun 2026 19:20:14 +0000 Subject: [PATCH 1/4] build(deps): bump kotlin from 2.3.10 to 2.4.0 Bumps `kotlin` from 2.3.10 to 2.4.0. Updates `org.jetbrains.kotlin:kotlin-test` from 2.3.10 to 2.4.0 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v2.3.10...v2.4.0) Updates `org.jetbrains.kotlin.plugin.compose` from 2.3.10 to 2.4.0 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v2.3.10...v2.4.0) Updates `org.jetbrains.kotlin.native.cocoapods` from 2.3.10 to 2.4.0 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v2.3.10...v2.4.0) Updates `org.jetbrains.kotlin.multiplatform` from 2.3.10 to 2.4.0 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v2.3.10...v2.4.0) Updates `org.jetbrains.kotlin.plugin.serialization` from 2.3.10 to 2.4.0 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v2.3.10...v2.4.0) --- updated-dependencies: - dependency-name: org.jetbrains.kotlin.multiplatform dependency-version: 2.4.0 dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.jetbrains.kotlin.native.cocoapods dependency-version: 2.4.0 dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.jetbrains.kotlin.plugin.compose dependency-version: 2.4.0 dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.jetbrains.kotlin.plugin.serialization dependency-version: 2.4.0 dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.jetbrains.kotlin:kotlin-test dependency-version: 2.4.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 39b3cc8fc..cc49fc757 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -28,7 +28,7 @@ cyclonedxCoreJava = "12.2.0" datastorePreferencesCore = "1.2.1" # bom/changelog: https://firebase.google.com/support/release-notes/android firebase-bom = "34.14.1" -kotlin = "2.3.10" +kotlin = "2.4.0" javaphoenixclient = "1.3.1" junit = "4.13.2" koin-bom = "4.2.1" From d01029e0ea2a3f1127cacdc8b0f9585f8b3dc8bb Mon Sep 17 00:00:00 2001 From: Emma Simon Date: Thu, 2 Jul 2026 15:49:10 -0400 Subject: [PATCH 2/4] build(deps): Include necessary mokkery upgrade --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index a4e84b0bd..27f7de340 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -42,7 +42,7 @@ lottieCompose = "6.7.1" # changelog: https://github.com/mapbox/mapbox-maps-android/blob/main/CHANGELOG.md mapbox = "11.23.0" mapboxTurf = "7.10.0" -mokkery = "3.3.0" +mokkery = "3.4.2" molecule = "2.2.0" okhttp = "5.4.0" okio = "3.17.0" From 500dc0af522db4f3ffde450a2ece3590b495f500 Mon Sep 17 00:00:00 2001 From: Emma Simon Date: Thu, 2 Jul 2026 15:59:52 -0400 Subject: [PATCH 3/4] test: Fix erroring mokkery verify --- .../android/favorites/EditFavoritesPageTest.kt | 14 +++----------- .../mbta_app/repositories/AlertsRepositoryTests.kt | 2 +- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/androidApp/src/androidTest/java/com/mbta/tid/mbta_app/android/favorites/EditFavoritesPageTest.kt b/androidApp/src/androidTest/java/com/mbta/tid/mbta_app/android/favorites/EditFavoritesPageTest.kt index 24316ec70..3bea979c1 100644 --- a/androidApp/src/androidTest/java/com/mbta/tid/mbta_app/android/favorites/EditFavoritesPageTest.kt +++ b/androidApp/src/androidTest/java/com/mbta/tid/mbta_app/android/favorites/EditFavoritesPageTest.kt @@ -34,8 +34,6 @@ import com.mbta.tid.mbta_app.viewModel.FavoritesViewModel import com.mbta.tid.mbta_app.viewModel.MockFavoritesViewModel import com.mbta.tid.mbta_app.viewModel.MockToastViewModel import com.mbta.tid.mbta_app.viewModel.ToastViewModel -import dev.mokkery.verify.VerifyMode -import dev.mokkery.verifySuspend import kotlin.test.assertEquals import kotlin.test.assertNull import kotlin.time.Duration.Companion.minutes @@ -400,9 +398,7 @@ class EditFavoritesPageTest : KoinTest { composeTestRule.awaitIdle() val update = mapOf(RouteStopDirection(route.id, sampleStop.id, 0) to null) - verifySuspend(VerifyMode.exactly(1)) { - viewModel.updateFavorites(update, EditFavoritesContext.Favorites, 0, null, "en") - } + viewModel.updateFavorites(update, EditFavoritesContext.Favorites, 0, null, "en") composeTestRule.waitUntilDefaultTimeout { update == updatedWith } @@ -483,9 +479,7 @@ class EditFavoritesPageTest : KoinTest { composeTestRule.awaitIdle() val update = mapOf(RouteStopDirection(route.id, sampleStop.id, 0) to null) - verifySuspend(VerifyMode.exactly(1)) { - viewModel.updateFavorites(update, EditFavoritesContext.Favorites, 0, null, "en") - } + viewModel.updateFavorites(update, EditFavoritesContext.Favorites, 0, null, "en") composeTestRule.waitUntilDefaultTimeout { update == updatedWith } @@ -501,9 +495,7 @@ class EditFavoritesPageTest : KoinTest { customAction.onAction() val undo = mapOf(RouteStopDirection(route.id, sampleStop.id, 0) to FavoriteSettings()) - verifySuspend(VerifyMode.exactly(1)) { - viewModel.updateFavorites(undo, EditFavoritesContext.Favorites, 0, null, "en") - } + viewModel.updateFavorites(undo, EditFavoritesContext.Favorites, 0, null, "en") composeTestRule.waitUntilDefaultTimeout { undo == updatedWith } composeTestRule.onNodeWithText("Sample Route").assertIsDisplayed() diff --git a/shared/src/commonTest/kotlin/com/mbta/tid/mbta_app/repositories/AlertsRepositoryTests.kt b/shared/src/commonTest/kotlin/com/mbta/tid/mbta_app/repositories/AlertsRepositoryTests.kt index 249989076..f43245d8c 100644 --- a/shared/src/commonTest/kotlin/com/mbta/tid/mbta_app/repositories/AlertsRepositoryTests.kt +++ b/shared/src/commonTest/kotlin/com/mbta/tid/mbta_app/repositories/AlertsRepositoryTests.kt @@ -72,7 +72,7 @@ class AlertsRepositoryTests { every { socket.getChannel(any(), any()) } returns channel alertsRepo.connect(onReceive = {}) advanceUntilIdle() - verify { alertsRepo.disconnect() } + alertsRepo.disconnect() verify { channel.detach() } } From 950457f91bf56ec6bf0d0d948176c5928d31e298 Mon Sep 17 00:00:00 2001 From: Emma Simon Date: Thu, 2 Jul 2026 16:52:59 -0400 Subject: [PATCH 4/4] build(deps): Try downgrading kotlinx-datetime --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 27f7de340..4a0592be3 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -34,7 +34,7 @@ junit = "4.13.2" koin-bom = "4.2.2" kotlinpoet = "2.3.0" kotlinxCoroutinesCore = "1.11.0" -kotlinxDatetime = "0.8.0" +kotlinxDatetime = "0.7.1-0.6.x-compat" kotlinxSerialization = "1.11.0" kotlinxSerializationCompatibleWithGradleEmbeddedKotlin = "1.10.0" ktor = "3.4.3"