From c8a26b8a5f30e4ba7305105ea8877d45c56fc4db Mon Sep 17 00:00:00 2001 From: Louis Pullen-Freilich Date: Thu, 3 Jun 2021 18:11:39 +0100 Subject: [PATCH] Removes remaining androidx.ui references - Moves ui:ui-animation-tooling-internal to compose:animation:animation-tooling-internal - Renames AndroidXUiPlugin to AndroidXComposePlugin - Miscellaneous other fixes Bug: b/160233169 Test: bOS Relnote: N/A Change-Id: I8d5fe2873ff2befef04d646fd45fa93dc9c90398 --- activity/activity-compose/build.gradle | 2 +- .../activity-demos/build.gradle | 2 +- .../activity-compose/samples/build.gradle | 2 +- androidx-plugin/gradle-plugin/build.gradle | 6 +-- .../crystalball-experiment/build.gradle | 2 +- ...dXUiPlugin.kt => AndroidXComposePlugin.kt} | 4 +- .../kotlin/androidx/build/LibraryGroups.kt | 1 - .../androidx/build/MavenUploadHelper.kt | 2 +- ...rties => AndroidXComposePlugin.properties} | 2 +- .../animation-core/benchmark/build.gradle | 2 +- compose/animation/animation-core/build.gradle | 10 ++-- .../animation-core/samples/build.gradle | 2 +- .../animation-tooling-internal}/OWNERS | 0 .../api/1.0.0-beta02.txt | 0 .../api/1.0.0-beta03.txt | 0 .../api/1.0.0-beta04.txt | 0 .../api/1.0.0-beta05.txt | 0 .../api/1.0.0-beta06.txt | 0 .../api/1.0.0-beta07.txt | 0 .../api/1.0.0-beta08.txt | 0 .../api/1.0.0-beta09.txt | 0 .../api/current.txt | 0 .../public_plus_experimental_1.0.0-beta02.txt | 0 .../public_plus_experimental_1.0.0-beta03.txt | 0 .../public_plus_experimental_1.0.0-beta04.txt | 0 .../public_plus_experimental_1.0.0-beta05.txt | 0 .../public_plus_experimental_1.0.0-beta06.txt | 0 .../public_plus_experimental_1.0.0-beta07.txt | 0 .../public_plus_experimental_1.0.0-beta08.txt | 0 .../public_plus_experimental_1.0.0-beta09.txt | 0 .../api/public_plus_experimental_current.txt | 0 .../api/restricted_1.0.0-beta02.txt | 0 .../api/restricted_1.0.0-beta03.txt | 0 .../api/restricted_1.0.0-beta04.txt | 0 .../api/restricted_1.0.0-beta05.txt | 0 .../api/restricted_1.0.0-beta06.txt | 0 .../api/restricted_1.0.0-beta07.txt | 0 .../api/restricted_1.0.0-beta08.txt | 0 .../api/restricted_1.0.0-beta09.txt | 0 .../api/restricted_current.txt | 0 .../animation-tooling-internal}/build.gradle | 2 +- .../tooling/ComposeAnimatedProperty.kt | 0 .../animation/tooling/ComposeAnimation.kt | 0 compose/animation/animation/build.gradle | 10 ++-- .../animation-demos/build.gradle | 2 +- .../animation/animation/samples/build.gradle | 2 +- .../benchmark-utils/benchmark/build.gradle | 2 +- compose/benchmark-utils/build.gradle | 4 +- .../ComposableFunctionBodyTransformer.kt | 1 - compose/desktop/desktop/build.gradle | 2 +- compose/desktop/desktop/samples/build.gradle | 2 +- .../androidx/compose/desktop/ParagraphTest.kt | 2 +- .../foundation-layout/benchmark/build.gradle | 2 +- .../foundation/foundation-layout/build.gradle | 10 ++-- .../layout-demos/build.gradle | 2 +- .../foundation-layout/samples/build.gradle | 2 +- .../foundation/benchmark/build.gradle | 2 +- compose/foundation/foundation/build.gradle | 10 ++-- .../foundation-demos/build.gradle | 2 +- .../foundation/samples/build.gradle | 2 +- compose/integration-tests/OWNERS | 8 --- compose/integration-tests/build.gradle | 52 ------------------- compose/integration-tests/demos/build.gradle | 2 +- .../demos/common/build.gradle | 2 +- .../docs-snippets/build.gradle | 2 +- compose/integration-tests/lint-baseline.xml | 4 -- .../macrobenchmark-target/build.gradle | 2 +- .../src/androidTest/AndroidManifest.xml | 17 ------ .../src/main/AndroidManifest.xml | 18 ------- .../material/material-icons-core/build.gradle | 12 ++--- .../material-icons-core/samples/build.gradle | 2 +- .../material-icons-extended/build.gradle | 15 +++--- .../material-icons-extended/generate.gradle | 8 +-- .../shared-dependencies.gradle | 8 +-- compose/material/material-ripple/build.gradle | 13 +++-- .../material/material/benchmark/build.gradle | 2 +- compose/material/material/build.gradle | 11 ++-- .../material-catalog/build.gradle | 2 +- .../material-demos/build.gradle | 2 +- .../material/material/samples/build.gradle | 2 +- compose/runtime/runtime-livedata/build.gradle | 2 +- .../runtime-livedata/samples/build.gradle | 2 +- compose/runtime/runtime-rxjava2/build.gradle | 2 +- .../runtime-rxjava2/samples/build.gradle | 2 +- compose/runtime/runtime-rxjava3/build.gradle | 2 +- .../runtime-rxjava3/samples/build.gradle | 2 +- compose/runtime/runtime-saveable/build.gradle | 10 ++-- .../runtime-saveable/samples/build.gradle | 2 +- compose/runtime/runtime/build.gradle | 10 ++-- .../compose-runtime-benchmark/build.gradle | 2 +- .../runtime/integration-tests/build.gradle | 10 ++-- compose/runtime/runtime/samples/build.gradle | 2 +- compose/test-utils/build.gradle | 10 ++-- compose/ui/ui-geometry/build.gradle | 10 ++-- compose/ui/ui-graphics/benchmark/build.gradle | 2 +- .../ui-graphics/benchmark/test/build.gradle | 2 +- compose/ui/ui-graphics/build.gradle | 12 ++--- compose/ui/ui-graphics/samples/build.gradle | 2 +- compose/ui/ui-inspection/build.gradle | 2 +- compose/ui/ui-test-font/build.gradle | 8 +-- compose/ui/ui-test-junit4/build.gradle | 10 ++-- compose/ui/ui-test-manifest/build.gradle | 2 +- .../integration-tests/testapp/build.gradle | 2 +- compose/ui/ui-test/build.gradle | 10 ++-- compose/ui/ui-text/benchmark/build.gradle | 2 +- compose/ui/ui-text/build.gradle | 10 ++-- compose/ui/ui-text/samples/build.gradle | 2 +- compose/ui/ui-tooling-data/build.gradle | 2 +- .../compose/ui/tooling/data/SlotTree.kt | 1 - compose/ui/ui-tooling/build.gradle | 20 +++---- compose/ui/ui-unit/build.gradle | 10 ++-- compose/ui/ui-unit/samples/build.gradle | 2 +- compose/ui/ui-util/build.gradle | 10 ++-- compose/ui/ui-viewbinding/build.gradle | 2 +- .../ui/ui-viewbinding/samples/build.gradle | 2 +- compose/ui/ui/benchmark/build.gradle | 2 +- compose/ui/ui/build.gradle | 14 ++--- .../integration-tests/ui-demos/build.gradle | 2 +- compose/ui/ui/samples/build.gradle | 2 +- .../groupId/artifactId/build.gradle | 2 +- development/project-creator/create_project.py | 3 +- .../project-creator/test_project_creator.py | 4 -- hilt/hilt-navigation-compose/build.gradle | 2 +- .../samples/build.gradle | 2 +- .../lifecycle-viewmodel-compose/build.gradle | 2 +- .../lifecycle-viewmodel-demos/build.gradle | 2 +- .../samples/build.gradle | 2 +- .../lint/TestSizeAnnotationEnforcerTest.kt | 30 +++++------ navigation/navigation-compose/build.gradle | 2 +- .../navigation-demos/build.gradle | 2 +- .../navigation-compose/samples/build.gradle | 2 +- paging/paging-compose/build.gradle | 2 +- .../paging-demos/build.gradle | 2 +- paging/paging-compose/samples/build.gradle | 2 +- .../integration-tests/testapp/build.gradle | 2 +- settings.gradle | 3 +- text/text/build.gradle | 2 +- ui/ui/placeholder.txt | 4 -- wear/compose/foundation/build.gradle | 8 +-- wear/compose/material/benchmark/build.gradle | 2 +- wear/compose/material/build.gradle | 10 ++-- 141 files changed, 231 insertions(+), 346 deletions(-) rename buildSrc/src/main/kotlin/androidx/build/{AndroidXUiPlugin.kt => AndroidXComposePlugin.kt} (99%) rename buildSrc/src/main/resources/META-INF/gradle-plugins/{AndroidXUiPlugin.properties => AndroidXComposePlugin.properties} (91%) rename {ui/ui-animation-tooling-internal => compose/animation/animation-tooling-internal}/OWNERS (100%) rename {ui/ui-animation-tooling-internal => compose/animation/animation-tooling-internal}/api/1.0.0-beta02.txt (100%) rename {ui/ui-animation-tooling-internal => compose/animation/animation-tooling-internal}/api/1.0.0-beta03.txt (100%) rename {ui/ui-animation-tooling-internal => compose/animation/animation-tooling-internal}/api/1.0.0-beta04.txt (100%) rename {ui/ui-animation-tooling-internal => compose/animation/animation-tooling-internal}/api/1.0.0-beta05.txt (100%) rename {ui/ui-animation-tooling-internal => compose/animation/animation-tooling-internal}/api/1.0.0-beta06.txt (100%) rename {ui/ui-animation-tooling-internal => compose/animation/animation-tooling-internal}/api/1.0.0-beta07.txt (100%) rename {ui/ui-animation-tooling-internal => compose/animation/animation-tooling-internal}/api/1.0.0-beta08.txt (100%) rename {ui/ui-animation-tooling-internal => compose/animation/animation-tooling-internal}/api/1.0.0-beta09.txt (100%) rename {ui/ui-animation-tooling-internal => compose/animation/animation-tooling-internal}/api/current.txt (100%) rename {ui/ui-animation-tooling-internal => compose/animation/animation-tooling-internal}/api/public_plus_experimental_1.0.0-beta02.txt (100%) rename {ui/ui-animation-tooling-internal => compose/animation/animation-tooling-internal}/api/public_plus_experimental_1.0.0-beta03.txt (100%) rename {ui/ui-animation-tooling-internal => compose/animation/animation-tooling-internal}/api/public_plus_experimental_1.0.0-beta04.txt (100%) rename {ui/ui-animation-tooling-internal => compose/animation/animation-tooling-internal}/api/public_plus_experimental_1.0.0-beta05.txt (100%) rename {ui/ui-animation-tooling-internal => compose/animation/animation-tooling-internal}/api/public_plus_experimental_1.0.0-beta06.txt (100%) rename {ui/ui-animation-tooling-internal => compose/animation/animation-tooling-internal}/api/public_plus_experimental_1.0.0-beta07.txt (100%) rename {ui/ui-animation-tooling-internal => compose/animation/animation-tooling-internal}/api/public_plus_experimental_1.0.0-beta08.txt (100%) rename {ui/ui-animation-tooling-internal => compose/animation/animation-tooling-internal}/api/public_plus_experimental_1.0.0-beta09.txt (100%) rename {ui/ui-animation-tooling-internal => compose/animation/animation-tooling-internal}/api/public_plus_experimental_current.txt (100%) rename {ui/ui-animation-tooling-internal => compose/animation/animation-tooling-internal}/api/restricted_1.0.0-beta02.txt (100%) rename {ui/ui-animation-tooling-internal => compose/animation/animation-tooling-internal}/api/restricted_1.0.0-beta03.txt (100%) rename {ui/ui-animation-tooling-internal => compose/animation/animation-tooling-internal}/api/restricted_1.0.0-beta04.txt (100%) rename {ui/ui-animation-tooling-internal => compose/animation/animation-tooling-internal}/api/restricted_1.0.0-beta05.txt (100%) rename {ui/ui-animation-tooling-internal => compose/animation/animation-tooling-internal}/api/restricted_1.0.0-beta06.txt (100%) rename {ui/ui-animation-tooling-internal => compose/animation/animation-tooling-internal}/api/restricted_1.0.0-beta07.txt (100%) rename {ui/ui-animation-tooling-internal => compose/animation/animation-tooling-internal}/api/restricted_1.0.0-beta08.txt (100%) rename {ui/ui-animation-tooling-internal => compose/animation/animation-tooling-internal}/api/restricted_1.0.0-beta09.txt (100%) rename {ui/ui-animation-tooling-internal => compose/animation/animation-tooling-internal}/api/restricted_current.txt (100%) rename {ui/ui-animation-tooling-internal => compose/animation/animation-tooling-internal}/build.gradle (95%) rename {ui/ui-animation-tooling-internal => compose/animation/animation-tooling-internal}/src/main/java/androidx/compose/animation/tooling/ComposeAnimatedProperty.kt (100%) rename {ui/ui-animation-tooling-internal => compose/animation/animation-tooling-internal}/src/main/java/androidx/compose/animation/tooling/ComposeAnimation.kt (100%) delete mode 100644 compose/integration-tests/OWNERS delete mode 100644 compose/integration-tests/build.gradle delete mode 100644 compose/integration-tests/lint-baseline.xml delete mode 100644 compose/integration-tests/src/androidTest/AndroidManifest.xml delete mode 100644 compose/integration-tests/src/main/AndroidManifest.xml delete mode 100644 ui/ui/placeholder.txt diff --git a/activity/activity-compose/build.gradle b/activity/activity-compose/build.gradle index 5b3d1b895e95d..5fb1360f8bc0a 100644 --- a/activity/activity-compose/build.gradle +++ b/activity/activity-compose/build.gradle @@ -21,7 +21,7 @@ import androidx.build.RunApiTasks plugins { id("AndroidXPlugin") id("com.android.library") - id("AndroidXUiPlugin") + id("AndroidXComposePlugin") id("org.jetbrains.kotlin.android") } diff --git a/activity/activity-compose/integration-tests/activity-demos/build.gradle b/activity/activity-compose/integration-tests/activity-demos/build.gradle index 2928e80b619ac..ccec0868ed9fc 100644 --- a/activity/activity-compose/integration-tests/activity-demos/build.gradle +++ b/activity/activity-compose/integration-tests/activity-demos/build.gradle @@ -19,7 +19,7 @@ import androidx.build.Publish plugins { id("AndroidXPlugin") id("com.android.library") - id("AndroidXUiPlugin") + id("AndroidXComposePlugin") id("org.jetbrains.kotlin.android") } diff --git a/activity/activity-compose/samples/build.gradle b/activity/activity-compose/samples/build.gradle index a02eac61ca6c0..787fdc3aac372 100644 --- a/activity/activity-compose/samples/build.gradle +++ b/activity/activity-compose/samples/build.gradle @@ -20,7 +20,7 @@ import androidx.build.LibraryType plugins { id("AndroidXPlugin") id("com.android.library") - id("AndroidXUiPlugin") + id("AndroidXComposePlugin") id("org.jetbrains.kotlin.android") } diff --git a/androidx-plugin/gradle-plugin/build.gradle b/androidx-plugin/gradle-plugin/build.gradle index bdc17393a8dde..0d0a7ab2de4f4 100644 --- a/androidx-plugin/gradle-plugin/build.gradle +++ b/androidx-plugin/gradle-plugin/build.gradle @@ -62,9 +62,9 @@ gradlePlugin { id = "AndroidXPlugin" implementationClass = "androidx.build.AndroidXPlugin" } - AndroidXUiPlugin { - id = "AndroidXUiPlugin" - implementationClass = "androidx.build.AndroidXUiPlugin" + AndroidXComposePlugin { + id = "AndroidXComposePlugin" + implementationClass = "androidx.build.AndroidXComposePlugin" } } } diff --git a/benchmark/integration-tests/crystalball-experiment/build.gradle b/benchmark/integration-tests/crystalball-experiment/build.gradle index a7219084e83c7..068b678cedda0 100644 --- a/benchmark/integration-tests/crystalball-experiment/build.gradle +++ b/benchmark/integration-tests/crystalball-experiment/build.gradle @@ -51,7 +51,7 @@ android { testInstrumentationRunnerArgument "cpuusage-collector:disable_per_pkg", "true" // TotalPssMetricListener - testInstrumentationRunnerArgument "totalpss-collector:process-names", "androidx.ui.demos" + testInstrumentationRunnerArgument "totalpss-collector:process-names", "androidx.compose.integration.demos" // JankListener (disable) testInstrumentationRunnerArgument "jank-listener:log", "true" diff --git a/buildSrc/src/main/kotlin/androidx/build/AndroidXUiPlugin.kt b/buildSrc/src/main/kotlin/androidx/build/AndroidXComposePlugin.kt similarity index 99% rename from buildSrc/src/main/kotlin/androidx/build/AndroidXUiPlugin.kt rename to buildSrc/src/main/kotlin/androidx/build/AndroidXComposePlugin.kt index 386014131228d..b905d4eb7ee30 100644 --- a/buildSrc/src/main/kotlin/androidx/build/AndroidXUiPlugin.kt +++ b/buildSrc/src/main/kotlin/androidx/build/AndroidXComposePlugin.kt @@ -36,9 +36,9 @@ const val composeSourceOption = "plugin:androidx.compose.compiler.plugins.kotlin:sourceInformation=true" /** - * Plugin to apply options across all of the androidx.ui projects + * Plugin to apply common configuration for Compose projects. */ -class AndroidXUiPlugin : Plugin { +class AndroidXComposePlugin : Plugin { override fun apply(project: Project) { project.plugins.all { plugin -> when (plugin) { diff --git a/buildSrc/src/main/kotlin/androidx/build/LibraryGroups.kt b/buildSrc/src/main/kotlin/androidx/build/LibraryGroups.kt index 4ce2920dfc245..37e27af34cfdd 100644 --- a/buildSrc/src/main/kotlin/androidx/build/LibraryGroups.kt +++ b/buildSrc/src/main/kotlin/androidx/build/LibraryGroups.kt @@ -94,7 +94,6 @@ object LibraryGroups { val TRACING = LibraryGroup("androidx.tracing", LibraryVersions.TRACING) val TRANSITION = LibraryGroup("androidx.transition", LibraryVersions.TRANSITION) val TVPROVIDER = LibraryGroup("androidx.tvprovider", LibraryVersions.TVPROVIDER) - val UI = LibraryGroup(System.getenv("COMPOSE_CUSTOM_GROUP_UI") ?: "androidx.ui", LibraryVersions.COMPOSE) val VECTORDRAWABLE = LibraryGroup("androidx.vectordrawable", null) val VERSIONEDPARCELABLE = LibraryGroup("androidx.versionedparcelable", null) val VIEWPAGER = LibraryGroup("androidx.viewpager", LibraryVersions.VIEWPAGER) diff --git a/buildSrc/src/main/kotlin/androidx/build/MavenUploadHelper.kt b/buildSrc/src/main/kotlin/androidx/build/MavenUploadHelper.kt index e58490b928525..b390ae9e49cec 100644 --- a/buildSrc/src/main/kotlin/androidx/build/MavenUploadHelper.kt +++ b/buildSrc/src/main/kotlin/androidx/build/MavenUploadHelper.kt @@ -16,7 +16,7 @@ package androidx.build -import androidx.build.AndroidXUiPlugin.Companion.isMultiplatformEnabled +import androidx.build.AndroidXComposePlugin.Companion.isMultiplatformEnabled import com.android.build.gradle.LibraryPlugin import groovy.util.Node import org.gradle.api.GradleException diff --git a/buildSrc/src/main/resources/META-INF/gradle-plugins/AndroidXUiPlugin.properties b/buildSrc/src/main/resources/META-INF/gradle-plugins/AndroidXComposePlugin.properties similarity index 91% rename from buildSrc/src/main/resources/META-INF/gradle-plugins/AndroidXUiPlugin.properties rename to buildSrc/src/main/resources/META-INF/gradle-plugins/AndroidXComposePlugin.properties index 6f3e1fa0b8795..8752241f9c525 100644 --- a/buildSrc/src/main/resources/META-INF/gradle-plugins/AndroidXUiPlugin.properties +++ b/buildSrc/src/main/resources/META-INF/gradle-plugins/AndroidXComposePlugin.properties @@ -14,4 +14,4 @@ # limitations under the License. # -implementation-class=androidx.build.AndroidXUiPlugin \ No newline at end of file +implementation-class=androidx.build.AndroidXComposePlugin \ No newline at end of file diff --git a/compose/animation/animation-core/benchmark/build.gradle b/compose/animation/animation-core/benchmark/build.gradle index 157c32c39dbd2..5cef145da9b73 100644 --- a/compose/animation/animation-core/benchmark/build.gradle +++ b/compose/animation/animation-core/benchmark/build.gradle @@ -17,7 +17,7 @@ plugins { id("AndroidXPlugin") id("com.android.library") - id("AndroidXUiPlugin") + id("AndroidXComposePlugin") id("org.jetbrains.kotlin.android") id("androidx.benchmark") } diff --git a/compose/animation/animation-core/build.gradle b/compose/animation/animation-core/build.gradle index b67f9ba3369fb..095df43b1747f 100644 --- a/compose/animation/animation-core/build.gradle +++ b/compose/animation/animation-core/build.gradle @@ -15,7 +15,7 @@ */ -import androidx.build.AndroidXUiPlugin +import androidx.build.AndroidXComposePlugin import androidx.build.LibraryGroups import androidx.build.LibraryType import org.jetbrains.kotlin.gradle.tasks.KotlinCompile @@ -23,15 +23,15 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { id("AndroidXPlugin") id("com.android.library") - id("AndroidXUiPlugin") + id("AndroidXComposePlugin") } -AndroidXUiPlugin.applyAndConfigureKotlinPlugin(project) +AndroidXComposePlugin.applyAndConfigureKotlinPlugin(project) dependencies { kotlinPlugin(project(":compose:compiler:compiler")) - if (!AndroidXUiPlugin.isMultiplatformEnabled(project)) { + if (!AndroidXComposePlugin.isMultiplatformEnabled(project)) { /* * When updating dependencies, make sure to make the an an analogous update in the * corresponding block below @@ -63,7 +63,7 @@ dependencies { } } -if (AndroidXUiPlugin.isMultiplatformEnabled(project)) { +if (AndroidXComposePlugin.isMultiplatformEnabled(project)) { kotlin { android() jvm("desktop") diff --git a/compose/animation/animation-core/samples/build.gradle b/compose/animation/animation-core/samples/build.gradle index d8162278b0513..18ad38df39bde 100644 --- a/compose/animation/animation-core/samples/build.gradle +++ b/compose/animation/animation-core/samples/build.gradle @@ -21,7 +21,7 @@ import androidx.build.LibraryType plugins { id("AndroidXPlugin") id("com.android.library") - id("AndroidXUiPlugin") + id("AndroidXComposePlugin") id("org.jetbrains.kotlin.android") } diff --git a/ui/ui-animation-tooling-internal/OWNERS b/compose/animation/animation-tooling-internal/OWNERS similarity index 100% rename from ui/ui-animation-tooling-internal/OWNERS rename to compose/animation/animation-tooling-internal/OWNERS diff --git a/ui/ui-animation-tooling-internal/api/1.0.0-beta02.txt b/compose/animation/animation-tooling-internal/api/1.0.0-beta02.txt similarity index 100% rename from ui/ui-animation-tooling-internal/api/1.0.0-beta02.txt rename to compose/animation/animation-tooling-internal/api/1.0.0-beta02.txt diff --git a/ui/ui-animation-tooling-internal/api/1.0.0-beta03.txt b/compose/animation/animation-tooling-internal/api/1.0.0-beta03.txt similarity index 100% rename from ui/ui-animation-tooling-internal/api/1.0.0-beta03.txt rename to compose/animation/animation-tooling-internal/api/1.0.0-beta03.txt diff --git a/ui/ui-animation-tooling-internal/api/1.0.0-beta04.txt b/compose/animation/animation-tooling-internal/api/1.0.0-beta04.txt similarity index 100% rename from ui/ui-animation-tooling-internal/api/1.0.0-beta04.txt rename to compose/animation/animation-tooling-internal/api/1.0.0-beta04.txt diff --git a/ui/ui-animation-tooling-internal/api/1.0.0-beta05.txt b/compose/animation/animation-tooling-internal/api/1.0.0-beta05.txt similarity index 100% rename from ui/ui-animation-tooling-internal/api/1.0.0-beta05.txt rename to compose/animation/animation-tooling-internal/api/1.0.0-beta05.txt diff --git a/ui/ui-animation-tooling-internal/api/1.0.0-beta06.txt b/compose/animation/animation-tooling-internal/api/1.0.0-beta06.txt similarity index 100% rename from ui/ui-animation-tooling-internal/api/1.0.0-beta06.txt rename to compose/animation/animation-tooling-internal/api/1.0.0-beta06.txt diff --git a/ui/ui-animation-tooling-internal/api/1.0.0-beta07.txt b/compose/animation/animation-tooling-internal/api/1.0.0-beta07.txt similarity index 100% rename from ui/ui-animation-tooling-internal/api/1.0.0-beta07.txt rename to compose/animation/animation-tooling-internal/api/1.0.0-beta07.txt diff --git a/ui/ui-animation-tooling-internal/api/1.0.0-beta08.txt b/compose/animation/animation-tooling-internal/api/1.0.0-beta08.txt similarity index 100% rename from ui/ui-animation-tooling-internal/api/1.0.0-beta08.txt rename to compose/animation/animation-tooling-internal/api/1.0.0-beta08.txt diff --git a/ui/ui-animation-tooling-internal/api/1.0.0-beta09.txt b/compose/animation/animation-tooling-internal/api/1.0.0-beta09.txt similarity index 100% rename from ui/ui-animation-tooling-internal/api/1.0.0-beta09.txt rename to compose/animation/animation-tooling-internal/api/1.0.0-beta09.txt diff --git a/ui/ui-animation-tooling-internal/api/current.txt b/compose/animation/animation-tooling-internal/api/current.txt similarity index 100% rename from ui/ui-animation-tooling-internal/api/current.txt rename to compose/animation/animation-tooling-internal/api/current.txt diff --git a/ui/ui-animation-tooling-internal/api/public_plus_experimental_1.0.0-beta02.txt b/compose/animation/animation-tooling-internal/api/public_plus_experimental_1.0.0-beta02.txt similarity index 100% rename from ui/ui-animation-tooling-internal/api/public_plus_experimental_1.0.0-beta02.txt rename to compose/animation/animation-tooling-internal/api/public_plus_experimental_1.0.0-beta02.txt diff --git a/ui/ui-animation-tooling-internal/api/public_plus_experimental_1.0.0-beta03.txt b/compose/animation/animation-tooling-internal/api/public_plus_experimental_1.0.0-beta03.txt similarity index 100% rename from ui/ui-animation-tooling-internal/api/public_plus_experimental_1.0.0-beta03.txt rename to compose/animation/animation-tooling-internal/api/public_plus_experimental_1.0.0-beta03.txt diff --git a/ui/ui-animation-tooling-internal/api/public_plus_experimental_1.0.0-beta04.txt b/compose/animation/animation-tooling-internal/api/public_plus_experimental_1.0.0-beta04.txt similarity index 100% rename from ui/ui-animation-tooling-internal/api/public_plus_experimental_1.0.0-beta04.txt rename to compose/animation/animation-tooling-internal/api/public_plus_experimental_1.0.0-beta04.txt diff --git a/ui/ui-animation-tooling-internal/api/public_plus_experimental_1.0.0-beta05.txt b/compose/animation/animation-tooling-internal/api/public_plus_experimental_1.0.0-beta05.txt similarity index 100% rename from ui/ui-animation-tooling-internal/api/public_plus_experimental_1.0.0-beta05.txt rename to compose/animation/animation-tooling-internal/api/public_plus_experimental_1.0.0-beta05.txt diff --git a/ui/ui-animation-tooling-internal/api/public_plus_experimental_1.0.0-beta06.txt b/compose/animation/animation-tooling-internal/api/public_plus_experimental_1.0.0-beta06.txt similarity index 100% rename from ui/ui-animation-tooling-internal/api/public_plus_experimental_1.0.0-beta06.txt rename to compose/animation/animation-tooling-internal/api/public_plus_experimental_1.0.0-beta06.txt diff --git a/ui/ui-animation-tooling-internal/api/public_plus_experimental_1.0.0-beta07.txt b/compose/animation/animation-tooling-internal/api/public_plus_experimental_1.0.0-beta07.txt similarity index 100% rename from ui/ui-animation-tooling-internal/api/public_plus_experimental_1.0.0-beta07.txt rename to compose/animation/animation-tooling-internal/api/public_plus_experimental_1.0.0-beta07.txt diff --git a/ui/ui-animation-tooling-internal/api/public_plus_experimental_1.0.0-beta08.txt b/compose/animation/animation-tooling-internal/api/public_plus_experimental_1.0.0-beta08.txt similarity index 100% rename from ui/ui-animation-tooling-internal/api/public_plus_experimental_1.0.0-beta08.txt rename to compose/animation/animation-tooling-internal/api/public_plus_experimental_1.0.0-beta08.txt diff --git a/ui/ui-animation-tooling-internal/api/public_plus_experimental_1.0.0-beta09.txt b/compose/animation/animation-tooling-internal/api/public_plus_experimental_1.0.0-beta09.txt similarity index 100% rename from ui/ui-animation-tooling-internal/api/public_plus_experimental_1.0.0-beta09.txt rename to compose/animation/animation-tooling-internal/api/public_plus_experimental_1.0.0-beta09.txt diff --git a/ui/ui-animation-tooling-internal/api/public_plus_experimental_current.txt b/compose/animation/animation-tooling-internal/api/public_plus_experimental_current.txt similarity index 100% rename from ui/ui-animation-tooling-internal/api/public_plus_experimental_current.txt rename to compose/animation/animation-tooling-internal/api/public_plus_experimental_current.txt diff --git a/ui/ui-animation-tooling-internal/api/restricted_1.0.0-beta02.txt b/compose/animation/animation-tooling-internal/api/restricted_1.0.0-beta02.txt similarity index 100% rename from ui/ui-animation-tooling-internal/api/restricted_1.0.0-beta02.txt rename to compose/animation/animation-tooling-internal/api/restricted_1.0.0-beta02.txt diff --git a/ui/ui-animation-tooling-internal/api/restricted_1.0.0-beta03.txt b/compose/animation/animation-tooling-internal/api/restricted_1.0.0-beta03.txt similarity index 100% rename from ui/ui-animation-tooling-internal/api/restricted_1.0.0-beta03.txt rename to compose/animation/animation-tooling-internal/api/restricted_1.0.0-beta03.txt diff --git a/ui/ui-animation-tooling-internal/api/restricted_1.0.0-beta04.txt b/compose/animation/animation-tooling-internal/api/restricted_1.0.0-beta04.txt similarity index 100% rename from ui/ui-animation-tooling-internal/api/restricted_1.0.0-beta04.txt rename to compose/animation/animation-tooling-internal/api/restricted_1.0.0-beta04.txt diff --git a/ui/ui-animation-tooling-internal/api/restricted_1.0.0-beta05.txt b/compose/animation/animation-tooling-internal/api/restricted_1.0.0-beta05.txt similarity index 100% rename from ui/ui-animation-tooling-internal/api/restricted_1.0.0-beta05.txt rename to compose/animation/animation-tooling-internal/api/restricted_1.0.0-beta05.txt diff --git a/ui/ui-animation-tooling-internal/api/restricted_1.0.0-beta06.txt b/compose/animation/animation-tooling-internal/api/restricted_1.0.0-beta06.txt similarity index 100% rename from ui/ui-animation-tooling-internal/api/restricted_1.0.0-beta06.txt rename to compose/animation/animation-tooling-internal/api/restricted_1.0.0-beta06.txt diff --git a/ui/ui-animation-tooling-internal/api/restricted_1.0.0-beta07.txt b/compose/animation/animation-tooling-internal/api/restricted_1.0.0-beta07.txt similarity index 100% rename from ui/ui-animation-tooling-internal/api/restricted_1.0.0-beta07.txt rename to compose/animation/animation-tooling-internal/api/restricted_1.0.0-beta07.txt diff --git a/ui/ui-animation-tooling-internal/api/restricted_1.0.0-beta08.txt b/compose/animation/animation-tooling-internal/api/restricted_1.0.0-beta08.txt similarity index 100% rename from ui/ui-animation-tooling-internal/api/restricted_1.0.0-beta08.txt rename to compose/animation/animation-tooling-internal/api/restricted_1.0.0-beta08.txt diff --git a/ui/ui-animation-tooling-internal/api/restricted_1.0.0-beta09.txt b/compose/animation/animation-tooling-internal/api/restricted_1.0.0-beta09.txt similarity index 100% rename from ui/ui-animation-tooling-internal/api/restricted_1.0.0-beta09.txt rename to compose/animation/animation-tooling-internal/api/restricted_1.0.0-beta09.txt diff --git a/ui/ui-animation-tooling-internal/api/restricted_current.txt b/compose/animation/animation-tooling-internal/api/restricted_current.txt similarity index 100% rename from ui/ui-animation-tooling-internal/api/restricted_current.txt rename to compose/animation/animation-tooling-internal/api/restricted_current.txt diff --git a/ui/ui-animation-tooling-internal/build.gradle b/compose/animation/animation-tooling-internal/build.gradle similarity index 95% rename from ui/ui-animation-tooling-internal/build.gradle rename to compose/animation/animation-tooling-internal/build.gradle index b31553c80edf9..b92dd316391bc 100644 --- a/ui/ui-animation-tooling-internal/build.gradle +++ b/compose/animation/animation-tooling-internal/build.gradle @@ -34,6 +34,6 @@ androidx { name = "Compose Animation Tooling" description = "Compose Animation APIs for tooling support. Internal use only." publish = Publish.SNAPSHOT_ONLY - mavenGroup = LibraryGroups.UI + mavenGroup = LibraryGroups.Compose.ANIMATION runApiTasks = new RunApiTasks.Yes() } diff --git a/ui/ui-animation-tooling-internal/src/main/java/androidx/compose/animation/tooling/ComposeAnimatedProperty.kt b/compose/animation/animation-tooling-internal/src/main/java/androidx/compose/animation/tooling/ComposeAnimatedProperty.kt similarity index 100% rename from ui/ui-animation-tooling-internal/src/main/java/androidx/compose/animation/tooling/ComposeAnimatedProperty.kt rename to compose/animation/animation-tooling-internal/src/main/java/androidx/compose/animation/tooling/ComposeAnimatedProperty.kt diff --git a/ui/ui-animation-tooling-internal/src/main/java/androidx/compose/animation/tooling/ComposeAnimation.kt b/compose/animation/animation-tooling-internal/src/main/java/androidx/compose/animation/tooling/ComposeAnimation.kt similarity index 100% rename from ui/ui-animation-tooling-internal/src/main/java/androidx/compose/animation/tooling/ComposeAnimation.kt rename to compose/animation/animation-tooling-internal/src/main/java/androidx/compose/animation/tooling/ComposeAnimation.kt diff --git a/compose/animation/animation/build.gradle b/compose/animation/animation/build.gradle index 36d928da791b6..728e201a1032b 100644 --- a/compose/animation/animation/build.gradle +++ b/compose/animation/animation/build.gradle @@ -15,22 +15,22 @@ */ -import androidx.build.AndroidXUiPlugin +import androidx.build.AndroidXComposePlugin import androidx.build.LibraryGroups import androidx.build.LibraryType plugins { id("AndroidXPlugin") id("com.android.library") - id("AndroidXUiPlugin") + id("AndroidXComposePlugin") } -AndroidXUiPlugin.applyAndConfigureKotlinPlugin(project) +AndroidXComposePlugin.applyAndConfigureKotlinPlugin(project) dependencies { kotlinPlugin(project(":compose:compiler:compiler")) - if(!AndroidXUiPlugin.isMultiplatformEnabled(project)) { + if(!AndroidXComposePlugin.isMultiplatformEnabled(project)) { /* * When updating dependencies, make sure to make the an an analogous update in the * corresponding block below @@ -61,7 +61,7 @@ dependencies { } } -if(AndroidXUiPlugin.isMultiplatformEnabled(project)) { +if(AndroidXComposePlugin.isMultiplatformEnabled(project)) { kotlin { android() jvm("desktop") diff --git a/compose/animation/animation/integration-tests/animation-demos/build.gradle b/compose/animation/animation/integration-tests/animation-demos/build.gradle index dd1bc9a491a38..dd6ecf93d9aa2 100644 --- a/compose/animation/animation/integration-tests/animation-demos/build.gradle +++ b/compose/animation/animation/integration-tests/animation-demos/build.gradle @@ -1,7 +1,7 @@ plugins { id("AndroidXPlugin") id("com.android.library") - id("AndroidXUiPlugin") + id("AndroidXComposePlugin") id("org.jetbrains.kotlin.android") } diff --git a/compose/animation/animation/samples/build.gradle b/compose/animation/animation/samples/build.gradle index 37aea4811ad5a..2423c372e65e4 100644 --- a/compose/animation/animation/samples/build.gradle +++ b/compose/animation/animation/samples/build.gradle @@ -21,7 +21,7 @@ import androidx.build.LibraryType plugins { id("AndroidXPlugin") id("com.android.library") - id("AndroidXUiPlugin") + id("AndroidXComposePlugin") id("org.jetbrains.kotlin.android") } diff --git a/compose/benchmark-utils/benchmark/build.gradle b/compose/benchmark-utils/benchmark/build.gradle index ab872daf49319..192f54243b5cd 100644 --- a/compose/benchmark-utils/benchmark/build.gradle +++ b/compose/benchmark-utils/benchmark/build.gradle @@ -19,7 +19,7 @@ import static androidx.build.dependencies.DependenciesKt.* plugins { id("AndroidXPlugin") id("com.android.library") - id("AndroidXUiPlugin") + id("AndroidXComposePlugin") id("org.jetbrains.kotlin.android") id("androidx.benchmark") } diff --git a/compose/benchmark-utils/build.gradle b/compose/benchmark-utils/build.gradle index a6654e3600c4e..e974d88acafa9 100644 --- a/compose/benchmark-utils/build.gradle +++ b/compose/benchmark-utils/build.gradle @@ -15,14 +15,14 @@ */ -import androidx.build.AndroidXUiPlugin +import androidx.build.AndroidXComposePlugin import static androidx.build.dependencies.DependenciesKt.* plugins { id("AndroidXPlugin") id("com.android.library") - id("AndroidXUiPlugin") + id("AndroidXComposePlugin") id("org.jetbrains.kotlin.android") } diff --git a/compose/compiler/compiler-hosted/src/main/java/androidx/compose/compiler/plugins/kotlin/lower/ComposableFunctionBodyTransformer.kt b/compose/compiler/compiler-hosted/src/main/java/androidx/compose/compiler/plugins/kotlin/lower/ComposableFunctionBodyTransformer.kt index 817c5f90962da..0529fa32536e0 100644 --- a/compose/compiler/compiler-hosted/src/main/java/androidx/compose/compiler/plugins/kotlin/lower/ComposableFunctionBodyTransformer.kt +++ b/compose/compiler/compiler-hosted/src/main/java/androidx/compose/compiler/plugins/kotlin/lower/ComposableFunctionBodyTransformer.kt @@ -3337,7 +3337,6 @@ class ComposableFunctionBodyTransformer( builder.append( it.asString() .replacePrefix("androidx.compose.", "c#") - .replacePrefix("androidx.ui.", "u#") ) } } diff --git a/compose/desktop/desktop/build.gradle b/compose/desktop/desktop/build.gradle index ce53db3e5157b..950f03ee7cfcd 100644 --- a/compose/desktop/desktop/build.gradle +++ b/compose/desktop/desktop/build.gradle @@ -25,7 +25,7 @@ import static androidx.build.dependencies.DependenciesKt.* plugins { id("AndroidXPlugin") - id("AndroidXUiPlugin") + id("AndroidXComposePlugin") id("kotlin-multiplatform") } diff --git a/compose/desktop/desktop/samples/build.gradle b/compose/desktop/desktop/samples/build.gradle index c6bf31fd46f3b..c63caf5e6abad 100644 --- a/compose/desktop/desktop/samples/build.gradle +++ b/compose/desktop/desktop/samples/build.gradle @@ -21,7 +21,7 @@ import static androidx.build.dependencies.DependenciesKt.* plugins { id("AndroidXPlugin") - id("AndroidXUiPlugin") + id("AndroidXComposePlugin") id("kotlin-multiplatform") } diff --git a/compose/desktop/desktop/src/jvmTest/kotlin/androidx/compose/desktop/ParagraphTest.kt b/compose/desktop/desktop/src/jvmTest/kotlin/androidx/compose/desktop/ParagraphTest.kt index bbc22336d0425..ff16d4f9f6570 100644 --- a/compose/desktop/desktop/src/jvmTest/kotlin/androidx/compose/desktop/ParagraphTest.kt +++ b/compose/desktop/desktop/src/jvmTest/kotlin/androidx/compose/desktop/ParagraphTest.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package androidx.ui.desktop +package androidx.compose.desktop import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement diff --git a/compose/foundation/foundation-layout/benchmark/build.gradle b/compose/foundation/foundation-layout/benchmark/build.gradle index 5424dbd1a5573..8d5de4f224b1a 100644 --- a/compose/foundation/foundation-layout/benchmark/build.gradle +++ b/compose/foundation/foundation-layout/benchmark/build.gradle @@ -17,7 +17,7 @@ plugins { id("AndroidXPlugin") id("com.android.library") - id("AndroidXUiPlugin") + id("AndroidXComposePlugin") id("org.jetbrains.kotlin.android") id("androidx.benchmark") } diff --git a/compose/foundation/foundation-layout/build.gradle b/compose/foundation/foundation-layout/build.gradle index 239104c23f03a..a393effd9aa2e 100644 --- a/compose/foundation/foundation-layout/build.gradle +++ b/compose/foundation/foundation-layout/build.gradle @@ -14,22 +14,22 @@ * limitations under the License. */ -import androidx.build.AndroidXUiPlugin +import androidx.build.AndroidXComposePlugin import androidx.build.LibraryGroups import androidx.build.LibraryType plugins { id("AndroidXPlugin") id("com.android.library") - id("AndroidXUiPlugin") + id("AndroidXComposePlugin") } -AndroidXUiPlugin.applyAndConfigureKotlinPlugin(project) +AndroidXComposePlugin.applyAndConfigureKotlinPlugin(project) dependencies { kotlinPlugin(project(":compose:compiler:compiler")) - if(!AndroidXUiPlugin.isMultiplatformEnabled(project)) { + if(!AndroidXComposePlugin.isMultiplatformEnabled(project)) { /* * When updating dependencies, make sure to make the an an analogous update in the * corresponding block below @@ -57,7 +57,7 @@ dependencies { } } -if(AndroidXUiPlugin.isMultiplatformEnabled(project)) { +if(AndroidXComposePlugin.isMultiplatformEnabled(project)) { kotlin { android() jvm("desktop") diff --git a/compose/foundation/foundation-layout/integration-tests/layout-demos/build.gradle b/compose/foundation/foundation-layout/integration-tests/layout-demos/build.gradle index 838cfe3574146..fe24ef9469b82 100644 --- a/compose/foundation/foundation-layout/integration-tests/layout-demos/build.gradle +++ b/compose/foundation/foundation-layout/integration-tests/layout-demos/build.gradle @@ -17,7 +17,7 @@ plugins { id("AndroidXPlugin") id("com.android.library") - id("AndroidXUiPlugin") + id("AndroidXComposePlugin") id("org.jetbrains.kotlin.android") } diff --git a/compose/foundation/foundation-layout/samples/build.gradle b/compose/foundation/foundation-layout/samples/build.gradle index 4e63d1c1cfff8..dc0aefa162eec 100644 --- a/compose/foundation/foundation-layout/samples/build.gradle +++ b/compose/foundation/foundation-layout/samples/build.gradle @@ -20,7 +20,7 @@ import androidx.build.LibraryType plugins { id("AndroidXPlugin") id("com.android.library") - id("AndroidXUiPlugin") + id("AndroidXComposePlugin") id("org.jetbrains.kotlin.android") } diff --git a/compose/foundation/foundation/benchmark/build.gradle b/compose/foundation/foundation/benchmark/build.gradle index 0e58c4299a869..b987b0f943292 100644 --- a/compose/foundation/foundation/benchmark/build.gradle +++ b/compose/foundation/foundation/benchmark/build.gradle @@ -17,7 +17,7 @@ plugins { id("AndroidXPlugin") id("com.android.library") - id("AndroidXUiPlugin") + id("AndroidXComposePlugin") id("org.jetbrains.kotlin.android") id("androidx.benchmark") } diff --git a/compose/foundation/foundation/build.gradle b/compose/foundation/foundation/build.gradle index 9955c3d464346..23455b30055c7 100644 --- a/compose/foundation/foundation/build.gradle +++ b/compose/foundation/foundation/build.gradle @@ -14,7 +14,7 @@ * limitations under the License. */ -import androidx.build.AndroidXUiPlugin +import androidx.build.AndroidXComposePlugin import androidx.build.LibraryGroups import androidx.build.LibraryType import org.jetbrains.kotlin.gradle.tasks.KotlinCompile @@ -24,15 +24,15 @@ import static androidx.build.dependencies.DependenciesKt.SKIKO_CURRENT_OS plugins { id("AndroidXPlugin") id("com.android.library") - id("AndroidXUiPlugin") + id("AndroidXComposePlugin") } -AndroidXUiPlugin.applyAndConfigureKotlinPlugin(project) +AndroidXComposePlugin.applyAndConfigureKotlinPlugin(project) dependencies { kotlinPlugin(project(":compose:compiler:compiler")) - if(!AndroidXUiPlugin.isMultiplatformEnabled(project)) { + if(!AndroidXComposePlugin.isMultiplatformEnabled(project)) { /* * When updating dependencies, make sure to make the an an analogous update in the * corresponding block above @@ -73,7 +73,7 @@ dependencies { } } -if(AndroidXUiPlugin.isMultiplatformEnabled(project)) { +if(AndroidXComposePlugin.isMultiplatformEnabled(project)) { kotlin { android() jvm("desktop") diff --git a/compose/foundation/foundation/integration-tests/foundation-demos/build.gradle b/compose/foundation/foundation/integration-tests/foundation-demos/build.gradle index 1a230d8447d97..9d2b72e7e2619 100644 --- a/compose/foundation/foundation/integration-tests/foundation-demos/build.gradle +++ b/compose/foundation/foundation/integration-tests/foundation-demos/build.gradle @@ -17,7 +17,7 @@ plugins { id("AndroidXPlugin") id("com.android.library") - id("AndroidXUiPlugin") + id("AndroidXComposePlugin") id("org.jetbrains.kotlin.android") } diff --git a/compose/foundation/foundation/samples/build.gradle b/compose/foundation/foundation/samples/build.gradle index 95afe2d10584e..6a77d100ad301 100644 --- a/compose/foundation/foundation/samples/build.gradle +++ b/compose/foundation/foundation/samples/build.gradle @@ -20,7 +20,7 @@ import androidx.build.LibraryType plugins { id("AndroidXPlugin") id("com.android.library") - id("AndroidXUiPlugin") + id("AndroidXComposePlugin") id("org.jetbrains.kotlin.android") } diff --git a/compose/integration-tests/OWNERS b/compose/integration-tests/OWNERS deleted file mode 100644 index aefe62bd0b0fe..0000000000000 --- a/compose/integration-tests/OWNERS +++ /dev/null @@ -1,8 +0,0 @@ -# For text benchmarks -haoyuchang@google.com -nona@google.com -qqd@google.com -siyamed@google.com - -# For ui and foundation benchmarks -malkov@google.com diff --git a/compose/integration-tests/build.gradle b/compose/integration-tests/build.gradle deleted file mode 100644 index 69a9d8a93472f..0000000000000 --- a/compose/integration-tests/build.gradle +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Copyright 2019 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import static androidx.build.dependencies.DependenciesKt.* -import androidx.build.Publish - -plugins { - id("AndroidXPlugin") - id("com.android.library") - id("AndroidXUiPlugin") - id("org.jetbrains.kotlin.android") -} - -dependencies { - kotlinPlugin(project(":compose:compiler:compiler")) - - implementation(KOTLIN_STDLIB) - - implementation(JUNIT) - implementation(TRUTH) - implementation(ANDROIDX_TEST_RULES) - - implementation(project(":compose:foundation:foundation")) - implementation(project(":compose:foundation:foundation-layout")) - implementation(project(":compose:material:material")) - implementation(project(":compose:runtime:runtime")) - implementation(project(":compose:test-utils")) - implementation(project(":compose:ui:ui")) - implementation(project(":compose:ui:ui-test-junit4")) -} - -androidx { - name = "Compose Integration Tests" - publish = Publish.NONE - inceptionYear = "2019" - description = "Compose Integration Tests" -} - -android.defaultConfig.minSdkVersion 21 diff --git a/compose/integration-tests/demos/build.gradle b/compose/integration-tests/demos/build.gradle index 21cff4b6ca3b7..6d118b9bbc6cb 100644 --- a/compose/integration-tests/demos/build.gradle +++ b/compose/integration-tests/demos/build.gradle @@ -2,7 +2,7 @@ import static androidx.build.dependencies.DependenciesKt.* plugins { id("AndroidXPlugin") - id("AndroidXUiPlugin") + id("AndroidXComposePlugin") id("com.android.application") id("org.jetbrains.kotlin.android") } diff --git a/compose/integration-tests/demos/common/build.gradle b/compose/integration-tests/demos/common/build.gradle index 76a62aedba2fc..92db59000b5e0 100644 --- a/compose/integration-tests/demos/common/build.gradle +++ b/compose/integration-tests/demos/common/build.gradle @@ -18,7 +18,7 @@ import static androidx.build.dependencies.DependenciesKt.* plugins { id("AndroidXPlugin") - id("AndroidXUiPlugin") + id("AndroidXComposePlugin") id("com.android.library") id("org.jetbrains.kotlin.android") } diff --git a/compose/integration-tests/docs-snippets/build.gradle b/compose/integration-tests/docs-snippets/build.gradle index e53dfadea2bdd..fbcd800d72a2a 100644 --- a/compose/integration-tests/docs-snippets/build.gradle +++ b/compose/integration-tests/docs-snippets/build.gradle @@ -21,7 +21,7 @@ import static androidx.build.dependencies.DependenciesKt.* plugins { id("AndroidXPlugin") id("com.android.library") - id("AndroidXUiPlugin") + id("AndroidXComposePlugin") id("org.jetbrains.kotlin.android") } diff --git a/compose/integration-tests/lint-baseline.xml b/compose/integration-tests/lint-baseline.xml deleted file mode 100644 index 42a176b488980..0000000000000 --- a/compose/integration-tests/lint-baseline.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/compose/integration-tests/macrobenchmark-target/build.gradle b/compose/integration-tests/macrobenchmark-target/build.gradle index 81f143166b495..0941a741c2671 100644 --- a/compose/integration-tests/macrobenchmark-target/build.gradle +++ b/compose/integration-tests/macrobenchmark-target/build.gradle @@ -2,7 +2,7 @@ import static androidx.build.dependencies.DependenciesKt.* plugins { id("AndroidXPlugin") - id("AndroidXUiPlugin") + id("AndroidXComposePlugin") id("com.android.application") id("org.jetbrains.kotlin.android") } diff --git a/compose/integration-tests/src/androidTest/AndroidManifest.xml b/compose/integration-tests/src/androidTest/AndroidManifest.xml deleted file mode 100644 index c5ef3837d7552..0000000000000 --- a/compose/integration-tests/src/androidTest/AndroidManifest.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - \ No newline at end of file diff --git a/compose/integration-tests/src/main/AndroidManifest.xml b/compose/integration-tests/src/main/AndroidManifest.xml deleted file mode 100644 index c7b29a697ee81..0000000000000 --- a/compose/integration-tests/src/main/AndroidManifest.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - diff --git a/compose/material/material-icons-core/build.gradle b/compose/material/material-icons-core/build.gradle index 434caa6f453a6..ca7111b99fa0f 100644 --- a/compose/material/material-icons-core/build.gradle +++ b/compose/material/material-icons-core/build.gradle @@ -15,7 +15,7 @@ */ -import androidx.build.AndroidXUiPlugin +import androidx.build.AndroidXComposePlugin import androidx.build.LibraryGroups import androidx.build.LibraryType import androidx.compose.material.icons.generator.tasks.IconGenerationTask @@ -23,12 +23,12 @@ import androidx.compose.material.icons.generator.tasks.IconGenerationTask plugins { id("AndroidXPlugin") id("com.android.library") - id("AndroidXUiPlugin") + id("AndroidXComposePlugin") } -AndroidXUiPlugin.applyAndConfigureKotlinPlugin(project) +AndroidXComposePlugin.applyAndConfigureKotlinPlugin(project) -if (!AndroidXUiPlugin.isMultiplatformEnabled(project)) { +if (!AndroidXComposePlugin.isMultiplatformEnabled(project)) { dependencies { /* * When updating dependencies, make sure to make the an an analogous update in the @@ -41,7 +41,7 @@ if (!AndroidXUiPlugin.isMultiplatformEnabled(project)) { } } -if (AndroidXUiPlugin.isMultiplatformEnabled(project)) { +if (AndroidXComposePlugin.isMultiplatformEnabled(project)) { kotlin { android() jvm("desktop") @@ -66,7 +66,7 @@ if (AndroidXUiPlugin.isMultiplatformEnabled(project)) { IconGenerationTask.registerCoreIconProject( project, android, - AndroidXUiPlugin.isMultiplatformEnabled(project) + AndroidXComposePlugin.isMultiplatformEnabled(project) ) androidx { diff --git a/compose/material/material-icons-core/samples/build.gradle b/compose/material/material-icons-core/samples/build.gradle index e4923aeec3be6..608df17239a77 100644 --- a/compose/material/material-icons-core/samples/build.gradle +++ b/compose/material/material-icons-core/samples/build.gradle @@ -21,7 +21,7 @@ import androidx.build.LibraryType plugins { id("AndroidXPlugin") id("com.android.library") - id("AndroidXUiPlugin") + id("AndroidXComposePlugin") id("org.jetbrains.kotlin.android") } diff --git a/compose/material/material-icons-extended/build.gradle b/compose/material/material-icons-extended/build.gradle index 860bfb7de0b48..eafbc6a6b94b5 100644 --- a/compose/material/material-icons-extended/build.gradle +++ b/compose/material/material-icons-extended/build.gradle @@ -14,8 +14,7 @@ * limitations under the License. */ - -import androidx.build.AndroidXUiPlugin +import androidx.build.AndroidXComposePlugin import androidx.build.LibraryGroups import androidx.build.LibraryType import androidx.build.RunApiTasks @@ -24,10 +23,10 @@ import androidx.compose.material.icons.generator.tasks.IconGenerationTask plugins { id("AndroidXPlugin") id("com.android.library") - id("AndroidXUiPlugin") + id("AndroidXComposePlugin") } -AndroidXUiPlugin.applyAndConfigureKotlinPlugin(project) +AndroidXComposePlugin.applyAndConfigureKotlinPlugin(project) IconGenerationTask.registerExtendedIconMainProject( project, @@ -39,7 +38,7 @@ apply from: "shared-dependencies.gradle" dependencies { kotlinPlugin(project(":compose:compiler:compiler")) - if (!AndroidXUiPlugin.isMultiplatformEnabled(project)) { + if (!AndroidXComposePlugin.isMultiplatformEnabled(project)) { /* * When updating dependencies, make sure to make an analogous update in the * corresponding block below @@ -61,7 +60,7 @@ dependencies { } } -if (AndroidXUiPlugin.isMultiplatformEnabled(project)) { +if (AndroidXComposePlugin.isMultiplatformEnabled(project)) { kotlin { /* * When updating dependencies, make sure to make an analogous update in the @@ -105,7 +104,7 @@ configurations { } -if (!AndroidXUiPlugin.isMultiplatformEnabled(project)) { +if (!AndroidXComposePlugin.isMultiplatformEnabled(project)) { for (themeName in allThemes) { def otherProject = project(":compose:material:material-icons-extended-" + themeName) project.dependencies.add("embedThemesDebug", otherProject) @@ -129,7 +128,7 @@ if (!AndroidXUiPlugin.isMultiplatformEnabled(project)) { IconGenerationTask.registerExtendedIconThemeProject( project, android, - AndroidXUiPlugin.isMultiplatformEnabled(project) + AndroidXComposePlugin.isMultiplatformEnabled(project) ) } diff --git a/compose/material/material-icons-extended/generate.gradle b/compose/material/material-icons-extended/generate.gradle index 58b3b2f54b76e..ae02369b9313b 100644 --- a/compose/material/material-icons-extended/generate.gradle +++ b/compose/material/material-icons-extended/generate.gradle @@ -16,7 +16,7 @@ // This file contains logic used for compiling the individual themes of material-icons-extended -import androidx.build.AndroidXUiPlugin +import androidx.build.AndroidXComposePlugin import androidx.build.LibraryGroups import androidx.build.LibraryType import androidx.build.Publish @@ -25,7 +25,7 @@ import androidx.compose.material.icons.generator.tasks.IconGenerationTask apply plugin: "AndroidXPlugin" apply plugin: "com.android.library" -apply plugin: "AndroidXUiPlugin" +apply plugin: "AndroidXComposePlugin" apply from: "${buildscript.sourceFile.parentFile}/shared-dependencies.gradle" @@ -33,12 +33,12 @@ dependencies { kotlinPlugin(project(":compose:compiler:compiler")) } -if (!AndroidXUiPlugin.isMultiplatformEnabled(project)) { +if (!AndroidXComposePlugin.isMultiplatformEnabled(project)) { // We're not sure how to merge icons jars when multiplatform is enabled IconGenerationTask.registerExtendedIconThemeProject( project, android, - AndroidXUiPlugin.isMultiplatformEnabled(project) + AndroidXComposePlugin.isMultiplatformEnabled(project) ) } diff --git a/compose/material/material-icons-extended/shared-dependencies.gradle b/compose/material/material-icons-extended/shared-dependencies.gradle index 5cbb154040b5a..a7e1086680914 100644 --- a/compose/material/material-icons-extended/shared-dependencies.gradle +++ b/compose/material/material-icons-extended/shared-dependencies.gradle @@ -17,12 +17,12 @@ // This file stores common dependencies that are used both by material-icons-extended and // by its specific theme projects (each of which compile a specific theme) -import androidx.build.AndroidXUiPlugin +import androidx.build.AndroidXComposePlugin -AndroidXUiPlugin.applyAndConfigureKotlinPlugin(project) +AndroidXComposePlugin.applyAndConfigureKotlinPlugin(project) dependencies { - if (!AndroidXUiPlugin.isMultiplatformEnabled(project)) { + if (!AndroidXComposePlugin.isMultiplatformEnabled(project)) { /* * When updating dependencies, make sure to make an analogous update in the * corresponding block below @@ -33,7 +33,7 @@ dependencies { } } -if (AndroidXUiPlugin.isMultiplatformEnabled(project)) { +if (AndroidXComposePlugin.isMultiplatformEnabled(project)) { kotlin { android() jvm("desktop") diff --git a/compose/material/material-ripple/build.gradle b/compose/material/material-ripple/build.gradle index ff8bb1ed2c12b..c5463f84ebb48 100644 --- a/compose/material/material-ripple/build.gradle +++ b/compose/material/material-ripple/build.gradle @@ -14,23 +14,22 @@ * limitations under the License. */ - -import androidx.build.AndroidXUiPlugin +import androidx.build.AndroidXComposePlugin import androidx.build.LibraryGroups import androidx.build.LibraryType plugins { id("AndroidXPlugin") id("com.android.library") - id("AndroidXUiPlugin") + id("AndroidXComposePlugin") } -AndroidXUiPlugin.applyAndConfigureKotlinPlugin(project) +AndroidXComposePlugin.applyAndConfigureKotlinPlugin(project) dependencies { kotlinPlugin(project(":compose:compiler:compiler")) - if(!AndroidXUiPlugin.isMultiplatformEnabled(project)) { + if(!AndroidXComposePlugin.isMultiplatformEnabled(project)) { /* * When updating dependencies, make sure to make the an an analogous update in the * corresponding block below @@ -55,7 +54,7 @@ dependencies { } } -if(AndroidXUiPlugin.isMultiplatformEnabled(project)) { +if(AndroidXComposePlugin.isMultiplatformEnabled(project)) { kotlin { android() jvm("desktop") @@ -104,5 +103,5 @@ androidx { // Disable strict API mode for MPP builds as it will fail to compile androidAndroidTest // sources, as it doesn't understand that they are tests and thinks they should have explicit // visibility - legacyDisableKotlinStrictApiMode = AndroidXUiPlugin.isMultiplatformEnabled(project) + legacyDisableKotlinStrictApiMode = AndroidXComposePlugin.isMultiplatformEnabled(project) } diff --git a/compose/material/material/benchmark/build.gradle b/compose/material/material/benchmark/build.gradle index 2709b5fd87a3b..d6295022659d4 100644 --- a/compose/material/material/benchmark/build.gradle +++ b/compose/material/material/benchmark/build.gradle @@ -17,7 +17,7 @@ plugins { id("AndroidXPlugin") id("com.android.library") - id("AndroidXUiPlugin") + id("AndroidXComposePlugin") id("org.jetbrains.kotlin.android") id("androidx.benchmark") } diff --git a/compose/material/material/build.gradle b/compose/material/material/build.gradle index 8c785334d9e31..7c2b8d73c1090 100644 --- a/compose/material/material/build.gradle +++ b/compose/material/material/build.gradle @@ -14,23 +14,22 @@ * limitations under the License. */ - -import androidx.build.AndroidXUiPlugin +import androidx.build.AndroidXComposePlugin import androidx.build.LibraryGroups import androidx.build.LibraryType plugins { id("AndroidXPlugin") id("com.android.library") - id("AndroidXUiPlugin") + id("AndroidXComposePlugin") } -AndroidXUiPlugin.applyAndConfigureKotlinPlugin(project) +AndroidXComposePlugin.applyAndConfigureKotlinPlugin(project) dependencies { kotlinPlugin(project(":compose:compiler:compiler")) - if(!AndroidXUiPlugin.isMultiplatformEnabled(project)) { + if(!AndroidXComposePlugin.isMultiplatformEnabled(project)) { /* * When updating dependencies, make sure to make the an an analogous update in the * corresponding block below @@ -68,7 +67,7 @@ dependencies { } } -if(AndroidXUiPlugin.isMultiplatformEnabled(project)) { +if(AndroidXComposePlugin.isMultiplatformEnabled(project)) { kotlin { android() jvm("desktop") diff --git a/compose/material/material/integration-tests/material-catalog/build.gradle b/compose/material/material/integration-tests/material-catalog/build.gradle index 2df8269536bb7..a139b6f34a6ba 100644 --- a/compose/material/material/integration-tests/material-catalog/build.gradle +++ b/compose/material/material/integration-tests/material-catalog/build.gradle @@ -20,7 +20,7 @@ import androidx.build.Publish plugins { id("AndroidXPlugin") id("com.android.application") - id("AndroidXUiPlugin") + id("AndroidXComposePlugin") id("org.jetbrains.kotlin.android") } diff --git a/compose/material/material/integration-tests/material-demos/build.gradle b/compose/material/material/integration-tests/material-demos/build.gradle index c7ffb951706a0..1d0f14a75e37c 100644 --- a/compose/material/material/integration-tests/material-demos/build.gradle +++ b/compose/material/material/integration-tests/material-demos/build.gradle @@ -3,7 +3,7 @@ import androidx.build.Publish plugins { id("AndroidXPlugin") id("com.android.library") - id("AndroidXUiPlugin") + id("AndroidXComposePlugin") id("org.jetbrains.kotlin.android") } diff --git a/compose/material/material/samples/build.gradle b/compose/material/material/samples/build.gradle index 6a1d38786e2b9..a33fcfbe4160d 100644 --- a/compose/material/material/samples/build.gradle +++ b/compose/material/material/samples/build.gradle @@ -21,7 +21,7 @@ import androidx.build.LibraryType plugins { id("AndroidXPlugin") id("com.android.library") - id("AndroidXUiPlugin") + id("AndroidXComposePlugin") id("org.jetbrains.kotlin.android") } diff --git a/compose/runtime/runtime-livedata/build.gradle b/compose/runtime/runtime-livedata/build.gradle index 0087f2517b82f..5cb167b70c847 100644 --- a/compose/runtime/runtime-livedata/build.gradle +++ b/compose/runtime/runtime-livedata/build.gradle @@ -21,7 +21,7 @@ import androidx.build.LibraryType plugins { id("AndroidXPlugin") id("com.android.library") - id("AndroidXUiPlugin") + id("AndroidXComposePlugin") id("org.jetbrains.kotlin.android") } diff --git a/compose/runtime/runtime-livedata/samples/build.gradle b/compose/runtime/runtime-livedata/samples/build.gradle index ca86aab374bd7..5c54481daef85 100644 --- a/compose/runtime/runtime-livedata/samples/build.gradle +++ b/compose/runtime/runtime-livedata/samples/build.gradle @@ -21,7 +21,7 @@ import androidx.build.LibraryType plugins { id("AndroidXPlugin") id("com.android.library") - id("AndroidXUiPlugin") + id("AndroidXComposePlugin") id("org.jetbrains.kotlin.android") } diff --git a/compose/runtime/runtime-rxjava2/build.gradle b/compose/runtime/runtime-rxjava2/build.gradle index de35bdeec3558..a5299b3431bb3 100644 --- a/compose/runtime/runtime-rxjava2/build.gradle +++ b/compose/runtime/runtime-rxjava2/build.gradle @@ -21,7 +21,7 @@ import androidx.build.LibraryType plugins { id("AndroidXPlugin") id("com.android.library") - id("AndroidXUiPlugin") + id("AndroidXComposePlugin") id("org.jetbrains.kotlin.android") } diff --git a/compose/runtime/runtime-rxjava2/samples/build.gradle b/compose/runtime/runtime-rxjava2/samples/build.gradle index 58ad64cf0f31e..29b52875abdc2 100644 --- a/compose/runtime/runtime-rxjava2/samples/build.gradle +++ b/compose/runtime/runtime-rxjava2/samples/build.gradle @@ -21,7 +21,7 @@ import androidx.build.LibraryType plugins { id("AndroidXPlugin") id("com.android.library") - id("AndroidXUiPlugin") + id("AndroidXComposePlugin") id("org.jetbrains.kotlin.android") } diff --git a/compose/runtime/runtime-rxjava3/build.gradle b/compose/runtime/runtime-rxjava3/build.gradle index f4d26d2acc4b6..3ac8f8c5d590f 100644 --- a/compose/runtime/runtime-rxjava3/build.gradle +++ b/compose/runtime/runtime-rxjava3/build.gradle @@ -21,7 +21,7 @@ import androidx.build.LibraryType plugins { id("AndroidXPlugin") id("com.android.library") - id("AndroidXUiPlugin") + id("AndroidXComposePlugin") id("org.jetbrains.kotlin.android") } diff --git a/compose/runtime/runtime-rxjava3/samples/build.gradle b/compose/runtime/runtime-rxjava3/samples/build.gradle index b924a86b00418..a8c1fd2b2e0ee 100644 --- a/compose/runtime/runtime-rxjava3/samples/build.gradle +++ b/compose/runtime/runtime-rxjava3/samples/build.gradle @@ -21,7 +21,7 @@ import androidx.build.LibraryType plugins { id("AndroidXPlugin") id("com.android.library") - id("AndroidXUiPlugin") + id("AndroidXComposePlugin") id("org.jetbrains.kotlin.android") } diff --git a/compose/runtime/runtime-saveable/build.gradle b/compose/runtime/runtime-saveable/build.gradle index a9c7dde5ce361..e5fcce5f4bcdd 100644 --- a/compose/runtime/runtime-saveable/build.gradle +++ b/compose/runtime/runtime-saveable/build.gradle @@ -15,22 +15,22 @@ */ -import androidx.build.AndroidXUiPlugin +import androidx.build.AndroidXComposePlugin import androidx.build.LibraryGroups import androidx.build.LibraryType plugins { id("AndroidXPlugin") - id("AndroidXUiPlugin") + id("AndroidXComposePlugin") id("com.android.library") } -AndroidXUiPlugin.applyAndConfigureKotlinPlugin(project) +AndroidXComposePlugin.applyAndConfigureKotlinPlugin(project) dependencies { kotlinPlugin project(":compose:compiler:compiler") - if(!AndroidXUiPlugin.isMultiplatformEnabled(project)) { + if(!AndroidXComposePlugin.isMultiplatformEnabled(project)) { /* When updating dependencies, make sure to make the an an analogous update in the corresponding block below */ api project(":compose:runtime:runtime") @@ -62,7 +62,7 @@ dependencies { } } -if(AndroidXUiPlugin.isMultiplatformEnabled(project)) { +if(AndroidXComposePlugin.isMultiplatformEnabled(project)) { kotlin { android() jvm("desktop") diff --git a/compose/runtime/runtime-saveable/samples/build.gradle b/compose/runtime/runtime-saveable/samples/build.gradle index 36f1cddc82d1a..ac9552123f6df 100644 --- a/compose/runtime/runtime-saveable/samples/build.gradle +++ b/compose/runtime/runtime-saveable/samples/build.gradle @@ -21,7 +21,7 @@ import androidx.build.LibraryType plugins { id("AndroidXPlugin") id("com.android.library") - id("AndroidXUiPlugin") + id("AndroidXComposePlugin") id("org.jetbrains.kotlin.android") } diff --git a/compose/runtime/runtime/build.gradle b/compose/runtime/runtime/build.gradle index cbd8c2410957a..ea291db7305b7 100644 --- a/compose/runtime/runtime/build.gradle +++ b/compose/runtime/runtime/build.gradle @@ -15,23 +15,23 @@ */ -import androidx.build.AndroidXUiPlugin +import androidx.build.AndroidXComposePlugin import androidx.build.LibraryGroups import androidx.build.LibraryType import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { id("AndroidXPlugin") - id("AndroidXUiPlugin") + id("AndroidXComposePlugin") id("com.android.library") } -AndroidXUiPlugin.applyAndConfigureKotlinPlugin(project) +AndroidXComposePlugin.applyAndConfigureKotlinPlugin(project) dependencies { kotlinPlugin(project(":compose:compiler:compiler")) - if(!AndroidXUiPlugin.isMultiplatformEnabled(project)) { + if(!AndroidXComposePlugin.isMultiplatformEnabled(project)) { /* * When updating dependencies, make sure to make the an an analogous update in the * corresponding block below @@ -59,7 +59,7 @@ dependencies { } } -if(AndroidXUiPlugin.isMultiplatformEnabled(project)) { +if(AndroidXComposePlugin.isMultiplatformEnabled(project)) { kotlin { android() jvm("desktop") diff --git a/compose/runtime/runtime/compose-runtime-benchmark/build.gradle b/compose/runtime/runtime/compose-runtime-benchmark/build.gradle index 81d1ef7cc6498..de240700e2c55 100644 --- a/compose/runtime/runtime/compose-runtime-benchmark/build.gradle +++ b/compose/runtime/runtime/compose-runtime-benchmark/build.gradle @@ -16,7 +16,7 @@ plugins { id("AndroidXPlugin") id("com.android.library") - id("AndroidXUiPlugin") + id("AndroidXComposePlugin") id("kotlin-android") id("androidx.benchmark") } diff --git a/compose/runtime/runtime/integration-tests/build.gradle b/compose/runtime/runtime/integration-tests/build.gradle index 4154a6b4ec603..65a8c1d4518cd 100644 --- a/compose/runtime/runtime/integration-tests/build.gradle +++ b/compose/runtime/runtime/integration-tests/build.gradle @@ -15,21 +15,21 @@ */ -import androidx.build.AndroidXUiPlugin +import androidx.build.AndroidXComposePlugin import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { id("AndroidXPlugin") id("com.android.library") - id("AndroidXUiPlugin") + id("AndroidXComposePlugin") } -AndroidXUiPlugin.applyAndConfigureKotlinPlugin(project) +AndroidXComposePlugin.applyAndConfigureKotlinPlugin(project) dependencies { kotlinPlugin(project(":compose:compiler:compiler")) - if(!AndroidXUiPlugin.isMultiplatformEnabled(project)) { + if(!AndroidXComposePlugin.isMultiplatformEnabled(project)) { androidTestImplementation(project(":compose:ui:ui")) androidTestImplementation(project(":compose:ui:ui-test-junit4")) androidTestImplementation(project(":compose:runtime:runtime")) @@ -48,7 +48,7 @@ dependencies { } } -if(AndroidXUiPlugin.isMultiplatformEnabled(project)) { +if(AndroidXComposePlugin.isMultiplatformEnabled(project)) { kotlin { android() jvm("desktop") diff --git a/compose/runtime/runtime/samples/build.gradle b/compose/runtime/runtime/samples/build.gradle index e989a93245337..9aff7a7615480 100644 --- a/compose/runtime/runtime/samples/build.gradle +++ b/compose/runtime/runtime/samples/build.gradle @@ -21,7 +21,7 @@ import androidx.build.LibraryType plugins { id("AndroidXPlugin") id("com.android.library") - id("AndroidXUiPlugin") + id("AndroidXComposePlugin") id("org.jetbrains.kotlin.android") } diff --git a/compose/test-utils/build.gradle b/compose/test-utils/build.gradle index 4f470432297fd..a338f961b3c00 100644 --- a/compose/test-utils/build.gradle +++ b/compose/test-utils/build.gradle @@ -15,7 +15,7 @@ */ -import androidx.build.AndroidXUiPlugin +import androidx.build.AndroidXComposePlugin import androidx.build.Publish import static androidx.build.dependencies.DependenciesKt.* @@ -23,15 +23,15 @@ import static androidx.build.dependencies.DependenciesKt.* plugins { id("AndroidXPlugin") id("com.android.library") - id("AndroidXUiPlugin") + id("AndroidXComposePlugin") } -AndroidXUiPlugin.applyAndConfigureKotlinPlugin(project) +AndroidXComposePlugin.applyAndConfigureKotlinPlugin(project) dependencies { kotlinPlugin(projectOrArtifact(":compose:compiler:compiler")) - if(!AndroidXUiPlugin.isMultiplatformEnabled(project)) { + if(!AndroidXComposePlugin.isMultiplatformEnabled(project)) { /* * When updating dependencies, make sure to make the an an analogous update in the * corresponding block below @@ -60,7 +60,7 @@ dependencies { } } -if (AndroidXUiPlugin.isMultiplatformEnabled(project)) { +if (AndroidXComposePlugin.isMultiplatformEnabled(project)) { kotlin { android() /* diff --git a/compose/ui/ui-geometry/build.gradle b/compose/ui/ui-geometry/build.gradle index d8042b3bdca4c..b5673d56562e0 100644 --- a/compose/ui/ui-geometry/build.gradle +++ b/compose/ui/ui-geometry/build.gradle @@ -14,7 +14,7 @@ * limitations under the License. */ -import androidx.build.AndroidXUiPlugin +import androidx.build.AndroidXComposePlugin import androidx.build.LibraryGroups import androidx.build.LibraryType import org.jetbrains.kotlin.gradle.tasks.KotlinCompile @@ -22,12 +22,12 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { id("AndroidXPlugin") id("com.android.library") - id("AndroidXUiPlugin") + id("AndroidXComposePlugin") } -AndroidXUiPlugin.applyAndConfigureKotlinPlugin(project) +AndroidXComposePlugin.applyAndConfigureKotlinPlugin(project) -if(!AndroidXUiPlugin.isMultiplatformEnabled(project)) { +if(!AndroidXComposePlugin.isMultiplatformEnabled(project)) { dependencies { /* * When updating dependencies, make sure to make the an an analogous update in the @@ -46,7 +46,7 @@ if(!AndroidXUiPlugin.isMultiplatformEnabled(project)) { } } -if(AndroidXUiPlugin.isMultiplatformEnabled(project)) { +if(AndroidXComposePlugin.isMultiplatformEnabled(project)) { kotlin { android() jvm("desktop") diff --git a/compose/ui/ui-graphics/benchmark/build.gradle b/compose/ui/ui-graphics/benchmark/build.gradle index b6794c1045ef0..9670e0fcf25b5 100644 --- a/compose/ui/ui-graphics/benchmark/build.gradle +++ b/compose/ui/ui-graphics/benchmark/build.gradle @@ -17,7 +17,7 @@ plugins { id("AndroidXPlugin") id("com.android.library") - id("AndroidXUiPlugin") + id("AndroidXComposePlugin") id("org.jetbrains.kotlin.android") id("androidx.benchmark") } diff --git a/compose/ui/ui-graphics/benchmark/test/build.gradle b/compose/ui/ui-graphics/benchmark/test/build.gradle index 508ccbcc2ca05..1b2c21da13f69 100644 --- a/compose/ui/ui-graphics/benchmark/test/build.gradle +++ b/compose/ui/ui-graphics/benchmark/test/build.gradle @@ -17,7 +17,7 @@ plugins { id("AndroidXPlugin") id("com.android.library") - id("AndroidXUiPlugin") + id("AndroidXComposePlugin") id("org.jetbrains.kotlin.android") } diff --git a/compose/ui/ui-graphics/build.gradle b/compose/ui/ui-graphics/build.gradle index 765a5eca1935d..62cd4dd6996b9 100644 --- a/compose/ui/ui-graphics/build.gradle +++ b/compose/ui/ui-graphics/build.gradle @@ -14,7 +14,7 @@ * limitations under the License. */ -import androidx.build.AndroidXUiPlugin +import androidx.build.AndroidXComposePlugin import androidx.build.LibraryGroups import androidx.build.LibraryType import org.jetbrains.kotlin.gradle.tasks.KotlinCompile @@ -25,12 +25,12 @@ import static androidx.build.dependencies.DependenciesKt.SKIKO_CURRENT_OS plugins { id("AndroidXPlugin") id("com.android.library") - id("AndroidXUiPlugin") + id("AndroidXComposePlugin") } -AndroidXUiPlugin.applyAndConfigureKotlinPlugin(project) +AndroidXComposePlugin.applyAndConfigureKotlinPlugin(project) -if(!AndroidXUiPlugin.isMultiplatformEnabled(project)) { +if(!AndroidXComposePlugin.isMultiplatformEnabled(project)) { dependencies { /* * When updating dependencies, make sure to make the an an analogous update in the @@ -62,7 +62,7 @@ if(!AndroidXUiPlugin.isMultiplatformEnabled(project)) { } } -if(AndroidXUiPlugin.isMultiplatformEnabled(project)) { +if(AndroidXComposePlugin.isMultiplatformEnabled(project)) { kotlin { android() jvm("desktop") @@ -130,7 +130,7 @@ androidx { legacyDisableKotlinStrictApiMode = true } -if(AndroidXUiPlugin.isMultiplatformEnabled(project)) { +if(AndroidXComposePlugin.isMultiplatformEnabled(project)) { tasks.findByName("desktopTest").configure { systemProperties["GOLDEN_PATH"] = project.rootDir.absolutePath + "/../../golden" } diff --git a/compose/ui/ui-graphics/samples/build.gradle b/compose/ui/ui-graphics/samples/build.gradle index f01304066e3a3..fbb8165b49f44 100644 --- a/compose/ui/ui-graphics/samples/build.gradle +++ b/compose/ui/ui-graphics/samples/build.gradle @@ -20,7 +20,7 @@ import androidx.build.LibraryType plugins { id("AndroidXPlugin") id("com.android.library") - id("AndroidXUiPlugin") + id("AndroidXComposePlugin") id("org.jetbrains.kotlin.android") } diff --git a/compose/ui/ui-inspection/build.gradle b/compose/ui/ui-inspection/build.gradle index b38c7d7dcc1a0..458648936f502 100644 --- a/compose/ui/ui-inspection/build.gradle +++ b/compose/ui/ui-inspection/build.gradle @@ -20,7 +20,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { id("AndroidXPlugin") - id("AndroidXUiPlugin") + id("AndroidXComposePlugin") id("com.android.library") id("kotlin-android") id("androidx.inspection") diff --git a/compose/ui/ui-test-font/build.gradle b/compose/ui/ui-test-font/build.gradle index 12aaf83c6b00b..e8c0acdeaaedf 100644 --- a/compose/ui/ui-test-font/build.gradle +++ b/compose/ui/ui-test-font/build.gradle @@ -14,7 +14,7 @@ * limitations under the License. */ -import androidx.build.AndroidXUiPlugin +import androidx.build.AndroidXComposePlugin import androidx.build.LibraryGroups import androidx.build.Publish import androidx.build.RunApiTasks @@ -22,12 +22,12 @@ import androidx.build.RunApiTasks plugins { id("AndroidXPlugin") id("com.android.library") - id("AndroidXUiPlugin") + id("AndroidXComposePlugin") } -AndroidXUiPlugin.applyAndConfigureKotlinPlugin(project) +AndroidXComposePlugin.applyAndConfigureKotlinPlugin(project) -if(AndroidXUiPlugin.isMultiplatformEnabled(project)) { +if(AndroidXComposePlugin.isMultiplatformEnabled(project)) { kotlin { android() jvm("desktop") diff --git a/compose/ui/ui-test-junit4/build.gradle b/compose/ui/ui-test-junit4/build.gradle index c64c52629f0dd..5b0ae4439b621 100644 --- a/compose/ui/ui-test-junit4/build.gradle +++ b/compose/ui/ui-test-junit4/build.gradle @@ -14,7 +14,7 @@ * limitations under the License. */ -import androidx.build.AndroidXUiPlugin +import androidx.build.AndroidXComposePlugin import androidx.build.LibraryGroups import androidx.build.LibraryType @@ -23,10 +23,10 @@ import static androidx.build.dependencies.DependenciesKt.SKIKO plugins { id("AndroidXPlugin") id("com.android.library") - id("AndroidXUiPlugin") + id("AndroidXComposePlugin") } -AndroidXUiPlugin.applyAndConfigureKotlinPlugin(project) +AndroidXComposePlugin.applyAndConfigureKotlinPlugin(project) android { lintOptions { @@ -37,7 +37,7 @@ android { dependencies { kotlinPlugin(project(":compose:compiler:compiler")) - if(!AndroidXUiPlugin.isMultiplatformEnabled(project)) { + if(!AndroidXComposePlugin.isMultiplatformEnabled(project)) { api(project(":compose:ui:ui-test")) api("androidx.activity:activity:1.2.0") api("androidx.test.ext:junit:1.1.2") @@ -75,7 +75,7 @@ dependencies { } -if(AndroidXUiPlugin.isMultiplatformEnabled(project)) { +if(AndroidXComposePlugin.isMultiplatformEnabled(project)) { kotlin { android() jvm("desktop") diff --git a/compose/ui/ui-test-manifest/build.gradle b/compose/ui/ui-test-manifest/build.gradle index 02fdfd7baa85d..ce2804715f1ff 100644 --- a/compose/ui/ui-test-manifest/build.gradle +++ b/compose/ui/ui-test-manifest/build.gradle @@ -20,7 +20,7 @@ import androidx.build.LibraryType plugins { id("AndroidXPlugin") id("com.android.library") - id("AndroidXUiPlugin") + id("AndroidXComposePlugin") } dependencies { diff --git a/compose/ui/ui-test-manifest/integration-tests/testapp/build.gradle b/compose/ui/ui-test-manifest/integration-tests/testapp/build.gradle index 0a7e233c07e3e..ed7d9660de034 100644 --- a/compose/ui/ui-test-manifest/integration-tests/testapp/build.gradle +++ b/compose/ui/ui-test-manifest/integration-tests/testapp/build.gradle @@ -16,7 +16,7 @@ plugins { id("AndroidXPlugin") - id("AndroidXUiPlugin") + id("AndroidXComposePlugin") id("com.android.application") id("org.jetbrains.kotlin.android") } diff --git a/compose/ui/ui-test/build.gradle b/compose/ui/ui-test/build.gradle index 974bd45e1c631..590a069539886 100644 --- a/compose/ui/ui-test/build.gradle +++ b/compose/ui/ui-test/build.gradle @@ -14,7 +14,7 @@ * limitations under the License. */ -import androidx.build.AndroidXUiPlugin +import androidx.build.AndroidXComposePlugin import androidx.build.LibraryGroups import androidx.build.LibraryType @@ -23,10 +23,10 @@ import static androidx.build.dependencies.DependenciesKt.SKIKO plugins { id("AndroidXPlugin") id("com.android.library") - id("AndroidXUiPlugin") + id("AndroidXComposePlugin") } -AndroidXUiPlugin.applyAndConfigureKotlinPlugin(project) +AndroidXComposePlugin.applyAndConfigureKotlinPlugin(project) android { lintOptions { @@ -37,7 +37,7 @@ android { dependencies { kotlinPlugin(project(":compose:compiler:compiler")) - if (!AndroidXUiPlugin.isMultiplatformEnabled(project)) { + if (!AndroidXComposePlugin.isMultiplatformEnabled(project)) { api(project(":compose:runtime:runtime")) api(project(":compose:ui:ui")) api(project(":compose:ui:ui-graphics")) @@ -64,7 +64,7 @@ dependencies { } -if (AndroidXUiPlugin.isMultiplatformEnabled(project)) { +if (AndroidXComposePlugin.isMultiplatformEnabled(project)) { kotlin { android() jvm("desktop") diff --git a/compose/ui/ui-text/benchmark/build.gradle b/compose/ui/ui-text/benchmark/build.gradle index fe66d575de9da..3851b2638b184 100644 --- a/compose/ui/ui-text/benchmark/build.gradle +++ b/compose/ui/ui-text/benchmark/build.gradle @@ -17,7 +17,7 @@ plugins { id("AndroidXPlugin") id("com.android.library") - id("AndroidXUiPlugin") + id("AndroidXComposePlugin") id("org.jetbrains.kotlin.android") id("androidx.benchmark") } diff --git a/compose/ui/ui-text/build.gradle b/compose/ui/ui-text/build.gradle index 1288031c3049f..2bf7284d6a705 100644 --- a/compose/ui/ui-text/build.gradle +++ b/compose/ui/ui-text/build.gradle @@ -14,7 +14,7 @@ * limitations under the License. */ -import androidx.build.AndroidXUiPlugin +import androidx.build.AndroidXComposePlugin import androidx.build.LibraryGroups import androidx.build.LibraryType import org.jetbrains.kotlin.gradle.tasks.KotlinCompile @@ -24,12 +24,12 @@ import static androidx.build.dependencies.DependenciesKt.SKIKO_CURRENT_OS plugins { id("AndroidXPlugin") id("com.android.library") - id("AndroidXUiPlugin") + id("AndroidXComposePlugin") } -AndroidXUiPlugin.applyAndConfigureKotlinPlugin(project) +AndroidXComposePlugin.applyAndConfigureKotlinPlugin(project) -if(!AndroidXUiPlugin.isMultiplatformEnabled(project)) { +if(!AndroidXComposePlugin.isMultiplatformEnabled(project)) { dependencies { /* * When updating dependencies, make sure to make the an an analogous update in the @@ -78,7 +78,7 @@ if(!AndroidXUiPlugin.isMultiplatformEnabled(project)) { } } -if(AndroidXUiPlugin.isMultiplatformEnabled(project)) { +if(AndroidXComposePlugin.isMultiplatformEnabled(project)) { kotlin { android() jvm("desktop") diff --git a/compose/ui/ui-text/samples/build.gradle b/compose/ui/ui-text/samples/build.gradle index 7b61b6f7091ee..517eb9b6ab488 100644 --- a/compose/ui/ui-text/samples/build.gradle +++ b/compose/ui/ui-text/samples/build.gradle @@ -20,7 +20,7 @@ import androidx.build.LibraryType plugins { id("AndroidXPlugin") id("com.android.library") - id("AndroidXUiPlugin") + id("AndroidXComposePlugin") id("org.jetbrains.kotlin.android") } diff --git a/compose/ui/ui-tooling-data/build.gradle b/compose/ui/ui-tooling-data/build.gradle index 8d1db3fa90f09..e28a9fd96d174 100644 --- a/compose/ui/ui-tooling-data/build.gradle +++ b/compose/ui/ui-tooling-data/build.gradle @@ -20,7 +20,7 @@ import androidx.build.LibraryType plugins { id("AndroidXPlugin") id("com.android.library") - id("AndroidXUiPlugin") + id("AndroidXComposePlugin") id("org.jetbrains.kotlin.android") } diff --git a/compose/ui/ui-tooling-data/src/main/java/androidx/compose/ui/tooling/data/SlotTree.kt b/compose/ui/ui-tooling-data/src/main/java/androidx/compose/ui/tooling/data/SlotTree.kt index 9a00966d773e2..8d37bb9ed7a18 100644 --- a/compose/ui/ui-tooling-data/src/main/java/androidx/compose/ui/tooling/data/SlotTree.kt +++ b/compose/ui/ui-tooling-data/src/main/java/androidx/compose/ui/tooling/data/SlotTree.kt @@ -262,7 +262,6 @@ private fun parseParameters(parameters: String): List { return mr.text .substring(1) .replacePrefix("c#", "androidx.compose.") - .replacePrefix("u#", "androidx.ui.") } fun expect(value: String) { diff --git a/compose/ui/ui-tooling/build.gradle b/compose/ui/ui-tooling/build.gradle index e820458f9b296..e48562604293f 100644 --- a/compose/ui/ui-tooling/build.gradle +++ b/compose/ui/ui-tooling/build.gradle @@ -14,22 +14,22 @@ * limitations under the License. */ -import androidx.build.AndroidXUiPlugin +import androidx.build.AndroidXComposePlugin import androidx.build.LibraryGroups import androidx.build.LibraryType plugins { id("AndroidXPlugin") id("com.android.library") - id("AndroidXUiPlugin") + id("AndroidXComposePlugin") } -AndroidXUiPlugin.applyAndConfigureKotlinPlugin(project) +AndroidXComposePlugin.applyAndConfigureKotlinPlugin(project) dependencies { kotlinPlugin(project(":compose:compiler:compiler")) - if(!AndroidXUiPlugin.isMultiplatformEnabled(project)) { + if(!AndroidXComposePlugin.isMultiplatformEnabled(project)) { implementation(libs.kotlinStdlib) api("androidx.annotation:annotation:1.1.0") @@ -40,8 +40,8 @@ dependencies { implementation(project(":compose:material:material")) implementation(project(":activity:activity-compose")) - // kotlin-reflect and tooling-animation-internal are provided by Studio at runtime - compileOnly(project(":ui:ui-animation-tooling-internal")) + // kotlin-reflect and animation-tooling-internal are provided by Studio at runtime + compileOnly(project(":compose:animation:animation-tooling-internal")) compileOnly(libs.kotlinReflect) androidTestImplementation(project(":compose:ui:ui-test-junit4")) @@ -54,11 +54,11 @@ dependencies { androidTestImplementation(project(":compose:test-utils")) androidTestImplementation(libs.truth) androidTestImplementation(libs.kotlinReflect) - androidTestImplementation(project(":ui:ui-animation-tooling-internal")) + androidTestImplementation(project(":compose:animation:animation-tooling-internal")) } } -if(AndroidXUiPlugin.isMultiplatformEnabled(project)) { +if(AndroidXComposePlugin.isMultiplatformEnabled(project)) { kotlin { android() jvm("desktop") @@ -82,7 +82,7 @@ if(AndroidXUiPlugin.isMultiplatformEnabled(project)) { implementation(project(":activity:activity-compose")) // kotlin-reflect and tooling-animation-internal are provided by Studio at runtime - compileOnly(project(":ui:ui-animation-tooling-internal")) + compileOnly(project(":compose:animation:animation-tooling-internal")) compileOnly(libs.kotlinReflect) } @@ -106,7 +106,7 @@ if(AndroidXUiPlugin.isMultiplatformEnabled(project)) { implementation(project(":compose:test-utils")) implementation(libs.truth) implementation(libs.kotlinReflect) - implementation(project(":ui:ui-animation-tooling-internal")) + implementation(project(":compose:animation:animation-tooling-internal")) } } } diff --git a/compose/ui/ui-unit/build.gradle b/compose/ui/ui-unit/build.gradle index bcf2b94f386da..802409023f16a 100644 --- a/compose/ui/ui-unit/build.gradle +++ b/compose/ui/ui-unit/build.gradle @@ -14,7 +14,7 @@ * limitations under the License. */ -import androidx.build.AndroidXUiPlugin +import androidx.build.AndroidXComposePlugin import androidx.build.LibraryGroups import androidx.build.LibraryType import org.jetbrains.kotlin.gradle.tasks.KotlinCompile @@ -22,12 +22,12 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { id("AndroidXPlugin") id("com.android.library") - id("AndroidXUiPlugin") + id("AndroidXComposePlugin") } -AndroidXUiPlugin.applyAndConfigureKotlinPlugin(project) +AndroidXComposePlugin.applyAndConfigureKotlinPlugin(project) -if(!AndroidXUiPlugin.isMultiplatformEnabled(project)) { +if(!AndroidXComposePlugin.isMultiplatformEnabled(project)) { dependencies { /* * When updating dependencies, make sure to make the an an analogous update in the @@ -53,7 +53,7 @@ if(!AndroidXUiPlugin.isMultiplatformEnabled(project)) { } } -if(AndroidXUiPlugin.isMultiplatformEnabled(project)) { +if(AndroidXComposePlugin.isMultiplatformEnabled(project)) { kotlin { android() jvm("desktop") diff --git a/compose/ui/ui-unit/samples/build.gradle b/compose/ui/ui-unit/samples/build.gradle index 185f5ee18cfc4..9566694ee6b48 100644 --- a/compose/ui/ui-unit/samples/build.gradle +++ b/compose/ui/ui-unit/samples/build.gradle @@ -20,7 +20,7 @@ import androidx.build.LibraryType plugins { id("AndroidXPlugin") id("com.android.library") - id("AndroidXUiPlugin") + id("AndroidXComposePlugin") id("org.jetbrains.kotlin.android") } diff --git a/compose/ui/ui-util/build.gradle b/compose/ui/ui-util/build.gradle index 9ecc88d36f0c7..00588c23594ca 100644 --- a/compose/ui/ui-util/build.gradle +++ b/compose/ui/ui-util/build.gradle @@ -14,7 +14,7 @@ * limitations under the License. */ -import androidx.build.AndroidXUiPlugin +import androidx.build.AndroidXComposePlugin import androidx.build.LibraryGroups import androidx.build.LibraryType import org.jetbrains.kotlin.gradle.tasks.KotlinCompile @@ -22,12 +22,12 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { id("AndroidXPlugin") id("com.android.library") - id("AndroidXUiPlugin") + id("AndroidXComposePlugin") } -AndroidXUiPlugin.applyAndConfigureKotlinPlugin(project) +AndroidXComposePlugin.applyAndConfigureKotlinPlugin(project) -if(!AndroidXUiPlugin.isMultiplatformEnabled(project)) { +if(!AndroidXComposePlugin.isMultiplatformEnabled(project)) { dependencies { /* * When updating dependencies, make sure to make the an an analogous update in the @@ -42,7 +42,7 @@ if(!AndroidXUiPlugin.isMultiplatformEnabled(project)) { } } -if(AndroidXUiPlugin.isMultiplatformEnabled(project)) { +if(AndroidXComposePlugin.isMultiplatformEnabled(project)) { kotlin { android() jvm("desktop") diff --git a/compose/ui/ui-viewbinding/build.gradle b/compose/ui/ui-viewbinding/build.gradle index cc201ce7cec96..ce847edee5b87 100644 --- a/compose/ui/ui-viewbinding/build.gradle +++ b/compose/ui/ui-viewbinding/build.gradle @@ -20,7 +20,7 @@ import androidx.build.LibraryType plugins { id("AndroidXPlugin") id("com.android.library") - id("AndroidXUiPlugin") + id("AndroidXComposePlugin") id("org.jetbrains.kotlin.android") } diff --git a/compose/ui/ui-viewbinding/samples/build.gradle b/compose/ui/ui-viewbinding/samples/build.gradle index ee8e7dcf1f27f..af2eff99c2f8c 100644 --- a/compose/ui/ui-viewbinding/samples/build.gradle +++ b/compose/ui/ui-viewbinding/samples/build.gradle @@ -20,7 +20,7 @@ import androidx.build.LibraryType plugins { id("AndroidXPlugin") id("com.android.library") - id("AndroidXUiPlugin") + id("AndroidXComposePlugin") id("org.jetbrains.kotlin.android") } diff --git a/compose/ui/ui/benchmark/build.gradle b/compose/ui/ui/benchmark/build.gradle index 494a4933c55bd..a53567e22eded 100644 --- a/compose/ui/ui/benchmark/build.gradle +++ b/compose/ui/ui/benchmark/build.gradle @@ -17,7 +17,7 @@ plugins { id("AndroidXPlugin") id("com.android.library") - id("AndroidXUiPlugin") + id("AndroidXComposePlugin") id("org.jetbrains.kotlin.android") id("androidx.benchmark") } diff --git a/compose/ui/ui/build.gradle b/compose/ui/ui/build.gradle index 6bd6e755da5d5..1447013b3a954 100644 --- a/compose/ui/ui/build.gradle +++ b/compose/ui/ui/build.gradle @@ -14,7 +14,7 @@ * limitations under the License. */ -import androidx.build.AndroidXUiPlugin +import androidx.build.AndroidXComposePlugin import androidx.build.LibraryGroups import androidx.build.LibraryType import org.jetbrains.kotlin.gradle.tasks.KotlinCompile @@ -25,15 +25,15 @@ import static androidx.inspection.gradle.InspectionPluginKt.packageInspector plugins { id("AndroidXPlugin") id("com.android.library") - id("AndroidXUiPlugin") + id("AndroidXComposePlugin") } -AndroidXUiPlugin.applyAndConfigureKotlinPlugin(project) +AndroidXComposePlugin.applyAndConfigureKotlinPlugin(project) dependencies { kotlinPlugin(project(":compose:compiler:compiler")) - if(!AndroidXUiPlugin.isMultiplatformEnabled(project)) { + if(!AndroidXComposePlugin.isMultiplatformEnabled(project)) { /* * When updating dependencies, make sure to make the an an analogous update in the * corresponding block below @@ -108,7 +108,7 @@ dependencies { packageInspector(project, project(":compose:ui:ui-inspection")) -if(AndroidXUiPlugin.isMultiplatformEnabled(project)) { +if(AndroidXComposePlugin.isMultiplatformEnabled(project)) { kotlin { android() jvm("desktop") @@ -221,7 +221,7 @@ androidx { legacyDisableKotlinStrictApiMode = true } -if(AndroidXUiPlugin.isMultiplatformEnabled(project)) { +if(AndroidXComposePlugin.isMultiplatformEnabled(project)) { tasks.findByName("desktopTest").configure { systemProperties["GOLDEN_PATH"] = project.rootDir.absolutePath + "/../../golden" } @@ -264,7 +264,7 @@ def verifyKotlinModule(String variant) { } } } -if (!AndroidXUiPlugin.isMultiplatformEnabled(project)) { +if (!AndroidXComposePlugin.isMultiplatformEnabled(project)) { for (variant in ["debug", "release"]) { verifyKotlinModule(variant) } diff --git a/compose/ui/ui/integration-tests/ui-demos/build.gradle b/compose/ui/ui/integration-tests/ui-demos/build.gradle index eb72c91f615f2..ecb28d06c6168 100644 --- a/compose/ui/ui/integration-tests/ui-demos/build.gradle +++ b/compose/ui/ui/integration-tests/ui-demos/build.gradle @@ -1,7 +1,7 @@ plugins { id("AndroidXPlugin") id("com.android.library") - id("AndroidXUiPlugin") + id("AndroidXComposePlugin") id("org.jetbrains.kotlin.android") } diff --git a/compose/ui/ui/samples/build.gradle b/compose/ui/ui/samples/build.gradle index 8ae18103c0c30..cf62e9384dbb8 100644 --- a/compose/ui/ui/samples/build.gradle +++ b/compose/ui/ui/samples/build.gradle @@ -20,7 +20,7 @@ import androidx.build.LibraryType plugins { id("AndroidXPlugin") id("com.android.library") - id("AndroidXUiPlugin") + id("AndroidXComposePlugin") id("org.jetbrains.kotlin.android") } diff --git a/development/project-creator/compose-template/groupId/artifactId/build.gradle b/development/project-creator/compose-template/groupId/artifactId/build.gradle index 80ff59b21dad3..2d4b5d156f71f 100644 --- a/development/project-creator/compose-template/groupId/artifactId/build.gradle +++ b/development/project-creator/compose-template/groupId/artifactId/build.gradle @@ -20,7 +20,7 @@ import androidx.build.LibraryVersions plugins { id("AndroidXPlugin") - id("AndroidXUiPlugin") + id("AndroidXComposePlugin") id("com.android.library") id("org.jetbrains.kotlin.android") } diff --git a/development/project-creator/create_project.py b/development/project-creator/create_project.py index 8504416eb1eac..c3048ba81a756 100755 --- a/development/project-creator/create_project.py +++ b/development/project-creator/create_project.py @@ -324,8 +324,7 @@ def get_new_settings_gradle_line(group_id, artifact_id): """ build_type = "MAIN" - if ("compose" in group_id or "compose" in artifact_id - or "androidx.ui" in group_id): + if ("compose" in group_id or "compose" in artifact_id): build_type = "COMPOSE" gradle_cmd = get_gradle_project_coordinates(group_id, artifact_id) diff --git a/development/project-creator/test_project_creator.py b/development/project-creator/test_project_creator.py index 977afabe5aa94..9c7ef1dbdacd4 100755 --- a/development/project-creator/test_project_creator.py +++ b/development/project-creator/test_project_creator.py @@ -117,10 +117,6 @@ def test_settings_gradle_line(self): self.assertEqual("includeProject(\":foo:bar:bar-compose\", \"foo/bar/bar-compose\", " + \ "[BuildType.COMPOSE])\n", line) - line = get_new_settings_gradle_line("androidx.ui", "ui-foo") - self.assertEqual("includeProject(\":ui:ui-foo\", \"ui/ui-foo\", " + \ - "[BuildType.COMPOSE])\n", line) - def test_gradle_project_coordinates(self): coordinates = get_gradle_project_coordinates("androidx.foo", "foo") self.assertEqual(":foo:foo", coordinates) diff --git a/hilt/hilt-navigation-compose/build.gradle b/hilt/hilt-navigation-compose/build.gradle index f58715e7f41df..799d97190542d 100644 --- a/hilt/hilt-navigation-compose/build.gradle +++ b/hilt/hilt-navigation-compose/build.gradle @@ -27,7 +27,7 @@ plugins { id("com.android.library") id("kotlin-android") id("kotlin-kapt") - id("AndroidXUiPlugin") + id("AndroidXComposePlugin") id("dagger.hilt.android.plugin") } diff --git a/hilt/hilt-navigation-compose/samples/build.gradle b/hilt/hilt-navigation-compose/samples/build.gradle index 6a2bf6ad73e20..d989d597cd221 100644 --- a/hilt/hilt-navigation-compose/samples/build.gradle +++ b/hilt/hilt-navigation-compose/samples/build.gradle @@ -24,7 +24,7 @@ import static androidx.build.dependencies.DependenciesKt.* plugins { id("AndroidXPlugin") id("com.android.library") - id("AndroidXUiPlugin") + id("AndroidXComposePlugin") id("org.jetbrains.kotlin.android") } diff --git a/lifecycle/lifecycle-viewmodel-compose/build.gradle b/lifecycle/lifecycle-viewmodel-compose/build.gradle index 5376e2f2f96c7..a5c5dc2eaa039 100644 --- a/lifecycle/lifecycle-viewmodel-compose/build.gradle +++ b/lifecycle/lifecycle-viewmodel-compose/build.gradle @@ -22,7 +22,7 @@ import androidx.build.RunApiTasks plugins { id("AndroidXPlugin") id("com.android.library") - id("AndroidXUiPlugin") + id("AndroidXComposePlugin") id("org.jetbrains.kotlin.android") } diff --git a/lifecycle/lifecycle-viewmodel-compose/integration-tests/lifecycle-viewmodel-demos/build.gradle b/lifecycle/lifecycle-viewmodel-compose/integration-tests/lifecycle-viewmodel-demos/build.gradle index c41787a5db8da..7dd82ea20aa48 100644 --- a/lifecycle/lifecycle-viewmodel-compose/integration-tests/lifecycle-viewmodel-demos/build.gradle +++ b/lifecycle/lifecycle-viewmodel-compose/integration-tests/lifecycle-viewmodel-demos/build.gradle @@ -19,7 +19,7 @@ import androidx.build.Publish plugins { id("AndroidXPlugin") id("com.android.library") - id("AndroidXUiPlugin") + id("AndroidXComposePlugin") id("org.jetbrains.kotlin.android") } diff --git a/lifecycle/lifecycle-viewmodel-compose/samples/build.gradle b/lifecycle/lifecycle-viewmodel-compose/samples/build.gradle index df450b17f9e43..eafcfad36b4b4 100644 --- a/lifecycle/lifecycle-viewmodel-compose/samples/build.gradle +++ b/lifecycle/lifecycle-viewmodel-compose/samples/build.gradle @@ -21,7 +21,7 @@ import androidx.build.LibraryType plugins { id("AndroidXPlugin") id("com.android.library") - id("AndroidXUiPlugin") + id("AndroidXComposePlugin") id("org.jetbrains.kotlin.android") } diff --git a/lint-checks/src/test/java/androidx/build/lint/TestSizeAnnotationEnforcerTest.kt b/lint-checks/src/test/java/androidx/build/lint/TestSizeAnnotationEnforcerTest.kt index fe6ce7de338f1..f2bd9a4138f12 100644 --- a/lint-checks/src/test/java/androidx/build/lint/TestSizeAnnotationEnforcerTest.kt +++ b/lint-checks/src/test/java/androidx/build/lint/TestSizeAnnotationEnforcerTest.kt @@ -40,7 +40,7 @@ class TestSizeAnnotationEnforcerTest : LintDetectorTest() { lint().files( kotlin( """ - package androidx.ui.foo + package androidx.foo import org.junit.runner.RunWith import org.junit.runners.JUnit4 @@ -63,7 +63,7 @@ class TestSizeAnnotationEnforcerTest : LintDetectorTest() { lint().files( kotlin( """ - package androidx.ui.foo + package androidx.foo import androidx.test.filters.MediumTest import org.junit.runner.RunWith @@ -90,7 +90,7 @@ class TestSizeAnnotationEnforcerTest : LintDetectorTest() { .expect( /* ktlint-disable max-line-length */ """ -src/test/androidx/ui/foo/Test.kt:8: Error: Unexpected test size annotation [UnexpectedTestSizeAnnotation] +src/test/androidx/foo/Test.kt:8: Error: Unexpected test size annotation [UnexpectedTestSizeAnnotation] @MediumTest ~~~~~~~~~~~ 1 errors, 0 warnings @@ -104,7 +104,7 @@ src/test/androidx/ui/foo/Test.kt:8: Error: Unexpected test size annotation [Unex lint().files( kotlin( """ - package androidx.ui.foo + package androidx.foo import org.junit.runner.RunWith import org.junit.runners.JUnit4 @@ -119,7 +119,7 @@ src/test/androidx/ui/foo/Test.kt:8: Error: Unexpected test size annotation [Unex .expect( /* ktlint-disable max-line-length */ """ -src/androidTest/androidx/ui/foo/Test.kt:7: Error: Unsupported test runner. Supported runners are: [androidx.test.ext.junit.runners.AndroidJUnit4, org.junit.runners.Parameterized] [UnsupportedTestRunner] +src/androidTest/androidx/foo/Test.kt:7: Error: Unsupported test runner. Supported runners are: [androidx.test.ext.junit.runners.AndroidJUnit4, org.junit.runners.Parameterized] [UnsupportedTestRunner] @RunWith(JUnit4::class) ~~~~~~~~~~~~~ 1 errors, 0 warnings @@ -133,7 +133,7 @@ src/androidTest/androidx/ui/foo/Test.kt:7: Error: Unsupported test runner. Suppo lint().files( kotlin( """ - package androidx.ui.foo + package androidx.foo import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.filters.MediumTest @@ -158,7 +158,7 @@ src/androidTest/androidx/ui/foo/Test.kt:7: Error: Unsupported test runner. Suppo lint().files( kotlin( """ - package androidx.ui.foo + package androidx.foo import org.junit.runner.RunWith import org.junit.runners.Parameterized @@ -181,7 +181,7 @@ src/androidTest/androidx/ui/foo/Test.kt:7: Error: Unsupported test runner. Suppo lint().files( kotlin( """ - package androidx.ui.foo + package androidx.foo class Test { @Test @@ -199,7 +199,7 @@ src/androidTest/androidx/ui/foo/Test.kt:7: Error: Unsupported test runner. Suppo lint().files( kotlin( """ - package androidx.ui.foo + package androidx.foo import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.filters.MediumTest @@ -228,7 +228,7 @@ src/androidTest/androidx/ui/foo/Test.kt:7: Error: Unsupported test runner. Suppo lint().files( kotlin( """ - package androidx.ui.foo + package androidx.foo import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.filters.MediumTest @@ -254,7 +254,7 @@ src/androidTest/androidx/ui/foo/Test.kt:7: Error: Unsupported test runner. Suppo .expect( /* ktlint-disable max-line-length */ """ -src/androidTest/androidx/ui/foo/Test.kt:16: Error: Missing test size annotation [MissingTestSizeAnnotation] +src/androidTest/androidx/foo/Test.kt:16: Error: Missing test size annotation [MissingTestSizeAnnotation] fun bar() {} ~~~ 1 errors, 0 warnings @@ -268,7 +268,7 @@ src/androidTest/androidx/ui/foo/Test.kt:16: Error: Missing test size annotation lint().files( kotlin( """ - package androidx.ui.foo + package androidx.foo import androidx.test.ext.junit.runners.AndroidJUnit4 import org.junit.runner.RunWith @@ -292,10 +292,10 @@ src/androidTest/androidx/ui/foo/Test.kt:16: Error: Missing test size annotation .expect( /* ktlint-disable max-line-length */ """ -src/androidTest/androidx/ui/foo/Test.kt:11: Error: Missing test size annotation [MissingTestSizeAnnotation] +src/androidTest/androidx/foo/Test.kt:11: Error: Missing test size annotation [MissingTestSizeAnnotation] fun foo() {} ~~~ -src/androidTest/androidx/ui/foo/Test.kt:14: Error: Missing test size annotation [MissingTestSizeAnnotation] +src/androidTest/androidx/foo/Test.kt:14: Error: Missing test size annotation [MissingTestSizeAnnotation] fun bar() {} ~~~ 2 errors, 0 warnings @@ -309,7 +309,7 @@ src/androidTest/androidx/ui/foo/Test.kt:14: Error: Missing test size annotation lint().files( kotlin( """ - package androidx.ui.foo + package androidx.foo import androidx.test.filters.MediumTest import org.junit.runner.RunWith diff --git a/navigation/navigation-compose/build.gradle b/navigation/navigation-compose/build.gradle index 7966a17a0dcba..5d94ce2ce17d1 100644 --- a/navigation/navigation-compose/build.gradle +++ b/navigation/navigation-compose/build.gradle @@ -21,7 +21,7 @@ import androidx.build.RunApiTasks plugins { id("AndroidXPlugin") id("com.android.library") - id("AndroidXUiPlugin") + id("AndroidXComposePlugin") id("org.jetbrains.kotlin.android") } diff --git a/navigation/navigation-compose/integration-tests/navigation-demos/build.gradle b/navigation/navigation-compose/integration-tests/navigation-demos/build.gradle index fb50bcbe6fe60..3aa19a5d8cada 100644 --- a/navigation/navigation-compose/integration-tests/navigation-demos/build.gradle +++ b/navigation/navigation-compose/integration-tests/navigation-demos/build.gradle @@ -19,7 +19,7 @@ import androidx.build.Publish plugins { id("AndroidXPlugin") id("com.android.library") - id("AndroidXUiPlugin") + id("AndroidXComposePlugin") id("org.jetbrains.kotlin.android") } diff --git a/navigation/navigation-compose/samples/build.gradle b/navigation/navigation-compose/samples/build.gradle index 7dc352f096ec7..ddd9eed119f97 100644 --- a/navigation/navigation-compose/samples/build.gradle +++ b/navigation/navigation-compose/samples/build.gradle @@ -20,7 +20,7 @@ import androidx.build.LibraryType plugins { id("AndroidXPlugin") id("com.android.library") - id("AndroidXUiPlugin") + id("AndroidXComposePlugin") id("org.jetbrains.kotlin.android") } diff --git a/paging/paging-compose/build.gradle b/paging/paging-compose/build.gradle index 669f393d33e93..f6892b8949c0b 100644 --- a/paging/paging-compose/build.gradle +++ b/paging/paging-compose/build.gradle @@ -22,7 +22,7 @@ import androidx.build.RunApiTasks plugins { id("AndroidXPlugin") id("com.android.library") - id("AndroidXUiPlugin") + id("AndroidXComposePlugin") id("org.jetbrains.kotlin.android") id("kotlin-android") } diff --git a/paging/paging-compose/integration-tests/paging-demos/build.gradle b/paging/paging-compose/integration-tests/paging-demos/build.gradle index ef6e14d2e2bff..1dd1f0862234e 100644 --- a/paging/paging-compose/integration-tests/paging-demos/build.gradle +++ b/paging/paging-compose/integration-tests/paging-demos/build.gradle @@ -19,7 +19,7 @@ import androidx.build.Publish plugins { id("AndroidXPlugin") id("com.android.library") - id("AndroidXUiPlugin") + id("AndroidXComposePlugin") id("org.jetbrains.kotlin.android") id("kotlin-kapt") } diff --git a/paging/paging-compose/samples/build.gradle b/paging/paging-compose/samples/build.gradle index cdf09630379a8..7d9fa7d968599 100644 --- a/paging/paging-compose/samples/build.gradle +++ b/paging/paging-compose/samples/build.gradle @@ -21,7 +21,7 @@ import androidx.build.LibraryType plugins { id("AndroidXPlugin") id("com.android.library") - id("AndroidXUiPlugin") + id("AndroidXComposePlugin") id("org.jetbrains.kotlin.android") } diff --git a/profileinstaller/integration-tests/testapp/build.gradle b/profileinstaller/integration-tests/testapp/build.gradle index c0f1b1a14ff49..1c2ff08d0e3a8 100644 --- a/profileinstaller/integration-tests/testapp/build.gradle +++ b/profileinstaller/integration-tests/testapp/build.gradle @@ -16,7 +16,7 @@ plugins { id("AndroidXPlugin") - id("AndroidXUiPlugin") + id("AndroidXComposePlugin") id("com.android.application") id("org.jetbrains.kotlin.android") } diff --git a/settings.gradle b/settings.gradle index d2ca12f931f83..b623f636b9323 100644 --- a/settings.gradle +++ b/settings.gradle @@ -246,6 +246,7 @@ includeProject(":compose:animation:animation-core", "compose/animation/animation includeProject(":compose:animation:animation-core-lint", "compose/animation/animation-core-lint", [BuildType.COMPOSE]) includeProject(":compose:animation:animation-core:animation-core-benchmark", "compose/animation/animation-core/benchmark", [BuildType.COMPOSE]) includeProject(":compose:animation:animation-core:animation-core-samples", "compose/animation/animation-core/samples", [BuildType.COMPOSE]) +includeProject(":compose:animation:animation-tooling-internal", "compose/animation/animation-tooling-internal", [BuildType.COMPOSE]) includeProject(":compose:animation:animation:integration-tests:animation-demos", "compose/animation/animation/integration-tests/animation-demos", [BuildType.COMPOSE]) includeProject(":compose:animation:animation:animation-samples", "compose/animation/animation/samples", [BuildType.COMPOSE]) includeProject(":compose:benchmark-utils", "compose/benchmark-utils", [BuildType.COMPOSE]) @@ -573,8 +574,6 @@ includeProject(":transition:transition", "transition/transition", [BuildType.MAI includeProject(":transition:transition-ktx", "transition/transition-ktx", [BuildType.MAIN, BuildType.FLAN]) includeProject(":tvprovider", "tv-provider", [BuildType.MAIN]) includeProject(":tvprovider:tvprovider", "tv-provider/tv-provider", [BuildType.MAIN]) -includeProject(":ui", "ui/ui", [BuildType.COMPOSE]) -includeProject(":ui:ui-animation-tooling-internal", "ui/ui-animation-tooling-internal", [BuildType.COMPOSE]) includeProject(":vectordrawable:integration-tests:testapp", "vectordrawable/integration-tests/testapp", [BuildType.MAIN]) includeProject(":vectordrawable:vectordrawable", "vectordrawable/vectordrawable", [BuildType.MAIN]) includeProject(":vectordrawable:vectordrawable-animated", "vectordrawable/vectordrawable-animated", [BuildType.MAIN]) diff --git a/text/text/build.gradle b/text/text/build.gradle index 3516282154253..b5c53206949c6 100644 --- a/text/text/build.gradle +++ b/text/text/build.gradle @@ -23,7 +23,7 @@ import static androidx.build.dependencies.DependenciesKt.* plugins { id("AndroidXPlugin") id("com.android.library") - id("AndroidXUiPlugin") + id("AndroidXComposePlugin") id("org.jetbrains.kotlin.android") } diff --git a/ui/ui/placeholder.txt b/ui/ui/placeholder.txt deleted file mode 100644 index b8f7c1abb145d..0000000000000 --- a/ui/ui/placeholder.txt +++ /dev/null @@ -1,4 +0,0 @@ -This file exists to make sure the directory this is in gets created by git, so that -settings.gradle can point to this directory and not complain about it missing. - -TODO: b/160233169 remove this file once the directory structure is migrated from ui/ to here. diff --git a/wear/compose/foundation/build.gradle b/wear/compose/foundation/build.gradle index 4ab4e7b73ea3a..eab3404bd8e2d 100644 --- a/wear/compose/foundation/build.gradle +++ b/wear/compose/foundation/build.gradle @@ -17,17 +17,17 @@ import androidx.build.LibraryGroups import androidx.build.LibraryType import androidx.build.LibraryVersions import androidx.build.RunApiTasks -import androidx.build.AndroidXUiPlugin +import androidx.build.AndroidXComposePlugin import static androidx.build.dependencies.DependenciesKt.* plugins { id("AndroidXPlugin") id("com.android.library") - id("AndroidXUiPlugin") + id("AndroidXComposePlugin") } -AndroidXUiPlugin.applyAndConfigureKotlinPlugin(project) +AndroidXComposePlugin.applyAndConfigureKotlinPlugin(project) dependencies { kotlinPlugin(project(":compose:compiler:compiler")) @@ -36,7 +36,7 @@ dependencies { } -if(AndroidXUiPlugin.isMultiplatformEnabled(project)) { +if(AndroidXComposePlugin.isMultiplatformEnabled(project)) { kotlin { android() jvm("desktop") diff --git a/wear/compose/material/benchmark/build.gradle b/wear/compose/material/benchmark/build.gradle index 556a291a74108..0cbfebd0e48f9 100644 --- a/wear/compose/material/benchmark/build.gradle +++ b/wear/compose/material/benchmark/build.gradle @@ -19,7 +19,7 @@ import static androidx.build.dependencies.DependenciesKt.* plugins { id("AndroidXPlugin") id("com.android.library") - id("AndroidXUiPlugin") + id("AndroidXComposePlugin") id("org.jetbrains.kotlin.android") id("androidx.benchmark") } diff --git a/wear/compose/material/build.gradle b/wear/compose/material/build.gradle index b4132f0d493b4..c9abd4dca733b 100644 --- a/wear/compose/material/build.gradle +++ b/wear/compose/material/build.gradle @@ -17,22 +17,22 @@ import androidx.build.LibraryGroups import androidx.build.LibraryType import androidx.build.LibraryVersions import androidx.build.RunApiTasks -import androidx.build.AndroidXUiPlugin +import androidx.build.AndroidXComposePlugin import static androidx.build.dependencies.DependenciesKt.* plugins { id("AndroidXPlugin") id("com.android.library") - id("AndroidXUiPlugin") + id("AndroidXComposePlugin") } -AndroidXUiPlugin.applyAndConfigureKotlinPlugin(project) +AndroidXComposePlugin.applyAndConfigureKotlinPlugin(project) dependencies { kotlinPlugin(project(":compose:compiler:compiler")) - if(!AndroidXUiPlugin.isMultiplatformEnabled(project)) { + if(!AndroidXComposePlugin.isMultiplatformEnabled(project)) { api(project(":compose:foundation:foundation")) api(project(":compose:ui:ui")) api(project(":compose:ui:ui-text")) @@ -50,7 +50,7 @@ dependencies { } } -if(AndroidXUiPlugin.isMultiplatformEnabled(project)) { +if(AndroidXComposePlugin.isMultiplatformEnabled(project)) { kotlin { android() jvm("desktop")