Js Support

.github/workflows/build.yml

@@ -25,4 +25,4 @@ jobs:
         uses: android-actions/setup-android@v3
 
       - name: Check, Assemble Android and compile iOS
-        run: ./gradlew ktlintCheck assembleDebug compileKotlinIosX64 --no-daemon
+        run: ./gradlew ktlintCheck assembleDebug compileKotlinIosSimulatorArm64 --no-daemon

android/src/main/java/co/touchlab/droidcon/android/MainApp.kt

@@ -9,11 +9,11 @@ import co.touchlab.droidcon.android.service.impl.DefaultParseUrlViewService
 import co.touchlab.droidcon.android.util.NotificationLocalizedStringFactory
 import co.touchlab.droidcon.application.service.NotificationSchedulingService
 import co.touchlab.droidcon.domain.service.AnalyticsService
+import co.touchlab.droidcon.domain.service.impl.ComposeResourceReader
 import co.touchlab.droidcon.domain.service.impl.ResourceReader
 import co.touchlab.droidcon.initKoin
 import co.touchlab.droidcon.service.ParseUrlViewService
 import co.touchlab.droidcon.ui.uiModule
-import co.touchlab.droidcon.util.ClasspathResourceReader
 import com.google.firebase.Firebase
 import com.google.firebase.analytics.analytics
 import com.russhwolf.settings.ExperimentalSettingsApi
@@ -47,7 +47,7 @@ class MainApp :
                 }
 
                 single<ResourceReader> {
-                    ClasspathResourceReader()
+                    ComposeResourceReader()
                 }
 
                 single<NotificationSchedulingService.LocalizedStringFactory> {

android/src/main/java/co/touchlab/droidcon/android/service/impl/DefaultParseUrlViewService.kt

@@ -8,5 +8,8 @@ class DefaultParseUrlViewService : ParseUrlViewService {
 
     private val urlRegex = Patterns.WEB_URL.toRegex()
 
-    override fun parse(text: String): List<WebLink> = urlRegex.findAll(text).map { WebLink(it.range, it.value) }.toList()
+    override fun parse(text: String): List<WebLink> = urlRegex
+        .findAll(text)
+        .map { WebLink(it.range, it.value) }
+        .toList()
 }

build.gradle.kts

@@ -45,7 +45,8 @@ subprojects {
         }
     }
 }
-
+/*
 tasks.register<Delete>("clean") {
     delete(rootProject.layout.buildDirectory)
 }
+*/

gradle/libs.versions.toml

@@ -1,18 +1,22 @@
 [versions]
 ## SDK Versions
+adaptive = "1.3.0-alpha02"
+kamelImageDefault = "1.0.9"
+kotlinxBrowser = "0.5.0"
+material3AdaptiveNavigationSuiteVersion = "1.9.0"
 minSdk = "23"
 targetSdk = "36"
 compileSdk = "36"
 
 # Dependencies
-kotlin = "2.2.21"
+kotlin = "2.3.10"
 
 ## Gradle Plugin version must be compatible with Multiplatform
 ## https://kotlinlang.org/docs/multiplatform-compatibility-guide.html#version-compatibility
-android-gradle-plugin = "8.13.1"
+android-gradle-plugin = "8.13.2"
 coroutines = "1.10.2"
 kotlinx-datetime = "0.7.1"
-ktor = "3.3.2"
+ktor = "3.3.3"
 
 stately = "2.1.0"
 java = "21"
@@ -26,12 +30,12 @@ sqlDelight = "2.2.1"
 firebase-analytics = "22.5.0"
 firebase-crashlytics = "19.4.4"
 firebase-messaging = "24.1.2"
-firebase-bom = "34.6.0"
+firebase-bom = "34.7.0"
 firebase-crashlytics-gradle = "3.0.6"
 gms-google-services = "4.4.4"
 
 # TODO: Update Compose libraries. There is currently a conflicing issue with the HorizontalPager
-compose-androidx-ui = "1.9.5"
+compose-androidx-ui = "1.10.0"
 compose-compiler = "1.5.15"
 composeNavigation = "2.9.6"
 compose-jb = "1.9.3"
@@ -52,11 +56,19 @@ uuid = "0.8.4"
 ktlint = "14.0.1"
 coil = "3.3.0"
 zoomimage = "1.4.0"
-skie = "0.10.8"
+skie = "0.10.10"
 
 [libraries]
+adaptive = { module = "org.jetbrains.compose.material3.adaptive:adaptive", version.ref = "adaptive" }
+adaptive-layout = { module = "org.jetbrains.compose.material3.adaptive:adaptive-layout", version.ref = "adaptive" }
+adaptive-navigation = { module = "org.jetbrains.compose.material3.adaptive:adaptive-navigation", version.ref = "adaptive" }
 coil-compose = { module = "io.coil-kt.coil3:coil-compose", version.ref = "coil" }
 coil-network = { module = "io.coil-kt.coil3:coil-network-ktor3", version.ref = "coil" }
+kamel-image-default = { module = "media.kamel:kamel-image-default", version.ref = "kamelImageDefault" }
+kotlinx-browser = { module = "org.jetbrains.kotlinx:kotlinx-browser", version.ref = "kotlinxBrowser" }
+ktor-client-cio = { module = "io.ktor:ktor-client-cio", version.ref = "ktor" }
+material3-adaptive-navigation-suite = { module = "org.jetbrains.compose.material3:material3-adaptive-navigation-suite", version.ref = "material3AdaptiveNavigationSuiteVersion" }
+multiplatform-settings-make-observable = { module = "com.russhwolf:multiplatform-settings-make-observable", version.ref = "multiplatformSettings" }
 sqliter = { module = "co.touchlab:sqliter-driver", version.ref = "sqliter" }
 compose-compiler = { module = "androidx.compose.compiler:compiler", version.ref = "compose-compiler" }
 androidx-core-splashscreen = { module = "androidx.core:core-splashscreen", version.ref = "splashscreen" }
