Upgrade to Kotlin 1.9.0 and Compose MP 1.5.0-dev

.github/workflows/build.yml

@@ -157,7 +157,7 @@ jobs:
           cache-disabled: true
 
       - name: Build Desktop App
-        run: ./gradlew jvmTest :desktop-app:package
+        run: ./gradlew jvmTest :desktop-app:packageDistributionForCurrentOS
 
       - name: Upload build outputs
         if: always()
@@ -274,7 +274,8 @@ jobs:
           cache-disabled: true
 
       - name: iosX64Test
-        run: ./gradlew iosX64Test
+        # Disable CC due to https://github.com/google/ksp/issues/1463
+        run: ./gradlew iosX64Test --no-configuration-cache
 
       - name: Upload reports
         if: always()

android-app/app/build.gradle.kts

@@ -6,7 +6,7 @@ plugins {
     id("app.tivi.android.application")
     id("app.tivi.kotlin.android")
     alias(libs.plugins.ksp)
-    alias(libs.plugins.composeMultiplatform)
+    id("app.tivi.compose")
 }
 
 val appVersionCode = properties["TIVI_VERSIONCODE"]?.toString()?.toInt() ?: 1000

android-app/app/src/main/kotlin/app/tivi/home/MainActivity.kt

@@ -38,13 +38,13 @@ class MainActivity : TiviActivity() {
             val navigator = rememberCircuitNavigator(backstack)
 
             component.tiviContent(
-                backstack = backstack,
-                navigator = navigator,
-                onOpenUrl = { url ->
+                backstack,
+                navigator,
+                { url ->
                     val intent = CustomTabsIntent.Builder().build()
                     intent.launchUrl(this@MainActivity, Uri.parse(url))
                 },
-                modifier = Modifier.semantics {
+                Modifier.semantics {
                     // Enables testTag -> UiAutomator resource id
                     // See https://developer.android.com/jetpack/compose/testing#uiautomator-interop
                     @OptIn(ExperimentalComposeUiApi::class)

common/imageloading/build.gradle.kts

@@ -5,7 +5,7 @@
 plugins {
     id("app.tivi.android.library")
     id("app.tivi.kotlin.multiplatform")
-    alias(libs.plugins.composeMultiplatform)
+    id("app.tivi.compose")
 }
 
 kotlin {

common/ui/circuit-overlay/build.gradle.kts

@@ -5,7 +5,7 @@
 plugins {
     id("app.tivi.android.library")
     id("app.tivi.kotlin.multiplatform")
-    alias(libs.plugins.composeMultiplatform)
+    id("app.tivi.compose")
 }
 
 android {

common/ui/compose/build.gradle.kts

@@ -5,7 +5,7 @@
 plugins {
     id("app.tivi.android.library")
     id("app.tivi.kotlin.multiplatform")
-    alias(libs.plugins.composeMultiplatform)
+    id("app.tivi.compose")
 }
 
 kotlin {
@@ -39,10 +39,6 @@ kotlin {
 
         val jvmCommon by creating {
             dependsOn(commonMain)
-
-            dependencies {
-                implementation(projects.thirdparty.composeMaterialDialogs.datetime)
-            }
         }
 
         val jvmMain by getting {

common/ui/compose/src/commonMain/kotlin/app/tivi/common/compose/LazyList.kt

@@ -81,7 +81,7 @@ fun <T : Any> LazyGridScope.items(
             val item = items.peek(index)
             when {
                 item != null && span != null -> span(item)
-                else -> GridItemSpan(0)
+                else -> GridItemSpan(1)
             }
         },
         contentType = { index ->

common/ui/compose/src/commonMain/kotlin/app/tivi/common/compose/ui/AppBar.kt

@@ -55,7 +55,7 @@ fun TopAppBarWithBottomContent(
                 title = title,
                 navigationIcon = navigationIcon,
                 actions = actions,
-                colors = TopAppBarDefaults.smallTopAppBarColors(
+                colors = TopAppBarDefaults.topAppBarColors(
                     containerColor = Color.Transparent,
                     titleContentColor = LocalContentColor.current,
                     actionIconContentColor = LocalContentColor.current,

common/ui/compose/src/commonMain/kotlin/app/tivi/common/compose/ui/DateTimeDialogs.kt

@@ -34,5 +34,4 @@ expect fun TimePickerDialog(
     },
     confirmLabel: String = LocalStrings.current.buttonConfirm,
     title: String = "",
-    is24Hour: Boolean = false,
 )

common/ui/compose/src/commonMain/kotlin/app/tivi/common/compose/ui/DateTimeTextFields.kt

@@ -10,9 +10,9 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.LocalTextStyle
 import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.OutlinedTextFieldDefaults
 import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
-import androidx.compose.material3.TextFieldDefaults
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.getValue
@@ -126,7 +126,7 @@ fun ClickableReadOnlyOutlinedTextField(
     onClick: () -> Unit,
     modifier: Modifier = Modifier,
     label: (@Composable () -> Unit)? = null,
-    shape: Shape = TextFieldDefaults.outlinedShape,
+    shape: Shape = OutlinedTextFieldDefaults.shape,
 ) {
     val borderColor = MaterialTheme.colorScheme.primary.copy(
         alpha = if (value.isNotEmpty()) 1f else 0.4f,

common/ui/compose/src/commonMain/kotlin/app/tivi/common/compose/ui/Image.kt

@@ -10,7 +10,7 @@ import androidx.compose.animation.ExperimentalAnimationApi
 import androidx.compose.animation.core.tween
 import androidx.compose.animation.fadeIn
 import androidx.compose.animation.fadeOut
-import androidx.compose.animation.with
+import androidx.compose.animation.togetherWith
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.runtime.Composable
@@ -104,10 +104,10 @@ fun AsyncImage(
         transitionSpec = {
             val (_, xfade) = targetState
             when {
-                xfade -> fadeIn(tween(200)) with fadeOut(tween(200))
+                xfade -> fadeIn(tween(200)) togetherWith fadeOut(tween(200))
                 else -> {
                     // If it's loaded from the memory cache, don't fade it in
-                    EnterTransition.None with ExitTransition.None
+                    EnterTransition.None togetherWith ExitTransition.None
                 }
             }
         },

common/ui/compose/src/iosMain/kotlin/app/tivi/common/compose/ui/DateTimeDialogs.kt

@@ -58,7 +58,6 @@ actual fun TimePickerDialog(
     selectedTime: LocalTime,
     confirmLabel: String,
     title: String,
-    is24Hour: Boolean,
 ) {
     DatePickerViewController(
         selectedDate = NSCalendar.currentCalendar().dateBySettingHour(

common/ui/compose/src/jvmCommon/kotlin/app/tivi/common/compose/ui/DateTimeDialogs.kt

@@ -6,13 +6,23 @@
 package app.tivi.common.compose.ui
 
 import androidx.compose.material3.Button
+import androidx.compose.material3.DatePicker
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Text
+import androidx.compose.material3.TimePicker
+import androidx.compose.material3.rememberDatePickerState
+import androidx.compose.material3.rememberTimePickerState
 import androidx.compose.runtime.Composable
-import com.vanpra.composematerialdialogs.datetime.date.DatePicker
-import com.vanpra.composematerialdialogs.datetime.time.TimePicker
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.snapshotFlow
+import kotlinx.datetime.Clock
+import kotlinx.datetime.Instant
 import kotlinx.datetime.LocalDate
 import kotlinx.datetime.LocalTime
+import kotlinx.datetime.TimeZone
+import kotlinx.datetime.atTime
+import kotlinx.datetime.toInstant
+import kotlinx.datetime.toLocalDateTime
 
 @Composable
 actual fun TimePickerDialog(
@@ -21,8 +31,14 @@ actual fun TimePickerDialog(
     selectedTime: LocalTime,
     confirmLabel: String,
     title: String,
-    is24Hour: Boolean,
 ) {
+    val timePickerState = rememberTimePickerState(selectedTime.hour, selectedTime.minute)
+
+    LaunchedEffect(timePickerState) {
+        snapshotFlow { LocalTime(timePickerState.hour, timePickerState.minute, 0, 0) }
+            .collect { onTimeChanged(it) }
+    }
+
     AlertDialog(
         onDismissRequest = onDismissRequest,
         confirmButton = {
@@ -31,12 +47,7 @@ actual fun TimePickerDialog(
             }
         },
         text = {
-            TimePicker(
-                title = title,
-                initialTime = selectedTime,
-                is24HourClock = false,
-                onTimeChange = onTimeChanged,
-            )
+            TimePicker(state = timePickerState)
         },
     )
 }
@@ -51,6 +62,14 @@ actual fun DatePickerDialog(
     maximumDate: LocalDate?,
     title: String,
 ) {
+    val datePickerState = rememberDatePickerState(
+        initialSelectedDateMillis = selectedDate
+            .atTime(hour = 12, minute = 0)
+            .toInstant(TimeZone.currentSystemDefault())
+            .toEpochMilliseconds(),
+        yearRange = 1900..Clock.System.now().toLocalDateTime(TimeZone.currentSystemDefault()).date.year,
+    )
+
     AlertDialog(
         onDismissRequest = onDismissRequest,
         confirmButton = {
@@ -60,10 +79,11 @@ actual fun DatePickerDialog(
         },
         text = {
             DatePicker(
-                title = title,
-                initialDate = selectedDate,
-                onDateChange = onDateChanged,
-                allowedDateValidator = { date ->
+                state = datePickerState,
+                dateValidator = { epoch ->
+                    val date = Instant.fromEpochMilliseconds(epoch)
+                        .toLocalDateTime(TimeZone.currentSystemDefault())
+                        .date
                     when {
                         minimumDate != null && date < minimumDate -> false
                         maximumDate != null && date > maximumDate -> false

common/ui/compose/src/jvmMain/kotlin/app/tivi/common/compose/Dialog.desktop.kt

@@ -4,6 +4,7 @@
 package app.tivi.common.compose
 
 import androidx.compose.runtime.Composable
+import androidx.compose.ui.window.DialogWindow
 import androidx.compose.ui.window.rememberDialogState
 
 @Composable
@@ -12,7 +13,7 @@ actual fun Dialog(
     properties: DialogProperties,
     content: @Composable () -> Unit,
 ) {
-    androidx.compose.ui.window.Dialog(
+    DialogWindow(
         onCloseRequest = onDismissRequest,
         state = rememberDialogState(size = properties.size),
         title = properties.title,

common/ui/resources/fonts/build.gradle.kts

@@ -5,7 +5,7 @@
 plugins {
     id("app.tivi.android.library")
     id("app.tivi.kotlin.multiplatform")
-    alias(libs.plugins.composeMultiplatform)
+    id("app.tivi.compose")
 }
 
 kotlin {

common/ui/resources/fonts/src/iosMain/kotlin/app/tivi/common/ui/resources/Fonts.ios.kt

@@ -7,19 +7,42 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.text.font.Font
 import androidx.compose.ui.text.font.FontStyle
 import androidx.compose.ui.text.font.FontWeight
-import kotlinx.coroutines.runBlocking
-import org.jetbrains.compose.resources.ExperimentalResourceApi
-import org.jetbrains.compose.resources.resource
+import kotlinx.cinterop.ExperimentalForeignApi
+import kotlinx.cinterop.addressOf
+import kotlinx.cinterop.usePinned
+import platform.Foundation.NSBundle
+import platform.Foundation.NSData
+import platform.Foundation.NSFileManager
+import platform.posix.memcpy
 
 private val cache: MutableMap<String, Font> = mutableMapOf()
 
-@OptIn(ExperimentalResourceApi::class)
 @Composable
 actual fun font(fontName: String, resourceId: String, weight: FontWeight, style: FontStyle): Font {
     return cache.getOrPut(resourceId) {
-        val byteArray = runBlocking {
-            resource("$resourceId.ttf").readBytes()
+        // Ideally we'd use the resource() API here, but it doesn't seem to be working
+        // in multi-module projects
+        androidx.compose.ui.text.platform.Font(
+            identity = resourceId,
+            data = readBundleFile("$resourceId.ttf"),
+            weight = weight,
+            style = style,
+        )
+    }
+}
+
+@OptIn(ExperimentalForeignApi::class)
+private fun readBundleFile(path: String): ByteArray {
+    val fileManager = NSFileManager.defaultManager()
+    val composeResourcesPath = NSBundle.mainBundle.resourcePath + "/" + path
+    val contentsAtPath: NSData? = fileManager.contentsAtPath(composeResourcesPath)
+    if (contentsAtPath != null) {
+        val byteArray = ByteArray(contentsAtPath.length.toInt())
+        byteArray.usePinned {
+            memcpy(it.addressOf(0), contentsAtPath.bytes, contentsAtPath.length)
         }
-        androidx.compose.ui.text.platform.Font(resourceId, byteArray, weight, style)
+        return byteArray
+    } else {
+        error("File $path not found in Bundle")
     }
 }

desktop-app/build.gradle.kts

@@ -11,7 +11,7 @@ plugins {
     // We have to use KMP due to Moko-resources
     // https://github.com/icerockdev/moko-resources/issues/263
     id("app.tivi.kotlin.multiplatform")
-    alias(libs.plugins.composeMultiplatform)
+    id("app.tivi.compose")
 }
 
 kotlin {

desktop-app/src/jvmMain/kotlin/app/tivi/Main.kt

@@ -37,10 +37,10 @@ fun main() = application {
         val navigator = rememberCircuitNavigator(backstack) { /* no-op */ }
 
         component.tiviContent(
-            backstack = backstack,
-            navigator = navigator,
-            onOpenUrl = { /* no-op for now */ },
-            modifier = Modifier,
+            backstack,
+            navigator,
+            { /* no-op for now */ },
+            Modifier,
         )
     }
 }

gradle.properties

@@ -19,9 +19,7 @@ org.gradle.parallel=true
 org.gradle.jvmargs=-Xmx4096m -Dfile.encoding=UTF-8
 
 # https://docs.gradle.org/7.6/userguide/configuration_cache.html
-# Disabled due to KMP plugin. Should be fixed in Kotlin 1.9:
-#   https://youtrack.jetbrains.com/issue/KT-49933/Support-Gradle-Configuration-caching-with-HMPP
-org.gradle.configuration-cache=false
+org.gradle.configuration-cache=true
 
 # AndroidX
 android.useAndroidX=true

gradle/build-logic/convention/build.gradle.kts

@@ -31,6 +31,7 @@ dependencies {
     compileOnly(libs.android.gradlePlugin)
     compileOnly(libs.kotlin.gradlePlugin)
     compileOnly(libs.spotless.gradlePlugin)
+    compileOnly(libs.compose.gradlePlugin)
 }
 
 gradlePlugin {
@@ -64,5 +65,10 @@ gradlePlugin {
             id = "app.tivi.android.test"
             implementationClass = "app.tivi.gradle.AndroidTestConventionPlugin"
         }
+
+        register("compose") {
+            id = "app.tivi.compose"
+            implementationClass = "app.tivi.gradle.ComposeMultiplatformConventionPlugin"
+        }
     }
 }