[GH] Generalize artifactOrProject helper section parsing
Test: GH workflows
Change-Id: I83e78da4ed6c458854e93f6812d9799e8af1e80f
This is an imported pull request from https://github.com/androidx/androidx/pull/99.
Resolves #99
Github-Pr-Head-Sha: e39d234f4ae2ae0a31d93cdf052fe73499eabecf
GitOrigin-RevId: 66cc7b936e2c51a413893a7dab5614ff83e48156
Change-Id: I21fed777ec2ffcbd29c3f78b96e07471b611c776
diff --git a/arch/core-common/api/2.0.0.txt b/arch/core/core-common/api/2.0.0.txt
similarity index 100%
rename from arch/core-common/api/2.0.0.txt
rename to arch/core/core-common/api/2.0.0.txt
diff --git a/arch/core-common/api/2.1.0-beta01.txt b/arch/core/core-common/api/2.1.0-beta01.txt
similarity index 100%
rename from arch/core-common/api/2.1.0-beta01.txt
rename to arch/core/core-common/api/2.1.0-beta01.txt
diff --git a/arch/core-common/api/2.1.0-rc01.txt b/arch/core/core-common/api/2.1.0-rc01.txt
similarity index 100%
rename from arch/core-common/api/2.1.0-rc01.txt
rename to arch/core/core-common/api/2.1.0-rc01.txt
diff --git a/arch/core-common/api/current.txt b/arch/core/core-common/api/current.txt
similarity index 100%
rename from arch/core-common/api/current.txt
rename to arch/core/core-common/api/current.txt
diff --git a/arch/core-common/api/public_plus_experimental_2.0.0.txt b/arch/core/core-common/api/public_plus_experimental_2.0.0.txt
similarity index 100%
rename from arch/core-common/api/public_plus_experimental_2.0.0.txt
rename to arch/core/core-common/api/public_plus_experimental_2.0.0.txt
diff --git a/arch/core-common/api/public_plus_experimental_2.1.0-beta01.txt b/arch/core/core-common/api/public_plus_experimental_2.1.0-beta01.txt
similarity index 100%
rename from arch/core-common/api/public_plus_experimental_2.1.0-beta01.txt
rename to arch/core/core-common/api/public_plus_experimental_2.1.0-beta01.txt
diff --git a/arch/core-common/api/public_plus_experimental_2.1.0-rc01.txt b/arch/core/core-common/api/public_plus_experimental_2.1.0-rc01.txt
similarity index 100%
rename from arch/core-common/api/public_plus_experimental_2.1.0-rc01.txt
rename to arch/core/core-common/api/public_plus_experimental_2.1.0-rc01.txt
diff --git a/arch/core-common/api/public_plus_experimental_current.txt b/arch/core/core-common/api/public_plus_experimental_current.txt
similarity index 100%
rename from arch/core-common/api/public_plus_experimental_current.txt
rename to arch/core/core-common/api/public_plus_experimental_current.txt
diff --git a/arch/core-common/api/restricted_2.0.0.txt b/arch/core/core-common/api/restricted_2.0.0.txt
similarity index 100%
rename from arch/core-common/api/restricted_2.0.0.txt
rename to arch/core/core-common/api/restricted_2.0.0.txt
diff --git a/arch/core-common/api/restricted_2.1.0-beta01.txt b/arch/core/core-common/api/restricted_2.1.0-beta01.txt
similarity index 100%
rename from arch/core-common/api/restricted_2.1.0-beta01.txt
rename to arch/core/core-common/api/restricted_2.1.0-beta01.txt
diff --git a/arch/core-common/api/restricted_2.1.0-rc01.txt b/arch/core/core-common/api/restricted_2.1.0-rc01.txt
similarity index 100%
rename from arch/core-common/api/restricted_2.1.0-rc01.txt
rename to arch/core/core-common/api/restricted_2.1.0-rc01.txt
diff --git a/arch/core-common/api/restricted_current.ignore b/arch/core/core-common/api/restricted_current.ignore
similarity index 100%
rename from arch/core-common/api/restricted_current.ignore
rename to arch/core/core-common/api/restricted_current.ignore
diff --git a/arch/core-common/api/restricted_current.txt b/arch/core/core-common/api/restricted_current.txt
similarity index 100%
rename from arch/core-common/api/restricted_current.txt
rename to arch/core/core-common/api/restricted_current.txt
diff --git a/arch/core-common/api_legacy/0.0.0.txt b/arch/core/core-common/api_legacy/0.0.0.txt
similarity index 100%
rename from arch/core-common/api_legacy/0.0.0.txt
rename to arch/core/core-common/api_legacy/0.0.0.txt
diff --git a/arch/core-common/api_legacy/1.0.0.txt b/arch/core/core-common/api_legacy/1.0.0.txt
similarity index 100%
rename from arch/core-common/api_legacy/1.0.0.txt
rename to arch/core/core-common/api_legacy/1.0.0.txt
diff --git a/arch/core-common/api_legacy/1.1.0.txt b/arch/core/core-common/api_legacy/1.1.0.txt
similarity index 100%
rename from arch/core-common/api_legacy/1.1.0.txt
rename to arch/core/core-common/api_legacy/1.1.0.txt
diff --git a/arch/core-common/build.gradle b/arch/core/core-common/build.gradle
similarity index 100%
rename from arch/core-common/build.gradle
rename to arch/core/core-common/build.gradle
diff --git a/arch/core-common/lint-baseline.xml b/arch/core/core-common/lint-baseline.xml
similarity index 100%
rename from arch/core-common/lint-baseline.xml
rename to arch/core/core-common/lint-baseline.xml
diff --git a/arch/core-common/src/main/java/androidx/arch/core/internal/FastSafeIterableMap.java b/arch/core/core-common/src/main/java/androidx/arch/core/internal/FastSafeIterableMap.java
similarity index 100%
rename from arch/core-common/src/main/java/androidx/arch/core/internal/FastSafeIterableMap.java
rename to arch/core/core-common/src/main/java/androidx/arch/core/internal/FastSafeIterableMap.java
diff --git a/arch/core-common/src/main/java/androidx/arch/core/internal/SafeIterableMap.java b/arch/core/core-common/src/main/java/androidx/arch/core/internal/SafeIterableMap.java
similarity index 100%
rename from arch/core-common/src/main/java/androidx/arch/core/internal/SafeIterableMap.java
rename to arch/core/core-common/src/main/java/androidx/arch/core/internal/SafeIterableMap.java
diff --git a/arch/core-common/src/main/java/androidx/arch/core/util/Function.java b/arch/core/core-common/src/main/java/androidx/arch/core/util/Function.java
similarity index 100%
rename from arch/core-common/src/main/java/androidx/arch/core/util/Function.java
rename to arch/core/core-common/src/main/java/androidx/arch/core/util/Function.java
diff --git a/arch/core-common/src/test/java/androidx/collection/FastSafeIterableMapTest.java b/arch/core/core-common/src/test/java/androidx/collection/FastSafeIterableMapTest.java
similarity index 100%
rename from arch/core-common/src/test/java/androidx/collection/FastSafeIterableMapTest.java
rename to arch/core/core-common/src/test/java/androidx/collection/FastSafeIterableMapTest.java
diff --git a/arch/core-common/src/test/java/androidx/collection/SafeIterableMapTest.java b/arch/core/core-common/src/test/java/androidx/collection/SafeIterableMapTest.java
similarity index 100%
rename from arch/core-common/src/test/java/androidx/collection/SafeIterableMapTest.java
rename to arch/core/core-common/src/test/java/androidx/collection/SafeIterableMapTest.java
diff --git a/arch/core-runtime/api/2.0.0.txt b/arch/core/core-runtime/api/2.0.0.txt
similarity index 100%
rename from arch/core-runtime/api/2.0.0.txt
rename to arch/core/core-runtime/api/2.0.0.txt
diff --git a/arch/core-runtime/api/2.1.0-beta01.txt b/arch/core/core-runtime/api/2.1.0-beta01.txt
similarity index 100%
rename from arch/core-runtime/api/2.1.0-beta01.txt
rename to arch/core/core-runtime/api/2.1.0-beta01.txt
diff --git a/arch/core-runtime/api/2.1.0-rc01.txt b/arch/core/core-runtime/api/2.1.0-rc01.txt
similarity index 100%
rename from arch/core-runtime/api/2.1.0-rc01.txt
rename to arch/core/core-runtime/api/2.1.0-rc01.txt
diff --git a/arch/core-runtime/api/current.txt b/arch/core/core-runtime/api/current.txt
similarity index 100%
rename from arch/core-runtime/api/current.txt
rename to arch/core/core-runtime/api/current.txt
diff --git a/arch/core-runtime/api/public_plus_experimental_2.0.0.txt b/arch/core/core-runtime/api/public_plus_experimental_2.0.0.txt
similarity index 100%
rename from arch/core-runtime/api/public_plus_experimental_2.0.0.txt
rename to arch/core/core-runtime/api/public_plus_experimental_2.0.0.txt
diff --git a/arch/core-runtime/api/public_plus_experimental_2.1.0-beta01.txt b/arch/core/core-runtime/api/public_plus_experimental_2.1.0-beta01.txt
similarity index 100%
rename from arch/core-runtime/api/public_plus_experimental_2.1.0-beta01.txt
rename to arch/core/core-runtime/api/public_plus_experimental_2.1.0-beta01.txt
diff --git a/arch/core-runtime/api/public_plus_experimental_2.1.0-rc01.txt b/arch/core/core-runtime/api/public_plus_experimental_2.1.0-rc01.txt
similarity index 100%
rename from arch/core-runtime/api/public_plus_experimental_2.1.0-rc01.txt
rename to arch/core/core-runtime/api/public_plus_experimental_2.1.0-rc01.txt
diff --git a/arch/core-runtime/api/public_plus_experimental_current.txt b/arch/core/core-runtime/api/public_plus_experimental_current.txt
similarity index 100%
rename from arch/core-runtime/api/public_plus_experimental_current.txt
rename to arch/core/core-runtime/api/public_plus_experimental_current.txt
diff --git a/arch/core-runtime/api/res-2.1.0-beta01.txt b/arch/core/core-runtime/api/res-2.1.0-beta01.txt
similarity index 100%
rename from arch/core-runtime/api/res-2.1.0-beta01.txt
rename to arch/core/core-runtime/api/res-2.1.0-beta01.txt
diff --git a/arch/core-runtime/api/res-2.1.0-rc01.txt b/arch/core/core-runtime/api/res-2.1.0-rc01.txt
similarity index 100%
rename from arch/core-runtime/api/res-2.1.0-rc01.txt
rename to arch/core/core-runtime/api/res-2.1.0-rc01.txt
diff --git a/arch/core-runtime/api/res-current.txt b/arch/core/core-runtime/api/res-current.txt
similarity index 100%
rename from arch/core-runtime/api/res-current.txt
rename to arch/core/core-runtime/api/res-current.txt
diff --git a/arch/core-runtime/api/restricted_2.0.0.txt b/arch/core/core-runtime/api/restricted_2.0.0.txt
similarity index 100%
rename from arch/core-runtime/api/restricted_2.0.0.txt
rename to arch/core/core-runtime/api/restricted_2.0.0.txt
diff --git a/arch/core-runtime/api/restricted_2.1.0-beta01.txt b/arch/core/core-runtime/api/restricted_2.1.0-beta01.txt
similarity index 100%
rename from arch/core-runtime/api/restricted_2.1.0-beta01.txt
rename to arch/core/core-runtime/api/restricted_2.1.0-beta01.txt
diff --git a/arch/core-runtime/api/restricted_2.1.0-rc01.txt b/arch/core/core-runtime/api/restricted_2.1.0-rc01.txt
similarity index 100%
rename from arch/core-runtime/api/restricted_2.1.0-rc01.txt
rename to arch/core/core-runtime/api/restricted_2.1.0-rc01.txt
diff --git a/arch/core-runtime/api/restricted_current.txt b/arch/core/core-runtime/api/restricted_current.txt
similarity index 100%
rename from arch/core-runtime/api/restricted_current.txt
rename to arch/core/core-runtime/api/restricted_current.txt
diff --git a/arch/core-runtime/api_legacy/1.0.0.txt b/arch/core/core-runtime/api_legacy/1.0.0.txt
similarity index 100%
rename from arch/core-runtime/api_legacy/1.0.0.txt
rename to arch/core/core-runtime/api_legacy/1.0.0.txt
diff --git a/arch/core-runtime/api_legacy/1.1.0.ignore b/arch/core/core-runtime/api_legacy/1.1.0.ignore
similarity index 100%
rename from arch/core-runtime/api_legacy/1.1.0.ignore
rename to arch/core/core-runtime/api_legacy/1.1.0.ignore
diff --git a/arch/core-runtime/api_legacy/1.1.0.txt b/arch/core/core-runtime/api_legacy/1.1.0.txt
similarity index 100%
rename from arch/core-runtime/api_legacy/1.1.0.txt
rename to arch/core/core-runtime/api_legacy/1.1.0.txt
diff --git a/arch/core-runtime/api_legacy/current.txt b/arch/core/core-runtime/api_legacy/current.txt
similarity index 100%
rename from arch/core-runtime/api_legacy/current.txt
rename to arch/core/core-runtime/api_legacy/current.txt
diff --git a/arch/core-runtime/build.gradle b/arch/core/core-runtime/build.gradle
similarity index 96%
rename from arch/core-runtime/build.gradle
rename to arch/core/core-runtime/build.gradle
index a6d9c34..32c8667 100644
--- a/arch/core-runtime/build.gradle
+++ b/arch/core/core-runtime/build.gradle
@@ -27,7 +27,7 @@
dependencies {
api("androidx.annotation:annotation:1.1.0")
- api(project(":arch:core-common"))
+ api(project(":arch:core:core-common"))
}
android {
diff --git a/arch/core-runtime/lint-baseline.xml b/arch/core/core-runtime/lint-baseline.xml
similarity index 100%
rename from arch/core-runtime/lint-baseline.xml
rename to arch/core/core-runtime/lint-baseline.xml
diff --git a/arch/core-runtime/src/main/AndroidManifest.xml b/arch/core/core-runtime/src/main/AndroidManifest.xml
similarity index 100%
rename from arch/core-runtime/src/main/AndroidManifest.xml
rename to arch/core/core-runtime/src/main/AndroidManifest.xml
diff --git a/arch/core-runtime/src/main/java/androidx/arch/core/executor/ArchTaskExecutor.java b/arch/core/core-runtime/src/main/java/androidx/arch/core/executor/ArchTaskExecutor.java
similarity index 100%
rename from arch/core-runtime/src/main/java/androidx/arch/core/executor/ArchTaskExecutor.java
rename to arch/core/core-runtime/src/main/java/androidx/arch/core/executor/ArchTaskExecutor.java
diff --git a/arch/core-runtime/src/main/java/androidx/arch/core/executor/DefaultTaskExecutor.java b/arch/core/core-runtime/src/main/java/androidx/arch/core/executor/DefaultTaskExecutor.java
similarity index 100%
rename from arch/core-runtime/src/main/java/androidx/arch/core/executor/DefaultTaskExecutor.java
rename to arch/core/core-runtime/src/main/java/androidx/arch/core/executor/DefaultTaskExecutor.java
diff --git a/arch/core-runtime/src/main/java/androidx/arch/core/executor/TaskExecutor.java b/arch/core/core-runtime/src/main/java/androidx/arch/core/executor/TaskExecutor.java
similarity index 100%
rename from arch/core-runtime/src/main/java/androidx/arch/core/executor/TaskExecutor.java
rename to arch/core/core-runtime/src/main/java/androidx/arch/core/executor/TaskExecutor.java
diff --git a/arch/core-testing/api/2.0.0.txt b/arch/core/core-testing/api/2.0.0.txt
similarity index 100%
rename from arch/core-testing/api/2.0.0.txt
rename to arch/core/core-testing/api/2.0.0.txt
diff --git a/arch/core-testing/api/2.1.0-beta01.txt b/arch/core/core-testing/api/2.1.0-beta01.txt
similarity index 100%
rename from arch/core-testing/api/2.1.0-beta01.txt
rename to arch/core/core-testing/api/2.1.0-beta01.txt
diff --git a/arch/core-testing/api/2.1.0-rc01.txt b/arch/core/core-testing/api/2.1.0-rc01.txt
similarity index 100%
rename from arch/core-testing/api/2.1.0-rc01.txt
rename to arch/core/core-testing/api/2.1.0-rc01.txt
diff --git a/arch/core-testing/api/api_lint.ignore b/arch/core/core-testing/api/api_lint.ignore
similarity index 100%
rename from arch/core-testing/api/api_lint.ignore
rename to arch/core/core-testing/api/api_lint.ignore
diff --git a/arch/core-testing/api/current.txt b/arch/core/core-testing/api/current.txt
similarity index 100%
rename from arch/core-testing/api/current.txt
rename to arch/core/core-testing/api/current.txt
diff --git a/arch/core-testing/api/public_plus_experimental_2.0.0.txt b/arch/core/core-testing/api/public_plus_experimental_2.0.0.txt
similarity index 100%
rename from arch/core-testing/api/public_plus_experimental_2.0.0.txt
rename to arch/core/core-testing/api/public_plus_experimental_2.0.0.txt
diff --git a/arch/core-testing/api/public_plus_experimental_2.1.0-beta01.txt b/arch/core/core-testing/api/public_plus_experimental_2.1.0-beta01.txt
similarity index 100%
rename from arch/core-testing/api/public_plus_experimental_2.1.0-beta01.txt
rename to arch/core/core-testing/api/public_plus_experimental_2.1.0-beta01.txt
diff --git a/arch/core-testing/api/public_plus_experimental_2.1.0-rc01.txt b/arch/core/core-testing/api/public_plus_experimental_2.1.0-rc01.txt
similarity index 100%
rename from arch/core-testing/api/public_plus_experimental_2.1.0-rc01.txt
rename to arch/core/core-testing/api/public_plus_experimental_2.1.0-rc01.txt
diff --git a/arch/core-testing/api/public_plus_experimental_current.txt b/arch/core/core-testing/api/public_plus_experimental_current.txt
similarity index 100%
rename from arch/core-testing/api/public_plus_experimental_current.txt
rename to arch/core/core-testing/api/public_plus_experimental_current.txt
diff --git a/arch/core-testing/api/res-2.0.0.txt b/arch/core/core-testing/api/res-2.0.0.txt
similarity index 100%
rename from arch/core-testing/api/res-2.0.0.txt
rename to arch/core/core-testing/api/res-2.0.0.txt
diff --git a/arch/core-testing/api/res-2.1.0-beta01.txt b/arch/core/core-testing/api/res-2.1.0-beta01.txt
similarity index 100%
rename from arch/core-testing/api/res-2.1.0-beta01.txt
rename to arch/core/core-testing/api/res-2.1.0-beta01.txt
diff --git a/arch/core-testing/api/res-2.1.0-rc01.txt b/arch/core/core-testing/api/res-2.1.0-rc01.txt
similarity index 100%
rename from arch/core-testing/api/res-2.1.0-rc01.txt
rename to arch/core/core-testing/api/res-2.1.0-rc01.txt
diff --git a/arch/core-testing/api/res-current.txt b/arch/core/core-testing/api/res-current.txt
similarity index 100%
rename from arch/core-testing/api/res-current.txt
rename to arch/core/core-testing/api/res-current.txt
diff --git a/arch/core-testing/api/restricted_2.0.0.txt b/arch/core/core-testing/api/restricted_2.0.0.txt
similarity index 100%
rename from arch/core-testing/api/restricted_2.0.0.txt
rename to arch/core/core-testing/api/restricted_2.0.0.txt
diff --git a/arch/core-testing/api/restricted_2.1.0-beta01.txt b/arch/core/core-testing/api/restricted_2.1.0-beta01.txt
similarity index 100%
rename from arch/core-testing/api/restricted_2.1.0-beta01.txt
rename to arch/core/core-testing/api/restricted_2.1.0-beta01.txt
diff --git a/arch/core-testing/api/restricted_2.1.0-rc01.txt b/arch/core/core-testing/api/restricted_2.1.0-rc01.txt
similarity index 100%
rename from arch/core-testing/api/restricted_2.1.0-rc01.txt
rename to arch/core/core-testing/api/restricted_2.1.0-rc01.txt
diff --git a/arch/core-testing/api/restricted_current.txt b/arch/core/core-testing/api/restricted_current.txt
similarity index 100%
rename from arch/core-testing/api/restricted_current.txt
rename to arch/core/core-testing/api/restricted_current.txt
diff --git a/arch/core-testing/api_legacy/1.0.0.txt b/arch/core/core-testing/api_legacy/1.0.0.txt
similarity index 100%
rename from arch/core-testing/api_legacy/1.0.0.txt
rename to arch/core/core-testing/api_legacy/1.0.0.txt
diff --git a/arch/core-testing/api_legacy/1.1.0.txt b/arch/core/core-testing/api_legacy/1.1.0.txt
similarity index 100%
rename from arch/core-testing/api_legacy/1.1.0.txt
rename to arch/core/core-testing/api_legacy/1.1.0.txt
diff --git a/arch/core-testing/api_legacy/current.txt b/arch/core/core-testing/api_legacy/current.txt
similarity index 100%
rename from arch/core-testing/api_legacy/current.txt
rename to arch/core/core-testing/api_legacy/current.txt
diff --git a/arch/core-testing/build.gradle b/arch/core/core-testing/build.gradle
similarity index 97%
rename from arch/core-testing/build.gradle
rename to arch/core/core-testing/build.gradle
index dc910a7..f94fa7a 100644
--- a/arch/core-testing/build.gradle
+++ b/arch/core/core-testing/build.gradle
@@ -26,7 +26,7 @@
}
dependencies {
- api(project(":arch:core-runtime"))
+ api(project(":arch:core:core-runtime"))
api("androidx.annotation:annotation:1.1.0")
api(JUNIT)
api(MOCKITO_CORE, libs.exclude_bytebuddy)
diff --git a/arch/core-testing/lint-baseline.xml b/arch/core/core-testing/lint-baseline.xml
similarity index 100%
rename from arch/core-testing/lint-baseline.xml
rename to arch/core/core-testing/lint-baseline.xml
diff --git a/arch/core-testing/src/androidTest/java/androidx/arch/core/executor/testing/CountingTaskExecutorRuleTest.java b/arch/core/core-testing/src/androidTest/java/androidx/arch/core/executor/testing/CountingTaskExecutorRuleTest.java
similarity index 100%
rename from arch/core-testing/src/androidTest/java/androidx/arch/core/executor/testing/CountingTaskExecutorRuleTest.java
rename to arch/core/core-testing/src/androidTest/java/androidx/arch/core/executor/testing/CountingTaskExecutorRuleTest.java
diff --git a/arch/core-testing/src/main/AndroidManifest.xml b/arch/core/core-testing/src/main/AndroidManifest.xml
similarity index 100%
rename from arch/core-testing/src/main/AndroidManifest.xml
rename to arch/core/core-testing/src/main/AndroidManifest.xml
diff --git a/arch/core-testing/src/main/java/androidx/arch/core/executor/JunitTaskExecutorRule.java b/arch/core/core-testing/src/main/java/androidx/arch/core/executor/JunitTaskExecutorRule.java
similarity index 100%
rename from arch/core-testing/src/main/java/androidx/arch/core/executor/JunitTaskExecutorRule.java
rename to arch/core/core-testing/src/main/java/androidx/arch/core/executor/JunitTaskExecutorRule.java
diff --git a/arch/core-testing/src/main/java/androidx/arch/core/executor/TaskExecutorWithFakeMainThread.java b/arch/core/core-testing/src/main/java/androidx/arch/core/executor/TaskExecutorWithFakeMainThread.java
similarity index 100%
rename from arch/core-testing/src/main/java/androidx/arch/core/executor/TaskExecutorWithFakeMainThread.java
rename to arch/core/core-testing/src/main/java/androidx/arch/core/executor/TaskExecutorWithFakeMainThread.java
diff --git a/arch/core-testing/src/main/java/androidx/arch/core/executor/testing/CountingTaskExecutorRule.java b/arch/core/core-testing/src/main/java/androidx/arch/core/executor/testing/CountingTaskExecutorRule.java
similarity index 100%
rename from arch/core-testing/src/main/java/androidx/arch/core/executor/testing/CountingTaskExecutorRule.java
rename to arch/core/core-testing/src/main/java/androidx/arch/core/executor/testing/CountingTaskExecutorRule.java
diff --git a/arch/core-testing/src/main/java/androidx/arch/core/executor/testing/InstantTaskExecutorRule.java b/arch/core/core-testing/src/main/java/androidx/arch/core/executor/testing/InstantTaskExecutorRule.java
similarity index 100%
rename from arch/core-testing/src/main/java/androidx/arch/core/executor/testing/InstantTaskExecutorRule.java
rename to arch/core/core-testing/src/main/java/androidx/arch/core/executor/testing/InstantTaskExecutorRule.java
diff --git a/arch/core-testing/src/test/java/androidx/arch/core/executor/testing/InstantTaskExecutorRuleTest.java b/arch/core/core-testing/src/test/java/androidx/arch/core/executor/testing/InstantTaskExecutorRuleTest.java
similarity index 100%
rename from arch/core-testing/src/test/java/androidx/arch/core/executor/testing/InstantTaskExecutorRuleTest.java
rename to arch/core/core-testing/src/test/java/androidx/arch/core/executor/testing/InstantTaskExecutorRuleTest.java
diff --git a/buildSrc/src/main/kotlin/androidx/build/AndroidXPlaygroundRootPlugin.kt b/buildSrc/src/main/kotlin/androidx/build/AndroidXPlaygroundRootPlugin.kt
index 4004244..dc7bdb9 100644
--- a/buildSrc/src/main/kotlin/androidx/build/AndroidXPlaygroundRootPlugin.kt
+++ b/buildSrc/src/main/kotlin/androidx/build/AndroidXPlaygroundRootPlugin.kt
@@ -103,13 +103,13 @@
// Typically androidx projects have 3 sections, compose has 4.
if (sections.size >= 3) {
- // first is empty, last is artifact
- val group = if (sections[1] == "androidx.arch") {
- "androidx.arch.core"
- } else {
- "androidx.${sections.drop(1).dropLast(1).joinToString(".")}"
- }
- return "$group:${sections.last()}:$SNAPSHOT_MARKER"
+ val group = sections
+ // Filter empty sections as many declarations start with ':'
+ .filter { !it.isBlank() }
+ // Last element is the artifact.
+ .dropLast(1)
+ .joinToString(".")
+ return "androidx.$group:${sections.last()}:$SNAPSHOT_MARKER"
}
throw GradleException("projectOrArtifact cannot find/replace project $path")
diff --git a/development/build_log_simplifier/messages.ignore b/development/build_log_simplifier/messages.ignore
index aee858a..a5539cf 100644
--- a/development/build_log_simplifier/messages.ignore
+++ b/development/build_log_simplifier/messages.ignore
@@ -360,7 +360,7 @@
src/main/java/androidx/slice/widget/RowContent\.java:[0-9]+: warning: Parameter policy references hidden type androidx\.slice\.widget\.SliceViewPolicy\. \[HiddenTypeParameter\]
# > Task :appcompat:appcompat-resources:generateApi
src/main/java/androidx/appcompat/widget/ResourceManagerInternal\.java:[0-9]+: warning: Parameter hooks references hidden type androidx\.appcompat\.widget\.ResourceManagerInternal\.ResourceManagerHooks\. \[HiddenTypeParameter\]
-# > Task :arch:core-common:generateApi
+# > Task :arch:core:core-common:generateApi
src/main/java/androidx/arch/core/internal/FastSafeIterableMap\.java:[0-9]+: warning: Method androidx\.arch\.core\.internal\.FastSafeIterableMap\.get\(K\) references hidden type androidx\.arch\.core\.internal\.SafeIterableMap\.Entry<K,V>\. \[HiddenTypeParameter\]
src/main/java/androidx/arch/core/internal/SafeIterableMap\.java:[0-9]+: warning: Method androidx\.arch\.core\.internal\.SafeIterableMap\.get\(K\) references hidden type androidx\.arch\.core\.internal\.SafeIterableMap\.Entry<K,V>\. \[HiddenTypeParameter\]
# > Task :appcompat:appcompat:generateApi
@@ -620,4 +620,4 @@
\$SUPPORT/.*/build\.gradle: Warning: Unknown issue id "ComposableLambdaParameterPosition" \[UnknownIssueId\]
Explanation for issues of type "UnknownIssueId":
Lint will report this issue if it is configured with an issue id it does
-not recognize in for example Gradle files or lint\.xml configuration files\.
\ No newline at end of file
+not recognize in for example Gradle files or lint\.xml configuration files\.
diff --git a/docs-tip-of-tree/build.gradle b/docs-tip-of-tree/build.gradle
index 70cb58c..fd99621 100644
--- a/docs-tip-of-tree/build.gradle
+++ b/docs-tip-of-tree/build.gradle
@@ -17,9 +17,9 @@
docs(project(":appsearch:appsearch"))
docs(project(":appsearch:appsearch-local-storage"))
docs(project(":collection:collection"))
- docs(project(":arch:core-common"))
- docs(project(":arch:core-runtime"))
- docs(project(":arch:core-testing"))
+ docs(project(":arch:core:core-common"))
+ docs(project(":arch:core:core-runtime"))
+ docs(project(":arch:core:core-testing"))
docs(project(":asynclayoutinflater:asynclayoutinflater"))
docs(project(":autofill:autofill"))
docs(project(":benchmark:benchmark-benchmark"))
diff --git a/playground-common/playground.properties b/playground-common/playground.properties
index 3454543..f4dd921 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=6978904
-androidx.playground.metalavaBuildId=6978074
+androidx.playground.snapshotBuildId=6981231
+androidx.playground.metalavaBuildId=6953083
androidx.playground.dokkaBuildId=6915080
androidx.studio.type=playground
diff --git a/room/integration-tests/autovaluetestapp/build.gradle b/room/integration-tests/autovaluetestapp/build.gradle
index 71aac58..e40523f 100644
--- a/room/integration-tests/autovaluetestapp/build.gradle
+++ b/room/integration-tests/autovaluetestapp/build.gradle
@@ -31,7 +31,7 @@
dependencies {
implementation(project(":room:room-common"))
implementation(project(":room:room-runtime"))
- implementation(projectOrArtifact(":arch:core-runtime"))
+ implementation(projectOrArtifact(":arch:core:core-runtime"))
// depend on the shadowed version so that it tests with the shipped artifact
androidTestAnnotationProcessor project(path: ":room:room-compiler",
@@ -39,7 +39,7 @@
androidTestAnnotationProcessor(AUTO_VALUE)
androidTestAnnotationProcessor(AUTO_VALUE_PARCEL)
- androidTestImplementation(projectOrArtifact(":arch:core-runtime")) // Added for b/155802460
+ androidTestImplementation(projectOrArtifact(":arch:core:core-runtime")) // Added for b/155802460
androidTestImplementation(project(":room:room-testing"))
androidTestImplementation("androidx.arch.core:core-testing:2.0.1")
androidTestImplementation(AUTO_VALUE_ANNOTATIONS)
diff --git a/room/integration-tests/kotlintestapp/build.gradle b/room/integration-tests/kotlintestapp/build.gradle
index e3f61a1..88c4386 100644
--- a/room/integration-tests/kotlintestapp/build.gradle
+++ b/room/integration-tests/kotlintestapp/build.gradle
@@ -76,14 +76,14 @@
dependencies {
implementation(project(":room:room-common"))
implementation(project(":room:room-runtime"))
- implementation(projectOrArtifact(":arch:core-runtime"))
+ implementation(projectOrArtifact(":arch:core:core-runtime"))
implementation(projectOrArtifact(":lifecycle:lifecycle-livedata"))
implementation(KOTLIN_STDLIB)
implementation(KOTLIN_COROUTINES_ANDROID)
// depend on the shadowed version so that it tests with the shipped artifact
kaptAndroidTest project(path: ":room:room-compiler", configuration: 'shadowAndImplementation')
- androidTestImplementation(projectOrArtifact(":arch:core-runtime")) // Added for b/155802460
+ androidTestImplementation(projectOrArtifact(":arch:core:core-runtime")) // Added for b/155802460
androidTestImplementation(ANDROIDX_TEST_EXT_JUNIT)
androidTestImplementation(ANDROIDX_TEST_CORE)
androidTestImplementation(ANDROIDX_TEST_RUNNER) {
diff --git a/room/integration-tests/testapp/build.gradle b/room/integration-tests/testapp/build.gradle
index 711cc66..02be4b0 100644
--- a/room/integration-tests/testapp/build.gradle
+++ b/room/integration-tests/testapp/build.gradle
@@ -77,7 +77,7 @@
dependencies {
implementation(project(":room:room-common"))
implementation(project(":room:room-runtime"))
- implementation(projectOrArtifact(":arch:core-runtime"))
+ implementation(projectOrArtifact(":arch:core:core-runtime"))
implementation(projectOrArtifact(":lifecycle:lifecycle-livedata"))
implementation(projectOrArtifact(":lifecycle:lifecycle-runtime"))
implementation(MULTIDEX)
diff --git a/settings.gradle b/settings.gradle
index d554619..245cb40 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -138,9 +138,9 @@
includeProject(":appsearch:appsearch", "appsearch/appsearch", [BuildType.MAIN])
includeProject(":appsearch:appsearch-compiler", "appsearch/compiler", [BuildType.MAIN])
includeProject(":appsearch:appsearch-local-storage", "appsearch/local-storage", [BuildType.MAIN])
-includeProject(":arch:core-common", "arch/core-common", [BuildType.MAIN])
-includeProject(":arch:core-runtime", "arch/core-runtime", [BuildType.MAIN])
-includeProject(":arch:core-testing", "arch/core-testing", [BuildType.MAIN])
+includeProject(":arch:core:core-common", "arch/core/core-common", [BuildType.MAIN])
+includeProject(":arch:core:core-runtime", "arch/core/core-runtime", [BuildType.MAIN])
+includeProject(":arch:core:core-testing", "arch/core/core-testing", [BuildType.MAIN])
includeProject(":asynclayoutinflater:asynclayoutinflater", "asynclayoutinflater/asynclayoutinflater", [BuildType.MAIN])
includeProject(":autofill:autofill", "autofill/autofill", [BuildType.MAIN])
includeProject(":benchmark:benchmark-benchmark", "benchmark/benchmark")