@@ -91,7 +103,9 @@ multiplatformSettings-test = { module = "com.russhwolf:multiplatform-settings-te
 
 sqldelight-driver-android = { module = "app.cash.sqldelight:android-driver", version.ref = "sqlDelight" }
 sqldelight-driver-ios = { module = "app.cash.sqldelight:native-driver", version.ref = "sqlDelight" }
+sqldelight-driver-js = { module = "app.cash.sqldelight:web-worker-driver", version.ref = "sqlDelight" }
 sqldelight-coroutines = { module = "app.cash.sqldelight:coroutines-extensions", version.ref = "sqlDelight" }
+sqldelight-async-extensions = { module = "app.cash.sqldelight:async-extensions", version.ref = "sqlDelight" }
 sqldelight-runtime = { module = "app.cash.sqldelight:runtime", version.ref = "sqlDelight" }
 
 kermit = { module = "co.touchlab:kermit", version.ref = "kermit" }
@@ -115,8 +129,10 @@ compose-navigation = { module = "androidx.navigation:navigation-compose", versio
 koin-android = { module = "io.insert-koin:koin-android", version.ref = "koin" }
 koin-core = { module = "io.insert-koin:koin-core", version.ref = "koin" }
 koin-test = { module = "io.insert-koin:koin-test", version.ref = "koin" }
+koin-compose = { module = "io.insert-koin:koin-compose", version.ref = "koin" }
 
 zoomimage-composeResources = { module = "io.github.panpf.zoomimage:zoomimage-compose-resources", version.ref = "zoomimage" }
+zoomimage-compose = { module = "io.github.panpf.zoomimage:zoomimage-compose", version.ref = "zoomimage" }
 
 [plugins]
 crashlytics = { id = "com.google.firebase.crashlytics", version.ref = "firebase-crashlytics-gradle" }

gradle/wrapper/gradle-wrapper.properties

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

ios/Droidcon/Droidcon.xcodeproj/project.pbxproj

@@ -25,7 +25,7 @@
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
-		1821427726B5418D0047DB71 /* about.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; name = about.json; path = ../../../shared/src/commonMain/resources/about.json; sourceTree = "<group>"; };
+		1821427726B5418D0047DB71 /* about.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; name = about.json; path = ../../../shared/src/commonMain/composeResources/files/about.json; sourceTree = "<group>"; };
 		18240FB62C6FED770099E416 /* Droidcon.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Droidcon.entitlements; sourceTree = "<group>"; };
 		1833220F26B0CF5600D79482 /* DroidconApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DroidconApp.swift; sourceTree = "<group>"; };
 		18E89B48283E5D2C00C08C9B /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = "<group>"; };

ios/src/iosMain/kotlin/co/touchlab/droidcon/ios/DependencyInjection.kt

@@ -2,15 +2,13 @@ package co.touchlab.droidcon.ios
 
 import co.touchlab.droidcon.application.service.NotificationSchedulingService
 import co.touchlab.droidcon.domain.service.AnalyticsService
+import co.touchlab.droidcon.domain.service.impl.ComposeResourceReader
 import co.touchlab.droidcon.domain.service.impl.ResourceReader
 import co.touchlab.droidcon.initKoin
 import co.touchlab.droidcon.ios.service.DefaultParseUrlViewService
 import co.touchlab.droidcon.ios.util.NotificationLocalizedStringFactory
-import co.touchlab.droidcon.ios.util.formatter.IOSDateFormatter
 import co.touchlab.droidcon.service.ParseUrlViewService
 import co.touchlab.droidcon.ui.uiModule
-import co.touchlab.droidcon.util.BundleResourceReader
-import co.touchlab.droidcon.util.formatter.DateFormatter
 import co.touchlab.droidcon.viewmodel.WaitForLoadedContextModel
 import com.russhwolf.settings.ExperimentalSettingsApi
 import com.russhwolf.settings.NSUserDefaultsSettings
@@ -26,9 +24,9 @@ fun initKoinIos(userDefaults: NSUserDefaults, analyticsService: AnalyticsService
     module {
         single { BundleProvider(bundle = NSBundle.mainBundle) }
         single<ObservableSettings> { NSUserDefaultsSettings(delegate = userDefaults) }
-        single<ResourceReader> { BundleResourceReader(bundle = get<BundleProvider>().bundle) }
-
-        single<DateFormatter> { IOSDateFormatter() }
+        single<ResourceReader> {
+            ComposeResourceReader()
+        }
 
         single<NotificationSchedulingService.LocalizedStringFactory> {
             NotificationLocalizedStringFactory(bundle = get<BundleProvider>().bundle)

kotlin-js-store/wasm/yarn.lock

@@ -0,0 +1,8 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
+"@js-joda/core@3.2.0":
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/@js-joda/core/-/core-3.2.0.tgz#3e61e21b7b2b8a6be746df1335cf91d70db2a273"
+  integrity sha512-PMqgJ0sw5B7FKb2d5bWYIoxjri+QlW/Pys7+Rw82jSH0QN3rB05jZ/VrrsUdh1w4+i2kw9JOejXGq/KhDOX7Kg==