Migrate to kotlin 2.0.10, compose-multiplatform 17.0-beta02, decompos…

…e 3.0.0 and decompose-router 0.8.0

.gitignore

@@ -17,3 +17,4 @@ xcuserdata
 !**/.idea/runConfigurations
 !**/.idea/icon.svg
 !**/.idea/.name
+/.kotlin/

build.gradle.kts

@@ -1,4 +1,7 @@
-plugins { }
+plugins {
+  alias(libs.plugins.compose.multiplatform) apply false
+  alias(libs.plugins.compose.compiler) apply false
+}
 
 buildscript {
   repositories {
@@ -9,7 +12,6 @@ buildscript {
 
   dependencies {
     classpath(libs.agp)
-    classpath(libs.compose.multiplatform)
     classpath(libs.kotlin.gradle.plugin)
     classpath(libs.kotlin.serialization)
     classpath(libs.molecule.gradle.plugin)

client/android/build.gradle.kts

@@ -5,7 +5,9 @@ import com.android.build.gradle.internal.cxx.configure.gradleLocalProperties
 plugins {
   id("com.android.application")
   kotlin("android")
-  id("org.jetbrains.compose")
+
+  alias(libs.plugins.compose.multiplatform)
+  alias(libs.plugins.compose.compiler)
 }
 
 android {

client/android/src/main/java/io/github/xxfast/nytimes/android/MainActivity.kt

@@ -6,12 +6,13 @@ import androidx.activity.compose.setContent
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Surface
+import androidx.compose.material3.windowsizeclass.ExperimentalMaterial3WindowSizeClassApi
+import androidx.compose.material3.windowsizeclass.WindowSizeClass
+import androidx.compose.material3.windowsizeclass.calculateWindowSizeClass
 import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.ui.Modifier
 import androidx.core.view.WindowCompat
 import io.github.xxfast.androidx.compose.material3.windowsizeclass.LocalWindowSizeClass
-import io.github.xxfast.androidx.compose.material3.windowsizeclass.WindowSizeClass
-import io.github.xxfast.androidx.compose.material3.windowsizeclass.calculateWindowSizeClass
 import io.github.xxfast.decompose.router.LocalRouterContext
 import io.github.xxfast.decompose.router.RouterContext
 import io.github.xxfast.decompose.router.defaultRouterContext
@@ -27,6 +28,7 @@ class MainActivity : ComponentActivity() {
     appStorage = filesDir.path
 
     setContent {
+      @OptIn(ExperimentalMaterial3WindowSizeClassApi::class)
       val windowSizeClass: WindowSizeClass = calculateWindowSizeClass(this)
       println(windowSizeClass)
 

client/build.gradle.kts

@@ -6,13 +6,18 @@ import com.codingfeline.buildkonfig.compiler.FieldSpec.Type.STRING
 plugins {
   kotlin("multiplatform")
   id("com.android.library")
-  id("org.jetbrains.compose")
+
+  alias(libs.plugins.compose.multiplatform)
+  alias(libs.plugins.compose.compiler)
+
   id("kotlin-parcelize")
   kotlin("plugin.serialization")
   id("com.codingfeline.buildkonfig")
 }
 
 kotlin {
+  applyDefaultHierarchyTemplate()
+
   androidTarget()
 
   jvm("desktop")
@@ -24,8 +29,7 @@ kotlin {
   ).forEach { target ->
     target.binaries {
       framework {
-        baseName = "NyTimes"
-
+        baseName = "App"
         export(libs.decompose.router)
       }
     }
@@ -46,8 +50,9 @@ kotlin {
         implementation(compose.materialIconsExtended)
 
         implementation(libs.molecule.runtime)
+        implementation(libs.compose.multiplatform.material3.windowsizeclass)
         implementation(libs.decompose)
-        implementation(libs.decompose.compose.multiplatform)
+        implementation(libs.decompose.compose)
         implementation(libs.essenty.parcelable)
         implementation(libs.ktor.client.core)
         implementation(libs.ktor.client.content.negotiation)
@@ -81,14 +86,7 @@ kotlin {
       }
     }
 
-    val iosX64Main by getting
-    val iosArm64Main by getting
-    val iosSimulatorArm64Main by getting
-    val iosMain by creating {
-      dependsOn(commonMain)
-      iosX64Main.dependsOn(this)
-      iosArm64Main.dependsOn(this)
-      iosSimulatorArm64Main.dependsOn(this)
+    val iosMain by getting {
       dependencies {
         implementation(libs.ktor.client.darwin)
         implementation(libs.kstore.file)

client/desktop/build.gradle.kts

@@ -4,7 +4,8 @@ import org.jetbrains.compose.desktop.application.dsl.TargetFormat.Msi
 
 plugins {
   kotlin("jvm")
-  id("org.jetbrains.compose")
+  alias(libs.plugins.compose.multiplatform)
+  alias(libs.plugins.compose.compiler)
 }
 
 dependencies {
@@ -15,8 +16,9 @@ dependencies {
   implementation(compose.material3)
   implementation(compose.materialIconsExtended)
   implementation(compose.preview)
+  implementation(libs.compose.multiplatform.material3.windowsizeclass)
   implementation(libs.decompose)
-  implementation(libs.decompose.compose.multiplatform)
+  implementation(libs.decompose.compose)
   implementation(libs.decompose.router)
   implementation(libs.harawata.appdirs)
 }

client/desktop/src/main/kotlin/io/github/xxfast/nytimes/desktop/Application.kt

@@ -1,14 +1,15 @@
 package io.github.xxfast.nytimes.desktop
 
 import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.windowsizeclass.ExperimentalMaterial3WindowSizeClassApi
+import androidx.compose.material3.windowsizeclass.WindowSizeClass
+import androidx.compose.material3.windowsizeclass.calculateWindowSizeClass
 import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.ui.window.Window
 import androidx.compose.ui.window.WindowState
 import androidx.compose.ui.window.application
 import androidx.compose.ui.window.rememberWindowState
 import io.github.xxfast.androidx.compose.material3.windowsizeclass.LocalWindowSizeClass
-import io.github.xxfast.androidx.compose.material3.windowsizeclass.WindowSizeClass
-import io.github.xxfast.androidx.compose.material3.windowsizeclass.calculateWindowSizeClass
 import io.github.xxfast.decompose.router.LocalRouterContext
 import io.github.xxfast.decompose.router.RouterContext
 import io.github.xxfast.decompose.router.defaultRouterContext
@@ -20,7 +21,7 @@ fun main() {
   application {
     val windowState: WindowState = rememberWindowState()
     val rootRouterContext: RouterContext = defaultRouterContext(windowState = windowState)
-    val windowSizeClass: WindowSizeClass = calculateWindowSizeClass(windowState)
+
 
     appStorage = AppDirsFactory.getInstance()
       .getUserDataDir("io.github.xxfast.nytimes", "1.0.0", "xxfast")
@@ -30,6 +31,9 @@ fun main() {
       state = windowState,
       onCloseRequest = { exitApplication() }
     ) {
+      @OptIn(ExperimentalMaterial3WindowSizeClassApi::class)
+      val windowSizeClass: WindowSizeClass = calculateWindowSizeClass()
+
       CompositionLocalProvider(
         LocalRouterContext provides rootRouterContext,
         LocalWindowSizeClass provides windowSizeClass,

client/ios/ios.xcodeproj/project.pbxproj

@@ -179,7 +179,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "cd \"$SRCROOT/../..\"\nsource ~/.bash_profile\necho $JAVA_HOME\njava -version\n./gradlew :client:embedAndSignAppleFrameworkForXcode\n";
+			shellScript = "cd \"$SRCROOT/../..\"\n./gradlew :client:embedAndSignAppleFrameworkForXcode\n";
 		};
 /* End PBXShellScriptBuildPhase section */
 

client/ios/ios/AppDelegate.swift

@@ -8,7 +8,7 @@
 
 import SwiftUI
 import Foundation
-import NyTimes
+import App
 
 @UIApplicationMain
 class AppDelegate: UIResponder, UIApplicationDelegate {

client/ios/ios/Info.plist

@@ -44,5 +44,7 @@
 		<string>UIInterfaceOrientationLandscapeLeft</string>
 		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
+	<key>CADisableMinimumFrameDurationOnPhone</key>
+	<true/>
 </dict>
 </plist>

client/src/commonMain/kotlin/io/github/xxfast/androidx/compose/material3/windowsizeclass/LocalWindowSizeClass.kt

@@ -1,5 +1,6 @@
 package io.github.xxfast.androidx.compose.material3.windowsizeclass
 
+import androidx.compose.material3.windowsizeclass.WindowSizeClass
 import androidx.compose.runtime.ProvidableCompositionLocal
 import androidx.compose.runtime.staticCompositionLocalOf