Merge pull request #337 from joreilly/dependency_updates

joreilly · web-flow · commit 452dc930e06d · 2025-09-07T09:41:28.000+01:00
dependency updates
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # Fantasy Premier League
 
-![kotlin-version](https://img.shields.io/badge/kotlin-2.2.0-blue?logo=kotlin)
+![kotlin-version](https://img.shields.io/badge/kotlin-2.2.10-blue?logo=kotlin)
 
 **Kotlin Multiplatform** project with Jetpack Compose, Compose for Desktop and SwiftUI clients (and using Ktor for remote API requests and Room for persistence). Currently running on:
 * Android (Jetpack Compose)
diff --git a/app/src/main/java/dev/johnoreilly/fantasypremierleague/presentation/fixtures/FixtureDetails/FixtureDetailsView.kt b/app/src/main/java/dev/johnoreilly/fantasypremierleague/presentation/fixtures/FixtureDetails/FixtureDetailsView.kt
@@ -89,7 +89,7 @@ fun FixtureDetailsView(fixtureId: Int, popBackStack: () -> Unit) {
                     )
                 }
 
-                fixture.localKickoffTime.let { localKickoffTime ->
+                fixture.localKickoffTime?.let { localKickoffTime ->
                     val formattedTime = "%02d:%02d".format(localKickoffTime.hour, localKickoffTime.minute)
                     PastFixtureStatView(statName = "Date", statValue = localKickoffTime.date.toString())
                     PastFixtureStatView(statName = "Kick Off Time", statValue = formattedTime)
diff --git a/app/src/main/java/dev/johnoreilly/fantasypremierleague/presentation/fixtures/FixtureView.kt b/app/src/main/java/dev/johnoreilly/fantasypremierleague/presentation/fixtures/FixtureView.kt
@@ -76,14 +76,15 @@ fun FixtureView(
                     fixture.awayTeamPhotoUrl
                 )
             }
-            Text(
-                modifier = Modifier.padding(top = 16.dp),
-                text = fixture.localKickoffTime.date.toString(),
-                fontWeight = FontWeight.Light,
-                fontSize = 14.sp
-            )
 
-            fixture.localKickoffTime.let { localKickoffTime ->
+            fixture.localKickoffTime?.let { localKickoffTime ->
+                Text(
+                    modifier = Modifier.padding(top = 16.dp),
+                    text = localKickoffTime.date.toString(),
+                    fontWeight = FontWeight.Light,
+                    fontSize = 14.sp
+                )
+
                 val formattedTime = "%02d:%02d".format(localKickoffTime.hour, localKickoffTime.minute)
                 Text(
                     modifier = Modifier.padding(bottom = 16.dp),
diff --git a/common/build.gradle.kts b/common/build.gradle.kts
@@ -43,12 +43,6 @@ kotlin {
     androidTarget()
     jvm()
 
-
-    @OptIn(ExperimentalKotlinGradlePluginApi::class)
-    compilerOptions {
-        languageVersion.set(KotlinVersion.KOTLIN_2_0)
-    }
-
     sourceSets {
         all {
             languageSettings.optIn("kotlinx.cinterop.ExperimentalForeignApi")
diff --git a/common/schemas/dev.johnoreilly.common.database.AppDatabase/1.json b/common/schemas/dev.johnoreilly.common.database.AppDatabase/1.json
@@ -2,7 +2,7 @@
   "formatVersion": 1,
   "database": {
     "version": 1,
-    "identityHash": "1d6755f9cf99963261ab91735a13f1a9",
+    "identityHash": "99d7047cc9aebd2bf9feb7a16411f0f0",
     "entities": [
       {
         "tableName": "Team",
@@ -102,7 +102,7 @@
       },
       {
         "tableName": "GameFixture",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `localKickoffTime` TEXT NOT NULL, `homeTeam` TEXT NOT NULL, `awayTeam` TEXT NOT NULL, `homeTeamPhotoUrl` TEXT NOT NULL, `awayTeamPhotoUrl` TEXT NOT NULL, `homeTeamScore` INTEGER, `awayTeamScore` INTEGER, `event` INTEGER NOT NULL, PRIMARY KEY(`id`))",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `localKickoffTime` TEXT, `homeTeam` TEXT NOT NULL, `awayTeam` TEXT NOT NULL, `homeTeamPhotoUrl` TEXT NOT NULL, `awayTeamPhotoUrl` TEXT NOT NULL, `homeTeamScore` INTEGER, `awayTeamScore` INTEGER, `event` INTEGER NOT NULL, PRIMARY KEY(`id`))",
         "fields": [
           {
             "fieldPath": "id",
@@ -113,8 +113,7 @@
           {
             "fieldPath": "localKickoffTime",
             "columnName": "localKickoffTime",
-            "affinity": "TEXT",
-            "notNull": true
+            "affinity": "TEXT"
           },
           {
             "fieldPath": "homeTeam",
@@ -167,7 +166,7 @@
     ],
     "setupQueries": [
       "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
-      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '1d6755f9cf99963261ab91735a13f1a9')"
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '99d7047cc9aebd2bf9feb7a16411f0f0')"
     ]
   }
 }
diff --git a/common/src/commonMain/kotlin/dev/johnoreilly/common/data/model/FixtureDto.kt b/common/src/commonMain/kotlin/dev/johnoreilly/common/data/model/FixtureDto.kt
@@ -1,7 +1,10 @@
+@file:OptIn(ExperimentalTime::class)
+
 package dev.johnoreilly.common.data.model
 
-import kotlinx.datetime.Instant
 import kotlinx.serialization.Serializable
+import kotlin.time.ExperimentalTime
+import kotlin.time.Instant
 
 @Serializable
 data class FixtureDto(
diff --git a/common/src/commonMain/kotlin/dev/johnoreilly/common/data/repository/FantasyPremierLeagueRepository.kt b/common/src/commonMain/kotlin/dev/johnoreilly/common/data/repository/FantasyPremierLeagueRepository.kt
@@ -22,6 +22,7 @@ import kotlinx.datetime.toInstant
 import kotlinx.datetime.toLocalDateTime
 import org.koin.core.component.KoinComponent
 import org.koin.core.component.inject
+import kotlin.time.ExperimentalTime
 
 
 class FantasyPremierLeagueRepository : KoinComponent {
@@ -54,6 +55,7 @@ class FantasyPremierLeagueRepository : KoinComponent {
     }
 
 
+    @OptIn(ExperimentalTime::class)
     private suspend fun writeDataToDb(
         bootstrapStaticInfoDto: BootstrapStaticInfoDto,
         fixtures: List<FixtureDto>
@@ -99,8 +101,9 @@ class FantasyPremierLeagueRepository : KoinComponent {
             val homeTeamPhotoUrl = "https://resources.premierleague.com/premierleague/badges/t${homeTeam?.code}.png"
             val awayTeamPhotoUrl = "https://resources.premierleague.com/premierleague/badges/t${awayTeam?.code}.png"
 
-            val localKickoffTime = fixtureDto.kickoff_time.toString().toInstant()
-                .toLocalDateTime(TimeZone.currentSystemDefault())
+
+                //.toString().toInstant(TimeZone.currentSystemDefault())
+            val localKickoffTime = fixtureDto.kickoff_time?.toLocalDateTime(TimeZone.currentSystemDefault())
 
             GameFixture(
                 fixtureDto.id,
diff --git a/common/src/commonMain/kotlin/dev/johnoreilly/common/model/GameFixture.kt b/common/src/commonMain/kotlin/dev/johnoreilly/common/model/GameFixture.kt
@@ -6,7 +6,7 @@ import kotlinx.datetime.LocalDateTime
 @Entity
 data class GameFixture(
     @PrimaryKey val id: Int,
-    val localKickoffTime: LocalDateTime,
+    val localKickoffTime: LocalDateTime?,
     val homeTeam: String,
     val awayTeam: String,
     val homeTeamPhotoUrl: String,
diff --git a/common/src/jvmMain/kotlin/dev/johnoreilly/common/Main.kt b/common/src/jvmMain/kotlin/dev/johnoreilly/common/Main.kt
@@ -6,7 +6,9 @@ import dev.johnoreilly.common.di.initKoin
 import kotlinx.datetime.*
 import org.ojalgo.okalgo.*
 import org.ojalgo.optimisation.Variable
+import kotlin.time.ExperimentalTime
 
+@OptIn(ExperimentalTime::class)
 suspend fun main() {
     val koin = initKoin(enableNetworkLogs = true).koin
 
diff --git a/common/src/jvmMain/kotlin/dev/johnoreilly/common/actual.kt b/common/src/jvmMain/kotlin/dev/johnoreilly/common/actual.kt
@@ -18,7 +18,7 @@ actual fun platformModule() = module {
 
 
 fun createRoomDatabase(): AppDatabase {
-    val dbFile = File(System.getProperty("java.io.tmpdir"), dbFileName)
+    val dbFile = File(dbFileName)
     return Room.databaseBuilder<AppDatabase>(name = dbFile.absolutePath,)
         .setDriver(BundledSQLiteDriver())
         .build()
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -3,20 +3,20 @@ kotlin = "2.2.10"
 ksp = "2.2.10-2.0.2"
 kotlinx-coroutines = "1.10.2"
 kotlinx-serialization = "1.9.0"
-kotlinx-dateTime = "0.6.0"
+kotlinx-dateTime = "0.7.1"
 
-androidGradlePlugin = "8.12.1"
-koalaplot = "0.9.0"
-koin = "4.1.0"
+androidGradlePlugin = "8.12.2"
+koalaplot = "0.9.1"
+koin = "4.1.1"
 ktor = "3.2.3"
 slf4j = "2.0.17"
 skie = "0.10.6"
 datastore = "1.1.7"
 
 androidxActivity = "1.10.1"
-androidxComposeBom = "2025.08.00"
+androidxComposeBom = "2025.08.01"
 androidxNavigationCompose = "2.9.3"
-androidxLifecycle = "2.9.2"
+androidxLifecycle = "2.9.3"
 androidxRoom = "2.7.2"
 sqlite = "2.5.2"
 compose-plugin = "1.8.2"
@@ -35,7 +35,7 @@ multikJvm = "0.1.1"
 okalgo = "0.0.2"
 kotlinStatistics = "1.2.1"
 mcp = "0.6.0"
-shadowPlugin = "9.0.2"
+shadowPlugin = "9.1.0"
 
 
 [libraries]
diff --git a/ios/FantasyPremierLeague/FantasyPremierLeague/Fixtures/FixtureDetailView.swift b/ios/FantasyPremierLeague/FantasyPremierLeague/Fixtures/FixtureDetailView.swift
@@ -20,15 +20,16 @@ struct FixtureDetailView: View {
             }
         }
         
-        List {
-            let formattedTime = String(format: "%02d:%02d", fixture.localKickoffTime.hour, fixture.localKickoffTime.minute)
-            Section(header: Text("Info"), content: {
-                InfoRowView(label: "Date", value:fixture.localKickoffTime.date.description())
-                InfoRowView(label: "Kick-off Time", value: formattedTime)
-                
-            })
+        if let localKickoffTime = fixture.localKickoffTime {
+            List {
+                let formattedTime = String(format: "%02d:%02d", localKickoffTime.hour, localKickoffTime.minute)
+                Section(header: Text("Info"), content: {
+                    InfoRowView(label: "Date", value: localKickoffTime.date.description())
+                    InfoRowView(label: "Kick-off Time", value: formattedTime)
+                    
+                })
+            }
         }
-
     }
 }
 
diff --git a/ios/FantasyPremierLeague/FantasyPremierLeague/Fixtures/FixtureListView.swift b/ios/FantasyPremierLeague/FantasyPremierLeague/Fixtures/FixtureListView.swift
@@ -62,9 +62,11 @@ struct FixtureView: View {
                 Spacer()
                 ClubInFixtureView(teamName: fixture.awayTeam, teamPhotoUrl: fixture.awayTeamPhotoUrl)
             }
-            let formattedTime = String(format: "%02d:%02d", fixture.localKickoffTime.hour, fixture.localKickoffTime.minute)
-            Text(fixture.localKickoffTime.date.description()).font(.system(size: 14)).padding(.top, 10)
-            Text(formattedTime).font(.system(size: 14))
+            if let localKickoffTime = fixture.localKickoffTime {
+                let formattedTime = String(format: "%02d:%02d", localKickoffTime.hour, localKickoffTime.minute)
+                Text(localKickoffTime.date.description()).font(.system(size: 14)).padding(.top, 10)
+                Text(formattedTime).font(.system(size: 14))
+            }
         }.padding(8)
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ fun FixtureDetailsView(fixtureId: Int, popBackStack: () -> Unit) {`
`89`	`89`	`)`
`90`	`90`	`}`
`91`	`91`
`92`		`- fixture.localKickoffTime.let { localKickoffTime ->`
	`92`	`+ fixture.localKickoffTime?.let { localKickoffTime ->`
`93`	`93`	`val formattedTime = "%02d:%02d".format(localKickoffTime.hour, localKickoffTime.minute)`
`94`	`94`	`PastFixtureStatView(statName = "Date", statValue = localKickoffTime.date.toString())`
`95`	`95`	`PastFixtureStatView(statName = "Kick Off Time", statValue = formattedTime)`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`"formatVersion": 1,`
`3`	`3`	`"database": {`
`4`	`4`	`"version": 1,`
`5`		`- "identityHash": "1d6755f9cf99963261ab91735a13f1a9",`
	`5`	`+ "identityHash": "99d7047cc9aebd2bf9feb7a16411f0f0",`
`6`	`6`	`"entities": [`
`7`	`7`	`{`
`8`	`8`	`"tableName": "Team",`
`@@ -102,7 +102,7 @@`
`102`	`102`	`},`
`103`	`103`	`{`
`104`	`104`	`"tableName": "GameFixture",`
`105`		- "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `localKickoffTime` TEXT NOT NULL, `homeTeam` TEXT NOT NULL, `awayTeam` TEXT NOT NULL, `homeTeamPhotoUrl` TEXT NOT NULL, `awayTeamPhotoUrl` TEXT NOT NULL, `homeTeamScore` INTEGER, `awayTeamScore` INTEGER, `event` INTEGER NOT NULL, PRIMARY KEY(`id`))",
	`105`	+ "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `localKickoffTime` TEXT, `homeTeam` TEXT NOT NULL, `awayTeam` TEXT NOT NULL, `homeTeamPhotoUrl` TEXT NOT NULL, `awayTeamPhotoUrl` TEXT NOT NULL, `homeTeamScore` INTEGER, `awayTeamScore` INTEGER, `event` INTEGER NOT NULL, PRIMARY KEY(`id`))",
`106`	`106`	`"fields": [`
`107`	`107`	`{`
`108`	`108`	`"fieldPath": "id",`
`@@ -113,8 +113,7 @@`
`113`	`113`	`{`
`114`	`114`	`"fieldPath": "localKickoffTime",`
`115`	`115`	`"columnName": "localKickoffTime",`
`116`		`- "affinity": "TEXT",`
`117`		`- "notNull": true`
	`116`	`+ "affinity": "TEXT"`
`118`	`117`	`},`
`119`	`118`	`{`
`120`	`119`	`"fieldPath": "homeTeam",`
`@@ -167,7 +166,7 @@`
`167`	`166`	`],`
`168`	`167`	`"setupQueries": [`
`169`	`168`	`"CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",`
`170`		`- "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '1d6755f9cf99963261ab91735a13f1a9')"`
	`169`	`+ "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '99d7047cc9aebd2bf9feb7a16411f0f0')"`
`171`	`170`	`]`
`172`	`171`	`}`
`173`	`172`	`}`