Migrate to JetBrains‘ Compose Material3 Adaptive & Window Core

build-logic/gradm/gradm.yml

@@ -1,12 +1,15 @@
 versions:
   circuit: "0.23.1"
-  compose:
-    annotation: "1.7.0-beta01"
-    collection: "1.7.0-beta01"
-    multiplatform: "1.7.0-beta01"
   consensus: "0.15.0"
   delusion: "0.9.0"
   gradle: "8.9"
+  jetbrains:
+    androidx:
+      annotation: "1.7.0-beta01"
+      collection: "1.7.0-beta01"
+      compose.material3.adaptive: "1.0.0-alpha02"
+      window: "1.3.0-alpha02"
+    compose: "1.7.0-beta01"
   kotlin: "2.0.20"
   kotlinx:
     coroutines: "1.9.0-RC.2"
@@ -28,7 +31,7 @@ plugins:
   gradlePluginPortal:
     com.diffplug.spotless: ${versions.plugins.spotless}
     com.gradle.develocity: ${versions.plugins.develocity}
-    org.jetbrains.compose: ${versions.compose.multiplatform}
+    org.jetbrains.compose: ${versions.jetbrains.compose}
     org.jetbrains.kotlin.plugin.compose: ${versions.kotlin}
     org.jetbrains.kotlin.plugin.serialization: ${versions.kotlin}
 
@@ -38,14 +41,28 @@ dependencies:
       circuit-foundation:
         alias: circuit.foundation
         version: ${versions.circuit}
+    org.jetbrains.androidx.window:
+      window-core:
+        alias: jetbrains.androidx.window.core
+        version: ${versions.jetbrains.androidx.window}
     org.jetbrains.compose.annotation-internal:
       annotation:
         alias: jetbrains.compose.annotation
-        version: ${versions.compose.annotation}
+        version: ${versions.jetbrains.androidx.annotation}
     org.jetbrains.compose.collection-internal:
       collection:
         alias: jetbrains.compose.collection
-        version: ${versions.compose.collection}
+        version: ${versions.jetbrains.androidx.collection}
+    org.jetbrains.compose.material3.adaptive:
+      adaptive:
+        alias: jetbrains.compose.material3.adaptive
+        version: ${versions.jetbrains.androidx.compose.material3.adaptive}
+      adaptive-layout:
+        alias: jetbrains.compose.material3.adaptive.layout
+        version: ${versions.jetbrains.androidx.compose.material3.adaptive}
+      adaptive-navigation:
+        alias: jetbrains.compose.material3.adaptive.navigation
+        version: ${versions.jetbrains.androidx.compose.material3.adaptive}
     org.jetbrains.kotlin:
       kotlin-gradle-plugin:
         alias: kotlinGradlePlugin

build-logic/project/src/main/kotlin/wwm.compose.gradle.kts

@@ -12,5 +12,5 @@ composeCompiler {
 }
 
 configureCommonComposeMultiplatform(
-    composeMultiplatformVersion = Versions.compose.multiplatform,
+    composeMultiplatformVersion = Versions.jetbrains.compose,
 )

build-logic/project/src/main/kotlin/wwm.root.androidx.gradle.kts

@@ -9,27 +9,15 @@ val fetchAndroidx: FetchAndroidx by tasks.register<FetchAndroidx>("fetchAndroidx
     val androidxDirectory = rootProject.consensus.localProperties.getOrNull<File>("ANDROIDX_DIRECTORY")
     enabled = androidxDirectory != null
     androidxDirectoryProperty.set(androidxDirectory)
-    // https://developer.android.com/jetpack/androidx/releases/compose-material3-adaptive#1.0.0-beta04
-    commitIdProperty.set("967bd940b24778daf0ac5f9661bc881f4d0487c1")
+    // https://developer.android.com/jetpack/androidx/releases/compose-material3-adaptive#1.0.0
+    commitIdProperty.set("cad2089d1b7edd842b0132ba03a6d2fa4ee7d1a1")
 }
 
 val syncAndroidx: SyncAndroidx by tasks.register<SyncAndroidx>("syncAndroidx") {
     enabled = fetchAndroidx.enabled
     androidxDirectoryProperty.set(fetchAndroidx.androidxDirectoryProperty)
     copySpecsProperty.set(
         listOf(
-            SyncAndroidx.CopySpec(
-                sourcePath = "compose/material3/adaptive/adaptive",
-                targetPath = "wwm/androidx/compose/material3/adaptive",
-            ),
-            SyncAndroidx.CopySpec(
-                sourcePath = "compose/material3/adaptive/adaptive-layout",
-                targetPath = "wwm/androidx/compose/material3/adaptive/layout",
-            ),
-            SyncAndroidx.CopySpec(
-                sourcePath = "compose/material3/adaptive/adaptive-navigation",
-                targetPath = "wwm/androidx/compose/material3/adaptive/navigation",
-            ),
             SyncAndroidx.CopySpec(
                 sourcePath = "compose/material3/material3-adaptive-navigation-suite",
                 targetPath = "wwm/androidx/compose/material3/adaptive/navigation/suite",