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
diff --git a/activity/activity-compose/build.gradle b/activity/activity-compose/build.gradle
index 5b3d1b8..5fb1360 100644
--- a/activity/activity-compose/build.gradle
+++ b/activity/activity-compose/build.gradle
@@ -21,7 +21,7 @@
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 2928e80..ccec086 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 @@
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 a02eac6..787fdc3 100644
--- a/activity/activity-compose/samples/build.gradle
+++ b/activity/activity-compose/samples/build.gradle
@@ -20,7 +20,7 @@
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 bdc1739..0d0a7ab 100644
--- a/androidx-plugin/gradle-plugin/build.gradle
+++ b/androidx-plugin/gradle-plugin/build.gradle
@@ -62,9 +62,9 @@
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 a721908..068b678 100644
--- a/benchmark/integration-tests/crystalball-experiment/build.gradle
+++ b/benchmark/integration-tests/crystalball-experiment/build.gradle
@@ -51,7 +51,7 @@
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 98%
rename from buildSrc/src/main/kotlin/androidx/build/AndroidXUiPlugin.kt
rename to buildSrc/src/main/kotlin/androidx/build/AndroidXComposePlugin.kt
index 3860141..b905d4e 100644
--- a/buildSrc/src/main/kotlin/androidx/build/AndroidXUiPlugin.kt
+++ b/buildSrc/src/main/kotlin/androidx/build/AndroidXComposePlugin.kt
@@ -36,9 +36,9 @@
"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
index 4ce2920..37e27af 100644
--- a/buildSrc/src/main/kotlin/androidx/build/LibraryGroups.kt
+++ b/buildSrc/src/main/kotlin/androidx/build/LibraryGroups.kt
@@ -94,7 +94,6 @@
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 e58490b..b390ae9 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 6f3e1fa..8752241 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 157c32c..5cef145 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 b67f9ba..095df43 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 @@
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 @@
}
}
-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 d816227..18ad38d 100644
--- a/compose/animation/animation-core/samples/build.gradle
+++ b/compose/animation/animation-core/samples/build.gradle
@@ -21,7 +21,7 @@
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 b31553c..b92dd31 100644
--- a/ui/ui-animation-tooling-internal/build.gradle
+++ b/compose/animation/animation-tooling-internal/build.gradle
@@ -34,6 +34,6 @@
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 36d928da..728e201 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 @@
}
}
-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 dd1bc9a..dd6ecf9 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 37aea48..2423c37 100644
--- a/compose/animation/animation/samples/build.gradle
+++ b/compose/animation/animation/samples/build.gradle
@@ -21,7 +21,7 @@
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 ab872da..192f542 100644
--- a/compose/benchmark-utils/benchmark/build.gradle
+++ b/compose/benchmark-utils/benchmark/build.gradle
@@ -19,7 +19,7 @@
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 a6654e3..e974d88 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 817c5f9..0529fa3 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 @@
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 ce53db3..950f03e 100644
--- a/compose/desktop/desktop/build.gradle
+++ b/compose/desktop/desktop/build.gradle
@@ -25,7 +25,7 @@
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 c6bf31f..c63caf5 100644
--- a/compose/desktop/desktop/samples/build.gradle
+++ b/compose/desktop/desktop/samples/build.gradle
@@ -21,7 +21,7 @@
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 bbc2233..ff16d4f 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 5424dbd..8d5de4f 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 239104c..a393eff 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 @@
}
}
-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 838cfe3..fe24ef9 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 4e63d1c..dc0aefa1 100644
--- a/compose/foundation/foundation-layout/samples/build.gradle
+++ b/compose/foundation/foundation-layout/samples/build.gradle
@@ -20,7 +20,7 @@
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 0e58c42..b987b0f 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 9955c3d4..23455b3 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 @@
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 @@
}
}
-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 1a230d8..9d2b72e 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 95afe2d..6a77d10 100644
--- a/compose/foundation/foundation/samples/build.gradle
+++ b/compose/foundation/foundation/samples/build.gradle
@@ -20,7 +20,7 @@
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 aefe62b..0000000
--- a/compose/integration-tests/OWNERS
+++ /dev/null
@@ -1,8 +0,0 @@
-# For text benchmarks
[email protected]
[email protected]
[email protected]
[email protected]
-
-# For ui and foundation benchmarks
[email protected]
diff --git a/compose/integration-tests/build.gradle b/compose/integration-tests/build.gradle
deleted file mode 100644
index 69a9d8a..0000000
--- 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 21cff4b..6d118b9 100644
--- a/compose/integration-tests/demos/build.gradle
+++ b/compose/integration-tests/demos/build.gradle
@@ -2,7 +2,7 @@
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 76a62ae..92db590 100644
--- a/compose/integration-tests/demos/common/build.gradle
+++ b/compose/integration-tests/demos/common/build.gradle
@@ -18,7 +18,7 @@
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 e53dfad..fbcd800 100644
--- a/compose/integration-tests/docs-snippets/build.gradle
+++ b/compose/integration-tests/docs-snippets/build.gradle
@@ -21,7 +21,7 @@
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 42a176b..0000000
--- a/compose/integration-tests/lint-baseline.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 7.0.0-alpha15" type="baseline" client="cli" name="Lint" variant="all" version="7.0.0-alpha15">
-
-</issues>
diff --git a/compose/integration-tests/macrobenchmark-target/build.gradle b/compose/integration-tests/macrobenchmark-target/build.gradle
index 81f1431..0941a74 100644
--- a/compose/integration-tests/macrobenchmark-target/build.gradle
+++ b/compose/integration-tests/macrobenchmark-target/build.gradle
@@ -2,7 +2,7 @@
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 c5ef383..0000000
--- a/compose/integration-tests/src/androidTest/AndroidManifest.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- ~ Copyright 2018 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.
- -->
-<manifest package="androidx.ui.integration.test" />
\ 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 c7b29a6..0000000
--- a/compose/integration-tests/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- ~ Copyright 2018 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.
- -->
-<manifest package="androidx.ui.integration.test"
- xmlns:android="http://schemas.android.com/apk/res/android" />
diff --git a/compose/material/material-icons-core/build.gradle b/compose/material/material-icons-core/build.gradle
index 434caa6..ca7111b 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 @@
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 (AndroidXComposePlugin.isMultiplatformEnabled(project)) {
kotlin {
android()
jvm("desktop")
@@ -66,7 +66,7 @@
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 e4923ae..608df17 100644
--- a/compose/material/material-icons-core/samples/build.gradle
+++ b/compose/material/material-icons-core/samples/build.gradle
@@ -21,7 +21,7 @@
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 860bfb7..eafbc6a 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 @@
plugins {
id("AndroidXPlugin")
id("com.android.library")
- id("AndroidXUiPlugin")
+ id("AndroidXComposePlugin")
}
-AndroidXUiPlugin.applyAndConfigureKotlinPlugin(project)
+AndroidXComposePlugin.applyAndConfigureKotlinPlugin(project)
IconGenerationTask.registerExtendedIconMainProject(
project,
@@ -39,7 +38,7 @@
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 @@
}
}
-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 @@
}
-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 @@
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 58b3b2f..ae02369 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 @@
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 @@
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 5cbb154..a7e1086 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 @@
}
}
-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 ff8bb1e..c5463f8 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 @@
}
}
-if(AndroidXUiPlugin.isMultiplatformEnabled(project)) {
+if(AndroidXComposePlugin.isMultiplatformEnabled(project)) {
kotlin {
android()
jvm("desktop")
@@ -104,5 +103,5 @@
// 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 2709b5f..d629502 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 8c78533..7c2b8d7 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 @@
}
}
-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 2df8269..a139b6f34 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 @@
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 c7ffb95..1d0f14a 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 @@
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 6a1d387..a33fcfb 100644
--- a/compose/material/material/samples/build.gradle
+++ b/compose/material/material/samples/build.gradle
@@ -21,7 +21,7 @@
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 0087f25..5cb167b 100644
--- a/compose/runtime/runtime-livedata/build.gradle
+++ b/compose/runtime/runtime-livedata/build.gradle
@@ -21,7 +21,7 @@
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 ca86aab..5c54481 100644
--- a/compose/runtime/runtime-livedata/samples/build.gradle
+++ b/compose/runtime/runtime-livedata/samples/build.gradle
@@ -21,7 +21,7 @@
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 de35bdee..a5299b3 100644
--- a/compose/runtime/runtime-rxjava2/build.gradle
+++ b/compose/runtime/runtime-rxjava2/build.gradle
@@ -21,7 +21,7 @@
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 58ad64c..29b5287 100644
--- a/compose/runtime/runtime-rxjava2/samples/build.gradle
+++ b/compose/runtime/runtime-rxjava2/samples/build.gradle
@@ -21,7 +21,7 @@
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 f4d26d2..3ac8f8c5 100644
--- a/compose/runtime/runtime-rxjava3/build.gradle
+++ b/compose/runtime/runtime-rxjava3/build.gradle
@@ -21,7 +21,7 @@
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 b924a86..a8c1fd2 100644
--- a/compose/runtime/runtime-rxjava3/samples/build.gradle
+++ b/compose/runtime/runtime-rxjava3/samples/build.gradle
@@ -21,7 +21,7 @@
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 a9c7dde..e5fcce5 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 @@
}
}
-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 36f1cdd..ac95521 100644
--- a/compose/runtime/runtime-saveable/samples/build.gradle
+++ b/compose/runtime/runtime-saveable/samples/build.gradle
@@ -21,7 +21,7 @@
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 cbd8c24..ea291db 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 @@
}
}
-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 81d1ef7..de24070 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 4154a6b..65a8c1d 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 @@
}
}
-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 e989a93..9aff7a7 100644
--- a/compose/runtime/runtime/samples/build.gradle
+++ b/compose/runtime/runtime/samples/build.gradle
@@ -21,7 +21,7 @@
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 4f47043..a338f96 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 @@
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 @@
}
}
-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 d8042b3..b5673d5 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 @@
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(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 b6794c1..9670e0f 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 508ccbc..1b2c21da 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 765a5ec..62cd4dd 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 @@
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(AndroidXComposePlugin.isMultiplatformEnabled(project)) {
kotlin {
android()
jvm("desktop")
@@ -130,7 +130,7 @@
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 f013040..fbb8165 100644
--- a/compose/ui/ui-graphics/samples/build.gradle
+++ b/compose/ui/ui-graphics/samples/build.gradle
@@ -20,7 +20,7 @@
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 b38c7d7..4586489 100644
--- a/compose/ui/ui-inspection/build.gradle
+++ b/compose/ui/ui-inspection/build.gradle
@@ -20,7 +20,7 @@
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 12aaf83..e8c0acd 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 @@
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 c64c526..5b0ae44 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 @@
plugins {
id("AndroidXPlugin")
id("com.android.library")
- id("AndroidXUiPlugin")
+ id("AndroidXComposePlugin")
}
-AndroidXUiPlugin.applyAndConfigureKotlinPlugin(project)
+AndroidXComposePlugin.applyAndConfigureKotlinPlugin(project)
android {
lintOptions {
@@ -37,7 +37,7 @@
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 @@
}
-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 02fdfd7..ce28047 100644
--- a/compose/ui/ui-test-manifest/build.gradle
+++ b/compose/ui/ui-test-manifest/build.gradle
@@ -20,7 +20,7 @@
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 0a7e233..ed7d966 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 974bd45..590a069 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 @@
plugins {
id("AndroidXPlugin")
id("com.android.library")
- id("AndroidXUiPlugin")
+ id("AndroidXComposePlugin")
}
-AndroidXUiPlugin.applyAndConfigureKotlinPlugin(project)
+AndroidXComposePlugin.applyAndConfigureKotlinPlugin(project)
android {
lintOptions {
@@ -37,7 +37,7 @@
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 @@
}
-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 fe66d57..3851b26 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 1288031..2bf7284 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 @@
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(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 7b61b6f..517eb9b6 100644
--- a/compose/ui/ui-text/samples/build.gradle
+++ b/compose/ui/ui-text/samples/build.gradle
@@ -20,7 +20,7 @@
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 8d1db3f..e28a9fd 100644
--- a/compose/ui/ui-tooling-data/build.gradle
+++ b/compose/ui/ui-tooling-data/build.gradle
@@ -20,7 +20,7 @@
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 9a00966..8d37bb9 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 @@
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 e820458..e485626 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 @@
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 @@
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 @@
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 @@
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 bcf2b94..8024090 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 @@
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(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 185f5ee..9566694 100644
--- a/compose/ui/ui-unit/samples/build.gradle
+++ b/compose/ui/ui-unit/samples/build.gradle
@@ -20,7 +20,7 @@
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 9ecc88d..00588c2 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 @@
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(AndroidXComposePlugin.isMultiplatformEnabled(project)) {
kotlin {
android()
jvm("desktop")
diff --git a/compose/ui/ui-viewbinding/build.gradle b/compose/ui/ui-viewbinding/build.gradle
index cc201ce..ce847ed 100644
--- a/compose/ui/ui-viewbinding/build.gradle
+++ b/compose/ui/ui-viewbinding/build.gradle
@@ -20,7 +20,7 @@
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 ee8e7dc..af2eff9 100644
--- a/compose/ui/ui-viewbinding/samples/build.gradle
+++ b/compose/ui/ui-viewbinding/samples/build.gradle
@@ -20,7 +20,7 @@
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 494a493..a53567e 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 6bd6e75..1447013 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 @@
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 @@
packageInspector(project, project(":compose:ui:ui-inspection"))
-if(AndroidXUiPlugin.isMultiplatformEnabled(project)) {
+if(AndroidXComposePlugin.isMultiplatformEnabled(project)) {
kotlin {
android()
jvm("desktop")
@@ -221,7 +221,7 @@
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 @@
}
}
}
-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 eb72c91..ecb28d0 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 8ae1810..cf62e93 100644
--- a/compose/ui/ui/samples/build.gradle
+++ b/compose/ui/ui/samples/build.gradle
@@ -20,7 +20,7 @@
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 80ff59b..2d4b5d1 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 @@
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 8504416..c3048ba 100755
--- a/development/project-creator/create_project.py
+++ b/development/project-creator/create_project.py
@@ -324,8 +324,7 @@
"""
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 977afab..9c7ef1d 100755
--- a/development/project-creator/test_project_creator.py
+++ b/development/project-creator/test_project_creator.py
@@ -117,10 +117,6 @@
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 f58715e..799d971 100644
--- a/hilt/hilt-navigation-compose/build.gradle
+++ b/hilt/hilt-navigation-compose/build.gradle
@@ -27,7 +27,7 @@
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 6a2bf6a..d989d59 100644
--- a/hilt/hilt-navigation-compose/samples/build.gradle
+++ b/hilt/hilt-navigation-compose/samples/build.gradle
@@ -24,7 +24,7 @@
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 5376e2f..a5c5dc2 100644
--- a/lifecycle/lifecycle-viewmodel-compose/build.gradle
+++ b/lifecycle/lifecycle-viewmodel-compose/build.gradle
@@ -22,7 +22,7 @@
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 c41787a..7dd82ea 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 @@
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 df450b1..eafcfad 100644
--- a/lifecycle/lifecycle-viewmodel-compose/samples/build.gradle
+++ b/lifecycle/lifecycle-viewmodel-compose/samples/build.gradle
@@ -21,7 +21,7 @@
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 fe6ce7d..f2bd9a4 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 @@
lint().files(
kotlin(
"""
- package androidx.ui.foo
+ package androidx.foo
import org.junit.runner.RunWith
import org.junit.runners.JUnit4
@@ -63,7 +63,7 @@
lint().files(
kotlin(
"""
- package androidx.ui.foo
+ package androidx.foo
import androidx.test.filters.MediumTest
import org.junit.runner.RunWith
@@ -90,7 +90,7 @@
.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 @@
lint().files(
kotlin(
"""
- package androidx.ui.foo
+ package androidx.foo
import org.junit.runner.RunWith
import org.junit.runners.JUnit4
@@ -119,7 +119,7 @@
.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 @@
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 @@
lint().files(
kotlin(
"""
- package androidx.ui.foo
+ package androidx.foo
import org.junit.runner.RunWith
import org.junit.runners.Parameterized
@@ -181,7 +181,7 @@
lint().files(
kotlin(
"""
- package androidx.ui.foo
+ package androidx.foo
class Test {
@Test
@@ -199,7 +199,7 @@
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 @@
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 @@
.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 @@
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 @@
.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 @@
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 7966a17..5d94ce2c 100644
--- a/navigation/navigation-compose/build.gradle
+++ b/navigation/navigation-compose/build.gradle
@@ -21,7 +21,7 @@
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 fb50bcb..3aa19a5 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 @@
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 7dc352f..ddd9eed 100644
--- a/navigation/navigation-compose/samples/build.gradle
+++ b/navigation/navigation-compose/samples/build.gradle
@@ -20,7 +20,7 @@
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 669f393d3..f6892b8 100644
--- a/paging/paging-compose/build.gradle
+++ b/paging/paging-compose/build.gradle
@@ -22,7 +22,7 @@
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 ef6e14d..1dd1f08 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 @@
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 cdf0963..7d9fa7d 100644
--- a/paging/paging-compose/samples/build.gradle
+++ b/paging/paging-compose/samples/build.gradle
@@ -21,7 +21,7 @@
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 c0f1b1a..1c2ff08 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 d2ca12f..b623f63 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -246,6 +246,7 @@
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-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 3516282..b5c5320 100644
--- a/text/text/build.gradle
+++ b/text/text/build.gradle
@@ -23,7 +23,7 @@
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 b8f7c1a..0000000
--- 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 4ab4e7b..eab3404 100644
--- a/wear/compose/foundation/build.gradle
+++ b/wear/compose/foundation/build.gradle
@@ -17,17 +17,17 @@
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 @@
}
-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 556a291..0cbfebd 100644
--- a/wear/compose/material/benchmark/build.gradle
+++ b/wear/compose/material/benchmark/build.gradle
@@ -19,7 +19,7 @@
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 b4132f0..c9abd4d 100644
--- a/wear/compose/material/build.gradle
+++ b/wear/compose/material/build.gradle
@@ -17,22 +17,22 @@
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 @@
}
}
-if(AndroidXUiPlugin.isMultiplatformEnabled(project)) {
+if(AndroidXComposePlugin.isMultiplatformEnabled(project)) {
kotlin {
android()
jvm("desktop")
