Skip to content

build(deps): bump kotlin from 2.3.10 to 2.4.0 #1772

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dependabot wants to merge 5 commits into
base: main
Choose a base branch
from
Open

build(deps): bump kotlin from 2.3.10 to 2.4.0 #1772

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e612fab
build(deps): bump kotlin from 2.3.10 to 2.4.0
dependabot[bot] Jun 18, 2026
8478e6d
Merge branch 'main' into dependabot/gradle/kotlin-2.4.0
EmmaSimon Jul 2, 2026
d01029e
build(deps): Include necessary mokkery upgrade
EmmaSimon Jul 2, 2026
500dc0a
test: Fix erroring mokkery verify
EmmaSimon Jul 2, 2026
950457f
build(deps): Try downgrading kotlinx-datetime
EmmaSimon Jul 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 3 additions & 11 deletions ...App/src/androidTest/java/com/mbta/tid/mbta_app/android/favorites/EditFavoritesPageTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 }

Expand Down Expand Up @@ -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 }

Expand All @@ -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()
Expand Down
6 changes: 3 additions & 3 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,21 +28,21 @@ 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.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"
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"
Expand Down
2 changes: 1 addition & 1 deletion shared/src/commonTest/kotlin/com/mbta/tid/mbta_app/repositories/AlertsRepositoryTests.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() }
}

Expand Down
Loading