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
ggfan · Jun 4, 2021 · c8a26b8 · c8a26b8
1 parent 3845482
commit c8a26b8
Show file tree

Hide file tree

Showing 141 changed files with 231 additions and 346 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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/...kotlin/androidx/build/AndroidXUiPlugin.kt → ...n/androidx/build/AndroidXComposePlugin.kt b/...kotlin/androidx/build/AndroidXUiPlugin.kt → ...n/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<Project> {
+class AndroidXComposePlugin : Plugin<Project> {
     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
@@ -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
@@ -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/...radle-plugins/AndroidXUiPlugin.properties → ...-plugins/AndroidXComposePlugin.properties b/...radle-plugins/AndroidXUiPlugin.properties → ...-plugins/AndroidXComposePlugin.properties
@@ -14,4 +14,4 @@
 # limitations under the License.
 #
 
-implementation-class=androidx.build.AndroidXUiPlugin
+implementation-class=androidx.build.AndroidXComposePlugin
diff --git 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
@@ -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("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
@@ -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 → ...imation/animation-tooling-internal/OWNERS b/ui/ui-animation-tooling-internal/OWNERS → ...imation/animation-tooling-internal/OWNERS
diff --git a/...ion-tooling-internal/api/1.0.0-beta02.txt → ...ion-tooling-internal/api/1.0.0-beta02.txt b/...ion-tooling-internal/api/1.0.0-beta02.txt → ...ion-tooling-internal/api/1.0.0-beta02.txt
diff --git a/...ion-tooling-internal/api/1.0.0-beta03.txt → ...ion-tooling-internal/api/1.0.0-beta03.txt b/...ion-tooling-internal/api/1.0.0-beta03.txt → ...ion-tooling-internal/api/1.0.0-beta03.txt
diff --git a/...ion-tooling-internal/api/1.0.0-beta04.txt → ...ion-tooling-internal/api/1.0.0-beta04.txt b/...ion-tooling-internal/api/1.0.0-beta04.txt → ...ion-tooling-internal/api/1.0.0-beta04.txt
diff --git a/...ion-tooling-internal/api/1.0.0-beta05.txt → ...ion-tooling-internal/api/1.0.0-beta05.txt b/...ion-tooling-internal/api/1.0.0-beta05.txt → ...ion-tooling-internal/api/1.0.0-beta05.txt
diff --git a/...ion-tooling-internal/api/1.0.0-beta06.txt → ...ion-tooling-internal/api/1.0.0-beta06.txt b/...ion-tooling-internal/api/1.0.0-beta06.txt → ...ion-tooling-internal/api/1.0.0-beta06.txt
diff --git a/...ion-tooling-internal/api/1.0.0-beta07.txt → ...ion-tooling-internal/api/1.0.0-beta07.txt b/...ion-tooling-internal/api/1.0.0-beta07.txt → ...ion-tooling-internal/api/1.0.0-beta07.txt
diff --git a/...ion-tooling-internal/api/1.0.0-beta08.txt → ...ion-tooling-internal/api/1.0.0-beta08.txt b/...ion-tooling-internal/api/1.0.0-beta08.txt → ...ion-tooling-internal/api/1.0.0-beta08.txt
diff --git a/...ion-tooling-internal/api/1.0.0-beta09.txt → ...ion-tooling-internal/api/1.0.0-beta09.txt b/...ion-tooling-internal/api/1.0.0-beta09.txt → ...ion-tooling-internal/api/1.0.0-beta09.txt
diff --git a/...nimation-tooling-internal/api/current.txt → ...nimation-tooling-internal/api/current.txt b/...nimation-tooling-internal/api/current.txt → ...nimation-tooling-internal/api/current.txt
diff --git a/...public_plus_experimental_1.0.0-beta02.txt → ...public_plus_experimental_1.0.0-beta02.txt b/...public_plus_experimental_1.0.0-beta02.txt → ...public_plus_experimental_1.0.0-beta02.txt
diff --git a/...public_plus_experimental_1.0.0-beta03.txt → ...public_plus_experimental_1.0.0-beta03.txt b/...public_plus_experimental_1.0.0-beta03.txt → ...public_plus_experimental_1.0.0-beta03.txt
diff --git a/...public_plus_experimental_1.0.0-beta04.txt → ...public_plus_experimental_1.0.0-beta04.txt b/...public_plus_experimental_1.0.0-beta04.txt → ...public_plus_experimental_1.0.0-beta04.txt
diff --git a/...public_plus_experimental_1.0.0-beta05.txt → ...public_plus_experimental_1.0.0-beta05.txt b/...public_plus_experimental_1.0.0-beta05.txt → ...public_plus_experimental_1.0.0-beta05.txt
diff --git a/...public_plus_experimental_1.0.0-beta06.txt → ...public_plus_experimental_1.0.0-beta06.txt b/...public_plus_experimental_1.0.0-beta06.txt → ...public_plus_experimental_1.0.0-beta06.txt
diff --git a/...public_plus_experimental_1.0.0-beta07.txt → ...public_plus_experimental_1.0.0-beta07.txt b/...public_plus_experimental_1.0.0-beta07.txt → ...public_plus_experimental_1.0.0-beta07.txt
diff --git a/...public_plus_experimental_1.0.0-beta08.txt → ...public_plus_experimental_1.0.0-beta08.txt b/...public_plus_experimental_1.0.0-beta08.txt → ...public_plus_experimental_1.0.0-beta08.txt
diff --git a/...public_plus_experimental_1.0.0-beta09.txt → ...public_plus_experimental_1.0.0-beta09.txt b/...public_plus_experimental_1.0.0-beta09.txt → ...public_plus_experimental_1.0.0-beta09.txt
diff --git a/.../api/public_plus_experimental_current.txt → .../api/public_plus_experimental_current.txt b/.../api/public_plus_experimental_current.txt → .../api/public_plus_experimental_current.txt
diff --git a/...-internal/api/restricted_1.0.0-beta02.txt → ...-internal/api/restricted_1.0.0-beta02.txt b/...-internal/api/restricted_1.0.0-beta02.txt → ...-internal/api/restricted_1.0.0-beta02.txt
diff --git a/...-internal/api/restricted_1.0.0-beta03.txt → ...-internal/api/restricted_1.0.0-beta03.txt b/...-internal/api/restricted_1.0.0-beta03.txt → ...-internal/api/restricted_1.0.0-beta03.txt
diff --git a/...-internal/api/restricted_1.0.0-beta04.txt → ...-internal/api/restricted_1.0.0-beta04.txt b/...-internal/api/restricted_1.0.0-beta04.txt → ...-internal/api/restricted_1.0.0-beta04.txt
diff --git a/...-internal/api/restricted_1.0.0-beta05.txt → ...-internal/api/restricted_1.0.0-beta05.txt b/...-internal/api/restricted_1.0.0-beta05.txt → ...-internal/api/restricted_1.0.0-beta05.txt
diff --git a/...-internal/api/restricted_1.0.0-beta06.txt → ...-internal/api/restricted_1.0.0-beta06.txt b/...-internal/api/restricted_1.0.0-beta06.txt → ...-internal/api/restricted_1.0.0-beta06.txt
diff --git a/...-internal/api/restricted_1.0.0-beta07.txt → ...-internal/api/restricted_1.0.0-beta07.txt b/...-internal/api/restricted_1.0.0-beta07.txt → ...-internal/api/restricted_1.0.0-beta07.txt
diff --git a/...-internal/api/restricted_1.0.0-beta08.txt → ...-internal/api/restricted_1.0.0-beta08.txt b/...-internal/api/restricted_1.0.0-beta08.txt → ...-internal/api/restricted_1.0.0-beta08.txt
diff --git a/...-internal/api/restricted_1.0.0-beta09.txt → ...-internal/api/restricted_1.0.0-beta09.txt b/...-internal/api/restricted_1.0.0-beta09.txt → ...-internal/api/restricted_1.0.0-beta09.txt
diff --git a/...oling-internal/api/restricted_current.txt → ...oling-internal/api/restricted_current.txt b/...oling-internal/api/restricted_current.txt → ...oling-internal/api/restricted_current.txt
diff --git a/...i-animation-tooling-internal/build.gradle → ...n/animation-tooling-internal/build.gradle b/...i-animation-tooling-internal/build.gradle → ...n/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/...mation/tooling/ComposeAnimatedProperty.kt → ...mation/tooling/ComposeAnimatedProperty.kt b/...mation/tooling/ComposeAnimatedProperty.kt → ...mation/tooling/ComposeAnimatedProperty.kt
diff --git a/...ose/animation/tooling/ComposeAnimation.kt → ...ose/animation/tooling/ComposeAnimation.kt b/...ose/animation/tooling/ComposeAnimation.kt → ...ose/animation/tooling/ComposeAnimation.kt
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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/.../java/androidx/compose/compiler/plugins/kotlin/lower/ComposableFunctionBodyTransformer.kt b/.../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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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