Update Compose Runtime version to 1.13.0-SNAPSHOT When repository configuration was moved to `settings.gradle.kts` in ae545fc1569e575ee2d341dcecab74fe62b7602c, `androidxSnapshotRepo` was not included in the move because the repository was not being used at the time. Now we are working on a Compose plugin change that depends on annotation classes that were only added in Compose Runtime 1.13.0, and snapshots of that version are currently only available from `androidxSnapshotRepo`. So, this PR adds configuration of `androidxSnapshotRepo` to `settings.gradle.kts` and updates the Compose Runtime version to 1.13.0-SNAPSHOT.
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index 2a754d6..d458c1e 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml
@@ -63,34 +63,34 @@ <sha256 value="b9cef424044cd52ffca7abd35724f13d9c5358db3e8609053970bd1b5194cc5b" origin="Generated by Gradle"/> </artifact> </component> - <component group="androidx.compose.runtime" name="runtime" version="1.11.2"> - <artifact name="runtime-metadata-1.11.2.jar"> - <sha256 value="123c8ed945250cf50ffbad74b5857cb37daef5a53f8537870b554525b364131c" origin="Generated by Gradle"/> + <component group="androidx.compose.runtime" name="runtime" version="1.13.0-20260701.184741-1"> + <artifact name="runtime-1.13.0-20260701.184741-1.jar"> + <sha256 value="5155b9c0ed9865096ad5f018c68854220dadbffabf38812eb8ab1cbdadc458d0" origin="Generated by Gradle"/> </artifact> </component> - <component group="androidx.compose.runtime" name="runtime-annotation" version="1.11.2"> - <artifact name="runtime-annotation-metadata-1.11.2.jar"> + <component group="androidx.compose.runtime" name="runtime-annotation" version="1.13.0-20260701.184741-1"> + <artifact name="runtime-annotation-1.13.0-20260701.184741-1.jar"> <sha256 value="190e363a7f2951794f5b4f0986da454f39a425b87799b2d592c2a78972d175df" origin="Generated by Gradle"/> </artifact> </component> - <component group="androidx.compose.runtime" name="runtime-annotation-js" version="1.11.2"> - <artifact name="runtime-annotation-js-1.11.2.klib"> - <sha256 value="a1f25da7f277f440f70545afce08c712d1c32bccda73bd45bb401915e6953ca1" origin="Generated by Gradle"/> + <component group="androidx.compose.runtime" name="runtime-annotation-js" version="1.13.0-SNAPSHOT"> + <artifact name="runtime-annotation-js-1.13.0-SNAPSHOT.klib"> + <sha256 value="f7c67d91d6180671be25c9872562a061b8a2aa86f2d53ccf613e2727a91bb3ef" origin="Generated by Gradle"/> </artifact> </component> - <component group="androidx.compose.runtime" name="runtime-annotation-jvm" version="1.11.2"> - <artifact name="runtime-annotation-jvm-1.11.2.jar"> - <sha256 value="e286a8520709d7bdc66481c272660c2a8d26b12740f76102543ce45704370396" origin="Generated by Gradle"/> + <component group="androidx.compose.runtime" name="runtime-annotation-jvm" version="1.13.0-SNAPSHOT"> + <artifact name="runtime-annotation-jvm-1.13.0-SNAPSHOT.jar"> + <sha256 value="e291a6ae01ab71a7f48a568ec9744c6bf9b3f46ef72fbcdeb28c3407ae531c5e" origin="Generated by Gradle"/> </artifact> </component> - <component group="androidx.compose.runtime" name="runtime-desktop" version="1.11.2"> - <artifact name="runtime-desktop-1.11.2.jar"> - <sha256 value="69551aee8f92114921816f3d9aaa66062104db228ed5710a6666f7adbdfafe3c" origin="Generated by Gradle"/> + <component group="androidx.compose.runtime" name="runtime-desktop" version="1.13.0-SNAPSHOT"> + <artifact name="runtime-desktop-1.13.0-SNAPSHOT.jar"> + <sha256 value="bac53c25f16d9e4139f91ad065cdfb2cb5ad7119927269101b82adc923a81a02" origin="Generated by Gradle"/> </artifact> </component> - <component group="androidx.compose.runtime" name="runtime-js" version="1.11.2"> - <artifact name="runtime-js-1.11.2.klib"> - <sha256 value="d9d30c5c02a9a4a3a3c44025e4b7ab8505162ba140ab72214a2b7a5d805e5af2" origin="Generated by Gradle"/> + <component group="androidx.compose.runtime" name="runtime-js" version="1.13.0-SNAPSHOT"> + <artifact name="runtime-js-1.13.0-SNAPSHOT.klib"> + <sha256 value="5166ec94f231352165534b85b95deb481ee9c15d56c10c401327a2fd669e9eb9" origin="Generated by Gradle"/> </artifact> </component> <component group="androidx.compose.ui" name="ui-desktop" version="1.7.0-alpha08">
diff --git a/plugins/compose/compose-runtime-snapshot-versions.toml b/plugins/compose/compose-runtime-snapshot-versions.toml index f0cbdf6..3ca60cc 100644 --- a/plugins/compose/compose-runtime-snapshot-versions.toml +++ b/plugins/compose/compose-runtime-snapshot-versions.toml
@@ -1,5 +1,5 @@ # Versions of Compose runtime snapshot from androidx.dev used in compiler testing # See libs.versions.toml to update versions of other Compose libraries [versions] -snapshot-id = "13911742" -runtime-version = "1.11.2" +snapshot-id = "15768756" +runtime-version = "1.13.0-20260701.184741-1"
diff --git a/repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/ComposeDependencies.kt b/repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/ComposeDependencies.kt index d15b904..70458ce 100644 --- a/repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/ComposeDependencies.kt +++ b/repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/ComposeDependencies.kt
@@ -25,18 +25,6 @@ } } -fun RepositoryHandler.androidxSnapshotRepo(composeSnapshotId: String) { - maven { - url = URI("https://androidx.dev/snapshots/builds/${composeSnapshotId}/artifacts/repository") - }.apply { - content { - includeGroup("androidx.compose.runtime") - includeGroup("androidx.collection") - includeGroup("androidx.annotation") - } - } -} - fun RepositoryHandler.composeGoogleMaven(composeStableVersion: String) { google { content {
diff --git a/repo/kotlin-build-helpers/src/repositories.kt b/repo/kotlin-build-helpers/src/repositories.kt index dab02ee..f333fde 100644 --- a/repo/kotlin-build-helpers/src/repositories.kt +++ b/repo/kotlin-build-helpers/src/repositories.kt
@@ -137,14 +137,29 @@ } } +fun RepositoryHandler.androidxSnapshotRepository(composeSnapshotId: String) { + maven { repository -> + repository.setUrl("https://androidx.dev/snapshots/builds/$composeSnapshotId/artifacts/repository") + repository.content { content -> + content.includeGroup("androidx.compose.runtime") + content.includeGroup("androidx.collection") + content.includeGroup("androidx.annotation") + } + } +} + fun RepositoryHandler.googleAndroidRepository() { exclusiveContent { exclusive -> exclusive.forRepository { - google() + maven { repository -> + repository.url = google().url + repository.content { content -> + content.includeGroupByRegex("""androidx(\..*)?""") + } + } } exclusive.filter { content -> content.includeGroupByRegex("""com\.android(\..*)?""") - content.includeGroupByRegex("""androidx(\..*)?""") content.includeGroup("com.google.testing.platform") } }
diff --git a/settings.gradle.kts b/settings.gradle.kts index bad7379..1d9b4dd 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts
@@ -104,11 +104,16 @@ } } repositories { + val composeRuntimeSnapshotVersions = Properties().apply { + file("plugins/compose/compose-runtime-snapshot-versions.toml").inputStream().use { load(it) } + } + intellijRepository(buildProperties.versionsProperty("intellijSdk").get()) intellijDependencies() kotlinDependencies() teamcityRepository() googleAndroidRepository() + composeRuntimeSnapshotVersions.getProperty("snapshot-id")?.let { androidxSnapshotRepository(it.trim('"')) } gradleLibsReleases() gradlePluginPortalRepository() litmuskt()