chore: bump dependencies

This commit is contained in:
LavaDesu 2025-08-08 02:25:51 +10:00
parent 6770c01613
commit efba64ea90
Signed by: cilly
GPG key ID: 6500251E087653C9
7 changed files with 30 additions and 24 deletions

View file

@ -16,7 +16,11 @@ kotlin {
jvmTarget.set(JvmTarget.JVM_11) jvmTarget.set(JvmTarget.JVM_11)
} }
} }
compilerOptions {
freeCompilerArgs.add("-opt-in=kotlin.time.ExperimentalTime")
}
listOf( listOf(
iosX64(), iosX64(),
iosArm64(), iosArm64(),

View file

@ -38,7 +38,7 @@ import com.google.maps.android.compose.GoogleMap
import com.google.maps.android.compose.MarkerComposable import com.google.maps.android.compose.MarkerComposable
import com.google.maps.android.compose.Polyline import com.google.maps.android.compose.Polyline
import com.google.maps.android.compose.rememberCameraPositionState import com.google.maps.android.compose.rememberCameraPositionState
import com.google.maps.android.compose.rememberMarkerState import com.google.maps.android.compose.rememberUpdatedMarkerState
import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.Flow
import moe.lava.banksia.R import moe.lava.banksia.R
import moe.lava.banksia.ui.BanksiaEvent import moe.lava.banksia.ui.BanksiaEvent
@ -129,8 +129,7 @@ actual fun Maps(
) { ) {
// [TODO]: Slight lag when routes with many stops such as the 901 bus is set // [TODO]: Slight lag when routes with many stops such as the 901 bus is set
for (marker in state.stops) { for (marker in state.stops) {
val state = rememberMarkerState() val state = rememberUpdatedMarkerState(marker.point.toLatLng())
state.position = marker.point.toLatLng()
MarkerComposable( MarkerComposable(
keys = arrayOf(marker), keys = arrayOf(marker),
zIndex = 0f, zIndex = 0f,
@ -150,8 +149,7 @@ actual fun Maps(
} }
} }
for (marker in state.vehicles) { for (marker in state.vehicles) {
val state = rememberMarkerState() val state = rememberUpdatedMarkerState(marker.point.toLatLng())
state.position = marker.point.toLatLng()
MarkerComposable( MarkerComposable(
keys = arrayOf(marker), keys = arrayOf(marker),
zIndex = 1f, zIndex = 1f,

View file

@ -13,8 +13,6 @@ import kotlinx.coroutines.flow.onEach
import kotlinx.coroutines.flow.takeWhile import kotlinx.coroutines.flow.takeWhile
import kotlinx.coroutines.flow.update import kotlinx.coroutines.flow.update
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import kotlinx.datetime.Clock
import kotlinx.datetime.Instant
import moe.lava.banksia.data.ptv.PtvService import moe.lava.banksia.data.ptv.PtvService
import moe.lava.banksia.data.ptv.structures.PtvRoute import moe.lava.banksia.data.ptv.structures.PtvRoute
import moe.lava.banksia.data.ptv.structures.PtvRouteType import moe.lava.banksia.data.ptv.structures.PtvRouteType
@ -31,6 +29,8 @@ import moe.lava.banksia.util.BoxedValue.Companion.box
import moe.lava.banksia.util.LoopFlow.Companion.waitUntilSubscribed import moe.lava.banksia.util.LoopFlow.Companion.waitUntilSubscribed
import moe.lava.banksia.util.Point import moe.lava.banksia.util.Point
import moe.lava.banksia.util.log import moe.lava.banksia.util.log
import kotlin.time.Clock
import kotlin.time.Instant
sealed class BanksiaEvent { sealed class BanksiaEvent {
data object DismissState : BanksiaEvent() data object DismissState : BanksiaEvent()

View file

@ -1,32 +1,32 @@
[versions] [versions]
agp = "8.9.1" agp = "8.11.1"
android-compileSdk = "35" android-compileSdk = "36"
android-minSdk = "24" android-minSdk = "24"
android-targetSdk = "35" android-targetSdk = "36"
androidx-activityCompose = "1.10.1" androidx-activityCompose = "1.10.1"
androidx-appcompat = "1.7.0" androidx-appcompat = "1.7.0"
androidx-constraintlayout = "2.2.1" androidx-constraintlayout = "2.2.1"
androidx-core-ktx = "1.15.0" androidx-core-ktx = "1.15.0"
androidx-espresso-core = "3.6.1" androidx-espresso-core = "3.6.1"
androidx-lifecycle = "2.8.4" androidx-lifecycle = "2.9.1"
androidx-material = "1.12.0" androidx-material = "1.12.0"
androidx-test-junit = "1.2.1" androidx-test-junit = "1.2.1"
compose-multiplatform = "1.8.0-beta02" compose-multiplatform = "1.8.2"
coroutines = "1.9.0" coroutines = "1.10.2"
geo = "0.8.0" geo = "0.8.0"
junit = "4.13.2" junit = "4.13.2"
koin = "4.1.0" koin = "4.1.0"
kotlin = "2.2.0" kotlin = "2.2.0"
kotlinxDatetime = "0.6.2" kotlinxDatetime = "0.7.1"
kotlinxSerializationCsv = "0.2.18" kotlinxSerializationCsv = "0.2.18"
kotlinxSerializationJson = "1.8.1" kotlinxSerializationJson = "1.9.0"
ksp = "2.2.0-2.0.2" ksp = "2.2.0-2.0.2"
ktor = "3.1.1" ktor = "3.2.3"
logback = "1.5.17" logback = "1.5.18"
mapsCompose = "6.4.1" mapsCompose = "6.7.0"
okio = "3.11.0" okio = "3.16.0"
playServicesLocation = "21.3.0" playServicesLocation = "21.3.0"
playServicesMaps = "19.1.0" playServicesMaps = "19.2.0"
sqlite = "2.5.2" sqlite = "2.5.2"
room = "2.7.2" room = "2.7.2"
secretsGradlePlugin = "2.0.1" secretsGradlePlugin = "2.0.1"

View file

@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
networkTimeout=10000 networkTimeout=10000
validateDistributionUrl=true validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME

View file

@ -24,7 +24,11 @@ kotlin {
jvmTarget.set(JvmTarget.JVM_11) jvmTarget.set(JvmTarget.JVM_11)
} }
} }
compilerOptions {
freeCompilerArgs.add("-opt-in=kotlin.time.ExperimentalTime")
}
iosX64() iosX64()
iosArm64() iosArm64()
iosSimulatorArm64() iosSimulatorArm64()

View file

@ -1,6 +1,5 @@
package moe.lava.banksia.data.ptv.structures package moe.lava.banksia.data.ptv.structures
import kotlinx.datetime.Instant
import kotlinx.datetime.LocalDateTime import kotlinx.datetime.LocalDateTime
import kotlinx.datetime.TimeZone import kotlinx.datetime.TimeZone
import kotlinx.datetime.toInstant import kotlinx.datetime.toInstant
@ -12,6 +11,7 @@ import kotlinx.serialization.descriptors.PrimitiveSerialDescriptor
import kotlinx.serialization.descriptors.SerialDescriptor import kotlinx.serialization.descriptors.SerialDescriptor
import kotlinx.serialization.encoding.Decoder import kotlinx.serialization.encoding.Decoder
import kotlinx.serialization.encoding.Encoder import kotlinx.serialization.encoding.Encoder
import kotlin.time.Instant
// Some datetimes are in local time (no timezone), observed on bus vehicle positions, // Some datetimes are in local time (no timezone), observed on bus vehicle positions,
// and some datetimes are in UTC, observed on train vehicle positions. We need to handle // and some datetimes are in UTC, observed on train vehicle positions. We need to handle