Replaces LibraryVersions.UI with LibraryVersions.COMPOSE
Long term we will want to have separate versions for the corresponding library groups in LibraryGroups.Compose, but for now since we aren't versioning independently we should pin everything to one version.
Bug: b/160233169
Test: ./gradlew bOS
Change-Id: Ib5b30cea556783b297e37ec877701fe862d19a96
diff --git a/buildSrc/src/main/kotlin/androidx/build/LibraryVersions.kt b/buildSrc/src/main/kotlin/androidx/build/LibraryVersions.kt
index b082308..68402f7 100644
--- a/buildSrc/src/main/kotlin/androidx/build/LibraryVersions.kt
+++ b/buildSrc/src/main/kotlin/androidx/build/LibraryVersions.kt
@@ -110,7 +110,6 @@
val TRACING = Version("1.0.0-rc01")
val TRANSITION = Version("1.4.0-beta01")
val TVPROVIDER = Version("1.1.0-alpha01")
- val UI = Version("1.0.0-alpha02")
val VECTORDRAWABLE = Version("1.2.0-alpha02")
val VECTORDRAWABLE_ANIMATED = Version("1.2.0-alpha01")
val VECTORDRAWABLE_SEEKABLE = Version("1.0.0-alpha02")
diff --git a/compose/animation/animation-core/build.gradle b/compose/animation/animation-core/build.gradle
index 78e8313..83e859d 100644
--- a/compose/animation/animation-core/build.gradle
+++ b/compose/animation/animation-core/build.gradle
@@ -70,7 +70,7 @@
androidx {
name = "Compose Animation Core"
publish = Publish.SNAPSHOT_AND_RELEASE
- mavenVersion = LibraryVersions.UI
+ mavenVersion = LibraryVersions.COMPOSE
mavenGroup = LibraryGroups.Compose.ANIMATION
inceptionYear = "2019"
description = "Animation engine and animation primitives that are the building blocks of the Compose animation library"
diff --git a/compose/animation/animation/build.gradle b/compose/animation/animation/build.gradle
index ca914a2..bcea23f 100644
--- a/compose/animation/animation/build.gradle
+++ b/compose/animation/animation/build.gradle
@@ -72,7 +72,7 @@
androidx {
name = "Compose Animation"
publish = Publish.SNAPSHOT_AND_RELEASE
- mavenVersion = LibraryVersions.UI
+ mavenVersion = LibraryVersions.COMPOSE
mavenGroup = LibraryGroups.Compose.ANIMATION
inceptionYear = "2019"
description = "Compose animation library"
diff --git a/compose/foundation/foundation-layout/build.gradle b/compose/foundation/foundation-layout/build.gradle
index 96eb0d5..93e2980 100644
--- a/compose/foundation/foundation-layout/build.gradle
+++ b/compose/foundation/foundation-layout/build.gradle
@@ -76,7 +76,7 @@
androidx {
name = "Compose Layouts"
publish = Publish.SNAPSHOT_AND_RELEASE
- mavenVersion = LibraryVersions.UI
+ mavenVersion = LibraryVersions.COMPOSE
mavenGroup = LibraryGroups.Compose.FOUNDATION
inceptionYear = "2019"
description = "Compose layout implementations"
diff --git a/compose/foundation/foundation-text/build.gradle b/compose/foundation/foundation-text/build.gradle
index eafc479..a88b8d4 100644
--- a/compose/foundation/foundation-text/build.gradle
+++ b/compose/foundation/foundation-text/build.gradle
@@ -83,7 +83,7 @@
androidx {
name = "Compose Text"
publish = Publish.SNAPSHOT_AND_RELEASE
- mavenVersion = LibraryVersions.UI
+ mavenVersion = LibraryVersions.COMPOSE
mavenGroup = LibraryGroups.Compose.FOUNDATION
inceptionYear = "2020"
description = "Compose Text higher level APIs"
diff --git a/compose/foundation/foundation/build.gradle b/compose/foundation/foundation/build.gradle
index b1333ac..2fa0b6a 100644
--- a/compose/foundation/foundation/build.gradle
+++ b/compose/foundation/foundation/build.gradle
@@ -85,7 +85,7 @@
androidx {
name = "Compose Foundation"
publish = Publish.SNAPSHOT_AND_RELEASE
- mavenVersion = LibraryVersions.UI
+ mavenVersion = LibraryVersions.COMPOSE
mavenGroup = LibraryGroups.Compose.FOUNDATION
inceptionYear = "2018"
description = "Higher level abstractions of the Compose UI primitives. This library is design system agnostic, providing the high-level building blocks for both application and design-system developers"
diff --git a/compose/material/material-icons-core/build.gradle b/compose/material/material-icons-core/build.gradle
index e1f499b..c752ff3 100644
--- a/compose/material/material-icons-core/build.gradle
+++ b/compose/material/material-icons-core/build.gradle
@@ -50,7 +50,7 @@
androidx {
name = "Compose Material Icons Core"
publish = Publish.SNAPSHOT_AND_RELEASE
- mavenVersion = LibraryVersions.UI
+ mavenVersion = LibraryVersions.COMPOSE
mavenGroup = LibraryGroups.Compose.MATERIAL
inceptionYear = "2020"
description = "Compose Material Design core icons. This module contains the most commonly used set of Material icons."
diff --git a/compose/material/material-icons-extended/build.gradle b/compose/material/material-icons-extended/build.gradle
index be0bbe18..2ac2813 100644
--- a/compose/material/material-icons-extended/build.gradle
+++ b/compose/material/material-icons-extended/build.gradle
@@ -67,7 +67,7 @@
androidx {
name = "Compose Material Icons Extended"
publish = Publish.SNAPSHOT_AND_RELEASE
- mavenVersion = LibraryVersions.UI
+ mavenVersion = LibraryVersions.COMPOSE
mavenGroup = LibraryGroups.Compose.MATERIAL
// This module has a large number (5000+) of generated source files and so doc generation /
// API tracking will simply take too long
diff --git a/compose/material/material/build.gradle b/compose/material/material/build.gradle
index 1a4736e..ef5e787 100644
--- a/compose/material/material/build.gradle
+++ b/compose/material/material/build.gradle
@@ -89,7 +89,7 @@
androidx {
name = "Compose Material Components"
publish = Publish.SNAPSHOT_AND_RELEASE
- mavenVersion = LibraryVersions.UI
+ mavenVersion = LibraryVersions.COMPOSE
mavenGroup = LibraryGroups.Compose.MATERIAL
inceptionYear = "2018"
description = "Compose Material Design Components library"
diff --git a/compose/material/material/icons/generator/build.gradle b/compose/material/material/icons/generator/build.gradle
index 20f02c2..eeee7f6 100644
--- a/compose/material/material/icons/generator/build.gradle
+++ b/compose/material/material/icons/generator/build.gradle
@@ -45,7 +45,7 @@
name = "Material Icon Generator"
publish = Publish.NONE
toolingProject = true
- mavenVersion = LibraryVersions.UI
+ mavenVersion = LibraryVersions.COMPOSE
mavenGroup = LibraryGroups.Compose.MATERIAL
inceptionYear = "2020"
description = "Generator module that parses XML drawables to generate programmatic " +
diff --git a/compose/runtime/runtime-livedata/build.gradle b/compose/runtime/runtime-livedata/build.gradle
index f91decc..825bf92 100644
--- a/compose/runtime/runtime-livedata/build.gradle
+++ b/compose/runtime/runtime-livedata/build.gradle
@@ -46,7 +46,7 @@
androidx {
name = "Compose LiveData integration"
publish = Publish.SNAPSHOT_AND_RELEASE
- mavenVersion = LibraryVersions.UI
+ mavenVersion = LibraryVersions.COMPOSE
mavenGroup = LibraryGroups.Compose.RUNTIME
inceptionYear = "2020"
description = "Compose integration with LiveData"
diff --git a/compose/runtime/runtime-rxjava2/build.gradle b/compose/runtime/runtime-rxjava2/build.gradle
index 5311fee..1afca61 100644
--- a/compose/runtime/runtime-rxjava2/build.gradle
+++ b/compose/runtime/runtime-rxjava2/build.gradle
@@ -45,7 +45,7 @@
androidx {
name = "Compose RxJava 2 integration"
publish = Publish.SNAPSHOT_AND_RELEASE
- mavenVersion = LibraryVersions.UI
+ mavenVersion = LibraryVersions.COMPOSE
mavenGroup = LibraryGroups.Compose.RUNTIME
inceptionYear = "2020"
description = "Compose integration with RxJava 2"
diff --git a/compose/runtime/runtime-saved-instance-state/build.gradle b/compose/runtime/runtime-saved-instance-state/build.gradle
index b8ad72b..690ee6a 100644
--- a/compose/runtime/runtime-saved-instance-state/build.gradle
+++ b/compose/runtime/runtime-saved-instance-state/build.gradle
@@ -78,7 +78,7 @@
androidx {
name = "Compose Saved Instance State support"
publish = Publish.SNAPSHOT_AND_RELEASE
- mavenVersion = LibraryVersions.UI
+ mavenVersion = LibraryVersions.COMPOSE
mavenGroup = LibraryGroups.Compose.RUNTIME
inceptionYear = "2020"
description = "Compose components that allow saving and restoring the local ui state"
diff --git a/compose/ui/ui-geometry/build.gradle b/compose/ui/ui-geometry/build.gradle
index 36affd2..25f65c1 100644
--- a/compose/ui/ui-geometry/build.gradle
+++ b/compose/ui/ui-geometry/build.gradle
@@ -55,7 +55,7 @@
androidx {
name = "Compose Geometry"
publish = Publish.SNAPSHOT_AND_RELEASE
- mavenVersion = LibraryVersions.UI
+ mavenVersion = LibraryVersions.COMPOSE
mavenGroup = LibraryGroups.Compose.UI
inceptionYear = "2020"
description = "Compose classes related to dimensions without units"
diff --git a/compose/ui/ui-graphics/build.gradle b/compose/ui/ui-graphics/build.gradle
index 42ed409..39c531b 100644
--- a/compose/ui/ui-graphics/build.gradle
+++ b/compose/ui/ui-graphics/build.gradle
@@ -71,7 +71,7 @@
androidx {
name = "Compose Graphics"
publish = Publish.SNAPSHOT_AND_RELEASE
- mavenVersion = LibraryVersions.UI
+ mavenVersion = LibraryVersions.COMPOSE
mavenGroup = LibraryGroups.Compose.UI
inceptionYear = "2020"
description = "Compose graphics"
diff --git a/compose/ui/ui-test-font/build.gradle b/compose/ui/ui-test-font/build.gradle
index 66db19f..6fdc8fb 100644
--- a/compose/ui/ui-test-font/build.gradle
+++ b/compose/ui/ui-test-font/build.gradle
@@ -27,7 +27,7 @@
androidx {
name = "Compose Test Font resources"
publish = Publish.NONE
- mavenVersion = LibraryVersions.UI
+ mavenVersion = LibraryVersions.COMPOSE
mavenGroup = LibraryGroups.Compose.UI
inceptionYear = "2020"
description = "Fonts designed for testing text capabilities"
diff --git a/compose/ui/ui-text-android/build.gradle b/compose/ui/ui-text-android/build.gradle
index 8ae134e..37a2fcd 100644
--- a/compose/ui/ui-text-android/build.gradle
+++ b/compose/ui/ui-text-android/build.gradle
@@ -54,7 +54,7 @@
name = "Compose UI Text Android support"
publish = Publish.SNAPSHOT_AND_RELEASE
generateDocs = false
- mavenVersion = LibraryVersions.UI
+ mavenVersion = LibraryVersions.COMPOSE
mavenGroup = LibraryGroups.Compose.UI
inceptionYear = "2018"
description = "Android specific implementations for Text in Compose"
diff --git a/compose/ui/ui-text/build.gradle b/compose/ui/ui-text/build.gradle
index e6e5c14..4f77808 100644
--- a/compose/ui/ui-text/build.gradle
+++ b/compose/ui/ui-text/build.gradle
@@ -94,7 +94,7 @@
androidx {
name = "Compose UI Text"
publish = Publish.SNAPSHOT_AND_RELEASE
- mavenVersion = LibraryVersions.UI
+ mavenVersion = LibraryVersions.COMPOSE
mavenGroup = LibraryGroups.Compose.UI
inceptionYear = "2019"
description = "Compose Text primitives and utilities"
diff --git a/compose/ui/ui-unit/build.gradle b/compose/ui/ui-unit/build.gradle
index 6ad2f711..d837e87 100644
--- a/compose/ui/ui-unit/build.gradle
+++ b/compose/ui/ui-unit/build.gradle
@@ -65,7 +65,7 @@
androidx {
name = "Compose Unit"
publish = Publish.SNAPSHOT_AND_RELEASE
- mavenVersion = LibraryVersions.UI
+ mavenVersion = LibraryVersions.COMPOSE
mavenGroup = LibraryGroups.Compose.UI
inceptionYear = "2020"
description = "Compose classes for simple units"
diff --git a/compose/ui/ui-util/build.gradle b/compose/ui/ui-util/build.gradle
index 9d6b9d5..455308c 100644
--- a/compose/ui/ui-util/build.gradle
+++ b/compose/ui/ui-util/build.gradle
@@ -62,7 +62,7 @@
androidx {
name = "Compose Util"
publish = Publish.SNAPSHOT_AND_RELEASE
- mavenVersion = LibraryVersions.UI
+ mavenVersion = LibraryVersions.COMPOSE
mavenGroup = LibraryGroups.Compose.UI
inceptionYear = "2020"
description = "Internal Compose utilities used by other modules"
diff --git a/compose/ui/ui-viewbinding/build.gradle b/compose/ui/ui-viewbinding/build.gradle
index a74564c..940c8fe 100644
--- a/compose/ui/ui-viewbinding/build.gradle
+++ b/compose/ui/ui-viewbinding/build.gradle
@@ -44,7 +44,7 @@
androidx {
name = "Compose ViewBinding"
publish = Publish.SNAPSHOT_AND_RELEASE
- mavenVersion = LibraryVersions.UI
+ mavenVersion = LibraryVersions.COMPOSE
mavenGroup = LibraryGroups.Compose.UI
inceptionYear = "2020"
description = "Compose integration with ViewBinding"
diff --git a/compose/ui/ui/build.gradle b/compose/ui/ui/build.gradle
index 072f281..ed1034e 100644
--- a/compose/ui/ui/build.gradle
+++ b/compose/ui/ui/build.gradle
@@ -129,7 +129,7 @@
androidx {
name = "Compose UI primitives"
publish = Publish.SNAPSHOT_AND_RELEASE
- mavenVersion = LibraryVersions.UI
+ mavenVersion = LibraryVersions.COMPOSE
mavenGroup = LibraryGroups.Compose.UI
inceptionYear = "2019"
description = "Compose UI primitives. This library contains the primitives that form the Compose UI Toolkit, such as drawing, measurement and layout."
diff --git a/ui/ui-animation-tooling-internal/build.gradle b/ui/ui-animation-tooling-internal/build.gradle
index 4be1456..627cf36 100644
--- a/ui/ui-animation-tooling-internal/build.gradle
+++ b/ui/ui-animation-tooling-internal/build.gradle
@@ -33,7 +33,7 @@
name = "Compose Animation Tooling"
description = "Compose Animation APIs for tooling support. Internal use only."
publish = Publish.SNAPSHOT_ONLY
- mavenVersion = LibraryVersions.UI
+ mavenVersion = LibraryVersions.COMPOSE
mavenGroup = LibraryGroups.UI
generateDocs = false
}
diff --git a/ui/ui-test/build.gradle b/ui/ui-test/build.gradle
index 465191e..ab3e2fc 100644
--- a/ui/ui-test/build.gradle
+++ b/ui/ui-test/build.gradle
@@ -89,7 +89,7 @@
androidx {
name = "Compose Testing"
publish = Publish.SNAPSHOT_AND_RELEASE
- mavenVersion = LibraryVersions.UI
+ mavenVersion = LibraryVersions.COMPOSE
mavenGroup = LibraryGroups.UI
inceptionYear = "2019"
description = "Compose testing library"
diff --git a/ui/ui-tooling/build.gradle b/ui/ui-tooling/build.gradle
index 67c0e15..8d21b69 100644
--- a/ui/ui-tooling/build.gradle
+++ b/ui/ui-tooling/build.gradle
@@ -58,7 +58,7 @@
androidx {
name = "Compose Tooling"
publish = Publish.SNAPSHOT_AND_RELEASE
- mavenVersion = LibraryVersions.UI
+ mavenVersion = LibraryVersions.COMPOSE
mavenGroup = LibraryGroups.UI
inceptionYear = "2019"
description = "Compose tooling library. This library exposes information to our tools for better IDE support."
