Merge branch 'main' into dpe

Author: martinbonnin

.github/workflows/android_wear_jvm.yml

@@ -18,7 +18,7 @@ jobs:
     - uses: actions/setup-java@v4
       with:
         distribution: 'zulu'
-        java-version: 17
+        java-version: 21
 
     - name: Setup Gradle
       uses: gradle/gradle-build-action@v3.5.0

README.md

@@ -1,6 +1,6 @@
 # Confetti 🎊
 
-![kotlin-version](https://img.shields.io/badge/kotlin-2.2.20-Beta1-blue?logo=kotlin)
+![kotlin-version](https://img.shields.io/badge/kotlin-2.2.20-blue?logo=kotlin)
 
 [<img src="https://upload.wikimedia.org/wikipedia/commons/7/78/Google_Play_Store_badge_EN.svg"
 alt="Get it on Google Play Store"

backend/datastore/src/jvmMain/kotlin/dev/johnoreilly/confetti/backend/datastore/ConferenceId.kt

@@ -43,6 +43,7 @@ enum class ConferenceId(val id: String) {
     AndroidMakers2025("androidmakers2025"),
     KotlinConf2025("kotlinconf2025"),
     DroidconNYC2025("droidconnyc2025"),
+    DroidConLondon2025("droidconlondon2025"),
     DPE2025("dpe2025"),
     ;
 

backend/service-import/src/jvmMain/kotlin/dev/johnoreilly/confetti/backend/import/Main.kt

@@ -11,6 +11,7 @@ import dev.johnoreilly.confetti.backend.import.Sessionize.importDevFestVenice202
 import dev.johnoreilly.confetti.backend.import.Sessionize.importDroidconLisbon2023
 import dev.johnoreilly.confetti.backend.import.Sessionize.importDroidconLisbon2024
 import dev.johnoreilly.confetti.backend.import.Sessionize.importDroidconLondon2024
+import dev.johnoreilly.confetti.backend.import.Sessionize.importDroidconLondon2025
 import io.ktor.http.HttpStatusCode
 import io.ktor.server.application.call
 import io.ktor.server.application.install
@@ -144,6 +145,7 @@ private suspend fun update(conf: String?): Int {
         ConferenceId.DevFestWarsaw2024 -> Sessionize.importDevFestWarsaw2024()
         ConferenceId.AndroidMakers2025 -> Sessionize.importAndroidMakers2025()
         ConferenceId.KotlinConf2025 -> Sessionize.importKotlinConf2025()
+        ConferenceId.DroidConLondon2025 -> importDroidconLondon2025()
         ConferenceId.DPE2025 -> DPE.import2025()
         null -> error("")
     }

backend/service-import/src/jvmMain/kotlin/dev/johnoreilly/confetti/backend/import/Sessionize.kt

@@ -789,6 +789,19 @@ object Sessionize {
         )
     }
 
+    suspend fun importDroidconLondon2025(): Int {
+        return writeData(
+            getData(url = "https://sessionize.com/api/v2/4l4dqh27/view/All", zoneId = "Europe/London"),
+            config = DConfig(
+                id = ConferenceId.DroidConLondon2025.id,
+                name = "droidcon London 2025",
+                timeZone = "Europe/London",
+                themeColor = "0xFF75E1C6"
+            ),
+            venue = businessDesignCenter,
+        )
+    }
+
     suspend fun importDevFestVenice2024(): Int {
         return writeData(
             getData("https://sessionize.com/api/v2/r14kt8fj/view/All"),

gradle/libs.versions.toml

@@ -24,7 +24,7 @@ decompose = "3.4.0-alpha03"
 doistx-normalize = "1.2.0"
 essenty = "2.5.0"
 googleid = "1.1.1"
-horologist = "0.8.0-alpha"
+horologist = "0.8.2-alpha"
 io-coil-kt = "2.7.0"
 io-coil3-kt = "3.2.0"
 kermit = "2.0.6"
@@ -35,7 +35,7 @@ lifecycle = "2.9.2"
 lifecycle-livedata-ktx = "2.9.2"
 materialkolor = "3.0.0"
 multiplatform-settings = "1.3.0"
-nav-compose = "2.9.2"
+nav-compose = "2.9.4"
 okio = "3.15.0"
 permissions = "0.19.1"
 permissionsCompose = "0.19.1"
@@ -46,7 +46,7 @@ room = "2.7.2"
 tiles-tooling-preview = "1.5.0"
 wear = "1.3.0"
 wear-watchface = "1.3.0-alpha07"
-wear-compose = "1.5.0-beta06"
+wear-compose = "1.5.1"
 wearPhoneInteractions = "1.1.0"
 work-runtime-ktx = "2.10.2"
 spring = "3.5.3"