Add snapshot dependencies
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index e4784fe..3a00b8f 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -76,6 +76,10 @@
<trust group="org.jetbrains.kotlin" name="kotlin-util-klib" version="2\.0\.20(-.+)?|2\.0\.0(-.+)?" regex="true"/>
<trust group="org.jetbrains.kotlin" name="kotlinx-serialization-compiler-plugin" version="2\.0\.20(-.+)?|2\.0\.0(-.+)?" regex="true"/>
<trust group="org.jetbrains.kotlin" name="kotlinx-serialization-compiler-plugin-embeddable" version="2\.0\.20(-.+)?|2\.0\.0(-.+)?" regex="true"/>
+ <trust group="androidx.compose.runtime" name="runtime" version="1.7.0-SNAPSHOT" regex="true"/>
+ <trust group="androidx.compose.runtime" name="runtime-desktop" version="1.7.0-SNAPSHOT" regex="true"/>
+ <trust group="androidx.compose.runtime" name="runtime-test-utils" version="1.7.0-SNAPSHOT" regex="true"/>
+ <trust group="androidx.compose.runtime" name="runtime-test-utils-desktop" version="1.7.0-SNAPSHOT" regex="true"/>
</trusted-artifacts>
</configuration>
<components>
diff --git a/plugins/compose/compiler-hosted/integration-tests/build.gradle.kts b/plugins/compose/compiler-hosted/integration-tests/build.gradle.kts
index ddda9db..ae1b50d 100644
--- a/plugins/compose/compiler-hosted/integration-tests/build.gradle.kts
+++ b/plugins/compose/compiler-hosted/integration-tests/build.gradle.kts
@@ -6,29 +6,9 @@
kotlin("multiplatform")
}
-val composeVersion = "1.7.0-alpha07"
repositories {
- google {
- content {
- includeGroup("androidx.collection")
- includeVersion("androidx.compose.runtime", "runtime", composeVersion)
- includeVersion("androidx.compose.runtime", "runtime-desktop", composeVersion)
- includeVersion("androidx.compose.foundation", "foundation-layout", composeVersion)
- includeVersion("androidx.compose.foundation", "foundation-layout-desktop", composeVersion)
- includeVersion("androidx.compose.foundation", "foundation", composeVersion)
- includeVersion("androidx.compose.foundation", "foundation-desktop", composeVersion)
- includeVersion("androidx.compose.animation", "animation", composeVersion)
- includeVersion("androidx.compose.animation", "animation-desktop", composeVersion)
- includeVersion("androidx.compose.ui", "ui", composeVersion)
- includeVersion("androidx.compose.ui", "ui-desktop", composeVersion)
- includeVersion("androidx.compose.ui", "ui-graphics", composeVersion)
- includeVersion("androidx.compose.ui", "ui-graphics-desktop", composeVersion)
- includeVersion("androidx.compose.ui", "ui-text", composeVersion)
- includeVersion("androidx.compose.ui", "ui-text-desktop", composeVersion)
- includeVersion("androidx.compose.ui", "ui-unit", composeVersion)
- includeVersion("androidx.compose.ui", "ui-unit-desktop", composeVersion)
- }
- }
+ composeGoogleMaven()
+ androidxSnapshotRepo()
}
fun KotlinDependencyHandler.implementationArtifactOnly(dependency: String) {
@@ -87,14 +67,14 @@
implementation(project(":plugins:compose-compiler-plugin:compiler-hosted:integration-tests:protobuf-test-classes"))
// external deps
- implementation("androidx.compose.runtime:runtime:$composeVersion")
- implementationArtifactOnly("androidx.compose.foundation:foundation:$composeVersion")
- implementationArtifactOnly("androidx.compose.foundation:foundation-layout:$composeVersion")
- implementationArtifactOnly("androidx.compose.animation:animation:$composeVersion")
- implementationArtifactOnly("androidx.compose.ui:ui:$composeVersion")
- implementationArtifactOnly("androidx.compose.ui:ui-graphics:$composeVersion")
- implementationArtifactOnly("androidx.compose.ui:ui-text:$composeVersion")
- implementationArtifactOnly("androidx.compose.ui:ui-unit:$composeVersion")
+ implementation(composeRuntime())
+ implementationArtifactOnly("androidx.compose.foundation:foundation:$composeStableVersion")
+ implementationArtifactOnly("androidx.compose.foundation:foundation-layout:$composeStableVersion")
+ implementationArtifactOnly("androidx.compose.animation:animation:$composeStableVersion")
+ implementationArtifactOnly("androidx.compose.ui:ui:$composeStableVersion")
+ implementationArtifactOnly("androidx.compose.ui:ui-graphics:$composeStableVersion")
+ implementationArtifactOnly("androidx.compose.ui:ui-text:$composeStableVersion")
+ implementationArtifactOnly("androidx.compose.ui:ui-unit:$composeStableVersion")
implementationArtifactOnly("org.jetbrains.kotlinx:kotlinx-collections-immutable-jvm:0.3.4")
implementationArtifactOnly("com.google.dagger:dagger:2.40.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 3313bd4..26cf8a3 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
@@ -1,6 +1,5 @@
import org.gradle.api.Project
import org.gradle.api.artifacts.dsl.RepositoryHandler
-import org.gradle.api.artifacts.repositories.MavenArtifactRepository
import java.net.URI
/*
@@ -8,16 +7,43 @@
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/
-private const val composeSnapshotId = "11751492"
-private const val composeVersion = "1.7.0-SNAPSHOT"
+private const val composeSnapshotId = "11809876"
+private const val composeSnapshotVersion = "1.7.0-SNAPSHOT"
+val composeStableVersion = "1.7.0-alpha07"
fun RepositoryHandler.androidxSnapshotRepo() {
maven {
url = URI("https://androidx.dev/snapshots/builds/$composeSnapshotId/artifacts/repository")
+ }.apply {
+ content {
+ includeGroup("androidx.compose.runtime")
+ }
}
}
-fun Project.composeRuntime() = "androidx.compose.runtime:runtime:${composeVersion}"
-fun Project.composeRuntimeTestUtils() = "androidx.compose.runtime:runtime-test-utils:${composeVersion}"
-fun Project.composeUi() = "androidx.compose.ui:ui:${composeVersion}"
-fun Project.composeFoundation() = "androidx.compose.foundation:foundation:${composeVersion}"
\ No newline at end of file
+fun RepositoryHandler.composeGoogleMaven() {
+ google {
+ content {
+ includeGroup("androidx.collection")
+ includeVersion("androidx.compose.runtime", "runtime", composeStableVersion)
+ includeVersion("androidx.compose.runtime", "runtime-desktop", composeStableVersion)
+ includeVersion("androidx.compose.foundation", "foundation-layout", composeStableVersion)
+ includeVersion("androidx.compose.foundation", "foundation-layout-desktop", composeStableVersion)
+ includeVersion("androidx.compose.foundation", "foundation", composeStableVersion)
+ includeVersion("androidx.compose.foundation", "foundation-desktop", composeStableVersion)
+ includeVersion("androidx.compose.animation", "animation", composeStableVersion)
+ includeVersion("androidx.compose.animation", "animation-desktop", composeStableVersion)
+ includeVersion("androidx.compose.ui", "ui", composeStableVersion)
+ includeVersion("androidx.compose.ui", "ui-desktop", composeStableVersion)
+ includeVersion("androidx.compose.ui", "ui-graphics", composeStableVersion)
+ includeVersion("androidx.compose.ui", "ui-graphics-desktop", composeStableVersion)
+ includeVersion("androidx.compose.ui", "ui-text", composeStableVersion)
+ includeVersion("androidx.compose.ui", "ui-text-desktop", composeStableVersion)
+ includeVersion("androidx.compose.ui", "ui-unit", composeStableVersion)
+ includeVersion("androidx.compose.ui", "ui-unit-desktop", composeStableVersion)
+ }
+ }
+}
+
+fun Project.composeRuntime() = "androidx.compose.runtime:runtime:${composeSnapshotVersion}"
+fun Project.composeRuntimeTestUtils() = "androidx.compose.runtime:runtime-test-utils:${composeSnapshotVersion}"
\ No newline at end of file
