Playground build fixes
Looks like some common demo utils was pulled out into a separate module.
Pulling in compose:compiler directly would pull in a bunch of other
stuff, so this change switches compose:integration-tests:demos:common to
use the artiactOrSnapshot helper instead
Test: ./gradlew bOS && cd navigation && ./gradlew navigation:navigation-compose:integration-tests:navigation-demos:build && cd ../paging && ./gradlew paging:paging-compose:integration-tests:paging-demos:runErrorProne
Change-Id: Ic37dc2ad826bd7ce6b103608b37a70d9408b0557
diff --git a/compose/integration-tests/demos/common/build.gradle b/compose/integration-tests/demos/common/build.gradle
index 33c7f2f..e72eb74 100644
--- a/compose/integration-tests/demos/common/build.gradle
+++ b/compose/integration-tests/demos/common/build.gradle
@@ -26,11 +26,11 @@
}
dependencies {
- kotlinPlugin project(":compose:compiler:compiler")
+ kotlinPlugin projectOrArtifact(":compose:compiler:compiler")
implementation(KOTLIN_STDLIB)
api "androidx.activity:activity:1.2.0-alpha02"
- implementation project(":compose:runtime:runtime")
+ implementation projectOrArtifact(":compose:runtime:runtime")
}
tasks.withType(KotlinCompile).configureEach {
diff --git a/navigation/settings.gradle b/navigation/settings.gradle
index 0e81dbb..0a27e02 100644
--- a/navigation/settings.gradle
+++ b/navigation/settings.gradle
@@ -21,6 +21,8 @@
selectProjectsFromAndroidX({ name ->
// Compose projects are not supported in playground yet
if (name.startsWith(":navigation")) return true
+ if (name == ":annotation:annotation-sampled") return true
+ if (name == ":compose:integration-tests:demos:common") return true
if (name.startsWith(":internal-testutils-navigation")) return true
if (name.startsWith(":internal-testutils-runtime")) return true
if (name.startsWith(":internal-testutils-truth")) return true
diff --git a/paging/settings.gradle b/paging/settings.gradle
index c737672e..e181f5b 100644
--- a/paging/settings.gradle
+++ b/paging/settings.gradle
@@ -20,11 +20,10 @@
setupPlayground(this, "..")
selectProjectsFromAndroidX({ name ->
if (name.startsWith(":paging")) return true
+ if (name == ":compose:integration-tests:demos:common") return true
+ if (name == ":annotation:annotation-sampled") return true
+ if (name == ":internal-testutils-ktx") return true
+ if (name == ":internal-testutils-paging") return true
return false
})
-includeProject(":annotation:annotation-sampled",
- new File(supportRootDir, "annotation/annotation-sampled"))
-includeProject(":internal-testutils-ktx",
- new File(supportRootDir, "testutils/testutils-ktx"))
-includeProject(":internal-testutils-paging",
- new File(supportRootDir, "testutils/testutils-paging"))
+
diff --git a/playground-common/playground.properties b/playground-common/playground.properties
index 7ad7d1a..3454543 100644
--- a/playground-common/playground.properties
+++ b/playground-common/playground.properties
@@ -28,7 +28,7 @@
androidx.enableDocumentation=false
# Disable coverage
androidx.coverageEnabled=false
-androidx.playground.snapshotBuildId=6976316
-androidx.playground.metalavaBuildId=6976479
+androidx.playground.snapshotBuildId=6978904
+androidx.playground.metalavaBuildId=6978074
androidx.playground.dokkaBuildId=6915080
androidx.studio.type=playground
