Skip to content

Prep Compose 1.12.0 #2722

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
stagg wants to merge 22 commits into
base: main
Choose a base branch
from
Draft

Prep Compose 1.12.0 #2722

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
11349bd
1.12.0-alpha01
stagg May 28, 2026
4313d1a
hack manifest gen for tests
stagg May 28, 2026
62ad2eb
Merge branch 'main' into j-compose-1120
stagg Jun 16, 2026
f0da76c
1.12.0-alpha02
stagg Jun 16, 2026
487e7db
fix warnings
stagg Jun 16, 2026
e046904
locks
stagg Jun 16, 2026
9da1422
baselines
stagg Jun 16, 2026
9967341
New compile = 37
stagg Jun 16, 2026
75fd3b3
Merge remote-tracking branch 'origin/main' into j-compose-1120
Copilot Jul 2, 2026
2dd0603
Update jb-compose to 1.12.0-beta01
Copilot Jul 2, 2026
e6eaeb1
Merge branch 'main' into j-compose-1120
stagg Jul 6, 2026
3b99f8a
Merge remote-tracking branch 'origin/main' into j-compose-1120
stagg Jul 16, 2026
4ad1438
Update jb-compose to 1.12.0-beta02
stagg Jul 16, 2026
7f0ea5e
Declare js/wasmJs executable binaries for Compose UI tests
stagg Jul 16, 2026
4af6ba8
Re-baseline dependencyGuard for Compose 1.12
stagg Jul 16, 2026
33404b1
Format circuit.android convention plugin
stagg Jul 16, 2026
3ec5391
Update jb-compose to 1.12.0-beta03
stagg Jul 28, 2026
0300216
Merge remote-tracking branch 'origin/main' into j-compose-1120
stagg Jul 28, 2026
6e870a2
Merge branch 'main' into j-compose-1120
stagg Aug 7, 2026
78c2caa
1.12.0-rc01
stagg Aug 11, 2026
9e127e7
Merge remote-tracking branch 'origin/main' into j-compose-1120
stagg Aug 11, 2026
81e6123
Merge remote-tracking branch 'origin/main' into j-compose-1120
Copilot Aug 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions backstack/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ kotlin {
js {
outputModuleName = property("POM_ARTIFACT_ID").toString()
browser()
binaries.executable()
}
@OptIn(ExperimentalWasmDsl::class)
wasmJs {
Expand Down
19 changes: 8 additions & 11 deletions backstack/dependencies/androidRuntimeClasspath.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,17 +34,12 @@ androidx.core:core-ktx
androidx.core:core-viewtree
androidx.core:core
androidx.customview:customview-poolingcontainer
androidx.documentfile:documentfile
androidx.dynamicanimation:dynamicanimation
androidx.emoji2:emoji2
androidx.graphics:graphics-path
androidx.interpolator:interpolator
androidx.legacy:legacy-support-core-utils
androidx.lifecycle:lifecycle-common-jvm
androidx.lifecycle:lifecycle-common
androidx.lifecycle:lifecycle-livedata-core-ktx
androidx.lifecycle:lifecycle-livedata-core
androidx.lifecycle:lifecycle-livedata
androidx.lifecycle:lifecycle-process
androidx.lifecycle:lifecycle-runtime-android
androidx.lifecycle:lifecycle-runtime-compose-android
Expand All @@ -57,9 +52,6 @@ androidx.lifecycle:lifecycle-viewmodel-ktx
androidx.lifecycle:lifecycle-viewmodel-savedstate-android
androidx.lifecycle:lifecycle-viewmodel-savedstate
androidx.lifecycle:lifecycle-viewmodel
androidx.loader:loader
androidx.localbroadcastmanager:localbroadcastmanager
androidx.print:print
androidx.profileinstaller:profileinstaller
androidx.savedstate:savedstate-android
androidx.savedstate:savedstate-compose-android
Expand All @@ -68,7 +60,6 @@ androidx.savedstate:savedstate-ktx
androidx.savedstate:savedstate
androidx.startup:startup-runtime
androidx.tracing:tracing
androidx.transition:transition
androidx.versionedparcelable:versionedparcelable
androidx.window:window-core-android
androidx.window:window-core
Expand All @@ -77,16 +68,22 @@ com.google.guava:listenablefuture
org.jetbrains.androidx.lifecycle:lifecycle-common
org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose
org.jetbrains.androidx.lifecycle:lifecycle-runtime
org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-savedstate
org.jetbrains.androidx.lifecycle:lifecycle-viewmodel
org.jetbrains.androidx.savedstate:savedstate-compose
org.jetbrains.androidx.savedstate:savedstate
org.jetbrains.compose.runtime:runtime-android
org.jetbrains.compose.runtime:runtime-saveable-android
org.jetbrains.compose.runtime:runtime-saveable
org.jetbrains.compose.runtime:runtime
org.jetbrains.compose.ui:ui-android
org.jetbrains.compose.ui:ui-geometry-android
org.jetbrains.compose.ui:ui-geometry
org.jetbrains.compose.ui:ui-graphics-android
org.jetbrains.compose.ui:ui-graphics
org.jetbrains.compose.ui:ui-text-android
org.jetbrains.compose.ui:ui-text
org.jetbrains.compose.ui:ui-unit-android
org.jetbrains.compose.ui:ui-unit
org.jetbrains.compose.ui:ui-util-android
org.jetbrains.compose.ui:ui-util
org.jetbrains.compose.ui:ui
org.jetbrains.kotlin:kotlin-bom
Expand Down
10 changes: 6 additions & 4 deletions backstack/dependencies/jvmRuntimeClasspath.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,14 @@ androidx.lifecycle:lifecycle-runtime-compose-desktop
androidx.lifecycle:lifecycle-runtime-compose
androidx.lifecycle:lifecycle-runtime-desktop
androidx.lifecycle:lifecycle-runtime
androidx.lifecycle:lifecycle-viewmodel-compose-desktop
androidx.lifecycle:lifecycle-viewmodel-compose
androidx.lifecycle:lifecycle-viewmodel-desktop
androidx.lifecycle:lifecycle-viewmodel-savedstate-desktop
androidx.lifecycle:lifecycle-viewmodel-savedstate
androidx.lifecycle:lifecycle-viewmodel
androidx.navigationevent:navigationevent-compose-desktop
androidx.navigationevent:navigationevent-compose
androidx.navigationevent:navigationevent-desktop
androidx.navigationevent:navigationevent
androidx.savedstate:savedstate-compose-desktop
Expand All @@ -31,17 +35,15 @@ org.jetbrains.androidx.lifecycle:lifecycle-common
org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose-desktop
org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose
org.jetbrains.androidx.lifecycle:lifecycle-runtime
org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-savedstate
org.jetbrains.androidx.lifecycle:lifecycle-viewmodel
org.jetbrains.androidx.navigationevent:navigationevent-compose-desktop
org.jetbrains.androidx.navigationevent:navigationevent-compose
org.jetbrains.androidx.savedstate:savedstate-compose-desktop
org.jetbrains.androidx.savedstate:savedstate-compose
org.jetbrains.androidx.savedstate:savedstate
org.jetbrains.compose.runtime:runtime-desktop
org.jetbrains.compose.runtime:runtime-saveable-desktop
org.jetbrains.compose.runtime:runtime-saveable
org.jetbrains.compose.runtime:runtime
org.jetbrains.compose.ui:ui-backhandler-desktop
org.jetbrains.compose.ui:ui-backhandler
org.jetbrains.compose.ui:ui-desktop
org.jetbrains.compose.ui:ui-geometry-desktop
org.jetbrains.compose.ui:ui-geometry
Expand Down
25 changes: 23 additions & 2 deletions build-logic/src/main/kotlin/circuit.android.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import org.jetbrains.kotlin.gradle.dsl.kotlinExtension
val catalog = rootProject.extensions.getByType<VersionCatalogsExtension>().named("libs")
val jvmTargetVersion = catalog.findVersion("jvmTarget").get().requiredVersion
val compileSdkVersion = catalog.findVersion("android-compileSdk").get().requiredVersion.toInt()
val targetSdkVersion = catalog.findVersion("android-targetSdk").get().requiredVersion.toInt()
val circuitExtension = extensions.getByType<CircuitProjectExtension>()

// Android Library configuration
Expand All @@ -24,7 +25,7 @@ pluginManager.withPlugin("com.android.kotlin.multiplatform.library") {
compileSdk = compileSdkVersion
minSdk = 23
compilations.withType(KotlinMultiplatformAndroidHostTestCompilation::class.java) {
targetSdk { release(compileSdkVersion) }
targetSdk { release(targetSdkVersion) }
}
lint {
// https://issuetracker.google.com/issues/243267012
Expand All @@ -35,6 +36,26 @@ pluginManager.withPlugin("com.android.kotlin.multiplatform.library") {
}
}
}
// todo Robolectric: targetSdk on host test compilations is not getting set on the manifest??
tasks
.matching { it.name == "processAndroidHostTestManifest" }
.configureEach {
val sdkVersion = targetSdkVersion
doLast {
val manifestDir = outputs.files.files.first { it.isDirectory }
val manifest = File(manifestDir, "AndroidManifest.xml")
if (manifest.exists()) {
manifest.writeText(
manifest
.readText()
.replace(
Regex("""android:targetSdkVersion="\d+""""),
"""android:targetSdkVersion="$sdkVersion"""",
)
)
}
}
}
pluginManager.withPlugin("com.google.devtools.ksp") {
// TODO Remove when KSP preserves the task dependency for generated Android host-test
// sources used by lint. https://github.com/google/ksp/issues/3128
Expand Down Expand Up @@ -114,7 +135,7 @@ pluginManager.withPlugin("com.android.application") {

defaultConfig {
minSdk = 23
targetSdk = compileSdkVersion
targetSdk = targetSdkVersion
}

buildTypes {
Expand Down
2 changes: 2 additions & 0 deletions circuit-codegen-annotations/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,13 @@ kotlin {
js {
outputModuleName = property("POM_ARTIFACT_ID").toString()
browser()
binaries.executable()
}
@OptIn(ExperimentalWasmDsl::class)
wasmJs {
outputModuleName = property("POM_ARTIFACT_ID").toString()
browser()
binaries.executable()
}
// endregion

Expand Down
1 change: 1 addition & 0 deletions circuit-foundation/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ kotlin {
enabled = false
}
}
binaries.executable()
}
@OptIn(ExperimentalWasmDsl::class)
wasmJs {
Expand Down
21 changes: 12 additions & 9 deletions circuit-foundation/dependencies/androidRuntimeClasspath.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,17 +43,12 @@ androidx.core:core-ktx
androidx.core:core-viewtree
androidx.core:core
androidx.customview:customview-poolingcontainer
androidx.documentfile:documentfile
androidx.dynamicanimation:dynamicanimation
androidx.emoji2:emoji2
androidx.graphics:graphics-path
androidx.interpolator:interpolator
androidx.legacy:legacy-support-core-utils
androidx.lifecycle:lifecycle-common-jvm
androidx.lifecycle:lifecycle-common
androidx.lifecycle:lifecycle-livedata-core-ktx
androidx.lifecycle:lifecycle-livedata-core
androidx.lifecycle:lifecycle-livedata
androidx.lifecycle:lifecycle-process
androidx.lifecycle:lifecycle-runtime-android
androidx.lifecycle:lifecycle-runtime-compose-android
Expand All @@ -68,13 +63,10 @@ androidx.lifecycle:lifecycle-viewmodel-ktx
androidx.lifecycle:lifecycle-viewmodel-savedstate-android
androidx.lifecycle:lifecycle-viewmodel-savedstate
androidx.lifecycle:lifecycle-viewmodel
androidx.loader:loader
androidx.localbroadcastmanager:localbroadcastmanager
androidx.navigationevent:navigationevent-android
androidx.navigationevent:navigationevent-compose-android
androidx.navigationevent:navigationevent-compose
androidx.navigationevent:navigationevent
androidx.print:print
androidx.profileinstaller:profileinstaller
androidx.savedstate:savedstate-android
androidx.savedstate:savedstate-compose-android
Expand All @@ -83,7 +75,6 @@ androidx.savedstate:savedstate-ktx
androidx.savedstate:savedstate
androidx.startup:startup-runtime
androidx.tracing:tracing
androidx.transition:transition
androidx.versionedparcelable:versionedparcelable
androidx.window:window-core-android
androidx.window:window-core
Expand All @@ -104,16 +95,28 @@ org.jetbrains.androidx.lifecycle:lifecycle-viewmodel
org.jetbrains.androidx.navigationevent:navigationevent-compose
org.jetbrains.androidx.savedstate:savedstate-compose
org.jetbrains.androidx.savedstate:savedstate
org.jetbrains.compose.animation:animation-android
org.jetbrains.compose.animation:animation-core-android
org.jetbrains.compose.animation:animation-core
org.jetbrains.compose.animation:animation
org.jetbrains.compose.foundation:foundation-android
org.jetbrains.compose.foundation:foundation-layout-android
org.jetbrains.compose.foundation:foundation-layout
org.jetbrains.compose.foundation:foundation
org.jetbrains.compose.runtime:runtime-android
org.jetbrains.compose.runtime:runtime-saveable-android
org.jetbrains.compose.runtime:runtime-saveable
org.jetbrains.compose.runtime:runtime
org.jetbrains.compose.ui:ui-android
org.jetbrains.compose.ui:ui-geometry-android
org.jetbrains.compose.ui:ui-geometry
org.jetbrains.compose.ui:ui-graphics-android
org.jetbrains.compose.ui:ui-graphics
org.jetbrains.compose.ui:ui-text-android
org.jetbrains.compose.ui:ui-text
org.jetbrains.compose.ui:ui-unit-android
org.jetbrains.compose.ui:ui-unit
org.jetbrains.compose.ui:ui-util-android
org.jetbrains.compose.ui:ui-util
org.jetbrains.compose.ui:ui
org.jetbrains.kotlin:kotlin-bom
Expand Down
2 changes: 0 additions & 2 deletions circuit-foundation/dependencies/jvmRuntimeClasspath.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,6 @@ org.jetbrains.compose.runtime:runtime-desktop
org.jetbrains.compose.runtime:runtime-saveable-desktop
org.jetbrains.compose.runtime:runtime-saveable
org.jetbrains.compose.runtime:runtime
org.jetbrains.compose.ui:ui-backhandler-desktop
org.jetbrains.compose.ui:ui-backhandler
org.jetbrains.compose.ui:ui-desktop
org.jetbrains.compose.ui:ui-geometry-desktop
org.jetbrains.compose.ui:ui-geometry
Expand Down
2 changes: 2 additions & 0 deletions circuit-overlay/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,13 @@ kotlin {
js {
outputModuleName = property("POM_ARTIFACT_ID").toString()
browser()
binaries.executable()
}
@OptIn(ExperimentalWasmDsl::class)
wasmJs {
outputModuleName = property("POM_ARTIFACT_ID").toString()
browser()
binaries.executable()
}
// endregion

Expand Down
23 changes: 12 additions & 11 deletions circuit-overlay/dependencies/androidRuntimeClasspath.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,17 +42,12 @@ androidx.core:core-ktx
androidx.core:core-viewtree
androidx.core:core
androidx.customview:customview-poolingcontainer
androidx.documentfile:documentfile
androidx.dynamicanimation:dynamicanimation
androidx.emoji2:emoji2
androidx.graphics:graphics-path
androidx.interpolator:interpolator
androidx.legacy:legacy-support-core-utils
androidx.lifecycle:lifecycle-common-jvm
androidx.lifecycle:lifecycle-common
androidx.lifecycle:lifecycle-livedata-core-ktx
androidx.lifecycle:lifecycle-livedata-core
androidx.lifecycle:lifecycle-livedata
androidx.lifecycle:lifecycle-process
androidx.lifecycle:lifecycle-runtime-android
androidx.lifecycle:lifecycle-runtime-compose-android
Expand All @@ -65,9 +60,6 @@ androidx.lifecycle:lifecycle-viewmodel-ktx
androidx.lifecycle:lifecycle-viewmodel-savedstate-android
androidx.lifecycle:lifecycle-viewmodel-savedstate
androidx.lifecycle:lifecycle-viewmodel
androidx.loader:loader
androidx.localbroadcastmanager:localbroadcastmanager
androidx.print:print
androidx.profileinstaller:profileinstaller
androidx.savedstate:savedstate-android
androidx.savedstate:savedstate-compose-android
Expand All @@ -76,7 +68,6 @@ androidx.savedstate:savedstate-ktx
androidx.savedstate:savedstate
androidx.startup:startup-runtime
androidx.tracing:tracing
androidx.transition:transition
androidx.versionedparcelable:versionedparcelable
androidx.window:window-core-android
androidx.window:window-core
Expand All @@ -85,20 +76,30 @@ com.google.guava:listenablefuture
org.jetbrains.androidx.lifecycle:lifecycle-common
org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose
org.jetbrains.androidx.lifecycle:lifecycle-runtime
org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-savedstate
org.jetbrains.androidx.lifecycle:lifecycle-viewmodel
org.jetbrains.androidx.savedstate:savedstate-compose
org.jetbrains.androidx.savedstate:savedstate
org.jetbrains.compose.animation:animation-android
org.jetbrains.compose.animation:animation-core-android
org.jetbrains.compose.animation:animation-core
org.jetbrains.compose.animation:animation
org.jetbrains.compose.foundation:foundation-android
org.jetbrains.compose.foundation:foundation-layout-android
org.jetbrains.compose.foundation:foundation-layout
org.jetbrains.compose.foundation:foundation
org.jetbrains.compose.runtime:runtime-android
org.jetbrains.compose.runtime:runtime-saveable-android
org.jetbrains.compose.runtime:runtime-saveable
org.jetbrains.compose.runtime:runtime
org.jetbrains.compose.ui:ui-android
org.jetbrains.compose.ui:ui-geometry-android
org.jetbrains.compose.ui:ui-geometry
org.jetbrains.compose.ui:ui-graphics-android
org.jetbrains.compose.ui:ui-graphics
org.jetbrains.compose.ui:ui-text-android
org.jetbrains.compose.ui:ui-text
org.jetbrains.compose.ui:ui-unit-android
org.jetbrains.compose.ui:ui-unit
org.jetbrains.compose.ui:ui-util-android
org.jetbrains.compose.ui:ui-util
org.jetbrains.compose.ui:ui
org.jetbrains.kotlin:kotlin-bom
Expand Down
10 changes: 6 additions & 4 deletions circuit-overlay/dependencies/jvmRuntimeClasspath.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,14 @@ androidx.lifecycle:lifecycle-runtime-compose-desktop
androidx.lifecycle:lifecycle-runtime-compose
androidx.lifecycle:lifecycle-runtime-desktop
androidx.lifecycle:lifecycle-runtime
androidx.lifecycle:lifecycle-viewmodel-compose-desktop
androidx.lifecycle:lifecycle-viewmodel-compose
androidx.lifecycle:lifecycle-viewmodel-desktop
androidx.lifecycle:lifecycle-viewmodel-savedstate-desktop
androidx.lifecycle:lifecycle-viewmodel-savedstate
androidx.lifecycle:lifecycle-viewmodel
androidx.navigationevent:navigationevent-compose-desktop
androidx.navigationevent:navigationevent-compose
androidx.navigationevent:navigationevent-desktop
androidx.navigationevent:navigationevent
androidx.savedstate:savedstate-compose-desktop
Expand All @@ -31,8 +35,8 @@ org.jetbrains.androidx.lifecycle:lifecycle-common
org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose-desktop
org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose
org.jetbrains.androidx.lifecycle:lifecycle-runtime
org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-savedstate
org.jetbrains.androidx.lifecycle:lifecycle-viewmodel
org.jetbrains.androidx.navigationevent:navigationevent-compose-desktop
org.jetbrains.androidx.navigationevent:navigationevent-compose
org.jetbrains.androidx.savedstate:savedstate-compose-desktop
org.jetbrains.androidx.savedstate:savedstate-compose
org.jetbrains.androidx.savedstate:savedstate
Expand All @@ -48,8 +52,6 @@ org.jetbrains.compose.runtime:runtime-desktop
org.jetbrains.compose.runtime:runtime-saveable-desktop
org.jetbrains.compose.runtime:runtime-saveable
org.jetbrains.compose.runtime:runtime
org.jetbrains.compose.ui:ui-backhandler-desktop
org.jetbrains.compose.ui:ui-backhandler
org.jetbrains.compose.ui:ui-desktop
org.jetbrains.compose.ui:ui-geometry-desktop
org.jetbrains.compose.ui:ui-geometry
Expand Down
2 changes: 2 additions & 0 deletions circuit-retained/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,13 @@ kotlin {
js {
outputModuleName = property("POM_ARTIFACT_ID").toString()
browser()
binaries.executable()
}
@OptIn(ExperimentalWasmDsl::class)
wasmJs {
outputModuleName = property("POM_ARTIFACT_ID").toString()
browser()
binaries.executable()
}
// endregion

Expand Down
2 changes: 2 additions & 0 deletions circuit-retained/dependencies/androidRuntimeClasspath.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,8 @@ org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-savedstate
org.jetbrains.androidx.lifecycle:lifecycle-viewmodel
org.jetbrains.androidx.savedstate:savedstate-compose
org.jetbrains.androidx.savedstate:savedstate
org.jetbrains.compose.runtime:runtime-android
org.jetbrains.compose.runtime:runtime-saveable-android
org.jetbrains.compose.runtime:runtime-saveable
org.jetbrains.compose.runtime:runtime
org.jetbrains.kotlin:kotlin-bom
Expand Down
Loading
Loading