[go: nahoru, domu]

removing explicit setting of library groups

and instead always computing it based on the project path

Test: ./gradlew help
Test: git checkout HEAD^ -- core && ./gradlew help # and see that trying to set mavenGroup causes a failure
Test: run `./gradlew printCoordinates` before and after this change, sort the output of each, and see that both results are the same
Test: Treehugger runs busytown/*.sh

Change-Id: Ib0cbff084c15198373c9d5d9c10a702703a44214
Merged-In: Ib0cbff084c15198373c9d5d9c10a702703a44214
diff --git a/activity/activity-compose-lint/build.gradle b/activity/activity-compose-lint/build.gradle
index 067c23b..327ee7a 100644
--- a/activity/activity-compose-lint/build.gradle
+++ b/activity/activity-compose-lint/build.gradle
@@ -42,7 +42,6 @@
 androidx {
     name = "Activity Compose Lint"
     type = LibraryType.LINT
-    mavenGroup = LibraryGroups.ACTIVITY
     inceptionYear = "2021"
     description = "Lint checks for Activity Compose"
 }
diff --git a/activity/activity-compose/build.gradle b/activity/activity-compose/build.gradle
index a0a7d61..52f72760 100644
--- a/activity/activity-compose/build.gradle
+++ b/activity/activity-compose/build.gradle
@@ -56,7 +56,6 @@
 androidx {
     name = "Activity Compose"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.ACTIVITY
     inceptionYear = "2020"
     description = "Compose integration with Activity"
     runApiTasks = new RunApiTasks.Yes()
diff --git a/activity/activity-compose/samples/build.gradle b/activity/activity-compose/samples/build.gradle
index 48236d48..e76d4bc 100644
--- a/activity/activity-compose/samples/build.gradle
+++ b/activity/activity-compose/samples/build.gradle
@@ -42,7 +42,6 @@
 androidx {
     name = "AndroidX Compose UI Activity Integration Samples"
     type = LibraryType.SAMPLES
-    mavenGroup = LibraryGroups.ACTIVITY
     inceptionYear = "2020"
     description = "Samples for Compose integration with Activity"
 }
diff --git a/activity/activity-ktx/build.gradle b/activity/activity-ktx/build.gradle
index 435ee81..1e892a2 100644
--- a/activity/activity-ktx/build.gradle
+++ b/activity/activity-ktx/build.gradle
@@ -57,7 +57,6 @@
 androidx {
     name = "Activity Kotlin Extensions"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.ACTIVITY
     inceptionYear = "2018"
     description = "Kotlin extensions for 'activity' artifact"
 }
diff --git a/activity/activity-lint/build.gradle b/activity/activity-lint/build.gradle
index c7ceb7b..704ee58 100644
--- a/activity/activity-lint/build.gradle
+++ b/activity/activity-lint/build.gradle
@@ -38,7 +38,6 @@
 androidx {
     name = "Android Activity Lint Checks"
     type = LibraryType.LINT
-    mavenGroup = LibraryGroups.ACTIVITY
     inceptionYear = "2020"
     description = "Android Activity Lint Checks"
 }
diff --git a/activity/activity/build.gradle b/activity/activity/build.gradle
index bbadf0f..8a8e97b 100644
--- a/activity/activity/build.gradle
+++ b/activity/activity/build.gradle
@@ -50,7 +50,6 @@
 androidx {
     name = "Activity"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.ACTIVITY
     inceptionYear = "2018"
     description = "Provides the base Activity subclass and the relevant hooks to build a composable structure on top."
 }
diff --git a/ads/ads-identifier-benchmark/build.gradle b/ads/ads-identifier-benchmark/build.gradle
index 66d7707..1bc05c2 100644
--- a/ads/ads-identifier-benchmark/build.gradle
+++ b/ads/ads-identifier-benchmark/build.gradle
@@ -40,6 +40,3 @@
     namespace "androidx.ads.identifier.benchmark"
 }
 
-androidx {
-    mavenGroup = LibraryGroups.ADS
-}
diff --git a/ads/ads-identifier-common/build.gradle b/ads/ads-identifier-common/build.gradle
index 26cd193..c753038 100644
--- a/ads/ads-identifier-common/build.gradle
+++ b/ads/ads-identifier-common/build.gradle
@@ -44,7 +44,6 @@
     name = "AndroidX Ads Identifier Common"
     publish = Publish.SNAPSHOT_AND_RELEASE
     mavenVersion = LibraryVersions.ADS_IDENTIFIER
-    mavenGroup = LibraryGroups.ADS
     inceptionYear = "2019"
     description = "AndroidX Ads Identifier Common"
 }
diff --git a/ads/ads-identifier-provider/build.gradle b/ads/ads-identifier-provider/build.gradle
index 97fa0b6..395eea7 100644
--- a/ads/ads-identifier-provider/build.gradle
+++ b/ads/ads-identifier-provider/build.gradle
@@ -43,7 +43,6 @@
     name = "AndroidX Ads Identifier Provider"
     publish = Publish.SNAPSHOT_AND_RELEASE
     mavenVersion = LibraryVersions.ADS_IDENTIFIER
-    mavenGroup = LibraryGroups.ADS
     inceptionYear = "2019"
     description = "AndroidX Ads Identifier Provider"
 }
diff --git a/ads/ads-identifier-testing/build.gradle b/ads/ads-identifier-testing/build.gradle
index 7c747bc..b1a7b7a 100644
--- a/ads/ads-identifier-testing/build.gradle
+++ b/ads/ads-identifier-testing/build.gradle
@@ -36,5 +36,4 @@
 
 androidx {
     type = LibraryType.INTERNAL_TEST_LIBRARY
-    mavenGroup = LibraryGroups.ADS
 }
diff --git a/ads/ads-identifier/build.gradle b/ads/ads-identifier/build.gradle
index 1c6ec54..90bd660 100644
--- a/ads/ads-identifier/build.gradle
+++ b/ads/ads-identifier/build.gradle
@@ -45,7 +45,6 @@
     name = "AndroidX Ads Identifier"
     publish = Publish.SNAPSHOT_AND_RELEASE
     mavenVersion = LibraryVersions.ADS_IDENTIFIER
-    mavenGroup = LibraryGroups.ADS
     inceptionYear = "2019"
     description = "AndroidX Ads Identifier"
 }
diff --git a/annotation/annotation-experimental-lint/build.gradle b/annotation/annotation-experimental-lint/build.gradle
index d7e5e9d..23fa122 100644
--- a/annotation/annotation-experimental-lint/build.gradle
+++ b/annotation/annotation-experimental-lint/build.gradle
@@ -42,7 +42,6 @@
     name = "Experimental annotation lint checks"
     type = LibraryType.LINT
     mavenVersion = LibraryVersions.ANNOTATION_EXPERIMENTAL
-    mavenGroup = LibraryGroups.ANNOTATION
     inceptionYear = "2019"
     description = "Lint checks for the Experimental annotation library. Also enforces the " +
             "semantics of Kotlin @Experimental APIs from within Android Java source code."
diff --git a/annotation/annotation-experimental-lint/integration-tests/build.gradle b/annotation/annotation-experimental-lint/integration-tests/build.gradle
index 9922f11..d81eeec 100644
--- a/annotation/annotation-experimental-lint/integration-tests/build.gradle
+++ b/annotation/annotation-experimental-lint/integration-tests/build.gradle
@@ -48,5 +48,4 @@
 
 androidx {
     type = LibraryType.INTERNAL_TEST_LIBRARY
-    mavenGroup = LibraryGroups.ANNOTATION
 }
diff --git a/annotation/annotation-experimental/build.gradle b/annotation/annotation-experimental/build.gradle
index c1179d8..0b75e9a 100644
--- a/annotation/annotation-experimental/build.gradle
+++ b/annotation/annotation-experimental/build.gradle
@@ -31,7 +31,6 @@
     name = "Experimental annotation"
     publish = Publish.SNAPSHOT_AND_RELEASE
     mavenVersion = LibraryVersions.ANNOTATION_EXPERIMENTAL
-    mavenGroup = LibraryGroups.ANNOTATION
     inceptionYear = "2019"
     description = "Java annotation for use on unstable Android API surfaces. When used in " +
             "conjunction with the Experimental annotation lint checks, this annotation provides " +
diff --git a/annotation/annotation-sampled/build.gradle b/annotation/annotation-sampled/build.gradle
index 267caf7..97f3955 100644
--- a/annotation/annotation-sampled/build.gradle
+++ b/annotation/annotation-sampled/build.gradle
@@ -23,6 +23,3 @@
     implementation(libs.kotlinStdlib)
 }
 
-androidx {
-    mavenGroup = LibraryGroups.ANNOTATION
-}
diff --git a/annotation/annotation/build.gradle b/annotation/annotation/build.gradle
index 00c5298..b34c118 100644
--- a/annotation/annotation/build.gradle
+++ b/annotation/annotation/build.gradle
@@ -72,7 +72,6 @@
     name = "Android Support Library Annotations"
     type = LibraryType.PUBLISHED_LIBRARY
     mavenVersion = LibraryVersions.ANNOTATION
-    mavenGroup = LibraryGroups.ANNOTATION
     inceptionYear = "2013"
     description = "The Support Library is a static library that you can add to your Android application in order to use APIs that are either not available for older platform versions or utility APIs that aren't a part of the framework APIs."
 }
diff --git a/appactions/interaction/interaction-proto/build.gradle b/appactions/interaction/interaction-proto/build.gradle
index b7979b6..6d10425 100644
--- a/appactions/interaction/interaction-proto/build.gradle
+++ b/appactions/interaction/interaction-proto/build.gradle
@@ -34,7 +34,6 @@
 androidx {
     name = "androidx.appactions.interaction:interaction-proto"
     type = LibraryType.PUBLISHED_LIBRARY
-    mavenGroup = LibraryGroups.APPACTIONS_INTERACTION
     inceptionYear = "2022"
     description = "Protos for use with App Action interaction libraries."
 }
diff --git a/appcompat/appcompat-benchmark/build.gradle b/appcompat/appcompat-benchmark/build.gradle
index b9310e0..039d310 100644
--- a/appcompat/appcompat-benchmark/build.gradle
+++ b/appcompat/appcompat-benchmark/build.gradle
@@ -35,6 +35,3 @@
     namespace "androidx.appcompat.benchmark"
 }
 
-androidx {
-    mavenGroup = LibraryGroups.APPCOMPAT
-}
diff --git a/appcompat/appcompat-lint/build.gradle b/appcompat/appcompat-lint/build.gradle
index 5488603..57b7f23 100644
--- a/appcompat/appcompat-lint/build.gradle
+++ b/appcompat/appcompat-lint/build.gradle
@@ -41,7 +41,6 @@
 androidx {
     name = "AppCompat Lint Checks"
     type = LibraryType.LINT
-    mavenGroup = LibraryGroups.APPCOMPAT
     inceptionYear = "2019"
     description = "AppCompat Lint Checks"
 }
diff --git a/appcompat/appcompat-resources/build.gradle b/appcompat/appcompat-resources/build.gradle
index 5ad3701..bab4b22 100644
--- a/appcompat/appcompat-resources/build.gradle
+++ b/appcompat/appcompat-resources/build.gradle
@@ -66,7 +66,6 @@
 androidx {
     name = "Android Resources Library"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.APPCOMPAT
     inceptionYear = "2019"
     description = "The Resources Library is a static library that you can add to your Android application in order to use resource APIs that backport the latest APIs to older versions of the platform. Compatible on devices running API 14 or later."
 }
diff --git a/appcompat/appcompat/build.gradle b/appcompat/appcompat/build.gradle
index afb0b80..a81c9b5 100644
--- a/appcompat/appcompat/build.gradle
+++ b/appcompat/appcompat/build.gradle
@@ -102,7 +102,6 @@
 androidx {
     name = "Android AppCompat Library"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.APPCOMPAT
     inceptionYear = "2011"
     description = "The Support Library is a static library that you can add to your Android application in order to use APIs that are either not available for older platform versions or utility APIs that aren\'t a part of the framework APIs. Compatible on devices running API 14 or later."
     failOnDeprecationWarnings = false
diff --git a/appsearch/appsearch-builtin-types/build.gradle b/appsearch/appsearch-builtin-types/build.gradle
index c079357..fd4407b 100644
--- a/appsearch/appsearch-builtin-types/build.gradle
+++ b/appsearch/appsearch-builtin-types/build.gradle
@@ -39,7 +39,6 @@
 androidx {
     name = 'AppSearch Builtin Types'
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.APPSEARCH
     inceptionYear = '2021'
     description = 'Contains AppSearch Document classes and builders for a variety of common ' +
             'objects based on http://schema.org. Data interchange with the system, and other ' +
diff --git a/appsearch/appsearch-debug-view/build.gradle b/appsearch/appsearch-debug-view/build.gradle
index eeaec52..1b0c3f2 100644
--- a/appsearch/appsearch-debug-view/build.gradle
+++ b/appsearch/appsearch-debug-view/build.gradle
@@ -46,7 +46,6 @@
 androidx {
     name = "AndroidX AppSearch Debug View"
     type = LibraryType.PUBLISHED_LIBRARY
-    mavenGroup = LibraryGroups.APPSEARCH
     inceptionYear = "2021"
     description = "A support library for AndroidX AppSearch that contains activities and views " +
             "for debugging an application's integration with AppSearch."
diff --git a/appsearch/appsearch-debug-view/samples/build.gradle b/appsearch/appsearch-debug-view/samples/build.gradle
index bba17b9..6724661 100644
--- a/appsearch/appsearch-debug-view/samples/build.gradle
+++ b/appsearch/appsearch-debug-view/samples/build.gradle
@@ -48,7 +48,6 @@
 androidx {
     name = "AndroidX AppSearch Debug View Sample App"
     type = LibraryType.SAMPLES
-    mavenGroup = LibraryGroups.APPSEARCH
     inceptionYear = "2021"
     description = "Contains a sample app for integrating the Androidx AppSearch Debug View"
 }
diff --git a/appsearch/appsearch-ktx/build.gradle b/appsearch/appsearch-ktx/build.gradle
index 0e72fdf..1f00bf2 100644
--- a/appsearch/appsearch-ktx/build.gradle
+++ b/appsearch/appsearch-ktx/build.gradle
@@ -38,7 +38,6 @@
 androidx {
     name = 'AndroidX AppSearch - Kotlin Extensions'
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.APPSEARCH
     inceptionYear = '2021'
     description = 'AndroidX AppSearch - Kotlin Extensions'
 }
diff --git a/appsearch/appsearch-local-storage/build.gradle b/appsearch/appsearch-local-storage/build.gradle
index d723e00..960328c 100644
--- a/appsearch/appsearch-local-storage/build.gradle
+++ b/appsearch/appsearch-local-storage/build.gradle
@@ -88,7 +88,6 @@
 androidx {
     name = "AppSearch Local Storage"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.APPSEARCH
     inceptionYear = "2020"
     description =
         "An implementation of AppSearchSession which uses local app storage and a local copy of " +
diff --git a/appsearch/appsearch-platform-storage/build.gradle b/appsearch/appsearch-platform-storage/build.gradle
index e4c1f37..1dcf87f 100644
--- a/appsearch/appsearch-platform-storage/build.gradle
+++ b/appsearch/appsearch-platform-storage/build.gradle
@@ -38,7 +38,6 @@
 androidx {
     name = "AppSearch Platform Storage"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.APPSEARCH
     inceptionYear = "2021"
     description =
         "An implementation of AppSearchSession which uses the AppSearch service on Android S+"
diff --git a/appsearch/appsearch-test-util/build.gradle b/appsearch/appsearch-test-util/build.gradle
index 34ac12c..0896d14 100644
--- a/appsearch/appsearch-test-util/build.gradle
+++ b/appsearch/appsearch-test-util/build.gradle
@@ -39,7 +39,6 @@
     name = 'AppSearch Test Util'
     type = LibraryType.INTERNAL_TEST_LIBRARY
     publish = Publish.NONE
-    mavenGroup = LibraryGroups.APPSEARCH
     inceptionYear = '2021'
     description = 'Test Utilities to be used by any test module for AppSearch'
 }
diff --git a/appsearch/appsearch/build.gradle b/appsearch/appsearch/build.gradle
index c82c623..7c0365c 100644
--- a/appsearch/appsearch/build.gradle
+++ b/appsearch/appsearch/build.gradle
@@ -57,7 +57,6 @@
 androidx {
     name = 'AndroidX AppSearch'
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.APPSEARCH
     inceptionYear = '2019'
     description = 'AndroidX AppSearch - App Indexing'
 }
diff --git a/appsearch/compiler/build.gradle b/appsearch/compiler/build.gradle
index c8586b6..f2c72b7 100644
--- a/appsearch/compiler/build.gradle
+++ b/appsearch/compiler/build.gradle
@@ -39,7 +39,6 @@
 androidx {
     name = 'AndroidX AppSearch Compiler'
     type = LibraryType.ANNOTATION_PROCESSOR
-    mavenGroup = LibraryGroups.APPSEARCH
     inceptionYear = '2019'
     description = 'Compiler for classes annotated with @androidx.appsearch.annotation.Document'
     failOnDeprecationWarnings = false
diff --git a/arch/core/core-common/build.gradle b/arch/core/core-common/build.gradle
index 450e35a..8a60844 100644
--- a/arch/core/core-common/build.gradle
+++ b/arch/core/core-common/build.gradle
@@ -31,7 +31,6 @@
 androidx {
     name = "Android Arch-Common"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.ARCH_CORE
     inceptionYear = "2017"
     description = "Android Arch-Common"
 }
diff --git a/arch/core/core-runtime/build.gradle b/arch/core/core-runtime/build.gradle
index f8ec338..6652bdf 100644
--- a/arch/core/core-runtime/build.gradle
+++ b/arch/core/core-runtime/build.gradle
@@ -29,7 +29,6 @@
 androidx {
     name = "Android Arch-Runtime"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.ARCH_CORE
     inceptionYear = "2017"
     description = "Android Arch-Runtime"
 }
diff --git a/arch/core/core-testing/build.gradle b/arch/core/core-testing/build.gradle
index 060c70c..0476e53 100644
--- a/arch/core/core-testing/build.gradle
+++ b/arch/core/core-testing/build.gradle
@@ -39,7 +39,6 @@
 androidx {
     name = "Android Core-Testing"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.ARCH_CORE
     inceptionYear = "2017"
     description = "Android Core-Testing"
 }
diff --git a/asynclayoutinflater/asynclayoutinflater-appcompat/build.gradle b/asynclayoutinflater/asynclayoutinflater-appcompat/build.gradle
index 3aabec8..8f08e8c 100644
--- a/asynclayoutinflater/asynclayoutinflater-appcompat/build.gradle
+++ b/asynclayoutinflater/asynclayoutinflater-appcompat/build.gradle
@@ -15,7 +15,6 @@
 androidx {
     name = "AsyncLayoutInflater integration for AppCompat"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.ASYNCLAYOUTINFLATER
     inceptionYear = "2022"
     description = "A thread-safe LayoutInflater Factory that provides compatibility between AsyncLayoutInflater and AppCompat."
 }
diff --git a/asynclayoutinflater/asynclayoutinflater/build.gradle b/asynclayoutinflater/asynclayoutinflater/build.gradle
index 20b1061..713ec8e 100644
--- a/asynclayoutinflater/asynclayoutinflater/build.gradle
+++ b/asynclayoutinflater/asynclayoutinflater/build.gradle
@@ -21,7 +21,6 @@
 androidx {
     name = "Android Support Library Async Layout Inflater"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.ASYNCLAYOUTINFLATER
     inceptionYear = "2018"
     description = "The Support Library is a static library that you can add to your Android application in order to use APIs that are either not available for older platform versions or utility APIs that aren't a part of the framework APIs. Compatible on devices running API 14 or later."
 }
diff --git a/autofill/autofill/build.gradle b/autofill/autofill/build.gradle
index a7b34bb..c4a5853 100644
--- a/autofill/autofill/build.gradle
+++ b/autofill/autofill/build.gradle
@@ -36,7 +36,6 @@
 androidx {
     name = "AndroidX Autofill"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.AUTOFILL
     inceptionYear = "2019"
     description = "AndroidX Autofill"
 }
diff --git a/benchmark/benchmark-common/build.gradle b/benchmark/benchmark-common/build.gradle
index d015492..ab830a8 100644
--- a/benchmark/benchmark-common/build.gradle
+++ b/benchmark/benchmark-common/build.gradle
@@ -68,7 +68,6 @@
 androidx {
     name = "Android Benchmark - Common"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.BENCHMARK
     inceptionYear = "2018"
     description = "Android Benchmark - Common"
 }
diff --git a/benchmark/benchmark-darwin-core/build.gradle b/benchmark/benchmark-darwin-core/build.gradle
index 89758d4..ac9243d 100644
--- a/benchmark/benchmark-darwin-core/build.gradle
+++ b/benchmark/benchmark-darwin-core/build.gradle
@@ -40,7 +40,6 @@
 
 androidx {
     name = "AndroidX Benchmarks - Darwin Core"
-    mavenGroup = LibraryGroups.BENCHMARK
     inceptionYear = "2022"
     description = "AndroidX Benchmarks - Darwin Core"
 }
diff --git a/benchmark/benchmark-darwin-gradle-plugin/build.gradle b/benchmark/benchmark-darwin-gradle-plugin/build.gradle
index ee36734..e8cd413 100644
--- a/benchmark/benchmark-darwin-gradle-plugin/build.gradle
+++ b/benchmark/benchmark-darwin-gradle-plugin/build.gradle
@@ -47,7 +47,6 @@
 androidx {
     name = "AndroidX Benchmarks - Darwin Gradle Plugin"
     type = LibraryType.GRADLE_PLUGIN
-    mavenGroup = LibraryGroups.BENCHMARK
     inceptionYear = "2022"
     description = "AndroidX Benchmarks - Darwin Gradle Plugin"
 }
diff --git a/benchmark/benchmark-darwin-samples/build.gradle b/benchmark/benchmark-darwin-samples/build.gradle
index dc8c184..c946afe 100644
--- a/benchmark/benchmark-darwin-samples/build.gradle
+++ b/benchmark/benchmark-darwin-samples/build.gradle
@@ -60,7 +60,6 @@
 
 androidx {
     name = "AndroidX Benchmarks - Darwin Samples"
-    mavenGroup = LibraryGroups.BENCHMARK
     inceptionYear = "2022"
     description = "AndroidX Benchmarks - Darwin Samples"
 }
diff --git a/benchmark/benchmark-darwin/build.gradle b/benchmark/benchmark-darwin/build.gradle
index 51acaba5..473a5c3 100644
--- a/benchmark/benchmark-darwin/build.gradle
+++ b/benchmark/benchmark-darwin/build.gradle
@@ -44,7 +44,6 @@
 
 androidx {
     name = "AndroidX Benchmarks - Darwin"
-    mavenGroup = LibraryGroups.BENCHMARK
     inceptionYear = "2022"
     description = "AndroidX Benchmarks - Darwin"
 }
diff --git a/benchmark/benchmark-junit4/build.gradle b/benchmark/benchmark-junit4/build.gradle
index ee2aaf0..1db1eb2 100644
--- a/benchmark/benchmark-junit4/build.gradle
+++ b/benchmark/benchmark-junit4/build.gradle
@@ -48,7 +48,6 @@
 androidx {
     name = "Android Benchmark - JUnit4"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.BENCHMARK
     inceptionYear = "2019"
     description = "Android Benchmark - JUnit4"
 }
diff --git a/benchmark/benchmark-macro-junit4/build.gradle b/benchmark/benchmark-macro-junit4/build.gradle
index 30f8fe2..db717c1 100644
--- a/benchmark/benchmark-macro-junit4/build.gradle
+++ b/benchmark/benchmark-macro-junit4/build.gradle
@@ -56,7 +56,6 @@
 androidx {
     name = "Android Benchmark - Macrobenchmark JUnit4"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.BENCHMARK
     inceptionYear = "2020"
     description = "Android Benchmark - Macrobenchmark JUnit4"
 }
diff --git a/benchmark/benchmark-macro/build.gradle b/benchmark/benchmark-macro/build.gradle
index 2f5fe85..134b4df 100644
--- a/benchmark/benchmark-macro/build.gradle
+++ b/benchmark/benchmark-macro/build.gradle
@@ -81,7 +81,6 @@
 androidx {
     name = "Android Benchmark - Macrobenchmark"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.BENCHMARK
     inceptionYear = "2020"
     description = "Android Benchmark - Macrobenchmark"
 }
diff --git a/benchmark/benchmark/build.gradle b/benchmark/benchmark/build.gradle
index 3676f98..983aaf0 100644
--- a/benchmark/benchmark/build.gradle
+++ b/benchmark/benchmark/build.gradle
@@ -42,5 +42,4 @@
 
 androidx {
     type = LibraryType.INTERNAL_TEST_LIBRARY
-    mavenGroup = LibraryGroups.BENCHMARK
 }
diff --git a/benchmark/gradle-plugin/build.gradle b/benchmark/gradle-plugin/build.gradle
index b7db163..fdf95af 100644
--- a/benchmark/gradle-plugin/build.gradle
+++ b/benchmark/gradle-plugin/build.gradle
@@ -60,7 +60,6 @@
 androidx {
     name = "Android Benchmark Gradle Plugin"
     type = LibraryType.GRADLE_PLUGIN
-    mavenGroup = LibraryGroups.BENCHMARK
     inceptionYear = "2019"
     description = "Android Benchmark Gradle Plugin"
 }
diff --git a/biometric/biometric-ktx/build.gradle b/biometric/biometric-ktx/build.gradle
index 22a6f56..89d81fc 100755
--- a/biometric/biometric-ktx/build.gradle
+++ b/biometric/biometric-ktx/build.gradle
@@ -38,7 +38,6 @@
 androidx {
     name = "Biometric Kotlin Extensions"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.BIOMETRIC
     inceptionYear = "2020"
     description = "Kotlin extensions for the Biometric Library."
 }
diff --git a/biometric/biometric-ktx/samples/build.gradle b/biometric/biometric-ktx/samples/build.gradle
index bb28ef6..0f995ee 100644
--- a/biometric/biometric-ktx/samples/build.gradle
+++ b/biometric/biometric-ktx/samples/build.gradle
@@ -30,7 +30,6 @@
 androidx {
     name = "AndroidX Biometric Samples"
     type = LibraryType.SAMPLES
-    mavenGroup = LibraryGroups.BIOMETRIC
     inceptionYear = "2021"
     description = "Contains the sample code for the AndroidX Biometric library"
 }
diff --git a/biometric/biometric/build.gradle b/biometric/biometric/build.gradle
index a67bf13..4243ce5 100644
--- a/biometric/biometric/build.gradle
+++ b/biometric/biometric/build.gradle
@@ -79,7 +79,6 @@
 androidx {
     name = "Biometric"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.BIOMETRIC
     inceptionYear = "2018"
     description = "The Biometric library is a static library that you can add to your Android application. It invokes BiometricPrompt on devices running P and greater, and on older devices will show a compat dialog. Compatible on devices running API 14 or later."
 }
diff --git a/bluetooth/bluetooth-core/build.gradle b/bluetooth/bluetooth-core/build.gradle
index cd23552..8350207 100644
--- a/bluetooth/bluetooth-core/build.gradle
+++ b/bluetooth/bluetooth-core/build.gradle
@@ -36,7 +36,6 @@
 androidx {
     name = "AndroidX Bluetooth Core"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.BLUETOOTH
     inceptionYear = "2022"
     description = "AndroidX Bluetooth Framework Kotlin Library"
 }
diff --git a/bluetooth/bluetooth-testing/build.gradle b/bluetooth/bluetooth-testing/build.gradle
index 7e8495a..a9ac8a5 100644
--- a/bluetooth/bluetooth-testing/build.gradle
+++ b/bluetooth/bluetooth-testing/build.gradle
@@ -29,7 +29,6 @@
 androidx {
     name = "AndroidX Bluetooth Testing"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.BLUETOOTH
     inceptionYear = "2022"
     description = "Test utilities for AndroidX Bluetooth"
 }
diff --git a/bluetooth/bluetooth/build.gradle b/bluetooth/bluetooth/build.gradle
index 7c49ae8..ec2269d 100644
--- a/bluetooth/bluetooth/build.gradle
+++ b/bluetooth/bluetooth/build.gradle
@@ -33,7 +33,6 @@
 androidx {
     name = "AndroidX Bluetooth"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.BLUETOOTH
     inceptionYear = "2022"
     description = "AndroidX Bluetooth Library"
 }
diff --git a/browser/browser/build.gradle b/browser/browser/build.gradle
index 31aa32b..2b37a8a 100644
--- a/browser/browser/build.gradle
+++ b/browser/browser/build.gradle
@@ -47,7 +47,6 @@
 androidx {
     name = "Android Support Custom Tabs"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.BROWSER
     inceptionYear = "2015"
     description = "Android Support Custom Tabs"
 }
diff --git a/buildSrc-tests/max-dep-versions/buildSrc-tests-max-dep-versions-dep/build.gradle b/buildSrc-tests/max-dep-versions/buildSrc-tests-max-dep-versions-dep/build.gradle
index 69da2cb..06e9e6e 100644
--- a/buildSrc-tests/max-dep-versions/buildSrc-tests-max-dep-versions-dep/build.gradle
+++ b/buildSrc-tests/max-dep-versions/buildSrc-tests-max-dep-versions-dep/build.gradle
@@ -13,7 +13,6 @@
 androidx {
     name = "Sample Library"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.BUILDSRC_TESTS
     type = LibraryType.SAMPLES
     inceptionYear = "2020"
     description = "This is a sample library for confirming that maxDepVersions builds work correctly"
diff --git a/buildSrc-tests/max-dep-versions/buildSrc-tests-max-dep-versions-main/build.gradle b/buildSrc-tests/max-dep-versions/buildSrc-tests-max-dep-versions-main/build.gradle
index 0a06d18..c4eed3c5 100644
--- a/buildSrc-tests/max-dep-versions/buildSrc-tests-max-dep-versions-main/build.gradle
+++ b/buildSrc-tests/max-dep-versions/buildSrc-tests-max-dep-versions-main/build.gradle
@@ -15,7 +15,6 @@
 
 androidx {
     name = "Sample Dependent library"
-    mavenGroup = LibraryGroups.BUILDSRC_TESTS
     type = LibraryType.SAMPLES
     inceptionYear = "2020"
     description = "This is a sample library for confirming that maxDepVersions builds work correctly"
diff --git a/buildSrc-tests/project-subsets/build.gradle b/buildSrc-tests/project-subsets/build.gradle
index 65ba658..3ee8f3d 100644
--- a/buildSrc-tests/project-subsets/build.gradle
+++ b/buildSrc-tests/project-subsets/build.gradle
@@ -31,6 +31,3 @@
     t.outputs.upToDateWhen { false }
 }
 
-androidx {
-    mavenGroup = LibraryGroups.BUILDSRC_TESTS
-}
diff --git a/buildSrc/private/src/main/kotlin/androidx/build/AndroidXExtension.kt b/buildSrc/private/src/main/kotlin/androidx/build/AndroidXExtension.kt
index a40314a..f104c26 100644
--- a/buildSrc/private/src/main/kotlin/androidx/build/AndroidXExtension.kt
+++ b/buildSrc/private/src/main/kotlin/androidx/build/AndroidXExtension.kt
@@ -32,16 +32,12 @@
     @JvmField
     val LibraryVersions: Map<String, Version>
     @JvmField
-    val LibraryGroups: Map<String, LibraryGroup>
+    val AllLibraryGroups: List<LibraryGroup>
 
     val libraryGroupsByGroupId: Map<String, LibraryGroup>
     val overrideLibraryGroupsByProjectPath: Map<String, LibraryGroup>
 
-    var mavenGroup: LibraryGroup? = null
-        set(value) {
-            field = value
-            chooseProjectVersion()
-        }
+    val mavenGroup: LibraryGroup?
 
     init {
         val toml = project.objects.fileProperty().fileValue(
@@ -60,13 +56,12 @@
             spec.parameters.useMultiplatformGroupVersions = useMultiplatformVersions
         }
         val service = serviceProvider.get()
-        LibraryGroups = service.libraryGroups
+        AllLibraryGroups = service.libraryGroups.values.toList()
         LibraryVersions = service.libraryVersions
         libraryGroupsByGroupId = service.libraryGroupsByGroupId
         overrideLibraryGroupsByProjectPath = service.overrideLibraryGroupsByProjectPath
-        project.afterEvaluate {
-            validateLibraryGroup()
-        }
+        mavenGroup = chooseLibraryGroup()
+        chooseProjectVersion()
     }
 
     var name: Property<String?> = project.objects.property(String::class.java)
@@ -77,17 +72,7 @@
             chooseProjectVersion()
         }
 
-    // a temporary method while we migrate from LibraryGroups.${key} to libraryGroup.get()
-    private fun validateLibraryGroup() {
-            val oldGroup = mavenGroup
-            val newGroup = getNewLibraryGroup()
-            check(newGroup == oldGroup) {
-                "Error in ${project.projectDir}/build.gradle: oldGroup = ${oldGroup?.group} " +
-                    "but newGroup = ${newGroup?.group}"
-            }
-    }
-
-    private fun getNewLibraryGroup(): LibraryGroup? {
+    private fun chooseLibraryGroup(): LibraryGroup? {
         val overridden = overrideLibraryGroupsByProjectPath.get(project.path)
         if (overridden != null)
             return overridden
diff --git a/buildSrc/public/src/main/kotlin/androidx/build/ExportAtomicLibraryGroupsToTextTask.kt b/buildSrc/public/src/main/kotlin/androidx/build/ExportAtomicLibraryGroupsToTextTask.kt
index fcc444e..085d264 100644
--- a/buildSrc/public/src/main/kotlin/androidx/build/ExportAtomicLibraryGroupsToTextTask.kt
+++ b/buildSrc/public/src/main/kotlin/androidx/build/ExportAtomicLibraryGroupsToTextTask.kt
@@ -35,7 +35,7 @@
 abstract class ExportAtomicLibraryGroupsToTextTask : DefaultTask() {
 
     @get:[Input]
-    lateinit var libraryGroups: Map<String, LibraryGroup>
+    lateinit var libraryGroups: List<LibraryGroup>
 
     @get:OutputDirectory
     abstract val outputDir: DirectoryProperty
@@ -48,7 +48,7 @@
         val textOutputFile = outputDir.file(filename).get().asFile
         val writer: Writer = BufferedWriter(Files.newWriter(textOutputFile, UTF_8))
 
-        libraryGroups.forEach { (_, libraryGroup) ->
+        libraryGroups.forEach { libraryGroup ->
             if (libraryGroup.requireSameVersion) {
                 writer.write("${libraryGroup.group}\n")
             }
diff --git a/camera/camera-camera2-pipe-integration/build.gradle b/camera/camera-camera2-pipe-integration/build.gradle
index 4d479e2..561c488 100644
--- a/camera/camera-camera2-pipe-integration/build.gradle
+++ b/camera/camera-camera2-pipe-integration/build.gradle
@@ -114,7 +114,6 @@
 androidx {
     name = "Jetpack Camera Camera Pipe Integration Library"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.CAMERA
     mavenVersion = LibraryVersions.CAMERA_PIPE
     inceptionYear = "2020"
     description = "A CameraPipe implementation of CameraX, a library providing a consistent and " +
diff --git a/camera/camera-camera2-pipe-testing/build.gradle b/camera/camera-camera2-pipe-testing/build.gradle
index b74856a..fcf6f79 100644
--- a/camera/camera-camera2-pipe-testing/build.gradle
+++ b/camera/camera-camera2-pipe-testing/build.gradle
@@ -62,7 +62,6 @@
 androidx {
     name = "Jetpack Camera Camera Pipe Testing Library"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.CAMERA
     mavenVersion = LibraryVersions.CAMERA_PIPE
     runApiTasks = new RunApiTasks.No("CameraPipe is an implementation detail of other libraries.")
     inceptionYear = "2020"
diff --git a/camera/camera-camera2-pipe/build.gradle b/camera/camera-camera2-pipe/build.gradle
index 1d364a1..da239fa 100644
--- a/camera/camera-camera2-pipe/build.gradle
+++ b/camera/camera-camera2-pipe/build.gradle
@@ -74,7 +74,6 @@
 androidx {
     name = "Jetpack Camera Pipe"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.CAMERA
     mavenVersion = LibraryVersions.CAMERA_PIPE
     runApiTasks = new RunApiTasks.No("CameraPipe is an implementation detail of other libraries.")
     inceptionYear = "2020"
diff --git a/camera/camera-camera2/build.gradle b/camera/camera-camera2/build.gradle
index 8f89ced..26856ba 100644
--- a/camera/camera-camera2/build.gradle
+++ b/camera/camera-camera2/build.gradle
@@ -90,7 +90,6 @@
 androidx {
     name = "Jetpack Camera Library Camera2 Implementation/Extensions"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.CAMERA
     inceptionYear = "2019"
     description = "Camera2 implementation and extensions for the Jetpack Camera Library, a " +
             "library providing a consistent and reliable camera foundation that enables great " +
diff --git a/camera/camera-core/build.gradle b/camera/camera-core/build.gradle
index 4a8647b..88dd657 100644
--- a/camera/camera-core/build.gradle
+++ b/camera/camera-core/build.gradle
@@ -107,7 +107,6 @@
 androidx {
     name = "Jetpack Camera Core Library"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.CAMERA
     inceptionYear = "2019"
     description = "Core components for the Jetpack Camera Library, a library providing a " +
             "consistent and reliable camera foundation that enables great camera driven " +
diff --git a/camera/camera-effects-still-portrait/build.gradle b/camera/camera-effects-still-portrait/build.gradle
index 8925e65..e6d14aa 100644
--- a/camera/camera-effects-still-portrait/build.gradle
+++ b/camera/camera-effects-still-portrait/build.gradle
@@ -34,7 +34,6 @@
 androidx {
     name = "Jetpack Camera Portrait Still Effect Library"
     publish = Publish.SNAPSHOT_ONLY
-    mavenGroup = LibraryGroups.CAMERA
     inceptionYear = "2022"
     runApiTasks = new RunApiTasks.Yes()
     description = "A post-processing effect that works with CameraX Library, providing a portrait" +
diff --git a/camera/camera-effects/build.gradle b/camera/camera-effects/build.gradle
index ce77c26..d6fc08d 100644
--- a/camera/camera-effects/build.gradle
+++ b/camera/camera-effects/build.gradle
@@ -34,7 +34,6 @@
 androidx {
     name = "Jetpack Camera Effects Library"
     publish = Publish.NONE
-    mavenGroup = LibraryGroups.CAMERA
     inceptionYear = "2022"
     runApiTasks = new RunApiTasks.Yes()
     description = "Camera effects components for the Jetpack Camera Library, a library providing " +
diff --git a/camera/camera-extensions-stub/build.gradle b/camera/camera-extensions-stub/build.gradle
index ac016eb..de2b943 100644
--- a/camera/camera-extensions-stub/build.gradle
+++ b/camera/camera-extensions-stub/build.gradle
@@ -27,7 +27,6 @@
 androidx {
     name = "Jetpack Camera Library OEM Extensions Stub"
     publish = Publish.NONE
-    mavenGroup = LibraryGroups.CAMERA
 
     inceptionYear = "2019"
     description = "OEM Extensions stub implementation for the Jetpack Camera Library, a library providing interfaces" +
diff --git a/camera/camera-extensions/build.gradle b/camera/camera-extensions/build.gradle
index 3c1cbc4..942e44b 100644
--- a/camera/camera-extensions/build.gradle
+++ b/camera/camera-extensions/build.gradle
@@ -83,7 +83,6 @@
     name = "Jetpack Camera Library OEM Extensions"
     publish = Publish.SNAPSHOT_AND_RELEASE
 
-    mavenGroup = LibraryGroups.CAMERA
     inceptionYear = "2019"
     description = "OEM Extensions for the Jetpack Camera Library, a library providing interfaces" +
             " to integrate with OEM specific camera features."
diff --git a/camera/camera-lifecycle/build.gradle b/camera/camera-lifecycle/build.gradle
index 68c12c7..7d0119c 100644
--- a/camera/camera-lifecycle/build.gradle
+++ b/camera/camera-lifecycle/build.gradle
@@ -63,7 +63,6 @@
 androidx {
     name = "Jetpack Camera Lifecycle Library"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.CAMERA
     inceptionYear = "2019"
     description = "Lifecycle components for the Jetpack Camera Library, a library providing a " +
             "consistent and reliable camera foundation that enables great camera driven " +
diff --git a/camera/camera-mlkit-vision/build.gradle b/camera/camera-mlkit-vision/build.gradle
index 3715943..f0f3bad 100644
--- a/camera/camera-mlkit-vision/build.gradle
+++ b/camera/camera-mlkit-vision/build.gradle
@@ -60,7 +60,6 @@
 androidx {
     name = "Jetpack Camera MLKit Vision Library"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.CAMERA
     inceptionYear = "2022"
     runApiTasks = new RunApiTasks.Yes()
     description = "MLKit vision components for the Jetpack Camera Library, a library providing a " +
diff --git a/camera/camera-testing/build.gradle b/camera/camera-testing/build.gradle
index 40a7f15..3030b72 100644
--- a/camera/camera-testing/build.gradle
+++ b/camera/camera-testing/build.gradle
@@ -94,7 +94,6 @@
     name = "Jetpack Camera Testing Library"
     type = LibraryType.INTERNAL_TEST_LIBRARY
     publish = Publish.NONE
-    mavenGroup = LibraryGroups.CAMERA
     inceptionYear = "2019"
     description = "Testing components for the Jetpack Camera Library, a library providing a " +
             "consistent and reliable camera foundation that enables great camera driven " +"" +
diff --git a/camera/camera-testlib-extensions/build.gradle b/camera/camera-testlib-extensions/build.gradle
index 3f343b6..886b875 100644
--- a/camera/camera-testlib-extensions/build.gradle
+++ b/camera/camera-testlib-extensions/build.gradle
@@ -41,7 +41,6 @@
 androidx {
     name = "Jetpack Camera Extensions Example Library"
     publish = Publish.NONE
-    mavenGroup = LibraryGroups.CAMERA
     inceptionYear = "2019"
     description = "Example extension implementation for the Jetpack Camera Library, a library providing a " +
             "consistent and reliable camera foundation that enables great camera driven " +
diff --git a/camera/camera-video/build.gradle b/camera/camera-video/build.gradle
index ea1bffd..ff70608 100644
--- a/camera/camera-video/build.gradle
+++ b/camera/camera-video/build.gradle
@@ -90,7 +90,6 @@
     name = "Jetpack Camera Video Library"
     publish = Publish.SNAPSHOT_AND_RELEASE
     runApiTasks = new RunApiTasks.Yes("Need to track API surface before moving to publish")
-    mavenGroup = LibraryGroups.CAMERA
     inceptionYear = "2020"
     description = "Video components for the Jetpack Camera Library, a library providing a " +
             "consistent and reliable camera foundation that enables great camera driven " +
diff --git a/camera/camera-view/build.gradle b/camera/camera-view/build.gradle
index 9c4856f..fe34a08 100644
--- a/camera/camera-view/build.gradle
+++ b/camera/camera-view/build.gradle
@@ -83,7 +83,6 @@
     name = "Jetpack Camera View Library"
     publish = Publish.SNAPSHOT_AND_RELEASE
 
-    mavenGroup = LibraryGroups.CAMERA
     inceptionYear = "2019"
     description = "UI tools for the Jetpack Camera Library, a library providing a consistent and " +
             "reliable camera foundation that enables great camera driven experiences across all " +
diff --git a/camera/camera-viewfinder/build.gradle b/camera/camera-viewfinder/build.gradle
index 873496e..449b256 100644
--- a/camera/camera-viewfinder/build.gradle
+++ b/camera/camera-viewfinder/build.gradle
@@ -80,7 +80,6 @@
     name = "androidx.camera:camera-viewfinder"
     publish = Publish.SNAPSHOT_AND_RELEASE
     runApiTasks = new RunApiTasks.Yes("Need to track API surface before moving to publish")
-    mavenGroup = LibraryGroups.CAMERA
     inceptionYear = "2022"
     description = "Standalone Viewfinder for Camera2 and CameraX"
 }
diff --git a/car/app/app-automotive/build.gradle b/car/app/app-automotive/build.gradle
index b66fba7..d2c31fc 100644
--- a/car/app/app-automotive/build.gradle
+++ b/car/app/app-automotive/build.gradle
@@ -69,7 +69,6 @@
 androidx {
     name = "Android for Cars App Library Automotive Extension"
     type = LibraryType.PUBLISHED_LIBRARY
-    mavenGroup = LibraryGroups.CAR_APP
     inceptionYear = "2021"
     description = "Automotive OS specific functionality to build navigation, parking, and charging apps for cars"
 }
diff --git a/car/app/app-projected/build.gradle b/car/app/app-projected/build.gradle
index 219e963..e53a4cb 100644
--- a/car/app/app-projected/build.gradle
+++ b/car/app/app-projected/build.gradle
@@ -57,7 +57,6 @@
 androidx {
     name = "Android for Cars App Library Projected Extension"
     type = LibraryType.PUBLISHED_LIBRARY
-    mavenGroup = LibraryGroups.CAR_APP
     inceptionYear = "2021"
     description = "Android Auto Projected specific funationaltiy to build navigation, parking, and charging apps for cars"
 }
diff --git a/car/app/app-samples/navigation/automotive/build.gradle b/car/app/app-samples/navigation/automotive/build.gradle
index 69414f8..531198c 100644
--- a/car/app/app-samples/navigation/automotive/build.gradle
+++ b/car/app/app-samples/navigation/automotive/build.gradle
@@ -49,5 +49,4 @@
 androidx {
     type = LibraryType.SAMPLES
     publish = Publish.NONE
-    mavenGroup = LibraryGroups.CAR_APP
 }
diff --git a/car/app/app-samples/navigation/common/build.gradle b/car/app/app-samples/navigation/common/build.gradle
index 24be554..9ca8478 100644
--- a/car/app/app-samples/navigation/common/build.gradle
+++ b/car/app/app-samples/navigation/common/build.gradle
@@ -44,5 +44,4 @@
 androidx {
     type = LibraryType.SAMPLES
     publish = Publish.NONE
-    mavenGroup = LibraryGroups.CAR_APP
 }
diff --git a/car/app/app-samples/navigation/mobile/build.gradle b/car/app/app-samples/navigation/mobile/build.gradle
index e7b4e50..5e80268 100644
--- a/car/app/app-samples/navigation/mobile/build.gradle
+++ b/car/app/app-samples/navigation/mobile/build.gradle
@@ -45,6 +45,3 @@
     implementation(project(":car:app:app-projected"))
 }
 
-androidx {
-    mavenGroup = LibraryGroups.CAR_APP
-}
diff --git a/car/app/app-samples/showcase/automotive/build.gradle b/car/app/app-samples/showcase/automotive/build.gradle
index 9310044..41cf3a4 100644
--- a/car/app/app-samples/showcase/automotive/build.gradle
+++ b/car/app/app-samples/showcase/automotive/build.gradle
@@ -49,6 +49,3 @@
     implementation(project(":car:app:app-automotive"))
 }
 
-androidx {
-    mavenGroup = LibraryGroups.CAR_APP
-}
diff --git a/car/app/app-samples/showcase/common/build.gradle b/car/app/app-samples/showcase/common/build.gradle
index 7a9988f..4b61c864 100644
--- a/car/app/app-samples/showcase/common/build.gradle
+++ b/car/app/app-samples/showcase/common/build.gradle
@@ -40,6 +40,3 @@
 }
 
 
-androidx {
-    mavenGroup = LibraryGroups.CAR_APP
-}
diff --git a/car/app/app-samples/showcase/mobile/build.gradle b/car/app/app-samples/showcase/mobile/build.gradle
index b3ab257..5466dad 100644
--- a/car/app/app-samples/showcase/mobile/build.gradle
+++ b/car/app/app-samples/showcase/mobile/build.gradle
@@ -51,6 +51,3 @@
     implementation(project(":car:app:app-projected"))
 }
 
-androidx {
-    mavenGroup = LibraryGroups.CAR_APP
-}
diff --git a/car/app/app-testing/build.gradle b/car/app/app-testing/build.gradle
index 5262400..9211db4 100644
--- a/car/app/app-testing/build.gradle
+++ b/car/app/app-testing/build.gradle
@@ -58,7 +58,6 @@
 androidx {
     name = "androidx.car.app:app-testing"
     type = LibraryType.PUBLISHED_TEST_LIBRARY
-    mavenGroup = LibraryGroups.CAR_APP
     inceptionYear = "2021"
     description = "androidx.car.app:app-testing"
 }
diff --git a/car/app/app/build.gradle b/car/app/app/build.gradle
index d7ff189..72a4cff 100644
--- a/car/app/app/build.gradle
+++ b/car/app/app/build.gradle
@@ -99,7 +99,6 @@
 androidx {
     name = "Android for Cars App Library"
     type = LibraryType.PUBLISHED_LIBRARY
-    mavenGroup = LibraryGroups.CAR_APP
     inceptionYear = "2020"
     description = "Build navigation, parking, and charging apps for Android Auto"
 }
diff --git a/cardview/cardview/build.gradle b/cardview/cardview/build.gradle
index cc2be1c..239abf1 100644
--- a/cardview/cardview/build.gradle
+++ b/cardview/cardview/build.gradle
@@ -13,7 +13,6 @@
 androidx {
     name = "Android Support CardView"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.CARDVIEW
     inceptionYear = "2011"
     description = "Android Support CardView"
     failOnDeprecationWarnings = false
diff --git a/collection/collection-benchmark-kmp/build.gradle b/collection/collection-benchmark-kmp/build.gradle
index 158941a..0bad6ce 100644
--- a/collection/collection-benchmark-kmp/build.gradle
+++ b/collection/collection-benchmark-kmp/build.gradle
@@ -70,6 +70,3 @@
     publish = Publish.NONE
 }
 
-androidx {
-    mavenGroup = LibraryGroups.COLLECTION
-}
diff --git a/collection/collection-benchmark/build.gradle b/collection/collection-benchmark/build.gradle
index 122d25a..9d23ccc 100644
--- a/collection/collection-benchmark/build.gradle
+++ b/collection/collection-benchmark/build.gradle
@@ -106,7 +106,6 @@
 
 androidx {
     name = "AndroidX Collections Benchmarks (Android / iOS)"
-    mavenGroup = LibraryGroups.COLLECTION
     inceptionYear = "2022"
     description = "AndroidX Collections Benchmarks (Android / iOS)"
 }
diff --git a/collection/collection-ktx/build.gradle b/collection/collection-ktx/build.gradle
index 3e9fcb7..47a111a 100644
--- a/collection/collection-ktx/build.gradle
+++ b/collection/collection-ktx/build.gradle
@@ -28,7 +28,6 @@
 androidx {
     name = "Collections Kotlin Extensions"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.COLLECTION
     inceptionYear = "2018"
     description = "Kotlin extensions for 'collection' artifact"
 }
diff --git a/collection/collection/build.gradle b/collection/collection/build.gradle
index 7178862..a3b11b3 100644
--- a/collection/collection/build.gradle
+++ b/collection/collection/build.gradle
@@ -138,7 +138,6 @@
 androidx {
     name = "Android Support Library collections"
     type = LibraryType.PUBLISHED_LIBRARY
-    mavenGroup = LibraryGroups.COLLECTION
     inceptionYear = "2018"
     description = "Standalone efficient collections."
 }
diff --git a/compose/animation/animation-core-lint/build.gradle b/compose/animation/animation-core-lint/build.gradle
index 2a9791f..0e84803 100644
--- a/compose/animation/animation-core-lint/build.gradle
+++ b/compose/animation/animation-core-lint/build.gradle
@@ -41,7 +41,6 @@
 androidx {
     name = "Compose Animation Core Lint Checks"
     type = LibraryType.LINT
-    mavenGroup = LibraryGroups.COMPOSE_ANIMATION
     inceptionYear = "2021"
     description = "Compose Animation Core Lint Checks"
 }
diff --git a/compose/animation/animation-core/build.gradle b/compose/animation/animation-core/build.gradle
index 4ff282e..2482074 100644
--- a/compose/animation/animation-core/build.gradle
+++ b/compose/animation/animation-core/build.gradle
@@ -135,7 +135,6 @@
 androidx {
     name = "Compose Animation Core"
     type = LibraryType.PUBLISHED_LIBRARY
-    mavenGroup = LibraryGroups.COMPOSE_ANIMATION
     inceptionYear = "2019"
     description = "Animation engine and animation primitives that are the building blocks of the Compose animation library"
     legacyDisableKotlinStrictApiMode = true
diff --git a/compose/animation/animation-core/samples/build.gradle b/compose/animation/animation-core/samples/build.gradle
index 8839e29..160f365 100644
--- a/compose/animation/animation-core/samples/build.gradle
+++ b/compose/animation/animation-core/samples/build.gradle
@@ -39,7 +39,6 @@
 androidx {
     name = "AndroidX Compose UI Animation Library Core Classes Samples"
     type = LibraryType.SAMPLES
-    mavenGroup = LibraryGroups.COMPOSE_ANIMATION
     inceptionYear = "2019"
     description = "Contains the sample code for the Androidx Compose UI Animation Core Classes"
 }
diff --git a/compose/animation/animation-graphics/build.gradle b/compose/animation/animation-graphics/build.gradle
index 1e1ab09..c6597a7 100644
--- a/compose/animation/animation-graphics/build.gradle
+++ b/compose/animation/animation-graphics/build.gradle
@@ -123,7 +123,6 @@
 androidx {
     name = "Compose Animation Graphics"
     type = LibraryType.PUBLISHED_LIBRARY
-    mavenGroup = LibraryGroups.COMPOSE_ANIMATION
     inceptionYear = "2021"
     description = "Compose Animation Graphics Library for using animated-vector resources in Compose"
 }
diff --git a/compose/animation/animation-graphics/samples/build.gradle b/compose/animation/animation-graphics/samples/build.gradle
index 11d3fdd..2b0e793 100644
--- a/compose/animation/animation-graphics/samples/build.gradle
+++ b/compose/animation/animation-graphics/samples/build.gradle
@@ -40,7 +40,6 @@
 androidx {
     name = "AndroidX Compose UI Animation Graphics Library Samples"
     type = LibraryType.SAMPLES
-    mavenGroup = LibraryGroups.COMPOSE_ANIMATION
     inceptionYear = "2021"
     description = "Contains the sample code for the Androidx Compose UI Animation Graphics Library"
 }
diff --git a/compose/animation/animation-lint/build.gradle b/compose/animation/animation-lint/build.gradle
index 2f5088f..e71729a 100644
--- a/compose/animation/animation-lint/build.gradle
+++ b/compose/animation/animation-lint/build.gradle
@@ -41,7 +41,6 @@
 androidx {
     name = "Compose Animation Lint Checks"
     type = LibraryType.LINT
-    mavenGroup = LibraryGroups.COMPOSE_ANIMATION
     inceptionYear = "2021"
     description = "Compose Animation Lint Checks"
 }
diff --git a/compose/animation/animation-tooling-internal/build.gradle b/compose/animation/animation-tooling-internal/build.gradle
index 87aeae3..c8da051 100644
--- a/compose/animation/animation-tooling-internal/build.gradle
+++ b/compose/animation/animation-tooling-internal/build.gradle
@@ -31,6 +31,5 @@
     name = "Compose Animation Tooling"
     description = "Compose Animation APIs for tooling support. Internal use only."
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.COMPOSE_ANIMATION
     runApiTasks = new RunApiTasks.Yes()
 }
diff --git a/compose/animation/animation/build.gradle b/compose/animation/animation/build.gradle
index 53e7b06..8d6b39f 100644
--- a/compose/animation/animation/build.gradle
+++ b/compose/animation/animation/build.gradle
@@ -123,7 +123,6 @@
 androidx {
     name = "Compose Animation"
     type = LibraryType.PUBLISHED_LIBRARY
-    mavenGroup = LibraryGroups.COMPOSE_ANIMATION
     inceptionYear = "2019"
     description = "Compose animation library"
     legacyDisableKotlinStrictApiMode = true
diff --git a/compose/animation/animation/samples/build.gradle b/compose/animation/animation/samples/build.gradle
index 6b2f8a3..d355cdf 100644
--- a/compose/animation/animation/samples/build.gradle
+++ b/compose/animation/animation/samples/build.gradle
@@ -39,7 +39,6 @@
 androidx {
     name = "AndroidX Compose UI Animation Library Samples"
     type = LibraryType.SAMPLES
-    mavenGroup = LibraryGroups.COMPOSE_ANIMATION
     inceptionYear = "2019"
     description = "Contains the sample code for the Androidx Compose UI Animation Library"
 }
diff --git a/compose/compiler/compiler-daemon/build.gradle b/compose/compiler/compiler-daemon/build.gradle
index 3b8ebed..33ee2f7 100644
--- a/compose/compiler/compiler-daemon/build.gradle
+++ b/compose/compiler/compiler-daemon/build.gradle
@@ -43,7 +43,6 @@
 androidx {
     name = "Compose Compiler Daemon"
     type = LibraryType.COMPILER_DAEMON
-    mavenGroup = LibraryGroups.COMPOSE_COMPILER
     inceptionYear = "2021"
     description = "Compiler Daemon that includes the Compose plugin"
 }
diff --git a/compose/compiler/compiler-hosted/build.gradle b/compose/compiler/compiler-hosted/build.gradle
index 334381c..fb76744 100644
--- a/compose/compiler/compiler-hosted/build.gradle
+++ b/compose/compiler/compiler-hosted/build.gradle
@@ -45,7 +45,6 @@
     // This is only published because that is required when exporting it to g3.
     // Nobody should ever get this artifact from maven; just from studio or from source
     type = LibraryType.COMPILER_PLUGIN
-    mavenGroup = LibraryGroups.COMPOSE_COMPILER
     inceptionYear = "2019"
     description = "Contains the Kotlin compiler plugin for Compose used in Android Studio and IDEA"
 }
diff --git a/compose/compiler/compiler/build.gradle b/compose/compiler/compiler/build.gradle
index 8fa0138..d47fc00 100644
--- a/compose/compiler/compiler/build.gradle
+++ b/compose/compiler/compiler/build.gradle
@@ -45,7 +45,6 @@
 androidx {
     name = "Compose Compiler"
     type = LibraryType.COMPILER_PLUGIN
-    mavenGroup = LibraryGroups.COMPOSE_COMPILER
     inceptionYear = "2019"
     description = "Compiler plugin that enables Compose"
 }
diff --git a/compose/desktop/desktop/build.gradle b/compose/desktop/desktop/build.gradle
index fdff105..a8baf7a 100644
--- a/compose/desktop/desktop/build.gradle
+++ b/compose/desktop/desktop/build.gradle
@@ -81,7 +81,6 @@
 androidx {
     name = "Jetpack Compose desktop implementation"
     type = LibraryType.PUBLISHED_LIBRARY
-    mavenGroup = LibraryGroups.COMPOSE_DESKTOP
     inceptionYear = "2020"
     legacyDisableKotlinStrictApiMode = true
     runApiTasks = new RunApiTasks.No(
diff --git a/compose/desktop/desktop/samples/build.gradle b/compose/desktop/desktop/samples/build.gradle
index 760fdc3..76b09be 100644
--- a/compose/desktop/desktop/samples/build.gradle
+++ b/compose/desktop/desktop/samples/build.gradle
@@ -104,8 +104,5 @@
     dependsOn("run1")
 }
 
-androidx {
-    mavenGroup = LibraryGroups.COMPOSE_DESKTOP
-}
 
 BuildOnServerKt.addToBuildOnServer(project, "${project.path}:jvmJar")
diff --git a/compose/foundation/foundation-layout/build.gradle b/compose/foundation/foundation-layout/build.gradle
index 2385d19..4004eae 100644
--- a/compose/foundation/foundation-layout/build.gradle
+++ b/compose/foundation/foundation-layout/build.gradle
@@ -130,7 +130,6 @@
 androidx {
     name = "Compose Layouts"
     type = LibraryType.PUBLISHED_LIBRARY
-    mavenGroup = LibraryGroups.COMPOSE_FOUNDATION
     inceptionYear = "2019"
     description = "Compose layout implementations"
     legacyDisableKotlinStrictApiMode = true
diff --git a/compose/foundation/foundation-layout/samples/build.gradle b/compose/foundation/foundation-layout/samples/build.gradle
index b150cb3..dd396a9 100644
--- a/compose/foundation/foundation-layout/samples/build.gradle
+++ b/compose/foundation/foundation-layout/samples/build.gradle
@@ -41,7 +41,6 @@
 androidx {
     name = "AndroidX Compose UI Core Layout Classes Samples"
     type = LibraryType.SAMPLES
-    mavenGroup = LibraryGroups.COMPOSE_FOUNDATION
     inceptionYear = "2019"
     description = "Contains the sample code for the Androidx Compose UI Core Layout Classes"
 }
diff --git a/compose/foundation/foundation-lint/build.gradle b/compose/foundation/foundation-lint/build.gradle
index de55078..be4b941 100644
--- a/compose/foundation/foundation-lint/build.gradle
+++ b/compose/foundation/foundation-lint/build.gradle
@@ -41,7 +41,6 @@
 androidx {
     name = "Compose Foundation Lint Checks"
     type = LibraryType.LINT
-    mavenGroup = LibraryGroups.COMPOSE_FOUNDATION
     inceptionYear = "2022"
     description = "Compose Foundation Lint Checks"
 }
diff --git a/compose/foundation/foundation/benchmark/build.gradle b/compose/foundation/foundation/benchmark/build.gradle
index 539cd8d..2b61744 100644
--- a/compose/foundation/foundation/benchmark/build.gradle
+++ b/compose/foundation/foundation/benchmark/build.gradle
@@ -47,5 +47,4 @@
 
 androidx {
     type = LibraryType.INTERNAL_TEST_LIBRARY
-    mavenGroup = LibraryGroups.COMPOSE_FOUNDATION
 }
diff --git a/compose/foundation/foundation/build.gradle b/compose/foundation/foundation/build.gradle
index 9001662..76e56d3 100644
--- a/compose/foundation/foundation/build.gradle
+++ b/compose/foundation/foundation/build.gradle
@@ -174,7 +174,6 @@
 androidx {
     name = "Compose Foundation"
     type = LibraryType.PUBLISHED_LIBRARY
-    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"
     legacyDisableKotlinStrictApiMode = true
diff --git a/compose/foundation/foundation/samples/build.gradle b/compose/foundation/foundation/samples/build.gradle
index 3fcb16a..8799f80 100644
--- a/compose/foundation/foundation/samples/build.gradle
+++ b/compose/foundation/foundation/samples/build.gradle
@@ -41,7 +41,6 @@
 androidx {
     name = "AndroidX Compose UI Foundational Component Samples"
     type = LibraryType.SAMPLES
-    mavenGroup = LibraryGroups.COMPOSE_FOUNDATION
     inceptionYear = "2019"
     description = "Contains the sample code for the Androidx Compose UI Foundational Components"
 }
diff --git a/compose/material/material-icons-core/build.gradle b/compose/material/material-icons-core/build.gradle
index 94cc265..0276b88 100644
--- a/compose/material/material-icons-core/build.gradle
+++ b/compose/material/material-icons-core/build.gradle
@@ -79,7 +79,6 @@
 androidx {
     name = "Compose Material Icons Core"
     type = LibraryType.PUBLISHED_LIBRARY
-    mavenGroup = LibraryGroups.COMPOSE_MATERIAL
     inceptionYear = "2020"
     description = "Compose Material Design core icons. This module contains the most commonly used set of Material icons."
     legacyDisableKotlinStrictApiMode = true
diff --git a/compose/material/material-icons-core/samples/build.gradle b/compose/material/material-icons-core/samples/build.gradle
index 1ff166f..040d910 100644
--- a/compose/material/material-icons-core/samples/build.gradle
+++ b/compose/material/material-icons-core/samples/build.gradle
@@ -38,7 +38,6 @@
 androidx {
     name = "AndroidX Compose UI Core Material Icons Samples"
     type = LibraryType.SAMPLES
-    mavenGroup = LibraryGroups.COMPOSE_MATERIAL
     inceptionYear = "2019"
     description = "Contains the sample code for the Androidx Compose UI Core Material Icons"
 }
diff --git a/compose/material/material-icons-extended-filled/build.gradle b/compose/material/material-icons-extended-filled/build.gradle
index b03fc9f..5933def 100644
--- a/compose/material/material-icons-extended-filled/build.gradle
+++ b/compose/material/material-icons-extended-filled/build.gradle
@@ -19,6 +19,3 @@
 android {
     namespace "androidx.compose.material.icons.extended"
 }
-androidx {
-    mavenGroup = LibraryGroups.COMPOSE_MATERIAL
-}
diff --git a/compose/material/material-icons-extended-outlined/build.gradle b/compose/material/material-icons-extended-outlined/build.gradle
index b03fc9f..5933def 100644
--- a/compose/material/material-icons-extended-outlined/build.gradle
+++ b/compose/material/material-icons-extended-outlined/build.gradle
@@ -19,6 +19,3 @@
 android {
     namespace "androidx.compose.material.icons.extended"
 }
-androidx {
-    mavenGroup = LibraryGroups.COMPOSE_MATERIAL
-}
diff --git a/compose/material/material-icons-extended-rounded/build.gradle b/compose/material/material-icons-extended-rounded/build.gradle
index b03fc9f..5933def 100644
--- a/compose/material/material-icons-extended-rounded/build.gradle
+++ b/compose/material/material-icons-extended-rounded/build.gradle
@@ -19,6 +19,3 @@
 android {
     namespace "androidx.compose.material.icons.extended"
 }
-androidx {
-    mavenGroup = LibraryGroups.COMPOSE_MATERIAL
-}
diff --git a/compose/material/material-icons-extended-sharp/build.gradle b/compose/material/material-icons-extended-sharp/build.gradle
index b03fc9f..5933def 100644
--- a/compose/material/material-icons-extended-sharp/build.gradle
+++ b/compose/material/material-icons-extended-sharp/build.gradle
@@ -19,6 +19,3 @@
 android {
     namespace "androidx.compose.material.icons.extended"
 }
-androidx {
-    mavenGroup = LibraryGroups.COMPOSE_MATERIAL
-}
diff --git a/compose/material/material-icons-extended-twotone/build.gradle b/compose/material/material-icons-extended-twotone/build.gradle
index b03fc9f..5933def 100644
--- a/compose/material/material-icons-extended-twotone/build.gradle
+++ b/compose/material/material-icons-extended-twotone/build.gradle
@@ -19,6 +19,3 @@
 android {
     namespace "androidx.compose.material.icons.extended"
 }
-androidx {
-    mavenGroup = LibraryGroups.COMPOSE_MATERIAL
-}
diff --git a/compose/material/material-icons-extended/build.gradle b/compose/material/material-icons-extended/build.gradle
index 2fde1e8..4a58d27 100644
--- a/compose/material/material-icons-extended/build.gradle
+++ b/compose/material/material-icons-extended/build.gradle
@@ -138,7 +138,6 @@
 androidx {
     name = "Compose Material Icons Extended"
     type = LibraryType.PUBLISHED_LIBRARY
-    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
     runApiTasks = new RunApiTasks.No("Five thousand generated source files")
diff --git a/compose/material/material-lint/build.gradle b/compose/material/material-lint/build.gradle
index 5362a4e..df5b0368 100644
--- a/compose/material/material-lint/build.gradle
+++ b/compose/material/material-lint/build.gradle
@@ -41,7 +41,6 @@
 androidx {
     name = "Compose Material Lint Checks"
     type = LibraryType.LINT
-    mavenGroup = LibraryGroups.COMPOSE_MATERIAL
     inceptionYear = "2021"
     description = "Compose Material Lint Checks"
 }
diff --git a/compose/material/material-ripple/build.gradle b/compose/material/material-ripple/build.gradle
index e77373f..31a99bb 100644
--- a/compose/material/material-ripple/build.gradle
+++ b/compose/material/material-ripple/build.gradle
@@ -100,7 +100,6 @@
 androidx {
     name = "Compose Material Ripple"
     type = LibraryType.PUBLISHED_LIBRARY
-    mavenGroup = LibraryGroups.COMPOSE_MATERIAL
     inceptionYear = "2020"
     description = "Material ripple used to build interactive components"
     // Disable strict API mode for MPP builds as it will fail to compile androidAndroidTest
diff --git a/compose/material/material/benchmark/build.gradle b/compose/material/material/benchmark/build.gradle
index 072cb27..1e36d67 100644
--- a/compose/material/material/benchmark/build.gradle
+++ b/compose/material/material/benchmark/build.gradle
@@ -47,5 +47,4 @@
 
 androidx {
     type = LibraryType.INTERNAL_TEST_LIBRARY
-    mavenGroup = LibraryGroups.COMPOSE_MATERIAL
 }
diff --git a/compose/material/material/build.gradle b/compose/material/material/build.gradle
index c1678a8..ebd1cd5 100644
--- a/compose/material/material/build.gradle
+++ b/compose/material/material/build.gradle
@@ -156,7 +156,6 @@
 androidx {
     name = "Compose Material Components"
     type = LibraryType.PUBLISHED_LIBRARY
-    mavenGroup = LibraryGroups.COMPOSE_MATERIAL
     inceptionYear = "2018"
     description = "Compose Material Design Components library"
     legacyDisableKotlinStrictApiMode = true
diff --git a/compose/material/material/samples/build.gradle b/compose/material/material/samples/build.gradle
index 10e989d..eda78e0 100644
--- a/compose/material/material/samples/build.gradle
+++ b/compose/material/material/samples/build.gradle
@@ -42,7 +42,6 @@
 androidx {
     name = "AndroidX Compose Material Components Samples"
     type = LibraryType.SAMPLES
-    mavenGroup = LibraryGroups.COMPOSE_MATERIAL
     inceptionYear = "2019"
     description = "Contains the sample code for the AndroidX Compose Material components."
 }
diff --git a/compose/material3/material3-lint/build.gradle b/compose/material3/material3-lint/build.gradle
index c626c35..112aa3e 100644
--- a/compose/material3/material3-lint/build.gradle
+++ b/compose/material3/material3-lint/build.gradle
@@ -41,7 +41,6 @@
 androidx {
     name = "Compose Material3 Lint Checks"
     type = LibraryType.LINT
-    mavenGroup = LibraryGroups.COMPOSE_MATERIAL3
     inceptionYear = "2022"
     description = "Compose Material3 Lint Checks"
 }
diff --git a/compose/material3/material3-window-size-class/build.gradle b/compose/material3/material3-window-size-class/build.gradle
index ad2abb0..9eb3383 100644
--- a/compose/material3/material3-window-size-class/build.gradle
+++ b/compose/material3/material3-window-size-class/build.gradle
@@ -105,7 +105,6 @@
 androidx {
     name = "Compose Material 3 Window Size Class"
     type = LibraryType.PUBLISHED_LIBRARY
-    mavenGroup = LibraryGroups.COMPOSE_MATERIAL3
     inceptionYear = "2022"
     description = "Provides window size classes for building responsive UIs"
 }
diff --git a/compose/material3/material3-window-size-class/samples/build.gradle b/compose/material3/material3-window-size-class/samples/build.gradle
index a9ea256..4dc7891 100644
--- a/compose/material3/material3-window-size-class/samples/build.gradle
+++ b/compose/material3/material3-window-size-class/samples/build.gradle
@@ -38,7 +38,6 @@
 androidx {
     name = "AndroidX Compose Material 3 Window Size Class Samples"
     type = LibraryType.SAMPLES
-    mavenGroup = LibraryGroups.COMPOSE_MATERIAL3
     inceptionYear = "2022"
     description = "Contains the sample code for the Material 3 Window Size Class APIs"
 }
diff --git a/compose/material3/material3/build.gradle b/compose/material3/material3/build.gradle
index fb360a4..84f0992 100644
--- a/compose/material3/material3/build.gradle
+++ b/compose/material3/material3/build.gradle
@@ -149,7 +149,6 @@
 androidx {
     name = "Compose Material3 Components"
     type = LibraryType.PUBLISHED_LIBRARY
-    mavenGroup = LibraryGroups.COMPOSE_MATERIAL3
     inceptionYear = "2021"
     description = "Compose Material You Design Components library"
 }
diff --git a/compose/material3/material3/samples/build.gradle b/compose/material3/material3/samples/build.gradle
index 62a5038..80423d4 100644
--- a/compose/material3/material3/samples/build.gradle
+++ b/compose/material3/material3/samples/build.gradle
@@ -48,7 +48,6 @@
 androidx {
     name = "AndroidX Compose Material3 Components Samples"
     type = LibraryType.SAMPLES
-    mavenGroup = LibraryGroups.COMPOSE_MATERIAL3
     inceptionYear = "2021"
     description = "Contains the sample code for the AndroidX Compose Material You components."
 }
diff --git a/compose/runtime/runtime-lint/build.gradle b/compose/runtime/runtime-lint/build.gradle
index 25f5390..467bc1d 100644
--- a/compose/runtime/runtime-lint/build.gradle
+++ b/compose/runtime/runtime-lint/build.gradle
@@ -41,7 +41,6 @@
 androidx {
     name = "Compose Runtime Lint Checks"
     type = LibraryType.LINT
-    mavenGroup = LibraryGroups.COMPOSE_RUNTIME
     inceptionYear = "2020"
     description = "Compose Runtime Lint Checks"
 }
diff --git a/compose/runtime/runtime-livedata/build.gradle b/compose/runtime/runtime-livedata/build.gradle
index 692ea89..a8f654b4 100644
--- a/compose/runtime/runtime-livedata/build.gradle
+++ b/compose/runtime/runtime-livedata/build.gradle
@@ -45,7 +45,6 @@
 androidx {
     name = "Compose LiveData integration"
     type = LibraryType.PUBLISHED_LIBRARY
-    mavenGroup = LibraryGroups.COMPOSE_RUNTIME
     inceptionYear = "2020"
     description = "Compose integration with LiveData"
     legacyDisableKotlinStrictApiMode = true
diff --git a/compose/runtime/runtime-livedata/samples/build.gradle b/compose/runtime/runtime-livedata/samples/build.gradle
index f31c13f..78130f2 100644
--- a/compose/runtime/runtime-livedata/samples/build.gradle
+++ b/compose/runtime/runtime-livedata/samples/build.gradle
@@ -36,7 +36,6 @@
 androidx {
     name = "AndroidX Compose UI Livedata Interop Samples"
     type = LibraryType.SAMPLES
-    mavenGroup = LibraryGroups.COMPOSE_RUNTIME
     inceptionYear = "2019"
     description = "Contains the sample code for the Androidx Compose UI Livedata Interop System"
 }
diff --git a/compose/runtime/runtime-rxjava2/build.gradle b/compose/runtime/runtime-rxjava2/build.gradle
index 341374c..5b25d58 100644
--- a/compose/runtime/runtime-rxjava2/build.gradle
+++ b/compose/runtime/runtime-rxjava2/build.gradle
@@ -44,7 +44,6 @@
 androidx {
     name = "Compose RxJava 2 integration"
     type = LibraryType.PUBLISHED_LIBRARY
-    mavenGroup = LibraryGroups.COMPOSE_RUNTIME
     inceptionYear = "2020"
     description = "Compose integration with RxJava 2"
     legacyDisableKotlinStrictApiMode = true
diff --git a/compose/runtime/runtime-rxjava2/samples/build.gradle b/compose/runtime/runtime-rxjava2/samples/build.gradle
index ac7012e..d73b254 100644
--- a/compose/runtime/runtime-rxjava2/samples/build.gradle
+++ b/compose/runtime/runtime-rxjava2/samples/build.gradle
@@ -36,7 +36,6 @@
 androidx {
     name = "AndroidX Compose RxJava 2 Integration Samples"
     type = LibraryType.SAMPLES
-    mavenGroup = LibraryGroups.COMPOSE_RUNTIME
     inceptionYear = "2019"
     description = "Contains the sample code for the Androidx Compose RxJava 2 Integration System"
 }
diff --git a/compose/runtime/runtime-rxjava3/build.gradle b/compose/runtime/runtime-rxjava3/build.gradle
index d6ca101..6729b40 100644
--- a/compose/runtime/runtime-rxjava3/build.gradle
+++ b/compose/runtime/runtime-rxjava3/build.gradle
@@ -44,7 +44,6 @@
 androidx {
     name = "Compose RxJava 3 integration"
     type = LibraryType.PUBLISHED_LIBRARY
-    mavenGroup = LibraryGroups.COMPOSE_RUNTIME
     inceptionYear = "2020"
     description = "Compose integration with RxJava 3"
     legacyDisableKotlinStrictApiMode = true
diff --git a/compose/runtime/runtime-rxjava3/samples/build.gradle b/compose/runtime/runtime-rxjava3/samples/build.gradle
index b38cc1e..aa111a0 100644
--- a/compose/runtime/runtime-rxjava3/samples/build.gradle
+++ b/compose/runtime/runtime-rxjava3/samples/build.gradle
@@ -36,7 +36,6 @@
 androidx {
     name = "AndroidX Compose RxJava 3 Integration Samples"
     type = LibraryType.SAMPLES
-    mavenGroup = LibraryGroups.COMPOSE_RUNTIME
     inceptionYear = "2020"
     description = "Contains the sample code for the Androidx Compose RxJava 3 Integration System"
 }
diff --git a/compose/runtime/runtime-saveable-lint/build.gradle b/compose/runtime/runtime-saveable-lint/build.gradle
index 974a7d4..6bdc70a 100644
--- a/compose/runtime/runtime-saveable-lint/build.gradle
+++ b/compose/runtime/runtime-saveable-lint/build.gradle
@@ -41,7 +41,6 @@
 androidx {
     name = "Compose Runtime Saveable Lint Checks"
     type = LibraryType.LINT
-    mavenGroup = LibraryGroups.COMPOSE_RUNTIME
     inceptionYear = "2021"
     description = "Compose Runtime Saveable Lint Checks"
 }
diff --git a/compose/runtime/runtime-saveable/build.gradle b/compose/runtime/runtime-saveable/build.gradle
index 2874e46..b4d8073 100644
--- a/compose/runtime/runtime-saveable/build.gradle
+++ b/compose/runtime/runtime-saveable/build.gradle
@@ -121,7 +121,6 @@
 androidx {
     name = "Compose Saveable"
     type = LibraryType.PUBLISHED_LIBRARY
-    mavenGroup = LibraryGroups.COMPOSE_RUNTIME
     inceptionYear = "2020"
     description = "Compose components that allow saving and restoring the local ui state"
     legacyDisableKotlinStrictApiMode = true
diff --git a/compose/runtime/runtime-saveable/samples/build.gradle b/compose/runtime/runtime-saveable/samples/build.gradle
index 3cac112..8483522 100644
--- a/compose/runtime/runtime-saveable/samples/build.gradle
+++ b/compose/runtime/runtime-saveable/samples/build.gradle
@@ -39,7 +39,6 @@
 androidx {
     name = "AndroidX Compose Saved Instance State System Samples"
     type = LibraryType.SAMPLES
-    mavenGroup = LibraryGroups.COMPOSE_RUNTIME
     inceptionYear = "2019"
     description = "Contains the sample code for the Androidx Compose Saved Instance State System"
 }
diff --git a/compose/runtime/runtime-tracing/build.gradle b/compose/runtime/runtime-tracing/build.gradle
index dffd973..ac8bdb8 100644
--- a/compose/runtime/runtime-tracing/build.gradle
+++ b/compose/runtime/runtime-tracing/build.gradle
@@ -46,7 +46,6 @@
     name = "Compose Runtime: Tracing"
     publish = Publish.SNAPSHOT_AND_RELEASE
     mavenVersion = LibraryVersions.COMPOSE_RUNTIME_TRACING
-    mavenGroup = LibraryGroups.COMPOSE_RUNTIME
     inceptionYear = "2022"
     description = "Additional tracing in Compose"
 }
diff --git a/compose/runtime/runtime/build.gradle b/compose/runtime/runtime/build.gradle
index 0818d02..f7317d7 100644
--- a/compose/runtime/runtime/build.gradle
+++ b/compose/runtime/runtime/build.gradle
@@ -117,7 +117,6 @@
 androidx {
     name = "Compose Runtime"
     type = LibraryType.PUBLISHED_LIBRARY
-    mavenGroup = LibraryGroups.COMPOSE_RUNTIME
     inceptionYear = "2019"
     description = "Tree composition support for code generated by the Compose compiler plugin and corresponding public API"
     legacyDisableKotlinStrictApiMode = true
diff --git a/compose/runtime/runtime/samples/build.gradle b/compose/runtime/runtime/samples/build.gradle
index 7ecbd86..376b851 100644
--- a/compose/runtime/runtime/samples/build.gradle
+++ b/compose/runtime/runtime/samples/build.gradle
@@ -38,7 +38,6 @@
 androidx {
     name = "AndroidX Compose Runtime Samples"
     type = LibraryType.SAMPLES
-    mavenGroup = LibraryGroups.COMPOSE_RUNTIME
     inceptionYear = "2019"
     description = "Contains the sample code for the Compose runtime"
 }
diff --git a/compose/ui/ui-android-stubs/build.gradle b/compose/ui/ui-android-stubs/build.gradle
index ed0f8cd..1213703 100644
--- a/compose/ui/ui-android-stubs/build.gradle
+++ b/compose/ui/ui-android-stubs/build.gradle
@@ -28,7 +28,6 @@
 androidx {
     name = "Compose Android Stubs"
     type = LibraryType.PUBLISHED_LIBRARY
-    mavenGroup = LibraryGroups.COMPOSE_UI
     inceptionYear = "2020"
     description = "Stubs for classes in older Android APIs"
 }
diff --git a/compose/ui/ui-geometry/build.gradle b/compose/ui/ui-geometry/build.gradle
index e9cef5f..1a05daf 100644
--- a/compose/ui/ui-geometry/build.gradle
+++ b/compose/ui/ui-geometry/build.gradle
@@ -79,7 +79,6 @@
 androidx {
     name = "Compose Geometry"
     type = LibraryType.PUBLISHED_LIBRARY
-    mavenGroup = LibraryGroups.COMPOSE_UI
     inceptionYear = "2020"
     description = "Compose classes related to dimensions without units"
     legacyDisableKotlinStrictApiMode = true
diff --git a/compose/ui/ui-graphics-lint/build.gradle b/compose/ui/ui-graphics-lint/build.gradle
index e59a8da..836b521 100644
--- a/compose/ui/ui-graphics-lint/build.gradle
+++ b/compose/ui/ui-graphics-lint/build.gradle
@@ -41,7 +41,6 @@
 androidx {
     name = "Compose UI Graphics Lint Checks"
     type = LibraryType.LINT
-    mavenGroup = LibraryGroups.COMPOSE_UI
     inceptionYear = "2021"
     description = "Compose UI Graphics Lint Checks"
 }
diff --git a/compose/ui/ui-graphics/build.gradle b/compose/ui/ui-graphics/build.gradle
index 9d729af..815c1df 100644
--- a/compose/ui/ui-graphics/build.gradle
+++ b/compose/ui/ui-graphics/build.gradle
@@ -148,7 +148,6 @@
 androidx {
     name = "Compose Graphics"
     type = LibraryType.PUBLISHED_LIBRARY
-    mavenGroup = LibraryGroups.COMPOSE_UI
     inceptionYear = "2020"
     description = "Compose graphics"
     legacyDisableKotlinStrictApiMode = true
diff --git a/compose/ui/ui-graphics/samples/build.gradle b/compose/ui/ui-graphics/samples/build.gradle
index 9faa8f8..b255806 100644
--- a/compose/ui/ui-graphics/samples/build.gradle
+++ b/compose/ui/ui-graphics/samples/build.gradle
@@ -38,7 +38,6 @@
 androidx {
     name = "AndroidX Compose UI Graphics Components Samples"
     type = LibraryType.SAMPLES
-    mavenGroup = LibraryGroups.COMPOSE_UI
     inceptionYear = "2019"
     description = "Contains the sample code for the Androidx Compose UI Graphics Components"
 }
diff --git a/compose/ui/ui-inspection/build.gradle b/compose/ui/ui-inspection/build.gradle
index f817241..b8db908 100644
--- a/compose/ui/ui-inspection/build.gradle
+++ b/compose/ui/ui-inspection/build.gradle
@@ -63,7 +63,6 @@
 androidx {
     name = "Android Compose Layout Inspector"
     type = LibraryType.IDE_PLUGIN
-    mavenGroup = LibraryGroups.COMPOSE_UI
     inceptionYear = "2021"
     description = "Compose layout inspector. Exposes information to our tools for better IDE support."
 }
diff --git a/compose/ui/ui-lint/build.gradle b/compose/ui/ui-lint/build.gradle
index 2d5541f..01be668 100644
--- a/compose/ui/ui-lint/build.gradle
+++ b/compose/ui/ui-lint/build.gradle
@@ -41,7 +41,6 @@
 androidx {
     name = "Compose UI Lint Checks"
     type = LibraryType.LINT
-    mavenGroup = LibraryGroups.COMPOSE_UI
     inceptionYear = "2020"
     description = "Compose UI Lint Checks"
 }
diff --git a/compose/ui/ui-test-junit4/build.gradle b/compose/ui/ui-test-junit4/build.gradle
index 1c123a8d..d4b8514 100644
--- a/compose/ui/ui-test-junit4/build.gradle
+++ b/compose/ui/ui-test-junit4/build.gradle
@@ -154,7 +154,6 @@
 androidx {
     name = "Compose Testing for JUnit4"
     type = LibraryType.PUBLISHED_TEST_LIBRARY
-    mavenGroup = LibraryGroups.COMPOSE_UI
     inceptionYear = "2020"
     description = "Compose testing integration with JUnit4"
     legacyDisableKotlinStrictApiMode = true
diff --git a/compose/ui/ui-test-manifest-lint/build.gradle b/compose/ui/ui-test-manifest-lint/build.gradle
index 5cd2aa1..2a3ed70 100644
--- a/compose/ui/ui-test-manifest-lint/build.gradle
+++ b/compose/ui/ui-test-manifest-lint/build.gradle
@@ -34,7 +34,6 @@
 androidx {
     name = "Compose Testing Manifest lint checks"
     type = LibraryType.LINT
-    mavenGroup = LibraryGroups.COMPOSE_UI
     inceptionYear = "2022"
     description = "Lint checks for Android Test Manifest"
 }
\ No newline at end of file
diff --git a/compose/ui/ui-test-manifest/build.gradle b/compose/ui/ui-test-manifest/build.gradle
index 6d5972c..e32c235 100644
--- a/compose/ui/ui-test-manifest/build.gradle
+++ b/compose/ui/ui-test-manifest/build.gradle
@@ -31,7 +31,6 @@
 androidx {
     name = "Compose Testing manifest dependency"
     type = LibraryType.PUBLISHED_TEST_LIBRARY
-    mavenGroup = LibraryGroups.COMPOSE_UI
     inceptionYear = "2021"
     description = "Compose testing library that should be added as a debugImplementation dependency to add properties to the debug manifest necessary for testing an application"
 }
diff --git a/compose/ui/ui-test/build.gradle b/compose/ui/ui-test/build.gradle
index 641350f..097486a 100644
--- a/compose/ui/ui-test/build.gradle
+++ b/compose/ui/ui-test/build.gradle
@@ -161,7 +161,6 @@
 androidx {
     name = "Compose Testing"
     type = LibraryType.PUBLISHED_TEST_LIBRARY
-    mavenGroup = LibraryGroups.COMPOSE_UI
     inceptionYear = "2019"
     description = "Compose testing library"
     legacyDisableKotlinStrictApiMode = true
diff --git a/compose/ui/ui-test/samples/build.gradle b/compose/ui/ui-test/samples/build.gradle
index 80949b0..cbf65bb 100644
--- a/compose/ui/ui-test/samples/build.gradle
+++ b/compose/ui/ui-test/samples/build.gradle
@@ -40,7 +40,6 @@
 androidx {
     name = "AndroidX Compose Testing Samples"
     type = LibraryType.SAMPLES
-    mavenGroup = LibraryGroups.COMPOSE_UI
     inceptionYear = "2022"
     description = "Contains samples for AndroidX Compose Testing."
 }
diff --git a/compose/ui/ui-text-google-fonts/build.gradle b/compose/ui/ui-text-google-fonts/build.gradle
index 74702ad..d8c49be 100644
--- a/compose/ui/ui-text-google-fonts/build.gradle
+++ b/compose/ui/ui-text-google-fonts/build.gradle
@@ -44,7 +44,6 @@
 androidx {
     name = "AndroidX Compose Google Fonts integration"
     type = LibraryType.PUBLISHED_LIBRARY
-    mavenGroup = LibraryGroups.COMPOSE_UI
     inceptionYear = "2022"
     description = "Compose Downloadable Fonts integration for Google Fonts"
 }
diff --git a/compose/ui/ui-text/build.gradle b/compose/ui/ui-text/build.gradle
index cc5ecad..c20c781 100644
--- a/compose/ui/ui-text/build.gradle
+++ b/compose/ui/ui-text/build.gradle
@@ -184,7 +184,6 @@
 androidx {
     name = "Compose UI Text"
     type = LibraryType.PUBLISHED_LIBRARY
-    mavenGroup = LibraryGroups.COMPOSE_UI
     inceptionYear = "2019"
     description = "Compose Text primitives and utilities"
     legacyDisableKotlinStrictApiMode = true
diff --git a/compose/ui/ui-text/samples/build.gradle b/compose/ui/ui-text/samples/build.gradle
index 46abd55..507a2ddb 100644
--- a/compose/ui/ui-text/samples/build.gradle
+++ b/compose/ui/ui-text/samples/build.gradle
@@ -39,7 +39,6 @@
 androidx {
     name = "AndroidX Compose UI Text Core Samples"
     type = LibraryType.SAMPLES
-    mavenGroup = LibraryGroups.COMPOSE_UI
     inceptionYear = "2019"
     description = "Contains sample code for the Androidx Compose UI Text Core APIs and Utilities"
 }
diff --git a/compose/ui/ui-tooling-data/build.gradle b/compose/ui/ui-tooling-data/build.gradle
index 46505a8..13f1be5 100644
--- a/compose/ui/ui-tooling-data/build.gradle
+++ b/compose/ui/ui-tooling-data/build.gradle
@@ -121,7 +121,6 @@
 androidx {
     name = "Compose Tooling Data"
     type = LibraryType.PUBLISHED_LIBRARY
-    mavenGroup = LibraryGroups.COMPOSE_UI
     inceptionYear = "2021"
     description = "Compose tooling library data. This library provides data about compose" +
             " for different tooling purposes."
diff --git a/compose/ui/ui-tooling-preview/build.gradle b/compose/ui/ui-tooling-preview/build.gradle
index 97820f5..a9f9236 100644
--- a/compose/ui/ui-tooling-preview/build.gradle
+++ b/compose/ui/ui-tooling-preview/build.gradle
@@ -69,7 +69,6 @@
 androidx {
     name = "Compose Tooling API"
     type = LibraryType.PUBLISHED_LIBRARY
-    mavenGroup = LibraryGroups.COMPOSE_UI
     inceptionYear = "2021"
     description = "Compose tooling library API. This library provides the API required to declare" +
             " @Preview composables in user apps."
diff --git a/compose/ui/ui-tooling/build.gradle b/compose/ui/ui-tooling/build.gradle
index dba7455..0cae782 100644
--- a/compose/ui/ui-tooling/build.gradle
+++ b/compose/ui/ui-tooling/build.gradle
@@ -130,7 +130,6 @@
 androidx {
     name = "Compose Tooling"
     type = LibraryType.PUBLISHED_LIBRARY
-    mavenGroup = LibraryGroups.COMPOSE_UI
     inceptionYear = "2019"
     description = "Compose tooling library. This library exposes information to our tools for better IDE support."
     legacyDisableKotlinStrictApiMode = true
diff --git a/compose/ui/ui-unit/build.gradle b/compose/ui/ui-unit/build.gradle
index 9dbad26..bfbfed7 100644
--- a/compose/ui/ui-unit/build.gradle
+++ b/compose/ui/ui-unit/build.gradle
@@ -108,7 +108,6 @@
 androidx {
     name = "Compose Unit"
     type = LibraryType.PUBLISHED_LIBRARY
-    mavenGroup = LibraryGroups.COMPOSE_UI
     inceptionYear = "2020"
     description = "Compose classes for simple units"
     legacyDisableKotlinStrictApiMode = true
diff --git a/compose/ui/ui-unit/samples/build.gradle b/compose/ui/ui-unit/samples/build.gradle
index 33161d2..a1409de 100644
--- a/compose/ui/ui-unit/samples/build.gradle
+++ b/compose/ui/ui-unit/samples/build.gradle
@@ -39,7 +39,6 @@
 androidx {
     name = "AndroidX Compose UI Simple Unit Classes Samples"
     type = LibraryType.SAMPLES
-    mavenGroup = LibraryGroups.COMPOSE_UI
     inceptionYear = "2019"
     description = "Contains the sample code for the Androidx Compose UI Simple Unit Classes"
 }
diff --git a/compose/ui/ui-util/build.gradle b/compose/ui/ui-util/build.gradle
index 765a47a..8eeb75e 100644
--- a/compose/ui/ui-util/build.gradle
+++ b/compose/ui/ui-util/build.gradle
@@ -83,7 +83,6 @@
 androidx {
     name = "Compose Util"
     type = LibraryType.PUBLISHED_LIBRARY
-    mavenGroup = LibraryGroups.COMPOSE_UI
     inceptionYear = "2020"
     description = "Internal Compose utilities used by other modules"
     legacyDisableKotlinStrictApiMode = true
diff --git a/compose/ui/ui-viewbinding/build.gradle b/compose/ui/ui-viewbinding/build.gradle
index 723ef55..901810d 100644
--- a/compose/ui/ui-viewbinding/build.gradle
+++ b/compose/ui/ui-viewbinding/build.gradle
@@ -46,7 +46,6 @@
 androidx {
     name = "Compose ViewBinding"
     type = LibraryType.PUBLISHED_LIBRARY
-    mavenGroup = LibraryGroups.COMPOSE_UI
     inceptionYear = "2020"
     description = "Compose integration with ViewBinding"
     legacyDisableKotlinStrictApiMode = true
diff --git a/compose/ui/ui-viewbinding/samples/build.gradle b/compose/ui/ui-viewbinding/samples/build.gradle
index 51694e7..6510bbb 100644
--- a/compose/ui/ui-viewbinding/samples/build.gradle
+++ b/compose/ui/ui-viewbinding/samples/build.gradle
@@ -45,7 +45,6 @@
 androidx {
     name = "AndroidX Compose UI Simple Unit Classes Samples"
     type = LibraryType.SAMPLES
-    mavenGroup = LibraryGroups.COMPOSE_UI
     inceptionYear = "2019"
     description = "Contains the sample code for the Androidx Compose UI Simple Unit Classes"
 }
diff --git a/compose/ui/ui/benchmark/build.gradle b/compose/ui/ui/benchmark/build.gradle
index 4478fa7..52af8a8 100644
--- a/compose/ui/ui/benchmark/build.gradle
+++ b/compose/ui/ui/benchmark/build.gradle
@@ -47,5 +47,4 @@
 
 androidx {
     type = LibraryType.INTERNAL_TEST_LIBRARY
-    mavenGroup = LibraryGroups.COMPOSE_UI
 }
diff --git a/compose/ui/ui/build.gradle b/compose/ui/ui/build.gradle
index e44eb1f..5f6535b 100644
--- a/compose/ui/ui/build.gradle
+++ b/compose/ui/ui/build.gradle
@@ -264,7 +264,6 @@
 androidx {
     name = "Compose UI primitives"
     type = LibraryType.PUBLISHED_LIBRARY
-    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."
     legacyDisableKotlinStrictApiMode = true
diff --git a/compose/ui/ui/samples/build.gradle b/compose/ui/ui/samples/build.gradle
index aaf78b9..f2675f6 100644
--- a/compose/ui/ui/samples/build.gradle
+++ b/compose/ui/ui/samples/build.gradle
@@ -41,7 +41,6 @@
 androidx {
     name = "AndroidX Compose UI Core Classes Samples"
     type = LibraryType.SAMPLES
-    mavenGroup = LibraryGroups.COMPOSE_UI
     inceptionYear = "2019"
     description = "Contains the sample code for the Androidx Compose UI Core Classes"
 }
diff --git a/concurrent/concurrent-futures-ktx/build.gradle b/concurrent/concurrent-futures-ktx/build.gradle
index a7da11d..872e6a2 100644
--- a/concurrent/concurrent-futures-ktx/build.gradle
+++ b/concurrent/concurrent-futures-ktx/build.gradle
@@ -35,7 +35,6 @@
 androidx {
     name = "AndroidX Futures Kotlin Extensions"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.CONCURRENT
     inceptionYear = "2019"
     description = "Kotlin Extensions for Androidx implementation of Guava's ListenableFuture"
 }
diff --git a/concurrent/concurrent-futures/build.gradle b/concurrent/concurrent-futures/build.gradle
index fc89681..2f134c0 100644
--- a/concurrent/concurrent-futures/build.gradle
+++ b/concurrent/concurrent-futures/build.gradle
@@ -31,7 +31,6 @@
 androidx {
     name = "AndroidX Futures"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.CONCURRENT
     inceptionYear = "2018"
     description = "Androidx implementation of Guava's ListenableFuture"
 }
diff --git a/constraintlayout/constraintlayout-compose/build.gradle b/constraintlayout/constraintlayout-compose/build.gradle
index 0af8cae..2d46d36 100644
--- a/constraintlayout/constraintlayout-compose/build.gradle
+++ b/constraintlayout/constraintlayout-compose/build.gradle
@@ -112,7 +112,6 @@
     name = "Android ConstraintLayout Compose Library"
     type = LibraryType.PUBLISHED_LIBRARY
     mavenVersion = LibraryVersions.CONSTRAINTLAYOUT_COMPOSE
-    mavenGroup = LibraryGroups.CONSTRAINTLAYOUT
     inceptionYear = "2022"
     description = "This library offers a flexible and adaptable way to position and animate widgets in Compose"
 }
diff --git a/constraintlayout/constraintlayout-core/build.gradle b/constraintlayout/constraintlayout-core/build.gradle
index 329d954..ce816fb 100644
--- a/constraintlayout/constraintlayout-core/build.gradle
+++ b/constraintlayout/constraintlayout-core/build.gradle
@@ -31,7 +31,6 @@
     name = "Android ConstraintLayout Core Library"
     type = LibraryType.PUBLISHED_LIBRARY
     mavenVersion = LibraryVersions.CONSTRAINTLAYOUT_CORE
-    mavenGroup = LibraryGroups.CONSTRAINTLAYOUT
     inceptionYear = "2022"
     description = "This library contains engines and algorithms for constraint based layout and complex animations (it is used by the ConstraintLayout library)"
 }
diff --git a/constraintlayout/constraintlayout/build.gradle b/constraintlayout/constraintlayout/build.gradle
index 7363d72..2b9c625 100644
--- a/constraintlayout/constraintlayout/build.gradle
+++ b/constraintlayout/constraintlayout/build.gradle
@@ -56,7 +56,6 @@
     name = "Android ConstraintLayout Library"
     type = LibraryType.PUBLISHED_LIBRARY
     mavenVersion = LibraryVersions.CONSTRAINTLAYOUT
-    mavenGroup = LibraryGroups.CONSTRAINTLAYOUT
     inceptionYear = "2022"
     description = "This library offers a flexible and adaptable way to position and animate widgets"
 }
diff --git a/contentpager/contentpager/build.gradle b/contentpager/contentpager/build.gradle
index 0a7fcb7..d2624f7 100644
--- a/contentpager/contentpager/build.gradle
+++ b/contentpager/contentpager/build.gradle
@@ -37,7 +37,6 @@
 androidx {
     name = "Android Support Content"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.CONTENTPAGER
     inceptionYear = "2017"
     description = "Library providing support for paging across content exposed via a ContentProvider. Use of this library allows a client to avoid expensive interprocess \"cursor window swaps\" on the UI thread."
     failOnDeprecationWarnings = false
diff --git a/coordinatorlayout/coordinatorlayout/build.gradle b/coordinatorlayout/coordinatorlayout/build.gradle
index 6d441ee..8b23b1a 100644
--- a/coordinatorlayout/coordinatorlayout/build.gradle
+++ b/coordinatorlayout/coordinatorlayout/build.gradle
@@ -44,7 +44,6 @@
 androidx {
     name = "Android Support Library Coordinator Layout"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.COORDINATORLAYOUT
     inceptionYear = "2011"
     description = "The Support Library is a static library that you can add to your Android application in order to use APIs that are either not available for older platform versions or utility APIs that aren't a part of the framework APIs. Compatible on devices running API 14 or later."
     failOnDeprecationWarnings = false
diff --git a/core/core-animation-testing/build.gradle b/core/core-animation-testing/build.gradle
index ae670b9..046bc43 100644
--- a/core/core-animation-testing/build.gradle
+++ b/core/core-animation-testing/build.gradle
@@ -32,7 +32,6 @@
     name = "Android Support Animator Testing"
     publish = Publish.SNAPSHOT_AND_RELEASE
     mavenVersion = LibraryVersions.CORE_ANIMATION_TESTING
-    mavenGroup = LibraryGroups.CORE
     inceptionYear = "2018"
     description = "This library provides functionalities for testing animations for API 14 and above."
 }
diff --git a/core/core-animation/build.gradle b/core/core-animation/build.gradle
index 45da746..fb7cc95 100644
--- a/core/core-animation/build.gradle
+++ b/core/core-animation/build.gradle
@@ -35,7 +35,6 @@
     name = "Android Support Animation"
     publish = Publish.SNAPSHOT_AND_RELEASE
     mavenVersion = LibraryVersions.CORE_ANIMATION
-    mavenGroup = LibraryGroups.CORE
     inceptionYear = "2018"
     description = "This library provides functionalities for creating and manipulating animations for API 14 and above."
 }
diff --git a/core/core-appdigest/build.gradle b/core/core-appdigest/build.gradle
index 933ff4a..a0d4af2 100644
--- a/core/core-appdigest/build.gradle
+++ b/core/core-appdigest/build.gradle
@@ -36,7 +36,6 @@
     name = "AndroidX AppDigest Library"
     publish = Publish.SNAPSHOT_AND_RELEASE
     mavenVersion = LibraryVersions.CORE_APPDIGEST
-    mavenGroup = LibraryGroups.CORE
     inceptionYear = "2020"
     description = "AndroidX AppDigest Library"
 }
diff --git a/core/core-google-shortcuts/build.gradle b/core/core-google-shortcuts/build.gradle
index b53699d..3071a80 100644
--- a/core/core-google-shortcuts/build.gradle
+++ b/core/core-google-shortcuts/build.gradle
@@ -57,7 +57,6 @@
     name = "Google Shortcuts Integration Library"
     type = LibraryType.PUBLISHED_LIBRARY
     mavenVersion = LibraryVersions.CORE_GOOGLE_SHORTCUTS
-    mavenGroup = LibraryGroups.CORE
     inceptionYear = "2021"
     description = "Library for powering Google features with Android app shortcuts"
 }
diff --git a/core/core-graphics-integration-tests/testapp/build.gradle b/core/core-graphics-integration-tests/testapp/build.gradle
index fe2d7ed..3dd9159 100644
--- a/core/core-graphics-integration-tests/testapp/build.gradle
+++ b/core/core-graphics-integration-tests/testapp/build.gradle
@@ -42,7 +42,6 @@
 androidx {
     name = "AndroidX bitmap scaling Sample"
     // type = LibraryType.SAMPLES
-    // mavenGroup = LibraryGroups.CORE
     inceptionYear = "2021"
     description = "Sample for the AndoridX graphics bitmap compatibility"
 }
diff --git a/core/core-i18n/build.gradle b/core/core-i18n/build.gradle
index 43cd6c1..3cab65c 100644
--- a/core/core-i18n/build.gradle
+++ b/core/core-i18n/build.gradle
@@ -39,7 +39,6 @@
     name = "Core Internationalization"
     type = LibraryType.PUBLISHED_LIBRARY
     mavenVersion = LibraryVersions.CORE_I18N
-    mavenGroup = LibraryGroups.CORE
     inceptionYear = "2022"
     description = "This library provides functionality for good internationalization (messages, plurals, date / time formatting)."
 }
diff --git a/core/core-ktx/build.gradle b/core/core-ktx/build.gradle
index 97233be..21bb1d2 100644
--- a/core/core-ktx/build.gradle
+++ b/core/core-ktx/build.gradle
@@ -29,7 +29,6 @@
     name = "Core Kotlin Extensions"
     publish = Publish.SNAPSHOT_AND_RELEASE
     mavenVersion = LibraryVersions.CORE
-    mavenGroup = LibraryGroups.CORE
     inceptionYear = "2018"
     description = "Kotlin extensions for 'core' artifact"
 }
diff --git a/core/core-location-altitude/build.gradle b/core/core-location-altitude/build.gradle
index c081e08..6f5e108 100644
--- a/core/core-location-altitude/build.gradle
+++ b/core/core-location-altitude/build.gradle
@@ -44,7 +44,6 @@
     name = "Location Altitude Compatibility Library"
     type = LibraryType.PUBLISHED_LIBRARY
     mavenVersion = LibraryVersions.CORE_LOCATION_ALTITUDE
-    mavenGroup = LibraryGroups.CORE
     inceptionYear = "2022"
     description = "Provides compatibility APIs concerning location altitudes."
 }
diff --git a/core/core-performance/build.gradle b/core/core-performance/build.gradle
index 5f24a1c..e1e7ee2 100644
--- a/core/core-performance/build.gradle
+++ b/core/core-performance/build.gradle
@@ -38,7 +38,6 @@
     name = "Core Performance"
     type = LibraryType.PUBLISHED_LIBRARY
     mavenVersion = LibraryVersions.CORE_PERFORMANCE
-    mavenGroup = LibraryGroups.CORE
     inceptionYear = "2021"
     description = "This library makes it easy for developers to make UI and feature choices based on Android Performance Class level for GMS devices."
 }
diff --git a/core/core-performance/samples/build.gradle b/core/core-performance/samples/build.gradle
index d3922f9..469b5ee 100644
--- a/core/core-performance/samples/build.gradle
+++ b/core/core-performance/samples/build.gradle
@@ -32,7 +32,6 @@
     name = "cSamples"
     type = LibraryType.SAMPLES
     mavenVersion = LibraryVersions.CORE_PERFORMANCE
-    mavenGroup = LibraryGroups.CORE
     inceptionYear = "2021"
     description = "Samples for AndroidX Core Performance Library"
 }
diff --git a/core/core-remoteviews/build.gradle b/core/core-remoteviews/build.gradle
index 4208597..eb33cc1 100644
--- a/core/core-remoteviews/build.gradle
+++ b/core/core-remoteviews/build.gradle
@@ -61,7 +61,6 @@
     name = "AndroidX RemoteViews Support"
     type = LibraryType.PUBLISHED_LIBRARY
     mavenVersion = LibraryVersions.CORE_REMOTEVIEWS
-    mavenGroup = LibraryGroups.CORE
     inceptionYear = "2021"
     description = "AndroidX RemoteViews Support"
 }
diff --git a/core/core-role/build.gradle b/core/core-role/build.gradle
index 0434c0f..e2f2c0a 100644
--- a/core/core-role/build.gradle
+++ b/core/core-role/build.gradle
@@ -17,7 +17,6 @@
     name = "Android Support Library Role"
     publish = Publish.SNAPSHOT_AND_RELEASE
     mavenVersion = LibraryVersions.CORE_ROLE
-    mavenGroup = LibraryGroups.CORE
     inceptionYear = "2019"
     description = "This Support Library provides names and documentation for roles."
 }
diff --git a/core/core-splashscreen/build.gradle b/core/core-splashscreen/build.gradle
index eba3aa9..7c0cefb 100644
--- a/core/core-splashscreen/build.gradle
+++ b/core/core-splashscreen/build.gradle
@@ -50,7 +50,6 @@
     name = "SplashScreen"
     type = LibraryType.PUBLISHED_LIBRARY
     mavenVersion = LibraryVersions.CORE_SPLASHSCREEN
-    mavenGroup = LibraryGroups.CORE
     inceptionYear = "2021"
     description = "This library provides the compatibility APIs for SplashScreen " +
             "and helper method to enable a splashscreen on devices prior Android 12"
diff --git a/core/core-splashscreen/samples/build.gradle b/core/core-splashscreen/samples/build.gradle
index 5a48fca..3c59a31 100644
--- a/core/core-splashscreen/samples/build.gradle
+++ b/core/core-splashscreen/samples/build.gradle
@@ -45,7 +45,6 @@
     name = "AndroidX Splashscreen Samples"
     type = LibraryType.SAMPLES
     mavenVersion = LibraryVersions.CORE_SPLASHSCREEN
-    mavenGroup = LibraryGroups.CORE
     inceptionYear = "2021"
     description = "Sample for the AndoridX Splashscreen library"
 }
diff --git a/core/core/build.gradle b/core/core/build.gradle
index 04285e7..b105104 100644
--- a/core/core/build.gradle
+++ b/core/core/build.gradle
@@ -89,7 +89,6 @@
     name = "Android Support Library compat"
     publish = Publish.SNAPSHOT_AND_RELEASE
     mavenVersion = LibraryVersions.CORE
-    mavenGroup = LibraryGroups.CORE
     inceptionYear = "2015"
     description = "The Support Library is a static library that you can add to your Android application in order to use APIs that are either not available for older platform versions or utility APIs that aren\'t a part of the framework APIs. Compatible on devices running API 14 or later."
     failOnDeprecationWarnings = false
diff --git a/core/uwb/uwb-rxjava3/build.gradle b/core/uwb/uwb-rxjava3/build.gradle
index f85f282..9c1379f 100644
--- a/core/uwb/uwb-rxjava3/build.gradle
+++ b/core/uwb/uwb-rxjava3/build.gradle
@@ -54,7 +54,6 @@
 androidx {
     name = "androidx.core.uwb:uwb-rxjava3"
     type = LibraryType.PUBLISHED_LIBRARY
-    mavenGroup = LibraryGroups.CORE_UWB
     inceptionYear = "2022"
     description = "RxJava3 integration for UWB module"
 }
\ No newline at end of file
diff --git a/core/uwb/uwb/build.gradle b/core/uwb/uwb/build.gradle
index d79149c..1c781ab 100644
--- a/core/uwb/uwb/build.gradle
+++ b/core/uwb/uwb/build.gradle
@@ -47,7 +47,6 @@
 androidx {
     name = "androidx.core.uwb:uwb"
     type = LibraryType.PUBLISHED_LIBRARY
-    mavenGroup = LibraryGroups.CORE_UWB
     inceptionYear = "2022"
     description = "Public API surface for apps to use UWB (ultra-wideband) on supported devices."
 }
diff --git a/credentials/credentials-play-services-auth/build.gradle b/credentials/credentials-play-services-auth/build.gradle
index 430b672..8bb5e87 100644
--- a/credentials/credentials-play-services-auth/build.gradle
+++ b/credentials/credentials-play-services-auth/build.gradle
@@ -55,7 +55,6 @@
 androidx {
     name = "Credentials Play Services Auth Library"
     type = LibraryType.PUBLISHED_LIBRARY
-    mavenGroup = LibraryGroups.CREDENTIALS
     inceptionYear = "2022"
     description = "sign into apps using play-services-auth library"
 }
diff --git a/credentials/credentials-provider/build.gradle b/credentials/credentials-provider/build.gradle
index f56c18c..94055ea 100644
--- a/credentials/credentials-provider/build.gradle
+++ b/credentials/credentials-provider/build.gradle
@@ -38,7 +38,6 @@
 androidx {
     name = "Credentials Provider Library"
     type = LibraryType.PUBLISHED_LIBRARY
-    mavenGroup = LibraryGroups.CREDENTIALS
     inceptionYear = "2022"
     description = "use utility APIs to process requests from, and return responses to the android" +
             "Credential Manager"
diff --git a/credentials/credentials/build.gradle b/credentials/credentials/build.gradle
index f5283f4..fa781a1 100644
--- a/credentials/credentials/build.gradle
+++ b/credentials/credentials/build.gradle
@@ -52,7 +52,6 @@
 androidx {
     name = "Credentials Core Library"
     type = LibraryType.PUBLISHED_LIBRARY
-    mavenGroup = LibraryGroups.CREDENTIALS
     inceptionYear = "2022"
     description = "Android Credentials Library"
 }
diff --git a/cursoradapter/cursoradapter/build.gradle b/cursoradapter/cursoradapter/build.gradle
index 1cecdf4..486beb8 100644
--- a/cursoradapter/cursoradapter/build.gradle
+++ b/cursoradapter/cursoradapter/build.gradle
@@ -12,7 +12,6 @@
 androidx {
     name = "Android Support Library Cursor Adapter"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.CURSORADAPTER
     inceptionYear = "2018"
     description = "The Support Library is a static library that you can add to your Android application in order to use APIs that are either not available for older platform versions or utility APIs that aren't a part of the framework APIs. Compatible on devices running API 14 or later."
 }
diff --git a/customview/customview-poolingcontainer/build.gradle b/customview/customview-poolingcontainer/build.gradle
index c7ee78c..49ae408 100644
--- a/customview/customview-poolingcontainer/build.gradle
+++ b/customview/customview-poolingcontainer/build.gradle
@@ -38,7 +38,6 @@
 androidx {
     name = "androidx.customview:poolingcontainer"
     type = LibraryType.PUBLISHED_LIBRARY
-    mavenGroup = LibraryGroups.CUSTOMVIEW
     mavenVersion = LibraryVersions.CUSTOMVIEW_POOLINGCONTAINER
     inceptionYear = "2021"
     description = "Utilities for listening to the lifecycle of containers that manage their child Views' lifecycle, such as RecyclerView"
diff --git a/customview/customview/build.gradle b/customview/customview/build.gradle
index 4f91368..041da7f 100644
--- a/customview/customview/build.gradle
+++ b/customview/customview/build.gradle
@@ -22,7 +22,6 @@
 androidx {
     name = "Android Support Library Custom View"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.CUSTOMVIEW
     mavenVersion = LibraryVersions.CUSTOMVIEW
     inceptionYear = "2018"
     description = "The Support Library is a static library that you can add to your Android application in order to use APIs that are either not available for older platform versions or utility APIs that aren't a part of the framework APIs. Compatible on devices running API 14 or later."
diff --git a/datastore/datastore-compose-samples/build.gradle b/datastore/datastore-compose-samples/build.gradle
index 48d74b4..f00695a 100644
--- a/datastore/datastore-compose-samples/build.gradle
+++ b/datastore/datastore-compose-samples/build.gradle
@@ -71,6 +71,3 @@
     }
 }
 
-androidx {
-    mavenGroup = LibraryGroups.DATASTORE
-}
diff --git a/datastore/datastore-core-okio/build.gradle b/datastore/datastore-core-okio/build.gradle
index 44bdc0f..9d4aa01 100644
--- a/datastore/datastore-core-okio/build.gradle
+++ b/datastore/datastore-core-okio/build.gradle
@@ -101,7 +101,6 @@
 androidx {
     name = "Android DataStore Core Okio"
     type = LibraryType.PUBLISHED_LIBRARY
-    mavenGroup = LibraryGroups.DATASTORE
     inceptionYear = "2020"
     description = "Android DataStore Core Okio- contains APIs to use datastore-core in multiplatform via okio"
 }
diff --git a/datastore/datastore-core/build.gradle b/datastore/datastore-core/build.gradle
index ea3988a..71aa61d 100644
--- a/datastore/datastore-core/build.gradle
+++ b/datastore/datastore-core/build.gradle
@@ -148,7 +148,6 @@
 androidx {
     name = "Android DataStore Core"
     type = LibraryType.PUBLISHED_LIBRARY
-    mavenGroup = LibraryGroups.DATASTORE
     inceptionYear = "2020"
     description = "Android DataStore Core - contains the underlying store used by each serialization method"
     legacyDisableKotlinStrictApiMode = true
diff --git a/datastore/datastore-preferences-core/build.gradle b/datastore/datastore-preferences-core/build.gradle
index a32be22..34b4020 100644
--- a/datastore/datastore-preferences-core/build.gradle
+++ b/datastore/datastore-preferences-core/build.gradle
@@ -124,7 +124,6 @@
 androidx {
     name = "Android Preferences DataStore Core"
     type = LibraryType.PUBLISHED_LIBRARY
-    mavenGroup = LibraryGroups.DATASTORE
     inceptionYear = "2020"
     description = "Android Preferences DataStore without the Android Dependencies"
     legacyDisableKotlinStrictApiMode = true
diff --git a/datastore/datastore-preferences-proto/build.gradle b/datastore/datastore-preferences-proto/build.gradle
index a958754..258630b 100644
--- a/datastore/datastore-preferences-proto/build.gradle
+++ b/datastore/datastore-preferences-proto/build.gradle
@@ -75,7 +75,6 @@
 androidx {
     name = "Android Preferences DataStore Proto"
     publish = Publish.NONE
-    mavenGroup = LibraryGroups.DATASTORE
     inceptionYear = "2020"
     description = "Jarjar the generated proto and proto-lite dependency for use by " +
             "datastore-preferences."
diff --git a/datastore/datastore-preferences-rxjava2/build.gradle b/datastore/datastore-preferences-rxjava2/build.gradle
index e6b0f01..d58618b 100644
--- a/datastore/datastore-preferences-rxjava2/build.gradle
+++ b/datastore/datastore-preferences-rxjava2/build.gradle
@@ -58,7 +58,6 @@
 androidx {
     name = "Android DataStore Core RxJava2 Wrappers"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.DATASTORE
     inceptionYear = "2020"
     description = "Android DataStore Core - contains wrappers for using DataStore using RxJava2"
     legacyDisableKotlinStrictApiMode = true
diff --git a/datastore/datastore-preferences-rxjava3/build.gradle b/datastore/datastore-preferences-rxjava3/build.gradle
index e77dd8f..8461448 100644
--- a/datastore/datastore-preferences-rxjava3/build.gradle
+++ b/datastore/datastore-preferences-rxjava3/build.gradle
@@ -58,7 +58,6 @@
 androidx {
     name = "Android DataStore Core RxJava2 Wrappers"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.DATASTORE
     inceptionYear = "2020"
     description = "Android DataStore Core - contains wrappers for using DataStore using RxJava2"
     legacyDisableKotlinStrictApiMode = true
diff --git a/datastore/datastore-preferences/build.gradle b/datastore/datastore-preferences/build.gradle
index 85d3156..f11e917 100644
--- a/datastore/datastore-preferences/build.gradle
+++ b/datastore/datastore-preferences/build.gradle
@@ -48,7 +48,6 @@
 androidx {
     name = "Android Preferences DataStore"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.DATASTORE
     inceptionYear = "2020"
     description = "Android Preferences DataStore"
     legacyDisableKotlinStrictApiMode = true
diff --git a/datastore/datastore-proto/build.gradle b/datastore/datastore-proto/build.gradle
index c5f600c..a3680b0 100644
--- a/datastore/datastore-proto/build.gradle
+++ b/datastore/datastore-proto/build.gradle
@@ -54,7 +54,6 @@
 androidx {
     name = "Android Proto DataStore"
     publish = Publish.NONE
-    mavenGroup = LibraryGroups.DATASTORE
     inceptionYear = "2020"
     description = "Android Proto DataStore"
     runApiTasks = new RunApiTasks.No("Unreleased library.")
diff --git a/datastore/datastore-rxjava2/build.gradle b/datastore/datastore-rxjava2/build.gradle
index 3404275..20edf8fb 100644
--- a/datastore/datastore-rxjava2/build.gradle
+++ b/datastore/datastore-rxjava2/build.gradle
@@ -54,7 +54,6 @@
 androidx {
     name = "Android DataStore Core RxJava2 Wrappers"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.DATASTORE
     inceptionYear = "2020"
     description = "Android DataStore Core - contains wrappers for using DataStore using RxJava2"
     legacyDisableKotlinStrictApiMode = true
diff --git a/datastore/datastore-rxjava3/build.gradle b/datastore/datastore-rxjava3/build.gradle
index 86edf2b..c9bfe85 100644
--- a/datastore/datastore-rxjava3/build.gradle
+++ b/datastore/datastore-rxjava3/build.gradle
@@ -54,7 +54,6 @@
 androidx {
     name = "Android DataStore Core RxJava2 Wrappers"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.DATASTORE
     inceptionYear = "2020"
     description = "Android DataStore Core - contains wrappers for using DataStore using RxJava2"
     legacyDisableKotlinStrictApiMode = true
diff --git a/datastore/datastore-sampleapp/build.gradle b/datastore/datastore-sampleapp/build.gradle
index d6b355b..1b0dcb6 100644
--- a/datastore/datastore-sampleapp/build.gradle
+++ b/datastore/datastore-sampleapp/build.gradle
@@ -73,6 +73,3 @@
     }
 }
 
-androidx {
-    mavenGroup = LibraryGroups.DATASTORE
-}
diff --git a/datastore/datastore/build.gradle b/datastore/datastore/build.gradle
index 061f44d..bf52132 100644
--- a/datastore/datastore/build.gradle
+++ b/datastore/datastore/build.gradle
@@ -105,7 +105,6 @@
 androidx {
     name = "Android DataStore"
     type = LibraryType.PUBLISHED_LIBRARY
-    mavenGroup = LibraryGroups.DATASTORE
     inceptionYear = "2020"
     description = "Android DataStore - contains the underlying store used by each serialization " +
             "method along with components that require an Android dependency"
diff --git a/development/project-creator/compose-template/groupId/artifactId/build.gradle b/development/project-creator/compose-template/groupId/artifactId/build.gradle
index 2fd97e3..a47774d 100644
--- a/development/project-creator/compose-template/groupId/artifactId/build.gradle
+++ b/development/project-creator/compose-template/groupId/artifactId/build.gradle
@@ -99,7 +99,6 @@
     name = "<NAME>"
     type = LibraryType.<LIBRARY_TYPE>
     mavenVersion = LibraryVersions.<GROUPID>
-    mavenGroup = LibraryGroups.COMPOSE_<GROUPID>
     inceptionYear = "<YEAR>"
     description = "<DESCRIPTION>"
 }
diff --git a/development/project-creator/java-template/groupId/artifactId/build.gradle b/development/project-creator/java-template/groupId/artifactId/build.gradle
index ab747fd..e1af3b3 100644
--- a/development/project-creator/java-template/groupId/artifactId/build.gradle
+++ b/development/project-creator/java-template/groupId/artifactId/build.gradle
@@ -34,7 +34,6 @@
     name = "<NAME>"
     type = LibraryType.<LIBRARY_TYPE>
     mavenVersion = LibraryVersions.<GROUPID>
-    mavenGroup = LibraryGroups.<GROUPID>
     inceptionYear = "<YEAR>"
     description = "<DESCRIPTION>"
 }
diff --git a/development/project-creator/kotlin-template/groupId/artifactId/build.gradle b/development/project-creator/kotlin-template/groupId/artifactId/build.gradle
index 1413c1c..33feb6d 100644
--- a/development/project-creator/kotlin-template/groupId/artifactId/build.gradle
+++ b/development/project-creator/kotlin-template/groupId/artifactId/build.gradle
@@ -35,7 +35,6 @@
     name = "<NAME>"
     type = LibraryType.<LIBRARY_TYPE>
     mavenVersion = LibraryVersions.<GROUPID>
-    mavenGroup = LibraryGroups.<GROUPID>
     inceptionYear = "<YEAR>"
     description = "<DESCRIPTION>"
 }
diff --git a/development/project-creator/native-template/groupId/artifactId/build.gradle b/development/project-creator/native-template/groupId/artifactId/build.gradle
index d3ea844..ca86ac6d 100644
--- a/development/project-creator/native-template/groupId/artifactId/build.gradle
+++ b/development/project-creator/native-template/groupId/artifactId/build.gradle
@@ -31,7 +31,6 @@
     name = "<NAME>"
     type = LibraryType.<LIBRARY_TYPE>
     mavenVersion = LibraryVersions.<GROUPID>
-    mavenGroup = LibraryGroups.<GROUPID>
     inceptionYear = "<YEAR>"
     description = "<DESCRIPTION>"
 }
diff --git a/documentfile/documentfile/build.gradle b/documentfile/documentfile/build.gradle
index c8f0ff5..4993c26 100644
--- a/documentfile/documentfile/build.gradle
+++ b/documentfile/documentfile/build.gradle
@@ -19,7 +19,6 @@
 androidx {
     name = "Android Support Library Document File"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.DOCUMENTFILE
     inceptionYear = "2018"
     description = "The Support Library is a static library that you can add to your Android application in order to use APIs that are either not available for older platform versions or utility APIs that aren't a part of the framework APIs. Compatible on devices running API 14 or later."
 }
diff --git a/draganddrop/draganddrop/build.gradle b/draganddrop/draganddrop/build.gradle
index 5e8aa01..37b0365 100644
--- a/draganddrop/draganddrop/build.gradle
+++ b/draganddrop/draganddrop/build.gradle
@@ -46,7 +46,6 @@
 androidx {
     name = "AndroidX Drag and Drop Library"
     type = LibraryType.PUBLISHED_LIBRARY
-    mavenGroup = LibraryGroups.DRAGANDDROP
     inceptionYear = "2021"
     description = "This library makes it easy for developers to accept data dragged-and-dropped from another app, and show a consistent affordance."
 }
diff --git a/drawerlayout/drawerlayout/build.gradle b/drawerlayout/drawerlayout/build.gradle
index 8bf6fa0..338299b 100644
--- a/drawerlayout/drawerlayout/build.gradle
+++ b/drawerlayout/drawerlayout/build.gradle
@@ -24,7 +24,6 @@
 androidx {
     name = "Android Support Library Drawer Layout"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.DRAWERLAYOUT
     inceptionYear = "2018"
     description = "The Support Library is a static library that you can add to your Android application in order to use APIs that are either not available for older platform versions or utility APIs that aren't a part of the framework APIs. Compatible on devices running API 14 or later."
 }
diff --git a/dynamicanimation/dynamicanimation-ktx/build.gradle b/dynamicanimation/dynamicanimation-ktx/build.gradle
index 86d67a5..472030b 100644
--- a/dynamicanimation/dynamicanimation-ktx/build.gradle
+++ b/dynamicanimation/dynamicanimation-ktx/build.gradle
@@ -40,7 +40,6 @@
     name = "Dynamic animation Kotlin Extensions"
     publish = Publish.SNAPSHOT_AND_RELEASE
     mavenVersion = LibraryVersions.DYNAMICANIMATION_KTX
-    mavenGroup = LibraryGroups.DYNAMICANIMATION
     inceptionYear = "2018"
     description = "Kotlin extensions for 'dynamicanimation' artifact"
 }
diff --git a/dynamicanimation/dynamicanimation/build.gradle b/dynamicanimation/dynamicanimation/build.gradle
index 28edc21..b3a6d81 100644
--- a/dynamicanimation/dynamicanimation/build.gradle
+++ b/dynamicanimation/dynamicanimation/build.gradle
@@ -22,7 +22,6 @@
     name = "Android Support DynamicAnimation"
     publish = Publish.SNAPSHOT_AND_RELEASE
     mavenVersion = LibraryVersions.DYNAMICANIMATION
-    mavenGroup = LibraryGroups.DYNAMICANIMATION
     inceptionYear = "2017"
     description = "Physics-based animation in support library, where the animations are driven by physics force. You can use this Animation library to create smooth and realistic animations."
     }
diff --git a/emoji/emoji-appcompat/build.gradle b/emoji/emoji-appcompat/build.gradle
index 95fd6fb..df0af37 100644
--- a/emoji/emoji-appcompat/build.gradle
+++ b/emoji/emoji-appcompat/build.gradle
@@ -30,7 +30,6 @@
     name = "Android Emoji AppCompat"
     publish = Publish.SNAPSHOT_AND_RELEASE
     mavenVersion = LibraryVersions.EMOJI
-    mavenGroup = LibraryGroups.EMOJI
     inceptionYear = "2017"
     description = "EmojiCompat Widgets for AppCompat integration"
 }
diff --git a/emoji/emoji-bundled/build.gradle b/emoji/emoji-bundled/build.gradle
index 5e925f9..d757fb1 100644
--- a/emoji/emoji-bundled/build.gradle
+++ b/emoji/emoji-bundled/build.gradle
@@ -24,7 +24,6 @@
     name = "Android Emoji Compat"
     publish = Publish.SNAPSHOT_AND_RELEASE
     mavenVersion = LibraryVersions.EMOJI
-    mavenGroup = LibraryGroups.EMOJI
     inceptionYear = "2017"
     description = "Library bundled with assets to enable emoji compatibility in Kitkat and newer devices to avoid the empty emoji characters."
 
diff --git a/emoji/emoji/build.gradle b/emoji/emoji/build.gradle
index 01e5f7de..5e135b6 100644
--- a/emoji/emoji/build.gradle
+++ b/emoji/emoji/build.gradle
@@ -57,7 +57,6 @@
     name = "Android Emoji Compat"
     publish = Publish.SNAPSHOT_AND_RELEASE
     mavenVersion = LibraryVersions.EMOJI
-    mavenGroup = LibraryGroups.EMOJI
     inceptionYear = "2017"
     description = "Core library to enable emoji compatibility in Kitkat and newer devices to avoid the empty emoji characters."
 
diff --git a/emoji2/emoji2-benchmark/build.gradle b/emoji2/emoji2-benchmark/build.gradle
index c65c7c3..63be59e 100644
--- a/emoji2/emoji2-benchmark/build.gradle
+++ b/emoji2/emoji2-benchmark/build.gradle
@@ -57,7 +57,6 @@
 androidx {
     name = "Emoji2 Benchmarks"
     publish = Publish.NONE
-    mavenGroup = LibraryGroups.EMOJI2
     inceptionYear = "2021"
     description = "Emoji2 Benchmarks"
 }
diff --git a/emoji2/emoji2-bundled/build.gradle b/emoji2/emoji2-bundled/build.gradle
index 0ea043e..5be609e 100644
--- a/emoji2/emoji2-bundled/build.gradle
+++ b/emoji2/emoji2-bundled/build.gradle
@@ -48,7 +48,6 @@
 androidx {
     name = "Android Emoji2 Compat"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.EMOJI2
     inceptionYear = "2017"
     description = "Library bundled with assets to enable emoji compatibility in Kitkat and newer " +
             "devices to avoid the empty emoji characters."
diff --git a/emoji2/emoji2-emojipicker/build.gradle b/emoji2/emoji2-emojipicker/build.gradle
index bcc3091..9a9292c 100644
--- a/emoji2/emoji2-emojipicker/build.gradle
+++ b/emoji2/emoji2-emojipicker/build.gradle
@@ -61,7 +61,6 @@
 androidx {
     name = "androidx.emoji2:emoji2-emojipicker"
     type = LibraryType.PUBLISHED_LIBRARY
-    mavenGroup = LibraryGroups.EMOJI2
     inceptionYear = "2022"
     description = "This library provides the latest emoji support and emoji picker UI to input " +
             "emoji in current and older devices"
diff --git a/emoji2/emoji2-emojipicker/samples/build.gradle b/emoji2/emoji2-emojipicker/samples/build.gradle
index a8bf5b4..12415f9 100644
--- a/emoji2/emoji2-emojipicker/samples/build.gradle
+++ b/emoji2/emoji2-emojipicker/samples/build.gradle
@@ -34,7 +34,6 @@
 androidx {
     name = "androidx.emoji2:emoji2-emojipicker-samples"
     type = LibraryType.SAMPLES
-    mavenGroup = LibraryGroups.EMOJI2
     inceptionYear = "2022"
     description = "Contains the sample code for the APIs in the androidx.emoji2:emoji2-emojipicker library"
 }
\ No newline at end of file
diff --git a/emoji2/emoji2-views-helper/build.gradle b/emoji2/emoji2-views-helper/build.gradle
index c177372..ed51ab7 100644
--- a/emoji2/emoji2-views-helper/build.gradle
+++ b/emoji2/emoji2-views-helper/build.gradle
@@ -29,7 +29,6 @@
 androidx {
     name = "Android Emoji2 Compat view helpers"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.EMOJI2
     inceptionYear = "2017"
     description = "View helpers for Emoji2"
 }
diff --git a/emoji2/emoji2-views/build.gradle b/emoji2/emoji2-views/build.gradle
index a53c92e..597d3b1 100644
--- a/emoji2/emoji2-views/build.gradle
+++ b/emoji2/emoji2-views/build.gradle
@@ -35,7 +35,6 @@
 androidx {
     name = "Android Emoji2 Compat Views"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.EMOJI2
     inceptionYear = "2017"
     description = "Support for using emoji2 directly with Android Views, for use in apps without " +
             "appcompat"
diff --git a/emoji2/emoji2/build.gradle b/emoji2/emoji2/build.gradle
index 888aa92..f1a2cdd 100644
--- a/emoji2/emoji2/build.gradle
+++ b/emoji2/emoji2/build.gradle
@@ -39,7 +39,6 @@
 androidx {
     name = "Android Emoji2 Compat"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.EMOJI2
     inceptionYear = "2017"
     description = "Core library to enable emoji compatibility in Kitkat and newer devices to avoid the empty emoji characters."
 }
diff --git a/enterprise/enterprise-feedback-testing/build.gradle b/enterprise/enterprise-feedback-testing/build.gradle
index b416d05..643fe67 100644
--- a/enterprise/enterprise-feedback-testing/build.gradle
+++ b/enterprise/enterprise-feedback-testing/build.gradle
@@ -35,7 +35,6 @@
 androidx {
     name = "Enterprise Feedback Testing"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.ENTERPRISE
     inceptionYear = "2019"
     description = "Test utilities for enterprise-feedback."
 }
diff --git a/enterprise/enterprise-feedback/build.gradle b/enterprise/enterprise-feedback/build.gradle
index 8b6fdad..8335234 100644
--- a/enterprise/enterprise-feedback/build.gradle
+++ b/enterprise/enterprise-feedback/build.gradle
@@ -26,7 +26,6 @@
 androidx {
     name = "Enterprise Feedback"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.ENTERPRISE
     inceptionYear = "2019"
     description = "A channel to enable communication between an app and an EMM (enterprise " +
             "mobility management)"
diff --git a/exifinterface/exifinterface/build.gradle b/exifinterface/exifinterface/build.gradle
index bc3b537..2db0519 100644
--- a/exifinterface/exifinterface/build.gradle
+++ b/exifinterface/exifinterface/build.gradle
@@ -17,7 +17,6 @@
 androidx {
     name = "Android Support ExifInterface"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.EXIFINTERFACE
     inceptionYear = "2016"
     description = "Android Support ExifInterface"
 }
diff --git a/external/libyuv/build.gradle b/external/libyuv/build.gradle
index 3fc8c1e..33a9896 100644
--- a/external/libyuv/build.gradle
+++ b/external/libyuv/build.gradle
@@ -62,7 +62,6 @@
     name = "libyuv"
     // Only intended to be used as snapshots, do not change to PUBLISHED.
     publish = Publish.SNAPSHOT_ONLY
-    mavenGroup = LibraryGroups.LIBYUV
     inceptionYear = "2021"
     description = "libyuv is an open source project that includes YUV scaling and conversion functionality."
 }
diff --git a/fragment/fragment-ktx/build.gradle b/fragment/fragment-ktx/build.gradle
index 4c8fc2f..5c5799c 100644
--- a/fragment/fragment-ktx/build.gradle
+++ b/fragment/fragment-ktx/build.gradle
@@ -56,7 +56,6 @@
 androidx {
     name = "Fragment Kotlin Extensions"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.FRAGMENT
     inceptionYear = "2018"
     description = "Kotlin extensions for 'fragment' artifact"
 }
diff --git a/fragment/fragment-lint/build.gradle b/fragment/fragment-lint/build.gradle
index 80e01cb..9a091e2 100644
--- a/fragment/fragment-lint/build.gradle
+++ b/fragment/fragment-lint/build.gradle
@@ -38,7 +38,6 @@
 androidx {
     name = "Android Fragment Lint Checks"
     type = LibraryType.LINT
-    mavenGroup = LibraryGroups.FRAGMENT
     inceptionYear = "2019"
     description = "Android Fragment Lint Checks"
 }
diff --git a/fragment/fragment-testing-lint/build.gradle b/fragment/fragment-testing-lint/build.gradle
index 30febdc..91a6a84 100644
--- a/fragment/fragment-testing-lint/build.gradle
+++ b/fragment/fragment-testing-lint/build.gradle
@@ -35,7 +35,6 @@
 androidx {
     name = "Android Fragment-Testing Lint Checks"
     type = LibraryType.LINT
-    mavenGroup = LibraryGroups.FRAGMENT
     inceptionYear = "2019"
     description = "Lint Checks for the Fragment Testing module"
 }
diff --git a/fragment/fragment-testing-manifest-lint/build.gradle b/fragment/fragment-testing-manifest-lint/build.gradle
index afa4705..3f8af05 100644
--- a/fragment/fragment-testing-manifest-lint/build.gradle
+++ b/fragment/fragment-testing-manifest-lint/build.gradle
@@ -35,7 +35,6 @@
 androidx {
     name = "Android Fragment-Testing-Manifest Lint Checks"
     type = LibraryType.LINT
-    mavenGroup = LibraryGroups.FRAGMENT
     inceptionYear = "2022"
     description = "Lint Checks for the Fragment Testing Manifest module"
 }
diff --git a/fragment/fragment-testing-manifest/build.gradle b/fragment/fragment-testing-manifest/build.gradle
index 55210b93..94d74d73 100644
--- a/fragment/fragment-testing-manifest/build.gradle
+++ b/fragment/fragment-testing-manifest/build.gradle
@@ -33,7 +33,6 @@
 androidx {
     name = "Fragment Testing Manifest dependency"
     type = LibraryType.PUBLISHED_TEST_LIBRARY
-    mavenGroup = LibraryGroups.FRAGMENT
     inceptionYear = "2022"
     description = "Fragment testing library that should be added as a debugImplementation dependency to add properties to the debug manifest necessary for testing an application"
 }
diff --git a/fragment/fragment-testing/build.gradle b/fragment/fragment-testing/build.gradle
index 919eb6c..7afdb67 100644
--- a/fragment/fragment-testing/build.gradle
+++ b/fragment/fragment-testing/build.gradle
@@ -45,7 +45,6 @@
 androidx {
     name = "Fragment Test Extensions"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.FRAGMENT
     inceptionYear = "2018"
     description = "Extensions for testing 'fragment' artifact"
 }
diff --git a/fragment/fragment-truth/build.gradle b/fragment/fragment-truth/build.gradle
index 33147bb..e4a0733 100644
--- a/fragment/fragment-truth/build.gradle
+++ b/fragment/fragment-truth/build.gradle
@@ -38,7 +38,6 @@
 androidx {
     name = "Fragment Truth Extensions"
     publish = Publish.NONE
-    mavenGroup = LibraryGroups.FRAGMENT
     inceptionYear = "2019"
     description = "Truth extensions for Fragments"
 }
diff --git a/fragment/fragment/build.gradle b/fragment/fragment/build.gradle
index d07f061..bd57126 100644
--- a/fragment/fragment/build.gradle
+++ b/fragment/fragment/build.gradle
@@ -71,7 +71,6 @@
 androidx {
     name = "Android Support Library fragment"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.FRAGMENT
     inceptionYear = "2011"
     description = "The Support Library is a static library that you can add to your Android application in order to use APIs that are either not available for older platform versions or utility APIs that aren\'t a part of the framework APIs. Compatible on devices running API 14 or later."
 }
diff --git a/glance/glance-appwidget-preview/build.gradle b/glance/glance-appwidget-preview/build.gradle
index 28af11e..bb9faa2 100644
--- a/glance/glance-appwidget-preview/build.gradle
+++ b/glance/glance-appwidget-preview/build.gradle
@@ -54,7 +54,6 @@
 androidx {
     name = "Android Glance AppWidget Preview"
     type = LibraryType.PUBLISHED_LIBRARY
-    mavenGroup = LibraryGroups.GLANCE
     inceptionYear = "2022"
     description = "Glance tooling library. This library provides the API required for the " +
             "GlanceAppWidget components and its Glance @Composable to be previewable in the IDE."
diff --git a/glance/glance-appwidget-proto/build.gradle b/glance/glance-appwidget-proto/build.gradle
index 3ab64a8..9613483 100644
--- a/glance/glance-appwidget-proto/build.gradle
+++ b/glance/glance-appwidget-proto/build.gradle
@@ -76,7 +76,6 @@
 androidx {
     name = "Glance AppWidget Protos"
     publish = Publish.NONE
-    mavenGroup = LibraryGroups.GLANCE
     inceptionYear = "2021"
     runApiTasks = new RunApiTasks.No("No public API required for internal use with app widgets.")
     description = "Protos for use with glance app widgets."
diff --git a/glance/glance-appwidget/build.gradle b/glance/glance-appwidget/build.gradle
index 1ad5b3b6..b098ddc 100644
--- a/glance/glance-appwidget/build.gradle
+++ b/glance/glance-appwidget/build.gradle
@@ -112,7 +112,6 @@
 androidx {
     name = "Glance For App Widgets"
     type = LibraryType.PUBLISHED_LIBRARY
-    mavenGroup = LibraryGroups.GLANCE
     inceptionYear = "2021"
     description = "Glance-appwidgets allows developers to build layouts for Android AppWidgets " +
             "using a Jetpack Compose-style API."
diff --git a/glance/glance-material/build.gradle b/glance/glance-material/build.gradle
index 58668cf..5a02590 100644
--- a/glance/glance-material/build.gradle
+++ b/glance/glance-material/build.gradle
@@ -28,7 +28,6 @@
 androidx {
     name = "Android Glance Material"
     type = LibraryType.PUBLISHED_LIBRARY
-    mavenGroup = LibraryGroups.GLANCE
     inceptionYear = "2022"
     description = "Glance Material 2 integration library." +
             " This library provides interop APIs with Material 2."
diff --git a/glance/glance-material3/build.gradle b/glance/glance-material3/build.gradle
index 393b4f2..4804184 100644
--- a/glance/glance-material3/build.gradle
+++ b/glance/glance-material3/build.gradle
@@ -28,7 +28,6 @@
 androidx {
     name = "Android Glance Material"
     type = LibraryType.PUBLISHED_LIBRARY
-    mavenGroup = LibraryGroups.GLANCE
     inceptionYear = "2022"
     description = "Glance Material integration library." +
             " This library provides interop APIs with Material 3."
diff --git a/glance/glance-preview/build.gradle b/glance/glance-preview/build.gradle
index ce67185..61462cc 100644
--- a/glance/glance-preview/build.gradle
+++ b/glance/glance-preview/build.gradle
@@ -26,7 +26,6 @@
 androidx {
     name = "Android Glance Preview"
     type = LibraryType.PUBLISHED_LIBRARY
-    mavenGroup = LibraryGroups.GLANCE
     inceptionYear = "2022"
     description = "Glance preview library. This library provides the API required for marking the" +
             "glance @Composable components that should have preview in the Android Studio."
diff --git a/glance/glance-wear-tiles-preview/build.gradle b/glance/glance-wear-tiles-preview/build.gradle
index d1a59d07..1736a49 100644
--- a/glance/glance-wear-tiles-preview/build.gradle
+++ b/glance/glance-wear-tiles-preview/build.gradle
@@ -53,7 +53,6 @@
 androidx {
     name = "Android Glance Wear Tiles Preview"
     type = LibraryType.PUBLISHED_LIBRARY
-    mavenGroup = LibraryGroups.GLANCE
     inceptionYear = "2022"
     description = "Glance tooling library. This library provides the API required for the " +
             "GlanceTileService components and its Glance @Composable to be previewable in the IDE."
diff --git a/glance/glance-wear-tiles/build.gradle b/glance/glance-wear-tiles/build.gradle
index eccfcf3..3b48948 100644
--- a/glance/glance-wear-tiles/build.gradle
+++ b/glance/glance-wear-tiles/build.gradle
@@ -91,7 +91,6 @@
 androidx {
     name = "Glance for Wear Tiles"
     type = LibraryType.PUBLISHED_LIBRARY
-    mavenGroup = LibraryGroups.GLANCE
     inceptionYear = "2021"
     description = "Glance allows developers to build layouts for Wear Tiles using a Jetpack " +
             "Compose-style API."
diff --git a/glance/glance/build.gradle b/glance/glance/build.gradle
index 8ded91f..1fd6934 100644
--- a/glance/glance/build.gradle
+++ b/glance/glance/build.gradle
@@ -72,7 +72,6 @@
 androidx {
     name = "Glance Core Library"
     type = LibraryType.PUBLISHED_LIBRARY
-    mavenGroup = LibraryGroups.GLANCE
     inceptionYear = "2021"
     description = "Glance allows developers to build layouts for remote surfaces using a Jetpack " +
             "Compose-style API."
diff --git a/graphics/filters/filters/build.gradle b/graphics/filters/filters/build.gradle
index 8d25f16..3ed99d6 100644
--- a/graphics/filters/filters/build.gradle
+++ b/graphics/filters/filters/build.gradle
@@ -34,7 +34,6 @@
 androidx {
     name = "androidx.graphics.filters:filters"
     type = LibraryType.PUBLISHED_LIBRARY
-    mavenGroup = LibraryGroups.GRAPHICS_FILTERS
     inceptionYear = "2022"
     description = "Apply visual filters to images, video or UI in real time."
 }
diff --git a/graphics/graphics-core/build.gradle b/graphics/graphics-core/build.gradle
index 630e316..c5f2052 100644
--- a/graphics/graphics-core/build.gradle
+++ b/graphics/graphics-core/build.gradle
@@ -56,7 +56,6 @@
 androidx {
     name = "Android Graphics Core"
     type = LibraryType.PUBLISHED_LIBRARY
-    mavenGroup = LibraryGroups.GRAPHICS
     inceptionYear = "2021"
     description = "Leverage graphics facilities across multiple Android platform releases"
 }
diff --git a/gridlayout/gridlayout/build.gradle b/gridlayout/gridlayout/build.gradle
index 63b8dfb..44db995 100644
--- a/gridlayout/gridlayout/build.gradle
+++ b/gridlayout/gridlayout/build.gradle
@@ -19,7 +19,6 @@
 androidx {
     name = "Android Support Grid Layout"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.GRIDLAYOUT
     inceptionYear = "2013"
     description = "Android Support Grid Layout"
     failOnDeprecationWarnings = false
diff --git a/health/connect/connect-client-proto/build.gradle b/health/connect/connect-client-proto/build.gradle
index 79350e1..18c9dc8 100644
--- a/health/connect/connect-client-proto/build.gradle
+++ b/health/connect/connect-client-proto/build.gradle
@@ -80,7 +80,6 @@
 androidx {
     name = "AndroidX Health Connect Client Proto"
     publish = Publish.NONE
-    mavenGroup = LibraryGroups.HEALTH_CONNECT
     inceptionYear = "2022"
     description = "Proto files for health-connect-client"
 }
diff --git a/health/connect/connect-client/build.gradle b/health/connect/connect-client/build.gradle
index 1fbe709..8a8757a 100644
--- a/health/connect/connect-client/build.gradle
+++ b/health/connect/connect-client/build.gradle
@@ -78,7 +78,6 @@
 androidx {
     name = "AndroidX Health Connect Client Library"
     type = LibraryType.PUBLISHED_LIBRARY
-    mavenGroup = LibraryGroups.HEALTH_CONNECT
     inceptionYear = "2022"
     description = "read or write user's health and fitness records."
 }
diff --git a/health/connect/connect-client/samples/build.gradle b/health/connect/connect-client/samples/build.gradle
index 7e451e2..2d8bd45 100644
--- a/health/connect/connect-client/samples/build.gradle
+++ b/health/connect/connect-client/samples/build.gradle
@@ -36,7 +36,6 @@
 androidx {
     name = "AndroidX Health Connect Library Samples"
     type = LibraryType.SAMPLES
-    mavenGroup = LibraryGroups.HEALTH_CONNECT
     inceptionYear = "2022"
     description = "Contains the sample code for the Androidx Health Connect Library"
 }
diff --git a/health/health-services-client/build.gradle b/health/health-services-client/build.gradle
index 1e6d812..617f4c2 100644
--- a/health/health-services-client/build.gradle
+++ b/health/health-services-client/build.gradle
@@ -76,7 +76,6 @@
     name = "AndroidX Health Services Client Library"
     type = LibraryType.PUBLISHED_LIBRARY
     mavenVersion = LibraryVersions.HEALTH_SERVICES_CLIENT
-    mavenGroup = LibraryGroups.HEALTH
     inceptionYear = "2021"
     description = "This library helps developers create performant health applications in a platform agnostic way"
 }
diff --git a/heifwriter/heifwriter/build.gradle b/heifwriter/heifwriter/build.gradle
index c693ee1..7bffa1a7 100644
--- a/heifwriter/heifwriter/build.gradle
+++ b/heifwriter/heifwriter/build.gradle
@@ -25,7 +25,6 @@
 androidx {
     name = "Android Support HeifWriter"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.HEIFWRITER
     inceptionYear = "2018"
     description = "Android Support HeifWriter for writing HEIF still images"
 }
diff --git a/hilt/hilt-common/build.gradle b/hilt/hilt-common/build.gradle
index a5efd28..24537d9 100644
--- a/hilt/hilt-common/build.gradle
+++ b/hilt/hilt-common/build.gradle
@@ -30,7 +30,6 @@
     name = "AndroidX Hilt Extension Annotations"
     publish = Publish.SNAPSHOT_AND_RELEASE
     mavenVersion = LibraryVersions.HILT
-    mavenGroup = LibraryGroups.HILT
     inceptionYear = "2020"
     description = "AndroidX Hilt Extension Annotations"
     // TODO(danysantiago): Remove once @ViewModelInject is deleted.
diff --git a/hilt/hilt-compiler/build.gradle b/hilt/hilt-compiler/build.gradle
index 8f08622..eb22d1c 100644
--- a/hilt/hilt-compiler/build.gradle
+++ b/hilt/hilt-compiler/build.gradle
@@ -55,7 +55,6 @@
     name = "AndroidX Hilt Extension Compiler"
     type = LibraryType.ANNOTATION_PROCESSOR
     mavenVersion = LibraryVersions.HILT
-    mavenGroup = LibraryGroups.HILT
     inceptionYear = "2020"
     description = "AndroidX Hilt Extension Compiler"
 }
diff --git a/hilt/hilt-navigation-compose/build.gradle b/hilt/hilt-navigation-compose/build.gradle
index 83fb1c1..ebadcb5 100644
--- a/hilt/hilt-navigation-compose/build.gradle
+++ b/hilt/hilt-navigation-compose/build.gradle
@@ -64,7 +64,6 @@
     name = "Navigation Compose Hilt Integration"
     publish = Publish.SNAPSHOT_AND_RELEASE
     mavenVersion = LibraryVersions.HILT_NAVIGATION_COMPOSE
-    mavenGroup = LibraryGroups.HILT
     inceptionYear = "2021"
     description = "Navigation Compose Hilt Integration"
     runApiTasks = new RunApiTasks.Yes()
diff --git a/hilt/hilt-navigation-compose/samples/build.gradle b/hilt/hilt-navigation-compose/samples/build.gradle
index 66c4a78..42cfbfe 100644
--- a/hilt/hilt-navigation-compose/samples/build.gradle
+++ b/hilt/hilt-navigation-compose/samples/build.gradle
@@ -35,7 +35,6 @@
     name = "Navigation Compose Hilt Extension Samples"
     publish = Publish.SNAPSHOT_AND_RELEASE
     type = LibraryType.SAMPLES
-    mavenGroup = LibraryGroups.HILT
     mavenVersion = LibraryVersions.HILT_NAVIGATION_COMPOSE
     inceptionYear = "2021"
     description = "Samples for the Navigation Compose Hilt Integration"
diff --git a/hilt/hilt-navigation-fragment/build.gradle b/hilt/hilt-navigation-fragment/build.gradle
index a7c9104..22eea96 100644
--- a/hilt/hilt-navigation-fragment/build.gradle
+++ b/hilt/hilt-navigation-fragment/build.gradle
@@ -59,7 +59,6 @@
     name = "Android Navigation Fragment Hilt Extension"
     publish = Publish.SNAPSHOT_AND_RELEASE
     mavenVersion = LibraryVersions.HILT
-    mavenGroup = LibraryGroups.HILT
     inceptionYear = "2021"
     description = "Android Navigation Fragment Hilt Extension"
 }
diff --git a/hilt/hilt-navigation/build.gradle b/hilt/hilt-navigation/build.gradle
index fbabb51..ad4e41a 100644
--- a/hilt/hilt-navigation/build.gradle
+++ b/hilt/hilt-navigation/build.gradle
@@ -35,7 +35,6 @@
     name = "Android Navigation Hilt Extension"
     publish = Publish.SNAPSHOT_AND_RELEASE
     mavenVersion = LibraryVersions.HILT
-    mavenGroup = LibraryGroups.HILT
     inceptionYear = "2021"
     description = "Android Navigation Hilt Extension"
 }
diff --git a/hilt/hilt-work/build.gradle b/hilt/hilt-work/build.gradle
index da8f26b..46f258b 100644
--- a/hilt/hilt-work/build.gradle
+++ b/hilt/hilt-work/build.gradle
@@ -40,7 +40,6 @@
     name = "Android Lifecycle WorkManager Hilt Extension"
     publish = Publish.SNAPSHOT_AND_RELEASE
     mavenVersion = LibraryVersions.HILT
-    mavenGroup = LibraryGroups.HILT
     inceptionYear = "2020"
     description = "Android Lifecycle WorkManager Hilt Extension"
 }
diff --git a/input/input-motionprediction/build.gradle b/input/input-motionprediction/build.gradle
index 8d3d5e2..c630796 100644
--- a/input/input-motionprediction/build.gradle
+++ b/input/input-motionprediction/build.gradle
@@ -42,7 +42,6 @@
     name = "Android Motion Prediction"
     type = LibraryType.PUBLISHED_LIBRARY
     mavenVersion = LibraryVersions.INPUT_MOTIONPREDICTION
-    mavenGroup = LibraryGroups.INPUT
     inceptionYear = "2022"
     description = "reduce the latency of input interactions by predicting future MotionEvents"
 }
diff --git a/inspection/inspection-gradle-plugin/build.gradle b/inspection/inspection-gradle-plugin/build.gradle
index fe20a87..4589093 100644
--- a/inspection/inspection-gradle-plugin/build.gradle
+++ b/inspection/inspection-gradle-plugin/build.gradle
@@ -55,7 +55,6 @@
     name = "Android Inspection Gradle Plugin"
     type = LibraryType.GRADLE_PLUGIN
     publish = Publish.NONE
-    mavenGroup = LibraryGroups.INSPECTION
     inceptionYear = "2019"
     description = "Android Inspection Gradle Plugin"
 }
diff --git a/inspection/inspection-testing/build.gradle b/inspection/inspection-testing/build.gradle
index 6261051..7f51b57 100644
--- a/inspection/inspection-testing/build.gradle
+++ b/inspection/inspection-testing/build.gradle
@@ -40,7 +40,6 @@
     name = "AndroidX Inspection Testing"
     type = LibraryType.INTERNAL_TEST_LIBRARY
     publish = Publish.NONE
-    mavenGroup = LibraryGroups.INSPECTION
     inceptionYear = "2019"
     description = "Experimental AndroidX Inspection Project"
 }
diff --git a/inspection/inspection/build.gradle b/inspection/inspection/build.gradle
index 02655dd..5c35b71 100644
--- a/inspection/inspection/build.gradle
+++ b/inspection/inspection/build.gradle
@@ -36,7 +36,6 @@
 androidx {
     name = "AndroidX Inspection"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.INSPECTION
     inceptionYear = "2019"
     description = "Experimental AndroidX Inspection Project"
     runApiTasks =  new RunApiTasks.Yes(
diff --git a/interpolator/interpolator/build.gradle b/interpolator/interpolator/build.gradle
index ff19cd2..524e14e 100644
--- a/interpolator/interpolator/build.gradle
+++ b/interpolator/interpolator/build.gradle
@@ -12,7 +12,6 @@
 androidx {
     name = "Android Support Library Interpolators"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.INTERPOLATOR
     inceptionYear = "2018"
     description = "The Support Library is a static library that you can add to your Android application in order to use APIs that are either not available for older platform versions or utility APIs that aren't a part of the framework APIs. Compatible on devices running API 14 or later."
 }
diff --git a/javascriptengine/javascriptengine/build.gradle b/javascriptengine/javascriptengine/build.gradle
index ed63ae3..7ac722c 100644
--- a/javascriptengine/javascriptengine/build.gradle
+++ b/javascriptengine/javascriptengine/build.gradle
@@ -48,7 +48,6 @@
 androidx {
     name = "JavaScript Engine"
     type = LibraryType.PUBLISHED_LIBRARY
-    mavenGroup = LibraryGroups.JAVASCRIPTENGINE
     inceptionYear = "2022"
     description = "Javascript Engine is a static library you can add to your Android application in order to evaluate JavaScript."
 }
diff --git a/leanback/leanback-grid/build.gradle b/leanback/leanback-grid/build.gradle
index d59f22e..36a1965 100644
--- a/leanback/leanback-grid/build.gradle
+++ b/leanback/leanback-grid/build.gradle
@@ -54,7 +54,6 @@
 androidx {
     name = "AndroidX Leanback Grid"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.LEANBACK
     mavenVersion = LibraryVersions.LEANBACK_GRID
     inceptionYear = "2021"
     description = "This library adds grid view components to be used in TV"
diff --git a/leanback/leanback-paging/build.gradle b/leanback/leanback-paging/build.gradle
index 0d04026..e0786f9 100644
--- a/leanback/leanback-paging/build.gradle
+++ b/leanback/leanback-paging/build.gradle
@@ -55,7 +55,6 @@
     name = "AndroidX Leanback Paging"
     publish = Publish.SNAPSHOT_AND_RELEASE
     mavenVersion = LibraryVersions.LEANBACK_PAGING
-    mavenGroup = LibraryGroups.LEANBACK
     inceptionYear = "2020"
     description = "AndroidX Leanback Paging"
     failOnDeprecationWarnings = false
diff --git a/leanback/leanback-preference/build.gradle b/leanback/leanback-preference/build.gradle
index 85a291e9..d64a337 100644
--- a/leanback/leanback-preference/build.gradle
+++ b/leanback/leanback-preference/build.gradle
@@ -31,7 +31,6 @@
     name = "AndroidX Leanback Preference"
     publish = Publish.SNAPSHOT_AND_RELEASE
     mavenVersion = LibraryVersions.LEANBACK_PREFERENCE
-    mavenGroup = LibraryGroups.LEANBACK
     inceptionYear = "2015"
     description = "AndroidX Leanback Preference"
     failOnDeprecationWarnings = false
diff --git a/leanback/leanback-tab/build.gradle b/leanback/leanback-tab/build.gradle
index 1b4205f..1c0b1cb 100644
--- a/leanback/leanback-tab/build.gradle
+++ b/leanback/leanback-tab/build.gradle
@@ -40,7 +40,6 @@
     name = "AndroidX Leanback Tab"
     publish = Publish.SNAPSHOT_AND_RELEASE
     mavenVersion = LibraryVersions.LEANBACK_TAB
-    mavenGroup = LibraryGroups.LEANBACK
     inceptionYear = "2020"
     description = "This library adds top tab navigation component to be used in TV"
 }
diff --git a/leanback/leanback/build.gradle b/leanback/leanback/build.gradle
index b7b7819..1a3152a 100644
--- a/leanback/leanback/build.gradle
+++ b/leanback/leanback/build.gradle
@@ -57,7 +57,6 @@
 androidx {
     name = "Android Support Leanback v17"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.LEANBACK
     mavenVersion = LibraryVersions.LEANBACK
     inceptionYear = "2014"
     description = "Android Support Leanback v17"
diff --git a/lifecycle/lifecycle-common-java8/build.gradle b/lifecycle/lifecycle-common-java8/build.gradle
index f4af9fe..cbab42e 100644
--- a/lifecycle/lifecycle-common-java8/build.gradle
+++ b/lifecycle/lifecycle-common-java8/build.gradle
@@ -32,7 +32,6 @@
 androidx {
     name = "Android Lifecycle-Common for Java 8 Language"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.LIFECYCLE
     inceptionYear = "2017"
     description = "Android Lifecycle-Common for Java 8 Language"
 }
diff --git a/lifecycle/lifecycle-common/build.gradle b/lifecycle/lifecycle-common/build.gradle
index 061f3b0..1f9a9f6 100644
--- a/lifecycle/lifecycle-common/build.gradle
+++ b/lifecycle/lifecycle-common/build.gradle
@@ -40,7 +40,6 @@
 androidx {
     name = "Android Lifecycle-Common"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.LIFECYCLE
     inceptionYear = "2017"
     description = "Android Lifecycle-Common"
 }
diff --git a/lifecycle/lifecycle-compiler/build.gradle b/lifecycle/lifecycle-compiler/build.gradle
index a1b7aba..60945b2 100644
--- a/lifecycle/lifecycle-compiler/build.gradle
+++ b/lifecycle/lifecycle-compiler/build.gradle
@@ -55,7 +55,6 @@
 androidx {
     name = "Android Lifecycles Compiler"
     type = LibraryType.ANNOTATION_PROCESSOR
-    mavenGroup = LibraryGroups.LIFECYCLE
     inceptionYear = "2017"
     description = "Android Lifecycles annotation processor"
 }
diff --git a/lifecycle/lifecycle-extensions/build.gradle b/lifecycle/lifecycle-extensions/build.gradle
index 92c8382..a41fdaa 100644
--- a/lifecycle/lifecycle-extensions/build.gradle
+++ b/lifecycle/lifecycle-extensions/build.gradle
@@ -54,7 +54,6 @@
     name = "Android Lifecycle Extensions"
     publish = Publish.NONE
     runApiTasks = new RunApiTasks.Yes("Need to track API surface before moving to publish")
-    mavenGroup = LibraryGroups.LIFECYCLE
     inceptionYear = "2017"
     description = "Android Lifecycle Extensions"
     failOnDeprecationWarnings = false
diff --git a/lifecycle/lifecycle-livedata-core-ktx-lint/build.gradle b/lifecycle/lifecycle-livedata-core-ktx-lint/build.gradle
index fdc63a0..6bb81f4 100644
--- a/lifecycle/lifecycle-livedata-core-ktx-lint/build.gradle
+++ b/lifecycle/lifecycle-livedata-core-ktx-lint/build.gradle
@@ -36,7 +36,6 @@
 androidx {
     name = "Android LiveData Kotlin Lint Checks"
     type = LibraryType.LINT
-    mavenGroup = LibraryGroups.LIFECYCLE
     inceptionYear = "2019"
     description = "Lint Checks for LiveData Kotlin Extensions"
 }
diff --git a/lifecycle/lifecycle-livedata-core-ktx/build.gradle b/lifecycle/lifecycle-livedata-core-ktx/build.gradle
index bb14934..b82b430 100644
--- a/lifecycle/lifecycle-livedata-core-ktx/build.gradle
+++ b/lifecycle/lifecycle-livedata-core-ktx/build.gradle
@@ -44,7 +44,6 @@
 androidx {
     name = "LiveData Core Kotlin Extensions"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.LIFECYCLE
     inceptionYear = "2018"
     description = "Kotlin extensions for 'livedata-core' artifact"
 }
diff --git a/lifecycle/lifecycle-livedata-core-truth/build.gradle b/lifecycle/lifecycle-livedata-core-truth/build.gradle
index d42633e..6f8a4c4 100644
--- a/lifecycle/lifecycle-livedata-core-truth/build.gradle
+++ b/lifecycle/lifecycle-livedata-core-truth/build.gradle
@@ -36,7 +36,6 @@
 androidx {
     name = "LiveData Core Truth Extensions"
     publish = Publish.NONE
-    mavenGroup = LibraryGroups.LIFECYCLE
     inceptionYear = "2019"
     description = "Truth extensions for 'livedata-core' artifact"
 }
diff --git a/lifecycle/lifecycle-livedata-core/build.gradle b/lifecycle/lifecycle-livedata-core/build.gradle
index 786db12..be5361f 100644
--- a/lifecycle/lifecycle-livedata-core/build.gradle
+++ b/lifecycle/lifecycle-livedata-core/build.gradle
@@ -44,7 +44,6 @@
 androidx {
     name = "Android Lifecycle LiveData Core"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.LIFECYCLE
     inceptionYear = "2017"
     description = "Android Lifecycle LiveData Core"
 }
diff --git a/lifecycle/lifecycle-livedata-ktx/build.gradle b/lifecycle/lifecycle-livedata-ktx/build.gradle
index b55620a..26ee2e4 100644
--- a/lifecycle/lifecycle-livedata-ktx/build.gradle
+++ b/lifecycle/lifecycle-livedata-ktx/build.gradle
@@ -50,7 +50,6 @@
 androidx {
     name = "LiveData Kotlin Extensions"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.LIFECYCLE
     inceptionYear = "2018"
     description = "Kotlin extensions for 'livedata' artifact"
 }
diff --git a/lifecycle/lifecycle-livedata/build.gradle b/lifecycle/lifecycle-livedata/build.gradle
index 01b408a..5d375fb 100644
--- a/lifecycle/lifecycle-livedata/build.gradle
+++ b/lifecycle/lifecycle-livedata/build.gradle
@@ -42,7 +42,6 @@
 androidx {
     name = "Android Lifecycle LiveData"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.LIFECYCLE
     inceptionYear = "2017"
     description = "Android Lifecycle LiveData"
 }
diff --git a/lifecycle/lifecycle-process/build.gradle b/lifecycle/lifecycle-process/build.gradle
index 25c09ea..09a4076 100644
--- a/lifecycle/lifecycle-process/build.gradle
+++ b/lifecycle/lifecycle-process/build.gradle
@@ -43,7 +43,6 @@
 androidx {
     name = "Android Lifecycle Process"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.LIFECYCLE
     inceptionYear = "2018"
     description = "Android Lifecycle Process"
 }
diff --git a/lifecycle/lifecycle-reactivestreams-ktx/build.gradle b/lifecycle/lifecycle-reactivestreams-ktx/build.gradle
index 826258a..9af2da3 100644
--- a/lifecycle/lifecycle-reactivestreams-ktx/build.gradle
+++ b/lifecycle/lifecycle-reactivestreams-ktx/build.gradle
@@ -43,7 +43,6 @@
 androidx {
   name = "Android Lifecycle ReactiveStreams KTX"
   publish = Publish.SNAPSHOT_AND_RELEASE
-  mavenGroup = LibraryGroups.LIFECYCLE
   inceptionYear = "2018"
   description = "Kotlin extensions for Lifecycle ReactiveStreams"
 }
diff --git a/lifecycle/lifecycle-reactivestreams/build.gradle b/lifecycle/lifecycle-reactivestreams/build.gradle
index c3adbe4..19e454a 100644
--- a/lifecycle/lifecycle-reactivestreams/build.gradle
+++ b/lifecycle/lifecycle-reactivestreams/build.gradle
@@ -46,7 +46,6 @@
 androidx {
     name = "Android Lifecycle Reactivestreams"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.LIFECYCLE
     inceptionYear = "2017"
     description = "Android Lifecycle Reactivestreams"
 }
diff --git a/lifecycle/lifecycle-runtime-compose/build.gradle b/lifecycle/lifecycle-runtime-compose/build.gradle
index ee587a3..6d093bc 100644
--- a/lifecycle/lifecycle-runtime-compose/build.gradle
+++ b/lifecycle/lifecycle-runtime-compose/build.gradle
@@ -56,7 +56,6 @@
 androidx {
     name = "Lifecycle Runtime Compose"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.LIFECYCLE
     inceptionYear = "2021"
     description = "Compose integration with Lifecycle"
     runApiTasks = new RunApiTasks.Yes()
diff --git a/lifecycle/lifecycle-runtime-compose/samples/build.gradle b/lifecycle/lifecycle-runtime-compose/samples/build.gradle
index b5b06a4..b1f8730 100644
--- a/lifecycle/lifecycle-runtime-compose/samples/build.gradle
+++ b/lifecycle/lifecycle-runtime-compose/samples/build.gradle
@@ -35,7 +35,6 @@
 androidx {
     name = "AndroidX Lifecycle Runtime Compose Integration Samples"
     type = LibraryType.SAMPLES
-    mavenGroup = LibraryGroups.LIFECYCLE
     inceptionYear = "2021"
     description = "Samples for Compose integration with Lifecycle Runtime"
 }
diff --git a/lifecycle/lifecycle-runtime-ktx-lint/build.gradle b/lifecycle/lifecycle-runtime-ktx-lint/build.gradle
index 48d362a..3761f26 100644
--- a/lifecycle/lifecycle-runtime-ktx-lint/build.gradle
+++ b/lifecycle/lifecycle-runtime-ktx-lint/build.gradle
@@ -37,7 +37,6 @@
 androidx {
     name = "Android Lifecycles Lint Checks"
     type = LibraryType.LINT
-    mavenGroup = LibraryGroups.LIFECYCLE
     inceptionYear = "2019"
     description = "Android Lifecycles Lint Checks"
 }
diff --git a/lifecycle/lifecycle-runtime-ktx/build.gradle b/lifecycle/lifecycle-runtime-ktx/build.gradle
index f8d0d7b..3aae0b5 100644
--- a/lifecycle/lifecycle-runtime-ktx/build.gradle
+++ b/lifecycle/lifecycle-runtime-ktx/build.gradle
@@ -50,7 +50,6 @@
 androidx {
     name = "Android Lifecycle Kotlin Extensions"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.LIFECYCLE
     inceptionYear = "2019"
     description = "Kotlin extensions for 'lifecycle' artifact"
 }
diff --git a/lifecycle/lifecycle-runtime-testing/build.gradle b/lifecycle/lifecycle-runtime-testing/build.gradle
index 73c5a96..4415f15 100644
--- a/lifecycle/lifecycle-runtime-testing/build.gradle
+++ b/lifecycle/lifecycle-runtime-testing/build.gradle
@@ -45,7 +45,6 @@
 androidx {
     name = "Android Lifecycle Runtime Testing"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.LIFECYCLE
     inceptionYear = "2019"
     description = "Testing utilities for 'lifecycle' artifact"
 }
diff --git a/lifecycle/lifecycle-runtime/build.gradle b/lifecycle/lifecycle-runtime/build.gradle
index c4f8f49..ccdd9ae 100644
--- a/lifecycle/lifecycle-runtime/build.gradle
+++ b/lifecycle/lifecycle-runtime/build.gradle
@@ -44,7 +44,6 @@
 androidx {
     name "Android Lifecycle Runtime"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup LibraryGroups.LIFECYCLE
     inceptionYear "2017"
     description "Android Lifecycle Runtime"
 }
diff --git a/lifecycle/lifecycle-service/build.gradle b/lifecycle/lifecycle-service/build.gradle
index d7c2c9a..a5a9ac3 100644
--- a/lifecycle/lifecycle-service/build.gradle
+++ b/lifecycle/lifecycle-service/build.gradle
@@ -34,7 +34,6 @@
 androidx {
     name = "Android Lifecycle Service"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.LIFECYCLE
     inceptionYear = "2018"
     description = "Android Lifecycle Service"
 }
diff --git a/lifecycle/lifecycle-viewmodel-compose/build.gradle b/lifecycle/lifecycle-viewmodel-compose/build.gradle
index 2a3aa44..2319bfcf 100644
--- a/lifecycle/lifecycle-viewmodel-compose/build.gradle
+++ b/lifecycle/lifecycle-viewmodel-compose/build.gradle
@@ -69,7 +69,6 @@
 androidx {
     name = "Lifecycle ViewModel Compose"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.LIFECYCLE
     inceptionYear = "2021"
     description = "Compose integration with Lifecycle ViewModel"
     runApiTasks = new RunApiTasks.Yes()
diff --git a/lifecycle/lifecycle-viewmodel-compose/samples/build.gradle b/lifecycle/lifecycle-viewmodel-compose/samples/build.gradle
index 2d12179..195fb57 100644
--- a/lifecycle/lifecycle-viewmodel-compose/samples/build.gradle
+++ b/lifecycle/lifecycle-viewmodel-compose/samples/build.gradle
@@ -35,7 +35,6 @@
 androidx {
     name = "AndroidX Lifecycle ViewModel Compose Integration Samples"
     type = LibraryType.SAMPLES
-    mavenGroup = LibraryGroups.LIFECYCLE
     inceptionYear = "2021"
     description = "Samples for Compose integration with Lifecycle ViewModel"
 }
diff --git a/lifecycle/lifecycle-viewmodel-ktx/build.gradle b/lifecycle/lifecycle-viewmodel-ktx/build.gradle
index 01883e7..3f1ae34 100644
--- a/lifecycle/lifecycle-viewmodel-ktx/build.gradle
+++ b/lifecycle/lifecycle-viewmodel-ktx/build.gradle
@@ -41,7 +41,6 @@
 androidx {
     name = "Android Lifecycle ViewModel Kotlin Extensions"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.LIFECYCLE
     inceptionYear = "2018"
     description = "Kotlin extensions for 'viewmodel' artifact"
 }
diff --git a/lifecycle/lifecycle-viewmodel-savedstate/build.gradle b/lifecycle/lifecycle-viewmodel-savedstate/build.gradle
index 1cda340..3ceb0b3 100644
--- a/lifecycle/lifecycle-viewmodel-savedstate/build.gradle
+++ b/lifecycle/lifecycle-viewmodel-savedstate/build.gradle
@@ -62,7 +62,6 @@
 androidx {
     name = "Android Lifecycle ViewModel with SavedState"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.LIFECYCLE
     inceptionYear = "2018"
     description = "Android Lifecycle ViewModel"
 }
diff --git a/lifecycle/lifecycle-viewmodel/build.gradle b/lifecycle/lifecycle-viewmodel/build.gradle
index c52cb40..ccee8de 100644
--- a/lifecycle/lifecycle-viewmodel/build.gradle
+++ b/lifecycle/lifecycle-viewmodel/build.gradle
@@ -55,7 +55,6 @@
 androidx {
     name = "Android Lifecycle ViewModel"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.LIFECYCLE
     inceptionYear = "2017"
     description = "Android Lifecycle ViewModel"
 }
diff --git a/lint-checks/build.gradle b/lint-checks/build.gradle
index 11b7a85..3fccf78 100644
--- a/lint-checks/build.gradle
+++ b/lint-checks/build.gradle
@@ -52,7 +52,7 @@
         "exportAtomicLibraryGroupsToText",
         ExportAtomicLibraryGroupsToTextTask
 ) { task ->
-    task.libraryGroups = androidx.LibraryGroups
+    task.libraryGroups = androidx.AllLibraryGroups
 
     def generatedDirectory = new File(project.buildDir, "generated/resources")
     task.outputDir.set(generatedDirectory)
diff --git a/loader/loader-ktx/build.gradle b/loader/loader-ktx/build.gradle
index 0f326a8..b6d2b3a 100644
--- a/loader/loader-ktx/build.gradle
+++ b/loader/loader-ktx/build.gradle
@@ -43,7 +43,6 @@
 androidx {
     name = "Loader Kotlin Extensions"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.LOADER
     inceptionYear = "2019"
     description = "Kotlin extensions for 'loader' artifact"
 }
diff --git a/loader/loader/build.gradle b/loader/loader/build.gradle
index e3c3d99..e9ff426 100644
--- a/loader/loader/build.gradle
+++ b/loader/loader/build.gradle
@@ -25,7 +25,6 @@
 androidx {
     name = "Android Support Library loader"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.LOADER
     inceptionYear = "2011"
     description = "The Support Library is a static library that you can add to your Android application in order to use APIs that are either not available for older platform versions or utility APIs that aren\'t a part of the framework APIs. Compatible on devices running API 14 or later."
     }
diff --git a/media/media/build.gradle b/media/media/build.gradle
index 05c226d..91a6177 100644
--- a/media/media/build.gradle
+++ b/media/media/build.gradle
@@ -54,7 +54,6 @@
     name = "Android Support Library media compat"
     publish = Publish.SNAPSHOT_AND_RELEASE
     mavenVersion = LibraryVersions.MEDIA
-    mavenGroup = LibraryGroups.MEDIA
     inceptionYear = "2011"
     description = "The Support Library is a static library that you can add to your Android application in order to use APIs that are either not available for older platform versions or utility APIs that aren't a part of the framework APIs. Compatible on devices running API 14 or later."
     failOnDeprecationWarnings = false
diff --git a/media2/media2-common/build.gradle b/media2/media2-common/build.gradle
index e4292a4..1b77a22 100644
--- a/media2/media2-common/build.gradle
+++ b/media2/media2-common/build.gradle
@@ -59,7 +59,6 @@
 androidx {
     name = "AndroidX media2 common library"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.MEDIA2
     inceptionYear = "2018"
     description = "Media2 Common"
     failOnDeprecationWarnings = false
diff --git a/media2/media2-exoplayer/build.gradle b/media2/media2-exoplayer/build.gradle
index 187272e..291a8bc 100644
--- a/media2/media2-exoplayer/build.gradle
+++ b/media2/media2-exoplayer/build.gradle
@@ -37,7 +37,6 @@
 androidx {
     name = "Media2 repackaged ExoPlayer dependency"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.MEDIA2
     inceptionYear = "2018"
     description = "Repackaged ExoPlayer for 'media2' artifact"
 }
diff --git a/media2/media2-player/build.gradle b/media2/media2-player/build.gradle
index 7320d6f..c11da0f 100644
--- a/media2/media2-player/build.gradle
+++ b/media2/media2-player/build.gradle
@@ -51,7 +51,6 @@
 androidx {
     name = "AndroidX media2 player library"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.MEDIA2
     inceptionYear = "2018"
     description = "Media2 Player"
     failOnDeprecationWarnings = false
diff --git a/media2/media2-session/build.gradle b/media2/media2-session/build.gradle
index 99c9c4a..22745c0 100644
--- a/media2/media2-session/build.gradle
+++ b/media2/media2-session/build.gradle
@@ -52,7 +52,6 @@
 androidx {
     name = "AndroidX media2 session library"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.MEDIA2
     inceptionYear = "2018"
     description = "Media2 Session"
     failOnDeprecationWarnings = false
diff --git a/media2/media2-widget/build.gradle b/media2/media2-widget/build.gradle
index 91a01ef..d4452b3 100644
--- a/media2/media2-widget/build.gradle
+++ b/media2/media2-widget/build.gradle
@@ -58,7 +58,6 @@
 androidx {
     name = "AndroidX media2 widget library"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.MEDIA2
     inceptionYear = "2018"
     description = "AndroidX Media2 Widget"
 }
diff --git a/mediarouter/mediarouter-testing/build.gradle b/mediarouter/mediarouter-testing/build.gradle
index ce4b429..5d2fbf6 100644
--- a/mediarouter/mediarouter-testing/build.gradle
+++ b/mediarouter/mediarouter-testing/build.gradle
@@ -29,7 +29,6 @@
 androidx {
     name = "AndroidX MediaRouter Testing"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.MEDIAROUTER
     inceptionYear = "2021"
     description = "Test utilities for AndroidX MediaRouter"
 }
diff --git a/mediarouter/mediarouter/build.gradle b/mediarouter/mediarouter/build.gradle
index 592becd..fcaf016 100644
--- a/mediarouter/mediarouter/build.gradle
+++ b/mediarouter/mediarouter/build.gradle
@@ -55,7 +55,6 @@
 androidx {
     name = "Android MediaRouter Support Library"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.MEDIAROUTER
     inceptionYear = "2013"
     description = "Android MediaRouter Support Library"
     failOnDeprecationWarnings = false
diff --git a/metrics/metrics-benchmark/build.gradle b/metrics/metrics-benchmark/build.gradle
index 82b966b..7a1d47b 100644
--- a/metrics/metrics-benchmark/build.gradle
+++ b/metrics/metrics-benchmark/build.gradle
@@ -43,6 +43,3 @@
     }
 }
 
-androidx {
-    mavenGroup = LibraryGroups.METRICS
-}
diff --git a/metrics/metrics-performance/build.gradle b/metrics/metrics-performance/build.gradle
index 60e88d4..94fcacb 100644
--- a/metrics/metrics-performance/build.gradle
+++ b/metrics/metrics-performance/build.gradle
@@ -61,7 +61,6 @@
 
     name = "AndroidX Metrics"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.METRICS
     inceptionYear = "2021"
     description = "Library for tracking and reporting various runtime metrics for applications"
 }
diff --git a/navigation/navigation-benchmark/build.gradle b/navigation/navigation-benchmark/build.gradle
index 7dde6e3..53cfa31 100644
--- a/navigation/navigation-benchmark/build.gradle
+++ b/navigation/navigation-benchmark/build.gradle
@@ -38,7 +38,6 @@
 androidx {
     name = "Navigation Benchmarks"
     publish = Publish.NONE
-    mavenGroup = LibraryGroups.NAVIGATION
     inceptionYear = "2018"
     description = "Navigation Benchmarks"
 }
diff --git a/navigation/navigation-common-ktx/build.gradle b/navigation/navigation-common-ktx/build.gradle
index 160f4e1..03904c3 100644
--- a/navigation/navigation-common-ktx/build.gradle
+++ b/navigation/navigation-common-ktx/build.gradle
@@ -34,7 +34,6 @@
 androidx {
     name = "Android Navigation Common Kotlin Extensions"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.NAVIGATION
     inceptionYear = "2018"
     description = "Android Navigation-Common-Ktx"
 }
diff --git a/navigation/navigation-common-lint/build.gradle b/navigation/navigation-common-lint/build.gradle
index 2136ad1..2bdc5ef 100644
--- a/navigation/navigation-common-lint/build.gradle
+++ b/navigation/navigation-common-lint/build.gradle
@@ -35,7 +35,6 @@
 androidx {
     name = "Navigation Common Lint"
     type = LibraryType.LINT
-    mavenGroup = LibraryGroups.NAVIGATION
     inceptionYear = "2022"
     description = "Lint checks for Navigation Common"
 }
diff --git a/navigation/navigation-common/build.gradle b/navigation/navigation-common/build.gradle
index 33cb3fe..08168f1 100644
--- a/navigation/navigation-common/build.gradle
+++ b/navigation/navigation-common/build.gradle
@@ -67,7 +67,6 @@
 androidx {
     name = "Android Navigation Common"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.NAVIGATION
     inceptionYear = "2017"
     description = "Android Navigation-Common"
 }
diff --git a/navigation/navigation-compose-lint/build.gradle b/navigation/navigation-compose-lint/build.gradle
index 916656e..aa54393 100644
--- a/navigation/navigation-compose-lint/build.gradle
+++ b/navigation/navigation-compose-lint/build.gradle
@@ -42,7 +42,6 @@
 androidx {
     name = "Navigation Compose Lint"
     type = LibraryType.LINT
-    mavenGroup = LibraryGroups.NAVIGATION
     inceptionYear = "2021"
     description = "Lint checks for Navigation Compose"
 }
diff --git a/navigation/navigation-compose/build.gradle b/navigation/navigation-compose/build.gradle
index 8495d53..8275048 100644
--- a/navigation/navigation-compose/build.gradle
+++ b/navigation/navigation-compose/build.gradle
@@ -62,7 +62,6 @@
 androidx {
     name = "Compose Navigation"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.NAVIGATION
     inceptionYear = "2020"
     description = "Compose integration with Navigation"
     runApiTasks = new RunApiTasks.Yes()
diff --git a/navigation/navigation-compose/samples/build.gradle b/navigation/navigation-compose/samples/build.gradle
index bc199d1..8ee9740 100644
--- a/navigation/navigation-compose/samples/build.gradle
+++ b/navigation/navigation-compose/samples/build.gradle
@@ -40,7 +40,6 @@
 androidx {
     name = "AndroidX Compose UI Navigation Integration Samples"
     type = LibraryType.SAMPLES
-    mavenGroup = LibraryGroups.NAVIGATION
     inceptionYear = "2020"
     description = "Samples for Compose integration with Navigation"
 }
diff --git a/navigation/navigation-dynamic-features-fragment/build.gradle b/navigation/navigation-dynamic-features-fragment/build.gradle
index 8631ad3..80119e7 100644
--- a/navigation/navigation-dynamic-features-fragment/build.gradle
+++ b/navigation/navigation-dynamic-features-fragment/build.gradle
@@ -66,7 +66,6 @@
 androidx {
     name = "Android Dynamic Feature Navigation Fragment"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.NAVIGATION
     inceptionYear = "2019"
     description = "Android Dynamic Feature Navigation Fragment"
 }
diff --git a/navigation/navigation-dynamic-features-runtime/build.gradle b/navigation/navigation-dynamic-features-runtime/build.gradle
index 6711b01..e56823a 100644
--- a/navigation/navigation-dynamic-features-runtime/build.gradle
+++ b/navigation/navigation-dynamic-features-runtime/build.gradle
@@ -62,7 +62,6 @@
 androidx {
     name = "Android Dynamic Feature Navigation Runtime"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.NAVIGATION
     inceptionYear = "2019"
     description = "Android Dynamic Feature Navigation Runtime"
 }
\ No newline at end of file
diff --git a/navigation/navigation-fragment-ktx/build.gradle b/navigation/navigation-fragment-ktx/build.gradle
index 83aee82..2cb0659 100644
--- a/navigation/navigation-fragment-ktx/build.gradle
+++ b/navigation/navigation-fragment-ktx/build.gradle
@@ -32,7 +32,6 @@
 androidx {
     name = "Android Navigation Fragment Kotlin Extensions"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.NAVIGATION
     inceptionYear = "2018"
     description = "Android Navigation-Fragment-Ktx"
 }
diff --git a/navigation/navigation-fragment/build.gradle b/navigation/navigation-fragment/build.gradle
index 5761728..6a5302c 100644
--- a/navigation/navigation-fragment/build.gradle
+++ b/navigation/navigation-fragment/build.gradle
@@ -45,7 +45,6 @@
 androidx {
     name = "Android Navigation Fragment"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.NAVIGATION
     inceptionYear = "2017"
     description = "Android Navigation-Fragment"
 }
diff --git a/navigation/navigation-runtime-ktx/build.gradle b/navigation/navigation-runtime-ktx/build.gradle
index 0066ce3..1b497c7 100644
--- a/navigation/navigation-runtime-ktx/build.gradle
+++ b/navigation/navigation-runtime-ktx/build.gradle
@@ -32,7 +32,6 @@
 androidx {
     name = "Android Navigation Runtime Kotlin Extensions"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.NAVIGATION
     inceptionYear = "2018"
     description = "Android Navigation-Runtime-Ktx"
 }
diff --git a/navigation/navigation-runtime-lint/build.gradle b/navigation/navigation-runtime-lint/build.gradle
index c586a3d..3362b92 100644
--- a/navigation/navigation-runtime-lint/build.gradle
+++ b/navigation/navigation-runtime-lint/build.gradle
@@ -35,7 +35,6 @@
 androidx {
     name = "Navigation Runtime Lint"
     type = LibraryType.LINT
-    mavenGroup = LibraryGroups.NAVIGATION
     inceptionYear = "2022"
     description = "Lint checks for Navigation Runtime"
 }
diff --git a/navigation/navigation-runtime-truth/build.gradle b/navigation/navigation-runtime-truth/build.gradle
index f93de57..dfc5054 100644
--- a/navigation/navigation-runtime-truth/build.gradle
+++ b/navigation/navigation-runtime-truth/build.gradle
@@ -40,7 +40,6 @@
 androidx {
     name = "Android Navigation Runtime Truth"
     publish = Publish.NONE
-    mavenGroup = LibraryGroups.NAVIGATION
     inceptionYear = "2019"
     description = "Android Navigation-Runtime-Truth"
 }
diff --git a/navigation/navigation-runtime/build.gradle b/navigation/navigation-runtime/build.gradle
index fa30316..a7e476e 100644
--- a/navigation/navigation-runtime/build.gradle
+++ b/navigation/navigation-runtime/build.gradle
@@ -61,7 +61,6 @@
 androidx {
     name = "Android Navigation Runtime"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.NAVIGATION
     inceptionYear = "2017"
     description = "Android Navigation-Runtime"
 }
diff --git a/navigation/navigation-safe-args-generator/build.gradle b/navigation/navigation-safe-args-generator/build.gradle
index 1741903..4b4c91f 100644
--- a/navigation/navigation-safe-args-generator/build.gradle
+++ b/navigation/navigation-safe-args-generator/build.gradle
@@ -62,7 +62,6 @@
 androidx {
     name = "Android Navigation TypeSafe Arguments Generator"
     type = LibraryType.OTHER_CODE_PROCESSOR
-    mavenGroup = LibraryGroups.NAVIGATION
     inceptionYear = "2017"
     description = "Android Navigation TypeSafe Arguments Generator"
 }
diff --git a/navigation/navigation-safe-args-gradle-plugin/build.gradle b/navigation/navigation-safe-args-gradle-plugin/build.gradle
index f44ca8d..1d740b2 100644
--- a/navigation/navigation-safe-args-gradle-plugin/build.gradle
+++ b/navigation/navigation-safe-args-gradle-plugin/build.gradle
@@ -52,7 +52,6 @@
 androidx {
     name = "Android Navigation TypeSafe Arguments Gradle Plugin"
     type = LibraryType.GRADLE_PLUGIN
-    mavenGroup = LibraryGroups.NAVIGATION
     inceptionYear = "2017"
     description = "Android Navigation TypeSafe Arguments Gradle Plugin"
 }
diff --git a/navigation/navigation-testing/build.gradle b/navigation/navigation-testing/build.gradle
index 8dde763..d30a3fc 100644
--- a/navigation/navigation-testing/build.gradle
+++ b/navigation/navigation-testing/build.gradle
@@ -40,7 +40,6 @@
 androidx {
     name = "Android Navigation Testing"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.NAVIGATION
     inceptionYear = "2017"
     description = "Android Navigation-Testing"
 }
diff --git a/navigation/navigation-ui-ktx/build.gradle b/navigation/navigation-ui-ktx/build.gradle
index 4e889f5..3cbe68b 100644
--- a/navigation/navigation-ui-ktx/build.gradle
+++ b/navigation/navigation-ui-ktx/build.gradle
@@ -32,7 +32,6 @@
 androidx {
     name = "Android Navigation UI Kotlin Extensions"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.NAVIGATION
     inceptionYear = "2018"
     description = "Android Navigation-UI-Ktx"
 }
diff --git a/navigation/navigation-ui/build.gradle b/navigation/navigation-ui/build.gradle
index f9836df..5dd6cca 100644
--- a/navigation/navigation-ui/build.gradle
+++ b/navigation/navigation-ui/build.gradle
@@ -57,7 +57,6 @@
 androidx {
     name = "Android Navigation UI"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.NAVIGATION
     inceptionYear = "2018"
     description = "Android Navigation-UI"
 }
diff --git a/paging/paging-common-ktx/build.gradle b/paging/paging-common-ktx/build.gradle
index 4d6c34b..bab41ca 100644
--- a/paging/paging-common-ktx/build.gradle
+++ b/paging/paging-common-ktx/build.gradle
@@ -28,7 +28,6 @@
 androidx {
     name = "Android Paging-Common Kotlin Extensions"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.PAGING
     inceptionYear = "2018"
     description = "Kotlin extensions for 'paging-common' artifact"
 }
diff --git a/paging/paging-common/build.gradle b/paging/paging-common/build.gradle
index 88a3769..e2ce56b 100644
--- a/paging/paging-common/build.gradle
+++ b/paging/paging-common/build.gradle
@@ -53,7 +53,6 @@
 androidx {
     name = "Android Paging-Common"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.PAGING
     inceptionYear = "2017"
     description = "Android Paging-Common"
 }
diff --git a/paging/paging-compose/build.gradle b/paging/paging-compose/build.gradle
index a1a8f3a..0fc9b87 100644
--- a/paging/paging-compose/build.gradle
+++ b/paging/paging-compose/build.gradle
@@ -54,7 +54,6 @@
     name = "Android Paging-Compose"
     publish = Publish.SNAPSHOT_AND_RELEASE
     mavenVersion = LibraryVersions.PAGING_COMPOSE
-    mavenGroup = LibraryGroups.PAGING
     inceptionYear = "2020"
     description = "Compose integration with Paging"
     runApiTasks = new RunApiTasks.Yes()
diff --git a/paging/paging-compose/samples/build.gradle b/paging/paging-compose/samples/build.gradle
index fb0f929..9d4ef9f 100644
--- a/paging/paging-compose/samples/build.gradle
+++ b/paging/paging-compose/samples/build.gradle
@@ -36,7 +36,6 @@
     name = "AndroidX Paging Compose Samples"
     type = LibraryType.SAMPLES
     mavenVersion = LibraryVersions.PAGING_COMPOSE
-    mavenGroup = LibraryGroups.PAGING
     inceptionYear = "2020"
     description = "Contains the sample code for the Androidx Paging library compose interop"
 }
diff --git a/paging/paging-guava/build.gradle b/paging/paging-guava/build.gradle
index 8138c10..041702f 100644
--- a/paging/paging-guava/build.gradle
+++ b/paging/paging-guava/build.gradle
@@ -41,7 +41,6 @@
 androidx {
     name = "Android Paging Guava"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.PAGING
     inceptionYear = "2019"
     description = "Android Paging Guava"
     legacyDisableKotlinStrictApiMode = true
diff --git a/paging/paging-runtime-ktx/build.gradle b/paging/paging-runtime-ktx/build.gradle
index 4ec8ec9..3f2e05d 100644
--- a/paging/paging-runtime-ktx/build.gradle
+++ b/paging/paging-runtime-ktx/build.gradle
@@ -31,7 +31,6 @@
 androidx {
     name = "Android Paging-Runtime Kotlin Extensions"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.PAGING
     inceptionYear = "2018"
     description = "Kotlin extensions for 'paging-runtime' artifact"
 }
diff --git a/paging/paging-runtime/build.gradle b/paging/paging-runtime/build.gradle
index 7297aae..e39b1bf 100644
--- a/paging/paging-runtime/build.gradle
+++ b/paging/paging-runtime/build.gradle
@@ -68,7 +68,6 @@
 androidx {
     name = "Android Paging-Runtime"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.PAGING
     inceptionYear = "2017"
     description = "Android Paging-Runtime"
     legacyDisableKotlinStrictApiMode = true
diff --git a/paging/paging-rxjava2-ktx/build.gradle b/paging/paging-rxjava2-ktx/build.gradle
index 0d9d6d8..b298111 100644
--- a/paging/paging-rxjava2-ktx/build.gradle
+++ b/paging/paging-rxjava2-ktx/build.gradle
@@ -38,7 +38,6 @@
 androidx {
     name = "Android Paging RxJava2 Kotlin Extensions"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.PAGING
     inceptionYear = "2018"
     description = "Kotlin extensions for 'paging-rxjava2' artifact"
 }
diff --git a/paging/paging-rxjava2/build.gradle b/paging/paging-rxjava2/build.gradle
index 0ee6124..da06741d 100644
--- a/paging/paging-rxjava2/build.gradle
+++ b/paging/paging-rxjava2/build.gradle
@@ -49,7 +49,6 @@
 androidx {
     name = "Android Paging-RXJava2"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.PAGING
     inceptionYear = "2018"
     description = "Android Paging-RXJava2"
     legacyDisableKotlinStrictApiMode = true
diff --git a/paging/paging-rxjava3/build.gradle b/paging/paging-rxjava3/build.gradle
index ae2cd17..f69969b 100644
--- a/paging/paging-rxjava3/build.gradle
+++ b/paging/paging-rxjava3/build.gradle
@@ -47,7 +47,6 @@
 androidx {
     name = "Android Paging-RxJava3"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.PAGING
     inceptionYear = "2020"
     description = "Android Paging-RxJava3"
     legacyDisableKotlinStrictApiMode = true
diff --git a/paging/paging-testing/build.gradle b/paging/paging-testing/build.gradle
index 8aef80c..18e00f6 100644
--- a/paging/paging-testing/build.gradle
+++ b/paging/paging-testing/build.gradle
@@ -38,7 +38,6 @@
 androidx {
     name = "androidx.paging:paging-testing"
     type = LibraryType.PUBLISHED_LIBRARY
-    mavenGroup = LibraryGroups.PAGING
     inceptionYear = "2022"
     description = "Test artifact for Paging implementation"
     publish = Publish.SNAPSHOT_AND_RELEASE
diff --git a/paging/samples/build.gradle b/paging/samples/build.gradle
index 855bd82..4a7e36a 100644
--- a/paging/samples/build.gradle
+++ b/paging/samples/build.gradle
@@ -54,7 +54,6 @@
 androidx {
     name = "AndroidX Paging Samples"
     type = LibraryType.SAMPLES
-    mavenGroup = LibraryGroups.PAGING
     inceptionYear = "2019"
     description = "Contains the sample code for the Androidx Paging library"
 }
diff --git a/palette/palette-ktx/build.gradle b/palette/palette-ktx/build.gradle
index 4e09042..20b494b 100644
--- a/palette/palette-ktx/build.gradle
+++ b/palette/palette-ktx/build.gradle
@@ -39,7 +39,6 @@
 androidx {
     name = "Palette Kotlin Extensions"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.PALETTE
     inceptionYear = "2018"
     description = "Kotlin extensions for 'palette' artifact"
 }
diff --git a/palette/palette/build.gradle b/palette/palette/build.gradle
index 573af81..bb524c8 100644
--- a/palette/palette/build.gradle
+++ b/palette/palette/build.gradle
@@ -24,7 +24,6 @@
 androidx {
     name = "Android Support Palette"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.PALETTE
     inceptionYear = "2014"
     description = "Android Support Palette"
 }
diff --git a/percentlayout/percentlayout/build.gradle b/percentlayout/percentlayout/build.gradle
index a69daf7..a28d3b0 100644
--- a/percentlayout/percentlayout/build.gradle
+++ b/percentlayout/percentlayout/build.gradle
@@ -26,7 +26,6 @@
 androidx {
     name = "Android Percent Support Library"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.PERCENTLAYOUT
     inceptionYear = "2015"
     description = "Android Percent Support Library"
 }
diff --git a/preference/preference-ktx/build.gradle b/preference/preference-ktx/build.gradle
index ebc4836..19e8159 100644
--- a/preference/preference-ktx/build.gradle
+++ b/preference/preference-ktx/build.gradle
@@ -50,7 +50,6 @@
 androidx {
     name = "Android Preferences KTX"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.PREFERENCE
     inceptionYear = "2018"
     description = "Kotlin extensions for preferences"
 }
diff --git a/preference/preference/build.gradle b/preference/preference/build.gradle
index 782614b..475c906 100644
--- a/preference/preference/build.gradle
+++ b/preference/preference/build.gradle
@@ -71,7 +71,6 @@
 androidx {
     name = "AndroidX Preference"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.PREFERENCE
     inceptionYear = "2015"
     description = "AndroidX Preference"
 }
diff --git a/print/print/build.gradle b/print/print/build.gradle
index 733e8fb..3b8be7c 100644
--- a/print/print/build.gradle
+++ b/print/print/build.gradle
@@ -12,7 +12,6 @@
 androidx {
     name = "Android Support Library Print"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.PRINT
     inceptionYear = "2018"
     description = "The Support Library is a static library that you can add to your Android application in order to use APIs that are either not available for older platform versions or utility APIs that aren't a part of the framework APIs. Compatible on devices running API 14 or later."
 }
diff --git a/privacysandbox/sdkruntime/sdkruntime-client/build.gradle b/privacysandbox/sdkruntime/sdkruntime-client/build.gradle
index 12371e8..4ce9b50 100644
--- a/privacysandbox/sdkruntime/sdkruntime-client/build.gradle
+++ b/privacysandbox/sdkruntime/sdkruntime-client/build.gradle
@@ -33,7 +33,6 @@
 androidx {
     name = "androidx.privacysandbox.sdkruntime:sdkruntime-client"
     type = LibraryType.PUBLISHED_LIBRARY
-    mavenGroup = LibraryGroups.PRIVACYSANDBOX_SDKRUNTIME
     inceptionYear = "2022"
     description = "Provides components for SdkRuntime aware Applications"
 }
diff --git a/privacysandbox/sdkruntime/sdkruntime-core/build.gradle b/privacysandbox/sdkruntime/sdkruntime-core/build.gradle
index 2bb6772..bbd8542 100644
--- a/privacysandbox/sdkruntime/sdkruntime-core/build.gradle
+++ b/privacysandbox/sdkruntime/sdkruntime-core/build.gradle
@@ -33,7 +33,6 @@
 androidx {
     name = "androidx.privacysandbox.sdkruntime:sdkruntime-core"
     type = LibraryType.PUBLISHED_LIBRARY
-    mavenGroup = LibraryGroups.PRIVACYSANDBOX_SDKRUNTIME
     inceptionYear = "2022"
     description = "Provides components for SdkRuntime aware SDKs"
 }
diff --git a/privacysandbox/tools/tools-apicompiler/build.gradle b/privacysandbox/tools/tools-apicompiler/build.gradle
index d45bcdf..22995d8 100644
--- a/privacysandbox/tools/tools-apicompiler/build.gradle
+++ b/privacysandbox/tools/tools-apicompiler/build.gradle
@@ -55,7 +55,6 @@
 androidx {
     name = "androidx.privacysandbox.tools:tools-apicompiler"
     type = LibraryType.ANNOTATION_PROCESSOR
-    mavenGroup = LibraryGroups.PRIVACYSANDBOX_TOOLS
     inceptionYear = "2022"
     description = "Compiler for Privacy Sandbox API annotations."
 }
diff --git a/privacysandbox/tools/tools-apigenerator/build.gradle b/privacysandbox/tools/tools-apigenerator/build.gradle
index 04b0326..5e82a89 100644
--- a/privacysandbox/tools/tools-apigenerator/build.gradle
+++ b/privacysandbox/tools/tools-apigenerator/build.gradle
@@ -61,7 +61,6 @@
 androidx {
     name = "androidx.privacysandbox.tools:tools-apigenerator"
     type = LibraryType.OTHER_CODE_PROCESSOR
-    mavenGroup = LibraryGroups.PRIVACYSANDBOX_TOOLS
     inceptionYear = "2022"
     description = "Generate sources for communication with SDKs in the Privacy Sandbox."
     runApiTasks = new RunApiTasks.No("API still under active development.")
diff --git a/privacysandbox/tools/tools-apipackager/build.gradle b/privacysandbox/tools/tools-apipackager/build.gradle
index 812d48a..19089d3 100644
--- a/privacysandbox/tools/tools-apipackager/build.gradle
+++ b/privacysandbox/tools/tools-apipackager/build.gradle
@@ -40,7 +40,6 @@
 androidx {
     name = "androidx.privacysandbox.tools:tools-apipackager"
     type = LibraryType.OTHER_CODE_PROCESSOR
-    mavenGroup = LibraryGroups.PRIVACYSANDBOX_TOOLS
     inceptionYear = "2022"
     description = "Packages API descriptions from SDKs compiled with Privacy Sandbox annotations."
 }
diff --git a/privacysandbox/tools/tools-core/build.gradle b/privacysandbox/tools/tools-core/build.gradle
index bb18c7b..9998eef 100644
--- a/privacysandbox/tools/tools-core/build.gradle
+++ b/privacysandbox/tools/tools-core/build.gradle
@@ -70,7 +70,6 @@
 androidx {
     name = "androidx.privacysandbox.tools:tools-core"
     type = LibraryType.ANNOTATION_PROCESSOR_UTILS
-    mavenGroup = LibraryGroups.PRIVACYSANDBOX_TOOLS
     inceptionYear = "2022"
     description = "Core utilities for Privacy Sandbox Tools."
 }
diff --git a/privacysandbox/tools/tools-testing/build.gradle b/privacysandbox/tools/tools-testing/build.gradle
index 8132d84..87354d6 100644
--- a/privacysandbox/tools/tools-testing/build.gradle
+++ b/privacysandbox/tools/tools-testing/build.gradle
@@ -32,7 +32,6 @@
 androidx {
     name = "androidx.privacysandbox.tools:tools-testing"
     type = LibraryType.INTERNAL_TEST_LIBRARY
-    mavenGroup = LibraryGroups.PRIVACYSANDBOX_TOOLS
     inceptionYear = "2022"
     description = "Testing utilities for privacysandbox tools."
 }
diff --git a/privacysandbox/tools/tools/build.gradle b/privacysandbox/tools/tools/build.gradle
index a2ccc30..ab1a8d2 100644
--- a/privacysandbox/tools/tools/build.gradle
+++ b/privacysandbox/tools/tools/build.gradle
@@ -30,7 +30,6 @@
 androidx {
     name = "androidx.privacysandbox.tools:tools"
     type = LibraryType.PUBLISHED_LIBRARY
-    mavenGroup = LibraryGroups.PRIVACYSANDBOX_TOOLS
     inceptionYear = "2022"
     description = "Tools for communicating with SDKs running in the Privacy Sandbox."
     runApiTasks = new RunApiTasks.No("API still under active development.")
diff --git a/privacysandbox/ui/ui-client/build.gradle b/privacysandbox/ui/ui-client/build.gradle
index 8c3be5e..82beabb 100644
--- a/privacysandbox/ui/ui-client/build.gradle
+++ b/privacysandbox/ui/ui-client/build.gradle
@@ -34,7 +34,6 @@
 androidx {
     name = "androidx.privacysandbox.ui:ui-client"
     type = LibraryType.PUBLISHED_LIBRARY
-    mavenGroup = LibraryGroups.PRIVACYSANDBOX_UI
     inceptionYear = "2022"
     description = "show UI from an SDKRuntime aware SDK"
 }
diff --git a/privacysandbox/ui/ui-core/build.gradle b/privacysandbox/ui/ui-core/build.gradle
index 6d1734d..4e0e9bd 100644
--- a/privacysandbox/ui/ui-core/build.gradle
+++ b/privacysandbox/ui/ui-core/build.gradle
@@ -34,7 +34,6 @@
 androidx {
     name = "androidx.privacysandbox.ui:ui-core"
     type = LibraryType.PUBLISHED_LIBRARY
-    mavenGroup = LibraryGroups.PRIVACYSANDBOX_UI
     inceptionYear = "2022"
     description = "contains core definitions for the privacysandbox ui library."
 }
diff --git a/privacysandbox/ui/ui-provider/build.gradle b/privacysandbox/ui/ui-provider/build.gradle
index 51a6f39..6b2b1324 100644
--- a/privacysandbox/ui/ui-provider/build.gradle
+++ b/privacysandbox/ui/ui-provider/build.gradle
@@ -34,7 +34,6 @@
 androidx {
     name = "androidx.privacysandbox.ui:ui-provider"
     type = LibraryType.PUBLISHED_LIBRARY
-    mavenGroup = LibraryGroups.PRIVACYSANDBOX_UI
     inceptionYear = "2022"
     description = "lets an SdkRuntime aware SDK share UI with a client application."
 }
diff --git a/profileinstaller/profileinstaller-benchmark/build.gradle b/profileinstaller/profileinstaller-benchmark/build.gradle
index f9f56b9..920f540 100644
--- a/profileinstaller/profileinstaller-benchmark/build.gradle
+++ b/profileinstaller/profileinstaller-benchmark/build.gradle
@@ -40,7 +40,6 @@
 androidx {
     name = "Profileinstaller Benchmarks"
     publish = Publish.NONE
-    mavenGroup = LibraryGroups.PROFILEINSTALLER
     inceptionYear = "2021"
     description = "Profileinstaller Benchmarks"
 }
diff --git a/profileinstaller/profileinstaller/build.gradle b/profileinstaller/profileinstaller/build.gradle
index 4a26114..ba3d60d 100644
--- a/profileinstaller/profileinstaller/build.gradle
+++ b/profileinstaller/profileinstaller/build.gradle
@@ -34,7 +34,6 @@
 androidx {
     name = "androidx.profileinstaller:profileinstaller"
     type = LibraryType.PUBLISHED_LIBRARY
-    mavenGroup = LibraryGroups.PROFILEINSTALLER
     inceptionYear = "2021"
     description = "Allows libraries to prepopulate ahead of time compilation traces to be read by" +
             " ART"
diff --git a/recommendation/recommendation/build.gradle b/recommendation/recommendation/build.gradle
index 4e37e3c..25a96bf 100644
--- a/recommendation/recommendation/build.gradle
+++ b/recommendation/recommendation/build.gradle
@@ -19,7 +19,6 @@
 androidx {
     name = "Android Support Recommendation"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.RECOMMENDATION
     inceptionYear = "2015"
     description = "Android Support Recommendation"
     failOnDeprecationWarnings = false
diff --git a/recyclerview/recyclerview-benchmark/build.gradle b/recyclerview/recyclerview-benchmark/build.gradle
index 8083a5c7..55bfdaa 100644
--- a/recyclerview/recyclerview-benchmark/build.gradle
+++ b/recyclerview/recyclerview-benchmark/build.gradle
@@ -37,6 +37,3 @@
     namespace "androidx.recyclerview.benchmark"
 }
 
-androidx {
-    mavenGroup = LibraryGroups.RECYCLERVIEW
-}
diff --git a/recyclerview/recyclerview-lint/build.gradle b/recyclerview/recyclerview-lint/build.gradle
index 3c20aeb..67c9e63 100644
--- a/recyclerview/recyclerview-lint/build.gradle
+++ b/recyclerview/recyclerview-lint/build.gradle
@@ -34,7 +34,6 @@
 androidx {
     name = "RecyclerView Lint Checks"
     type = LibraryType.LINT
-    mavenGroup = LibraryGroups.RECYCLERVIEW
     inceptionYear = "2020"
     description = "RecyclerView Lint Checks"
 }
diff --git a/recyclerview/recyclerview-selection/build.gradle b/recyclerview/recyclerview-selection/build.gradle
index 7641371..49f9cfd 100644
--- a/recyclerview/recyclerview-selection/build.gradle
+++ b/recyclerview/recyclerview-selection/build.gradle
@@ -40,7 +40,6 @@
     name = "Android RecyclerView Selection"
     publish = Publish.SNAPSHOT_AND_RELEASE
     mavenVersion = LibraryVersions.RECYCLERVIEW_SELECTION
-    mavenGroup = LibraryGroups.RECYCLERVIEW
     inceptionYear = "2017"
     description = "Library providing item selection framework for RecyclerView. Support for touch based and band selection is provided."
 }
diff --git a/recyclerview/recyclerview/build.gradle b/recyclerview/recyclerview/build.gradle
index 991478a..758e3f6 100644
--- a/recyclerview/recyclerview/build.gradle
+++ b/recyclerview/recyclerview/build.gradle
@@ -57,7 +57,6 @@
     name = "Android Support RecyclerView"
     publish = Publish.SNAPSHOT_AND_RELEASE
     mavenVersion = LibraryVersions.RECYCLERVIEW
-    mavenGroup = LibraryGroups.RECYCLERVIEW
     inceptionYear = "2014"
     description = "Android Support RecyclerView"
     failOnDeprecationWarnings = false
diff --git a/remotecallback/processor/build.gradle b/remotecallback/processor/build.gradle
index 8680698..b097e37 100644
--- a/remotecallback/processor/build.gradle
+++ b/remotecallback/processor/build.gradle
@@ -29,7 +29,6 @@
 androidx {
     name = "Remote Callback Compiler"
     type = LibraryType.ANNOTATION_PROCESSOR
-    mavenGroup = LibraryGroups.REMOTECALLBACK
     inceptionYear = "2018"
     description = "Compiler for RemoteCallback implementations"
     failOnDeprecationWarnings = false
diff --git a/remotecallback/remotecallback/build.gradle b/remotecallback/remotecallback/build.gradle
index fe0d220a..3144809 100644
--- a/remotecallback/remotecallback/build.gradle
+++ b/remotecallback/remotecallback/build.gradle
@@ -40,7 +40,6 @@
 androidx {
     name = "Remote Callback"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.REMOTECALLBACK
     inceptionYear = "2018"
     description = "Wraps PendingIntents in a friendly and easier way to handle remote callbacks"
     failOnDeprecationWarnings = false
diff --git a/resourceinspection/resourceinspection-annotation/build.gradle b/resourceinspection/resourceinspection-annotation/build.gradle
index 5981ca1..86bb07a 100644
--- a/resourceinspection/resourceinspection-annotation/build.gradle
+++ b/resourceinspection/resourceinspection-annotation/build.gradle
@@ -28,7 +28,6 @@
 androidx {
     name = "Android Resource Inspection - Annotations"
     type = LibraryType.PUBLISHED_LIBRARY
-    mavenGroup = LibraryGroups.RESOURCEINSPECTION
     inceptionYear = "2021"
     description = "Annotation processors for Android resource and layout inspection"
 }
diff --git a/resourceinspection/resourceinspection-processor/build.gradle b/resourceinspection/resourceinspection-processor/build.gradle
index 5e7e101..a633319 100644
--- a/resourceinspection/resourceinspection-processor/build.gradle
+++ b/resourceinspection/resourceinspection-processor/build.gradle
@@ -52,7 +52,6 @@
 androidx {
     name = "Android Resource Inspection - Annotation Processor"
     type = LibraryType.ANNOTATION_PROCESSOR
-    mavenGroup = LibraryGroups.RESOURCEINSPECTION
     inceptionYear = "2021"
     description = "Annotation processors for Android resource and layout inspection"
 }
diff --git a/room/benchmark/build.gradle b/room/benchmark/build.gradle
index 5a6ddbe..7758551 100644
--- a/room/benchmark/build.gradle
+++ b/room/benchmark/build.gradle
@@ -48,5 +48,4 @@
 
 androidx {
     type = LibraryType.INTERNAL_TEST_LIBRARY
-    mavenGroup = LibraryGroups.ROOM
 }
diff --git a/room/room-common/build.gradle b/room/room-common/build.gradle
index 6b3ebcc..8930841 100644
--- a/room/room-common/build.gradle
+++ b/room/room-common/build.gradle
@@ -34,7 +34,6 @@
 androidx {
     name = "Android Room-Common"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.ROOM
     inceptionYear = "2017"
     description = "Android Room-Common"
 }
diff --git a/room/room-compiler-processing-testing/build.gradle b/room/room-compiler-processing-testing/build.gradle
index a26f969..84229ea 100644
--- a/room/room-compiler-processing-testing/build.gradle
+++ b/room/room-compiler-processing-testing/build.gradle
@@ -71,7 +71,6 @@
 androidx {
     name = "AndroidX Room XProcessor Testing"
     type = LibraryType.ANNOTATION_PROCESSOR_UTILS
-    mavenGroup = LibraryGroups.ROOM
     inceptionYear = "2020"
     description = "Testing helpers for Room XProcessing APIs"
 }
diff --git a/room/room-compiler-processing/build.gradle b/room/room-compiler-processing/build.gradle
index 1056652..345e56b 100644
--- a/room/room-compiler-processing/build.gradle
+++ b/room/room-compiler-processing/build.gradle
@@ -62,7 +62,6 @@
 androidx {
     name = "AndroidX Room XProcessor"
     type = LibraryType.ANNOTATION_PROCESSOR_UTILS
-    mavenGroup = LibraryGroups.ROOM
     inceptionYear = "2020"
     description = "Processing Environment Abstraction for AndroidX Room"
 }
diff --git a/room/room-compiler/build.gradle b/room/room-compiler/build.gradle
index dbf84e5..e0d4d13 100644
--- a/room/room-compiler/build.gradle
+++ b/room/room-compiler/build.gradle
@@ -300,7 +300,6 @@
 androidx {
     name = "Android Room Compiler"
     type = LibraryType.ANNOTATION_PROCESSOR
-    mavenGroup = LibraryGroups.ROOM
     inceptionYear = "2017"
     description = "Android Room annotation processor"
 }
diff --git a/room/room-guava/build.gradle b/room/room-guava/build.gradle
index 1fae3c1..ef2b7b79 100644
--- a/room/room-guava/build.gradle
+++ b/room/room-guava/build.gradle
@@ -36,7 +36,6 @@
 androidx {
     name = "Android Room Guava"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.ROOM
     inceptionYear = "2018"
     description = "Android Room Guava"
 }
diff --git a/room/room-ktx/build.gradle b/room/room-ktx/build.gradle
index b4ed97d..466e365 100644
--- a/room/room-ktx/build.gradle
+++ b/room/room-ktx/build.gradle
@@ -43,7 +43,6 @@
 androidx {
     name = "Android Room Kotlin Extensions"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.ROOM
     inceptionYear = "2019"
     description = "Android Room Kotlin Extensions"
 }
diff --git a/room/room-migration/build.gradle b/room/room-migration/build.gradle
index 49240373..20954b0 100644
--- a/room/room-migration/build.gradle
+++ b/room/room-migration/build.gradle
@@ -34,7 +34,6 @@
 androidx {
     name = "Android Room Migration"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.ROOM
     inceptionYear = "2017"
     description = "Android Room Migration"
 }
diff --git a/room/room-paging-guava/build.gradle b/room/room-paging-guava/build.gradle
index b737920..723c5da 100644
--- a/room/room-paging-guava/build.gradle
+++ b/room/room-paging-guava/build.gradle
@@ -48,7 +48,6 @@
 androidx {
     name = "Room Paging Guava"
     type = LibraryType.PUBLISHED_LIBRARY
-    mavenGroup = LibraryGroups.ROOM
     inceptionYear = "2022"
     description = "Guava integration in Room Paging"
     publish = Publish.SNAPSHOT_AND_RELEASE
diff --git a/room/room-paging-rxjava2/build.gradle b/room/room-paging-rxjava2/build.gradle
index f078726..d4f2bd4 100644
--- a/room/room-paging-rxjava2/build.gradle
+++ b/room/room-paging-rxjava2/build.gradle
@@ -47,7 +47,6 @@
 androidx {
     name = "Room Paging RxJava2"
     type = LibraryType.PUBLISHED_LIBRARY
-    mavenGroup = LibraryGroups.ROOM
     inceptionYear = "2022"
     description = "RxJava2 integration in Room Paging"
     publish = Publish.SNAPSHOT_AND_RELEASE
diff --git a/room/room-paging-rxjava3/build.gradle b/room/room-paging-rxjava3/build.gradle
index 820b60e..11a3bb65 100644
--- a/room/room-paging-rxjava3/build.gradle
+++ b/room/room-paging-rxjava3/build.gradle
@@ -47,7 +47,6 @@
 androidx {
     name = "Room Paging RxJava3"
     type = LibraryType.PUBLISHED_LIBRARY
-    mavenGroup = LibraryGroups.ROOM
     inceptionYear = "2022"
     description = "RxJava3 integration in Room Paging"
     publish = Publish.SNAPSHOT_AND_RELEASE
diff --git a/room/room-paging/build.gradle b/room/room-paging/build.gradle
index b6d0d5c..adbfb9b 100644
--- a/room/room-paging/build.gradle
+++ b/room/room-paging/build.gradle
@@ -58,7 +58,6 @@
 androidx {
     name = "Room Paging"
     type = LibraryType.PUBLISHED_LIBRARY
-    mavenGroup = LibraryGroups.ROOM
     inceptionYear = "2021"
     description = "Room Paging integration"
     publish = Publish.SNAPSHOT_AND_RELEASE
diff --git a/room/room-runtime-lint/build.gradle b/room/room-runtime-lint/build.gradle
index 662e8e4..ea43587 100644
--- a/room/room-runtime-lint/build.gradle
+++ b/room/room-runtime-lint/build.gradle
@@ -35,7 +35,6 @@
 androidx {
     name = "Android Room-Runtime Lint Checks"
     type = LibraryType.LINT
-    mavenGroup = LibraryGroups.ROOM
     inceptionYear = "2022"
     description = "Android Room-Runtime Lint Checks"
 }
diff --git a/room/room-runtime/build.gradle b/room/room-runtime/build.gradle
index 1d8ce5d..1a99191 100644
--- a/room/room-runtime/build.gradle
+++ b/room/room-runtime/build.gradle
@@ -70,7 +70,6 @@
 androidx {
     name = "Android Room-Runtime"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.ROOM
     inceptionYear = "2017"
     description = "Android Room-Runtime"
 }
diff --git a/room/room-rxjava2/build.gradle b/room/room-rxjava2/build.gradle
index ed6314b..a9a4adb 100644
--- a/room/room-rxjava2/build.gradle
+++ b/room/room-rxjava2/build.gradle
@@ -41,7 +41,6 @@
 androidx {
     name = "Android Room RXJava2"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.ROOM
     inceptionYear = "2017"
     description = "Android Room RXJava2"
 }
diff --git a/room/room-rxjava3/build.gradle b/room/room-rxjava3/build.gradle
index 48b85ff..8369f03 100644
--- a/room/room-rxjava3/build.gradle
+++ b/room/room-rxjava3/build.gradle
@@ -42,7 +42,6 @@
 androidx {
     name = "Android Room RXJava3"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.ROOM
     inceptionYear = "2020"
     description = "Android Room RXJava3"
 }
diff --git a/room/room-testing/build.gradle b/room/room-testing/build.gradle
index 7f0951e..4cef2b2 100644
--- a/room/room-testing/build.gradle
+++ b/room/room-testing/build.gradle
@@ -39,7 +39,6 @@
 androidx {
     name = "Android Room Testing"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.ROOM
     inceptionYear = "2017"
     description = "Android Room Testing"
 }
diff --git a/savedstate/savedstate-ktx/build.gradle b/savedstate/savedstate-ktx/build.gradle
index 7f5e440..da99fd8 100644
--- a/savedstate/savedstate-ktx/build.gradle
+++ b/savedstate/savedstate-ktx/build.gradle
@@ -40,7 +40,6 @@
 androidx {
     name = "SavedState Kotlin Extensions"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.SAVEDSTATE
     inceptionYear = "2020"
     description = "Kotlin extensions for 'savedstate' artifact"
 }
diff --git a/savedstate/savedstate/build.gradle b/savedstate/savedstate/build.gradle
index ca99126..26d8317 100644
--- a/savedstate/savedstate/build.gradle
+++ b/savedstate/savedstate/build.gradle
@@ -35,7 +35,6 @@
 androidx {
     name = "Saved State"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.SAVEDSTATE
     inceptionYear = "2018"
     description = "Android Lifecycle Saved State"
 }
diff --git a/security/security-app-authenticator-testing/build.gradle b/security/security-app-authenticator-testing/build.gradle
index cc5998e..7f3ed40 100644
--- a/security/security-app-authenticator-testing/build.gradle
+++ b/security/security-app-authenticator-testing/build.gradle
@@ -41,7 +41,6 @@
     name = "Android Security App Package Authenticator Testing"
     type = LibraryType.PUBLISHED_TEST_LIBRARY
     mavenVersion = LibraryVersions.SECURITY_APP_AUTHENTICATOR_TESTING
-    mavenGroup = LibraryGroups.SECURITY
     inceptionYear = "2021"
     description = "This library provides a configurable AppAuthenticator that can be used during testing"
 }
diff --git a/security/security-app-authenticator/build.gradle b/security/security-app-authenticator/build.gradle
index 730607e..cb80735 100644
--- a/security/security-app-authenticator/build.gradle
+++ b/security/security-app-authenticator/build.gradle
@@ -51,7 +51,6 @@
     name = "Android Security App Package Authenitcator Library"
     type = LibraryType.PUBLISHED_LIBRARY
     mavenVersion = LibraryVersions.SECURITY_APP_AUTHENTICATOR
-    mavenGroup = LibraryGroups.SECURITY
     inceptionYear = "2020"
     description = "Verify app packages for proper app to app authentication."
 }
diff --git a/security/security-biometric/build.gradle b/security/security-biometric/build.gradle
index 9183eab..c8204ad 100644
--- a/security/security-biometric/build.gradle
+++ b/security/security-biometric/build.gradle
@@ -46,7 +46,6 @@
     name = "AndroidX Security Biometric"
     publish = Publish.SNAPSHOT_AND_RELEASE
     mavenVersion = LibraryVersions.SECURITY_BIOMETRIC
-    mavenGroup = LibraryGroups.SECURITY
     inceptionYear = "2020"
     description = "AndroidX Security Biometric"
 }
diff --git a/security/security-crypto-ktx/build.gradle b/security/security-crypto-ktx/build.gradle
index d25904c..adf0c8b 100644
--- a/security/security-crypto-ktx/build.gradle
+++ b/security/security-crypto-ktx/build.gradle
@@ -45,7 +45,6 @@
     name = "AndroidX Security Kotlin Extensions"
     publish = Publish.SNAPSHOT_AND_RELEASE
     mavenVersion = LibraryVersions.SECURITY
-    mavenGroup = LibraryGroups.SECURITY
     inceptionYear = "2020"
     description = "Kotlin Extensions for the androidx.security:Security-crypto artifact"
 }
diff --git a/security/security-crypto/build.gradle b/security/security-crypto/build.gradle
index 3183bc2..459f6be 100644
--- a/security/security-crypto/build.gradle
+++ b/security/security-crypto/build.gradle
@@ -49,7 +49,6 @@
     name = "AndroidX Security"
     publish = Publish.SNAPSHOT_AND_RELEASE
     mavenVersion = LibraryVersions.SECURITY
-    mavenGroup = LibraryGroups.SECURITY
     inceptionYear = "2019"
     description = "AndroidX Security"
 }
diff --git a/security/security-identity-credential/build.gradle b/security/security-identity-credential/build.gradle
index 6b1e4f8..d6b322a 100644
--- a/security/security-identity-credential/build.gradle
+++ b/security/security-identity-credential/build.gradle
@@ -49,7 +49,6 @@
     publish = Publish.SNAPSHOT_AND_RELEASE
     runApiTasks = new RunApiTasks.Yes("Need to track API surface before moving to publish")
     mavenVersion = LibraryVersions.SECURITY_IDENTITY_CREDENTIAL
-    mavenGroup = LibraryGroups.SECURITY
     inceptionYear = "2019"
     description = "AndroidX Security"
 }
diff --git a/sharetarget/sharetarget/build.gradle b/sharetarget/sharetarget/build.gradle
index f302b3d..233ff32 100644
--- a/sharetarget/sharetarget/build.gradle
+++ b/sharetarget/sharetarget/build.gradle
@@ -38,7 +38,6 @@
 androidx {
     name = "AndroidX Share Target Support Library"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.SHARETARGET
     inceptionYear = "2018"
     description = "ShareTarget"
 }
diff --git a/slice/slice-benchmark/build.gradle b/slice/slice-benchmark/build.gradle
index 909cc63..308c45b 100644
--- a/slice/slice-benchmark/build.gradle
+++ b/slice/slice-benchmark/build.gradle
@@ -43,7 +43,6 @@
     name = "Slices Benchmarks"
     publish = Publish.NONE
     mavenVersion = LibraryVersions.SLICE_BENCHMARK
-    mavenGroup = LibraryGroups.SLICE
     inceptionYear = "2018"
     description = "RecyclerView Benchmarks"
 }
diff --git a/slice/slice-builders-ktx/build.gradle b/slice/slice-builders-ktx/build.gradle
index 2fd11c0..7e26f93 100644
--- a/slice/slice-builders-ktx/build.gradle
+++ b/slice/slice-builders-ktx/build.gradle
@@ -47,7 +47,6 @@
     name = "Slice builders KTX"
     publish = Publish.SNAPSHOT_AND_RELEASE
     mavenVersion = LibraryVersions.SLICE_BUILDERS_KTX
-    mavenGroup = LibraryGroups.SLICE
     inceptionYear = "2018"
     description = "A set of Kotlin extension methods built on top of slice-builders APIs."
     failOnDeprecationWarnings = false
diff --git a/slice/slice-builders/build.gradle b/slice/slice-builders/build.gradle
index eab2fbf..c2fa4dd 100644
--- a/slice/slice-builders/build.gradle
+++ b/slice/slice-builders/build.gradle
@@ -33,7 +33,6 @@
     name = "Slice builders"
     publish = Publish.SNAPSHOT_AND_RELEASE
     mavenVersion = LibraryVersions.SLICE
-    mavenGroup = LibraryGroups.SLICE
     inceptionYear = "2017"
     description = "A set of builders to create templates using SliceProvider APIs"
     failOnDeprecationWarnings = false
diff --git a/slice/slice-core/build.gradle b/slice/slice-core/build.gradle
index bba2449..add74f3 100644
--- a/slice/slice-core/build.gradle
+++ b/slice/slice-core/build.gradle
@@ -39,7 +39,6 @@
     name = "Common utilities for slices"
     publish = Publish.SNAPSHOT_AND_RELEASE
     mavenVersion = LibraryVersions.SLICE
-    mavenGroup = LibraryGroups.SLICE
     inceptionYear = "2017"
     description = "The slices core library provides utilities for the slices view and provider libraries"
     failOnDeprecationWarnings = false
diff --git a/slice/slice-remotecallback/build.gradle b/slice/slice-remotecallback/build.gradle
index 7a75ffecf..afbf75b 100644
--- a/slice/slice-remotecallback/build.gradle
+++ b/slice/slice-remotecallback/build.gradle
@@ -39,7 +39,6 @@
     name = "Slice Remote Callback"
     publish = Publish.SNAPSHOT_AND_RELEASE
     mavenVersion = LibraryVersions.SLICE_REMOTECALLBACK
-    mavenGroup = LibraryGroups.SLICE
     inceptionYear = "2019"
     description = "A library that handles PendingIntents in slices as remote callbacks"
     failOnDeprecationWarnings = false
diff --git a/slice/slice-test/build.gradle b/slice/slice-test/build.gradle
index 8268e8f..e5a0a1fc 100644
--- a/slice/slice-test/build.gradle
+++ b/slice/slice-test/build.gradle
@@ -42,7 +42,6 @@
     type = LibraryType.INTERNAL_TEST_LIBRARY
     publish = Publish.NONE
     mavenVersion = LibraryVersions.SLICE
-    mavenGroup = LibraryGroups.SLICE
     inceptionYear = "2017"
     description = "A library that holds common code for testing slices"
     failOnDeprecationWarnings = false
diff --git a/slice/slice-view/build.gradle b/slice/slice-view/build.gradle
index f36b668..8d7bd57 100644
--- a/slice/slice-view/build.gradle
+++ b/slice/slice-view/build.gradle
@@ -43,7 +43,6 @@
     name = "Slice views"
     publish = Publish.SNAPSHOT_AND_RELEASE
     mavenVersion = LibraryVersions.SLICE
-    mavenGroup = LibraryGroups.SLICE
     inceptionYear = "2017"
     description = "A library that handles rendering of slice content into supported templates"
     failOnDeprecationWarnings = false
diff --git a/slidingpanelayout/slidingpanelayout/build.gradle b/slidingpanelayout/slidingpanelayout/build.gradle
index 08fca49..c1e7fc2 100644
--- a/slidingpanelayout/slidingpanelayout/build.gradle
+++ b/slidingpanelayout/slidingpanelayout/build.gradle
@@ -25,7 +25,6 @@
 androidx {
     name = "Android Support Library Sliding Pane Layout"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.SLIDINGPANELAYOUT
     inceptionYear = "2018"
     description = "SlidingPaneLayout offers a responsive, two pane layout that automatically switches between overlapping panes on smaller devices to a side by side view on larger devices."
 }
diff --git a/sqlite/sqlite-framework/build.gradle b/sqlite/sqlite-framework/build.gradle
index 657c4f3..0169f43 100644
--- a/sqlite/sqlite-framework/build.gradle
+++ b/sqlite/sqlite-framework/build.gradle
@@ -39,7 +39,6 @@
 androidx {
     name = "Android Support SQLite - Framework Implementation"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.SQLITE
     inceptionYear = "2017"
     description = "The implementation of Support SQLite library using the framework code."
 }
diff --git a/sqlite/sqlite-inspection/build.gradle b/sqlite/sqlite-inspection/build.gradle
index ba9d20e..da58266 100644
--- a/sqlite/sqlite-inspection/build.gradle
+++ b/sqlite/sqlite-inspection/build.gradle
@@ -42,7 +42,6 @@
     type = LibraryType.IDE_PLUGIN
     // Decouple SQLITE_INSPECTOR because it depends on
     // the inspection protocol, which is alpha
-    mavenGroup = LibraryGroups.INSPECTION_EXTENSIONS
     inceptionYear = "2019"
     description = "The implementation of SQLite Inspector."
 }
diff --git a/sqlite/sqlite-ktx/build.gradle b/sqlite/sqlite-ktx/build.gradle
index f0012cf..a793599 100644
--- a/sqlite/sqlite-ktx/build.gradle
+++ b/sqlite/sqlite-ktx/build.gradle
@@ -33,7 +33,6 @@
 androidx {
     name = "Android DB KTX"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.SQLITE
     inceptionYear = "2018"
     description = "Kotlin extensions for DB"
 }
diff --git a/sqlite/sqlite/build.gradle b/sqlite/sqlite/build.gradle
index 36053c0..580912e 100644
--- a/sqlite/sqlite/build.gradle
+++ b/sqlite/sqlite/build.gradle
@@ -38,7 +38,6 @@
 androidx {
     name = "Android DB"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.SQLITE
     inceptionYear = "2017"
     description = "Android DB"
 }
diff --git a/startup/startup-runtime-lint/build.gradle b/startup/startup-runtime-lint/build.gradle
index 28c3370..0a10bc6 100644
--- a/startup/startup-runtime-lint/build.gradle
+++ b/startup/startup-runtime-lint/build.gradle
@@ -38,6 +38,3 @@
     description = "Android App Startup Runtime"
 }
 
-androidx {
-    mavenGroup = LibraryGroups.STARTUP
-}
diff --git a/startup/startup-runtime/build.gradle b/startup/startup-runtime/build.gradle
index 7b8b18a..68d9455 100644
--- a/startup/startup-runtime/build.gradle
+++ b/startup/startup-runtime/build.gradle
@@ -47,7 +47,6 @@
 androidx {
     name = "Android App Startup Runtime"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.STARTUP
     inceptionYear = "2020"
     description = "Android App Startup Runtime"
 }
diff --git a/swiperefreshlayout/swiperefreshlayout/build.gradle b/swiperefreshlayout/swiperefreshlayout/build.gradle
index c00acaf..8450677 100644
--- a/swiperefreshlayout/swiperefreshlayout/build.gradle
+++ b/swiperefreshlayout/swiperefreshlayout/build.gradle
@@ -32,7 +32,6 @@
 androidx {
     name = "Android Support Library Custom View"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.SWIPEREFRESHLAYOUT
     inceptionYear = "2018"
     description = "The Support Library is a static library that you can add to your Android application in order to use APIs that are either not available for older platform versions or utility APIs that aren't a part of the framework APIs. Compatible on devices running API 14 or later."
 }
diff --git a/test/ext/junit-gtest/build.gradle b/test/ext/junit-gtest/build.gradle
index 1726ef4..be6c1fd 100644
--- a/test/ext/junit-gtest/build.gradle
+++ b/test/ext/junit-gtest/build.gradle
@@ -36,7 +36,6 @@
 androidx {
     name = "AndroidX JUnit GTest"
     type = LibraryType.PUBLISHED_LIBRARY
-    mavenGroup = LibraryGroups.TESTEXT
     inceptionYear = "2022"
     description = "Run GTest tests on Android devices"
     // Bypassed to better match existing androidx.test libraries
diff --git a/test/screenshot/screenshot/build.gradle b/test/screenshot/screenshot/build.gradle
index 16a3649..aef8ffc 100644
--- a/test/screenshot/screenshot/build.gradle
+++ b/test/screenshot/screenshot/build.gradle
@@ -51,7 +51,6 @@
 androidx {
     name = "AndroidX Library Screenshot Test"
     type = LibraryType.INTERNAL_TEST_LIBRARY
-    mavenGroup = LibraryGroups.TESTSCREENSHOT
 }
 
 android {
diff --git a/test/uiautomator/uiautomator/build.gradle b/test/uiautomator/uiautomator/build.gradle
index be614e4..ef6ca7c 100644
--- a/test/uiautomator/uiautomator/build.gradle
+++ b/test/uiautomator/uiautomator/build.gradle
@@ -46,7 +46,6 @@
 androidx {
     name = "Android UIAutomator"
     type = LibraryType.PUBLISHED_LIBRARY
-    mavenGroup = LibraryGroups.TEST_UIAUTOMATOR
     inceptionYear = "2012"
     description = "UI testing framework suitable for cross-app functional UI testing"
     failOnDeprecationWarnings = false
diff --git a/text/text/build.gradle b/text/text/build.gradle
index a24d9f3..a918d46 100644
--- a/text/text/build.gradle
+++ b/text/text/build.gradle
@@ -50,7 +50,6 @@
 androidx {
     name = "UI Text utilities"
     publish = Publish.NONE
-    mavenGroup = LibraryGroups.TEXT
     inceptionYear = "2020"
     description = "Text primitives and utilities"
     legacyDisableKotlinStrictApiMode = true
diff --git a/tracing/tracing-ktx/build.gradle b/tracing/tracing-ktx/build.gradle
index e68efcd..9cfe63d 100644
--- a/tracing/tracing-ktx/build.gradle
+++ b/tracing/tracing-ktx/build.gradle
@@ -36,7 +36,6 @@
 androidx {
     name = "Android Tracing Runtime Kotlin Extensions"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.TRACING
     inceptionYear = "2020"
     description = "Android Tracing"
 }
diff --git a/tracing/tracing-perfetto-binary/build.gradle b/tracing/tracing-perfetto-binary/build.gradle
index 041c702..6a2f998 100644
--- a/tracing/tracing-perfetto-binary/build.gradle
+++ b/tracing/tracing-perfetto-binary/build.gradle
@@ -85,7 +85,6 @@
     name = "AndroidX Tracing: Perfetto SDK Native Dependencies"
     publish = Publish.SNAPSHOT_AND_RELEASE
     mavenVersion = LibraryVersions.TRACING_PERFETTO
-    mavenGroup = LibraryGroups.TRACING
     inceptionYear = "2022"
     description = "Provides native binaries required by AndroidX Tracing: Perfetto SDK " +
         "and is not intended to be used outside of that context."
diff --git a/tracing/tracing-perfetto-common/build.gradle b/tracing/tracing-perfetto-common/build.gradle
index 7156d6d..4d9548c 100644
--- a/tracing/tracing-perfetto-common/build.gradle
+++ b/tracing/tracing-perfetto-common/build.gradle
@@ -36,7 +36,6 @@
     name = "AndroidX Tracing: Perfetto Common"
     publish = Publish.SNAPSHOT_AND_RELEASE
     mavenVersion = LibraryVersions.TRACING_PERFETTO
-    mavenGroup = LibraryGroups.TRACING
     inceptionYear = "2022"
     description = "AndroidX Tracing: Perfetto Common"
 }
diff --git a/tracing/tracing-perfetto/build.gradle b/tracing/tracing-perfetto/build.gradle
index f69a48a..9e6c8fb 100644
--- a/tracing/tracing-perfetto/build.gradle
+++ b/tracing/tracing-perfetto/build.gradle
@@ -61,7 +61,6 @@
     name = "AndroidX Tracing: Perfetto SDK"
     publish = Publish.SNAPSHOT_AND_RELEASE
     mavenVersion = LibraryVersions.TRACING_PERFETTO
-    mavenGroup = LibraryGroups.TRACING
     inceptionYear = "2022"
     description = "AndroidX Tracing: Perfetto SDK"
 }
diff --git a/tracing/tracing/build.gradle b/tracing/tracing/build.gradle
index 5e7f556..032edf2 100644
--- a/tracing/tracing/build.gradle
+++ b/tracing/tracing/build.gradle
@@ -34,7 +34,6 @@
 androidx {
     name = "Android Tracing"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.TRACING
     inceptionYear = "2020"
     description = "Android Tracing"
 }
diff --git a/transition/transition-ktx/build.gradle b/transition/transition-ktx/build.gradle
index 1e7b9e5..538eec9 100644
--- a/transition/transition-ktx/build.gradle
+++ b/transition/transition-ktx/build.gradle
@@ -36,7 +36,6 @@
 androidx {
     name = "Transition Kotlin Extensions"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.TRANSITION
     inceptionYear = "2019"
     description = "Kotlin extensions for 'transition' artifact"
 }
diff --git a/transition/transition/build.gradle b/transition/transition/build.gradle
index 58d37cb..e1080ed 100644
--- a/transition/transition/build.gradle
+++ b/transition/transition/build.gradle
@@ -46,7 +46,6 @@
 androidx {
     name = "Android Transition Support Library"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.TRANSITION
     inceptionYear = "2016"
     description = "Android Transition Support Library"
 }
diff --git a/tv/samples/build.gradle b/tv/samples/build.gradle
index dd420cc..a040d647 100644
--- a/tv/samples/build.gradle
+++ b/tv/samples/build.gradle
@@ -36,7 +36,6 @@
 androidx {
     name = "Samples library for TV packages"
     type = LibraryType.SAMPLES
-    mavenGroup = LibraryGroups.TV
     inceptionYear = "2022"
     description = "Contains the sample code for the APIs in the androidx.tv libraries"
 }
diff --git a/tv/tv-foundation/build.gradle b/tv/tv-foundation/build.gradle
index c6d4008..3f8b544 100644
--- a/tv/tv-foundation/build.gradle
+++ b/tv/tv-foundation/build.gradle
@@ -66,7 +66,6 @@
 androidx {
     name = "androidx.tv:tv-foundation"
     type = LibraryType.PUBLISHED_LIBRARY
-    mavenGroup = LibraryGroups.TV
     inceptionYear = "2022"
     description = "This library makes it easier for developers" +
             "to write Jetpack Compose applications for TV devices by providing " +
diff --git a/tv/tv-material/build.gradle b/tv/tv-material/build.gradle
index 2190bec..17990d7 100644
--- a/tv/tv-material/build.gradle
+++ b/tv/tv-material/build.gradle
@@ -63,7 +63,6 @@
 androidx {
     name = "androidx.tv:tv-material"
     type = LibraryType.PUBLISHED_LIBRARY
-    mavenGroup = LibraryGroups.TV
     inceptionYear = "2022"
     description = "build TV applications using controls that adhere to Material Design Language."
     targetsJavaConsumers = false
diff --git a/tvprovider/tvprovider/build.gradle b/tvprovider/tvprovider/build.gradle
index f18eb11..3ca9e91 100644
--- a/tvprovider/tvprovider/build.gradle
+++ b/tvprovider/tvprovider/build.gradle
@@ -26,7 +26,6 @@
 androidx {
     name = "Android Support TV Provider"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.TVPROVIDER
     inceptionYear = "2017"
     description = "Android Support Library for TV Provider"
     failOnDeprecationWarnings = false
diff --git a/vectordrawable/vectordrawable-animated/build.gradle b/vectordrawable/vectordrawable-animated/build.gradle
index 75c6c2a..2217ba2 100644
--- a/vectordrawable/vectordrawable-animated/build.gradle
+++ b/vectordrawable/vectordrawable-animated/build.gradle
@@ -37,7 +37,6 @@
     name = "Android Support AnimatedVectorDrawable"
     publish = Publish.SNAPSHOT_AND_RELEASE
     mavenVersion = LibraryVersions.VECTORDRAWABLE_ANIMATED
-    mavenGroup = LibraryGroups.VECTORDRAWABLE
     inceptionYear = "2015"
     description = "Android Support AnimatedVectorDrawable"
     failOnDeprecationWarnings = false
diff --git a/vectordrawable/vectordrawable-seekable/build.gradle b/vectordrawable/vectordrawable-seekable/build.gradle
index 7392b0d..aac1763 100644
--- a/vectordrawable/vectordrawable-seekable/build.gradle
+++ b/vectordrawable/vectordrawable-seekable/build.gradle
@@ -39,7 +39,6 @@
     name = "Android SeekableAnimatedVectorDrawable"
     publish = Publish.SNAPSHOT_AND_RELEASE
     mavenVersion = LibraryVersions.VECTORDRAWABLE_SEEKABLE
-    mavenGroup = LibraryGroups.VECTORDRAWABLE
     inceptionYear = "2020"
     description = "Android SeekableAnimatedVectorDrawable"
 }
diff --git a/vectordrawable/vectordrawable/build.gradle b/vectordrawable/vectordrawable/build.gradle
index b345be1..9a818af 100644
--- a/vectordrawable/vectordrawable/build.gradle
+++ b/vectordrawable/vectordrawable/build.gradle
@@ -31,7 +31,6 @@
     name = "Android Support VectorDrawable"
     publish = Publish.SNAPSHOT_AND_RELEASE
     mavenVersion = LibraryVersions.VECTORDRAWABLE
-    mavenGroup = LibraryGroups.VECTORDRAWABLE
     inceptionYear = "2015"
     description = "Android Support VectorDrawable"
     failOnDeprecationWarnings = false
diff --git a/versionedparcelable/versionedparcelable-compiler/build.gradle b/versionedparcelable/versionedparcelable-compiler/build.gradle
index 1b6639e..ff5be75 100644
--- a/versionedparcelable/versionedparcelable-compiler/build.gradle
+++ b/versionedparcelable/versionedparcelable-compiler/build.gradle
@@ -29,7 +29,6 @@
     name = "VersionedParcelable - Compiler"
     type = LibraryType.ANNOTATION_PROCESSOR
     mavenVersion = LibraryVersions.VERSIONED_PARCELABLE
-    mavenGroup = LibraryGroups.VERSIONEDPARCELABLE
     inceptionYear = "2018"
     description = "Annotation processor for VersionedParcelable"
 }
diff --git a/versionedparcelable/versionedparcelable/build.gradle b/versionedparcelable/versionedparcelable/build.gradle
index fd8a54d..a51599f 100644
--- a/versionedparcelable/versionedparcelable/build.gradle
+++ b/versionedparcelable/versionedparcelable/build.gradle
@@ -48,7 +48,6 @@
     name = "VersionedParcelable"
     publish = Publish.SNAPSHOT_AND_RELEASE
     mavenVersion = LibraryVersions.VERSIONED_PARCELABLE
-    mavenGroup = LibraryGroups.VERSIONEDPARCELABLE
     inceptionYear = "2018"
     description = "Provides a stable but relatively compact binary serialization format that can be passed across processes or persisted safely."
     failOnDeprecationWarnings = false
diff --git a/viewpager/viewpager/build.gradle b/viewpager/viewpager/build.gradle
index 24b3deb..583c085 100644
--- a/viewpager/viewpager/build.gradle
+++ b/viewpager/viewpager/build.gradle
@@ -23,7 +23,6 @@
 androidx {
     name = "Android Support Library View Pager"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.VIEWPAGER
     inceptionYear = "2018"
     description = "The Support Library is a static library that you can add to your Android application in order to use APIs that are either not available for older platform versions or utility APIs that aren't a part of the framework APIs. Compatible on devices running API 14 or later."
     failOnDeprecationWarnings = false
diff --git a/viewpager2/viewpager2/build.gradle b/viewpager2/viewpager2/build.gradle
index 5d007b6..c05941a 100644
--- a/viewpager2/viewpager2/build.gradle
+++ b/viewpager2/viewpager2/build.gradle
@@ -52,7 +52,6 @@
 androidx {
     name = "AndroidX Widget ViewPager2"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.VIEWPAGER2
     inceptionYear = "2017"
     description = "AndroidX Widget ViewPager2"
 }
diff --git a/wear/compose/compose-foundation/build.gradle b/wear/compose/compose-foundation/build.gradle
index cca24b1..1b0eb34 100644
--- a/wear/compose/compose-foundation/build.gradle
+++ b/wear/compose/compose-foundation/build.gradle
@@ -112,7 +112,6 @@
 androidx {
     name = "Android Wear Compose Foundation"
     type = LibraryType.PUBLISHED_LIBRARY
-    mavenGroup = LibraryGroups.WEAR_COMPOSE
     inceptionYear = "2021"
     description = "WearOS Compose Foundation Library. This library makes it easier for developers" +
             "to write Jetpack Compose applications for Wearable devices by providing " +
diff --git a/wear/compose/compose-foundation/samples/build.gradle b/wear/compose/compose-foundation/samples/build.gradle
index e5cce243..5cd0e39 100644
--- a/wear/compose/compose-foundation/samples/build.gradle
+++ b/wear/compose/compose-foundation/samples/build.gradle
@@ -46,7 +46,6 @@
 androidx {
     name = "Android Wear Compose Foundation Samples"
     type = LibraryType.SAMPLES
-    mavenGroup = LibraryGroups.WEAR_COMPOSE
     inceptionYear = "2021"
     description = "Contains the sample code for the Android Wear Compose Foundation Classes"
 }
diff --git a/wear/compose/compose-material-core/build.gradle b/wear/compose/compose-material-core/build.gradle
index 30aac6a..5ce2b0b 100644
--- a/wear/compose/compose-material-core/build.gradle
+++ b/wear/compose/compose-material-core/build.gradle
@@ -125,7 +125,6 @@
 androidx {
     name = "Android Wear Compose Material Core"
     type = LibraryType.PUBLISHED_LIBRARY
-    mavenGroup = LibraryGroups.WEAR_COMPOSE
     inceptionYear = "2022"
     description = "WearOS Compose Material Core Library. This library contains themeless " +
             "components that are shared between different WearOS Compose Material libraries. It " +
diff --git a/wear/compose/compose-material/benchmark/build.gradle b/wear/compose/compose-material/benchmark/build.gradle
index 8fd202a..55879b0 100644
--- a/wear/compose/compose-material/benchmark/build.gradle
+++ b/wear/compose/compose-material/benchmark/build.gradle
@@ -54,5 +54,4 @@
 }
 androidx {
     type = LibraryType.INTERNAL_TEST_LIBRARY
-    mavenGroup = LibraryGroups.WEAR_COMPOSE
 }
diff --git a/wear/compose/compose-material/build.gradle b/wear/compose/compose-material/build.gradle
index 52f456a..9dcd8459 100644
--- a/wear/compose/compose-material/build.gradle
+++ b/wear/compose/compose-material/build.gradle
@@ -132,7 +132,6 @@
 androidx {
     name = "Android Wear Compose Material"
     type = LibraryType.PUBLISHED_LIBRARY
-    mavenGroup = LibraryGroups.WEAR_COMPOSE
     inceptionYear = "2021"
     description = "WearOS Compose Material Library. This library makes it easier for developers " +
             "to write Jetpack Compose applications for Wearable devices that implement Wear " +
diff --git a/wear/compose/compose-material/samples/build.gradle b/wear/compose/compose-material/samples/build.gradle
index f841dbb..0e71692 100644
--- a/wear/compose/compose-material/samples/build.gradle
+++ b/wear/compose/compose-material/samples/build.gradle
@@ -56,7 +56,6 @@
 androidx {
     name = "Android Wear Compose Material Samples"
     type = LibraryType.SAMPLES
-    mavenGroup = LibraryGroups.WEAR_COMPOSE
     inceptionYear = "2021"
     description = "Contains the sample code for the Android Wear Compose Material Classes"
 }
diff --git a/wear/compose/compose-material3/benchmark/build.gradle b/wear/compose/compose-material3/benchmark/build.gradle
index 20201b8..1fcfc80 100644
--- a/wear/compose/compose-material3/benchmark/build.gradle
+++ b/wear/compose/compose-material3/benchmark/build.gradle
@@ -53,5 +53,4 @@
 }
 androidx {
     type = LibraryType.INTERNAL_TEST_LIBRARY
-    mavenGroup = LibraryGroups.WEAR_COMPOSE
 }
diff --git a/wear/compose/compose-material3/build.gradle b/wear/compose/compose-material3/build.gradle
index 297ea36..a2185f0 100644
--- a/wear/compose/compose-material3/build.gradle
+++ b/wear/compose/compose-material3/build.gradle
@@ -133,7 +133,6 @@
     name = "Android Wear Compose Material 3"
     type = LibraryType.PUBLISHED_LIBRARY
     mavenVersion = LibraryVersions.WEAR_COMPOSE_MATERIAL3
-    mavenGroup = LibraryGroups.WEAR_COMPOSE
     inceptionYear = "2022"
     description = "WearOS Compose Material 3 Library. This library makes it easier for " +
             "developers to write Jetpack Compose applications for Wearable devices that " +
diff --git a/wear/compose/compose-material3/samples/build.gradle b/wear/compose/compose-material3/samples/build.gradle
index 03b746a..8f54238 100644
--- a/wear/compose/compose-material3/samples/build.gradle
+++ b/wear/compose/compose-material3/samples/build.gradle
@@ -56,7 +56,6 @@
 androidx {
     name = "Android Wear Compose Material 3 Samples"
     type = LibraryType.SAMPLES
-    mavenGroup = LibraryGroups.WEAR_COMPOSE
     inceptionYear = "2022"
     description = "Contains the sample code for the Android Wear Compose Material 3 Classes"
 }
diff --git a/wear/compose/compose-navigation/build.gradle b/wear/compose/compose-navigation/build.gradle
index 4f3ab02..1963785 100644
--- a/wear/compose/compose-navigation/build.gradle
+++ b/wear/compose/compose-navigation/build.gradle
@@ -60,7 +60,6 @@
 androidx {
     name = "Android Wear Compose Navigation"
     type = LibraryType.PUBLISHED_LIBRARY
-    mavenGroup = LibraryGroups.WEAR_COMPOSE
     inceptionYear = "2021"
     description = "WearOS Compose Navigation Library. This library makes it easier for developers" +
             "to write Jetpack Compose applications for Wearable devices by providing " +
diff --git a/wear/compose/compose-navigation/samples/build.gradle b/wear/compose/compose-navigation/samples/build.gradle
index 5503956..959235d 100644
--- a/wear/compose/compose-navigation/samples/build.gradle
+++ b/wear/compose/compose-navigation/samples/build.gradle
@@ -49,7 +49,6 @@
 androidx {
     name = "Android Wear Compose Navigation Samples"
     type = LibraryType.SAMPLES
-    mavenGroup = LibraryGroups.WEAR_COMPOSE
     inceptionYear = "2021"
     description = "Contains the sample code for the Android Wear Compose Navigation Classes"
 }
diff --git a/wear/protolayout/protolayout-expression-pipeline/build.gradle b/wear/protolayout/protolayout-expression-pipeline/build.gradle
index 6bb2d3b..7a9f216 100644
--- a/wear/protolayout/protolayout-expression-pipeline/build.gradle
+++ b/wear/protolayout/protolayout-expression-pipeline/build.gradle
@@ -32,7 +32,6 @@
 androidx {
     name = "ProtoLayout Dynamic Expression Evaluation Pipeline"
     type = LibraryType.PUBLISHED_LIBRARY
-    mavenGroup = LibraryGroups.WEAR_PROTOLAYOUT
     inceptionYear = "2022"
     description = "Evaluate dynamic expressions."
 }
diff --git a/wear/protolayout/protolayout-expression/build.gradle b/wear/protolayout/protolayout-expression/build.gradle
index 6e5826a..5dbbadc 100644
--- a/wear/protolayout/protolayout-expression/build.gradle
+++ b/wear/protolayout/protolayout-expression/build.gradle
@@ -32,7 +32,6 @@
 androidx {
     name = "ProtoLayout Dynamic Expression"
     type = LibraryType.PUBLISHED_LIBRARY
-    mavenGroup = LibraryGroups.WEAR_PROTOLAYOUT
     inceptionYear = "2022"
     description = "Create dynamic expressions (for late evaluation by a remote evaluator)."
 }
diff --git a/wear/protolayout/protolayout-proto/build.gradle b/wear/protolayout/protolayout-proto/build.gradle
index 8600bd5..00c8979 100644
--- a/wear/protolayout/protolayout-proto/build.gradle
+++ b/wear/protolayout/protolayout-proto/build.gradle
@@ -87,7 +87,6 @@
 androidx {
     name = "Wear ProtoLayout Proto"
     type = LibraryType.PUBLISHED_LIBRARY
-    mavenGroup = LibraryGroups.WEAR_PROTOLAYOUT
     inceptionYear = "2022"
     description = "Jarjar the generated proto and proto-lite dependency for use by wear-protolayout"
     runApiTasks = new RunApiTasks.No("Metalava doesn't properly parse the proto sources " +
diff --git a/wear/protolayout/protolayout-renderer/build.gradle b/wear/protolayout/protolayout-renderer/build.gradle
index a9bc2f2..d071817 100644
--- a/wear/protolayout/protolayout-renderer/build.gradle
+++ b/wear/protolayout/protolayout-renderer/build.gradle
@@ -32,7 +32,6 @@
 androidx {
     name = "ProtoLayout Renderer"
     type = LibraryType.PUBLISHED_LIBRARY
-    mavenGroup = LibraryGroups.WEAR_PROTOLAYOUT
     inceptionYear = "2022"
     description = "Render ProtoLayouts to an Android surface"
 }
diff --git a/wear/protolayout/protolayout/build.gradle b/wear/protolayout/protolayout/build.gradle
index 74f7467..8332043 100644
--- a/wear/protolayout/protolayout/build.gradle
+++ b/wear/protolayout/protolayout/build.gradle
@@ -32,7 +32,6 @@
 androidx {
     name = "ProtoLayout"
     type = LibraryType.PUBLISHED_LIBRARY
-    mavenGroup = LibraryGroups.WEAR_PROTOLAYOUT
     inceptionYear = "2022"
     description = "Create layouts that can be rendered by a remote host."
 }
diff --git a/wear/tiles/tiles-material/build.gradle b/wear/tiles/tiles-material/build.gradle
index 55ad39a..c696e99 100644
--- a/wear/tiles/tiles-material/build.gradle
+++ b/wear/tiles/tiles-material/build.gradle
@@ -73,7 +73,6 @@
     name = "Android Wear Tiles Material"
     type = LibraryType.PUBLISHED_LIBRARY
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.WEAR_TILES
     inceptionYear = "2021"
     description = "Material components library for Android Wear Tiles."
 }
diff --git a/wear/tiles/tiles-proto/build.gradle b/wear/tiles/tiles-proto/build.gradle
index 91b8bbd..8c2f80d 100644
--- a/wear/tiles/tiles-proto/build.gradle
+++ b/wear/tiles/tiles-proto/build.gradle
@@ -90,7 +90,6 @@
 androidx {
     name = "Wear Tiles Proto"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.WEAR_TILES
     inceptionYear = "2020"
     description = "Jarjar the generated proto and proto-lite dependency for use by " +
             "wear-tiles."
diff --git a/wear/tiles/tiles-renderer/build.gradle b/wear/tiles/tiles-renderer/build.gradle
index 33e7c27..6982211 100644
--- a/wear/tiles/tiles-renderer/build.gradle
+++ b/wear/tiles/tiles-renderer/build.gradle
@@ -106,7 +106,6 @@
     name = "Android Wear Tiles Renderer"
     type = LibraryType.PUBLISHED_LIBRARY
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.WEAR_TILES
     inceptionYear = "2021"
     description = "Android Wear Tiles Renderer components. These components can be used to parse " +
             "and render an already constructed Wear Tile."
diff --git a/wear/tiles/tiles-testing/build.gradle b/wear/tiles/tiles-testing/build.gradle
index ddc83b8..e0ff8e58 100644
--- a/wear/tiles/tiles-testing/build.gradle
+++ b/wear/tiles/tiles-testing/build.gradle
@@ -63,7 +63,6 @@
     name = "Android Wear Tiles Testing Utilities"
     type = LibraryType.PUBLISHED_TEST_LIBRARY
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.WEAR_TILES
     inceptionYear = "2021"
     description = "Testing utilities for Android Wear Tiles."
 }
diff --git a/wear/tiles/tiles/build.gradle b/wear/tiles/tiles/build.gradle
index b7df1ba..f5af724 100644
--- a/wear/tiles/tiles/build.gradle
+++ b/wear/tiles/tiles/build.gradle
@@ -61,7 +61,6 @@
     name = "Android Wear Tiles"
     type = LibraryType.PUBLISHED_LIBRARY
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.WEAR_TILES
     inceptionYear = "2020"
     description = "Android Wear Tiles"
 }
diff --git a/wear/watchface/watchface-client-guava/build.gradle b/wear/watchface/watchface-client-guava/build.gradle
index 3f920aa..49dba28 100644
--- a/wear/watchface/watchface-client-guava/build.gradle
+++ b/wear/watchface/watchface-client-guava/build.gradle
@@ -42,7 +42,6 @@
 androidx {
     name = "Android Wear Watchface Client Guava"
     type = LibraryType.PUBLISHED_LIBRARY
-    mavenGroup = LibraryGroups.WEAR_WATCHFACE
     inceptionYear = "2021"
     description = "Guava wrappers for the Androidx Wear Watchface library"
 }
diff --git a/wear/watchface/watchface-client/build.gradle b/wear/watchface/watchface-client/build.gradle
index dcad002..0b2af5a 100644
--- a/wear/watchface/watchface-client/build.gradle
+++ b/wear/watchface/watchface-client/build.gradle
@@ -67,7 +67,6 @@
 androidx {
     name = "Android Wear Watchface Client"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.WEAR_WATCHFACE
     inceptionYear = "2020"
     description = "Client library for controlling androidx watchfaces"
 }
diff --git a/wear/watchface/watchface-complications-data-source-ktx/build.gradle b/wear/watchface/watchface-complications-data-source-ktx/build.gradle
index 290a516..8fc553a 100644
--- a/wear/watchface/watchface-complications-data-source-ktx/build.gradle
+++ b/wear/watchface/watchface-complications-data-source-ktx/build.gradle
@@ -46,7 +46,6 @@
 androidx {
     name = "Android Wear Complications Data Source Ktx"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.WEAR_WATCHFACE
     inceptionYear = "2021"
     description = "Kotlin suspend wrapper for Android Wear Complications Data Source"
 }
diff --git a/wear/watchface/watchface-complications-data-source-samples/build.gradle b/wear/watchface/watchface-complications-data-source-samples/build.gradle
index 1cdd9b1..6c7db9a 100644
--- a/wear/watchface/watchface-complications-data-source-samples/build.gradle
+++ b/wear/watchface/watchface-complications-data-source-samples/build.gradle
@@ -34,6 +34,3 @@
     namespace "androidx.wear.watchface.complications.datasource.samples"
 }
 
-androidx {
-    mavenGroup = LibraryGroups.WEAR_WATCHFACE
-}
diff --git a/wear/watchface/watchface-complications-data-source/build.gradle b/wear/watchface/watchface-complications-data-source/build.gradle
index 32940e3..e8b91c7 100644
--- a/wear/watchface/watchface-complications-data-source/build.gradle
+++ b/wear/watchface/watchface-complications-data-source/build.gradle
@@ -54,7 +54,6 @@
 androidx {
     name = "Android Wear Complications Data Source"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.WEAR_WATCHFACE
     inceptionYear = "2020"
     description = "Android Wear Complications Data Source"
 }
diff --git a/wear/watchface/watchface-complications-data/build.gradle b/wear/watchface/watchface-complications-data/build.gradle
index a9e5904..b57cba4 100644
--- a/wear/watchface/watchface-complications-data/build.gradle
+++ b/wear/watchface/watchface-complications-data/build.gradle
@@ -63,7 +63,6 @@
 androidx {
     name = "Android Wear Complications Data"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.WEAR_WATCHFACE
     inceptionYear = "2020"
     description = "Android Wear Complications Data"
 }
diff --git a/wear/watchface/watchface-complications-permission-dialogs-sample/build.gradle b/wear/watchface/watchface-complications-permission-dialogs-sample/build.gradle
index cccb4e7..5342fd8 100644
--- a/wear/watchface/watchface-complications-permission-dialogs-sample/build.gradle
+++ b/wear/watchface/watchface-complications-permission-dialogs-sample/build.gradle
@@ -31,7 +31,6 @@
 androidx {
     name = "AndroidX Wear Watchface Permission Dialog Samples"
     type = LibraryType.SAMPLES
-    mavenGroup = LibraryGroups.WEAR_WATCHFACE
     inceptionYear = "2021"
     description = "Contains sample code for building Watchface Permission Dialogs"
 }
diff --git a/wear/watchface/watchface-complications-rendering/build.gradle b/wear/watchface/watchface-complications-rendering/build.gradle
index 1f3f0cc..c79c2e2 100644
--- a/wear/watchface/watchface-complications-rendering/build.gradle
+++ b/wear/watchface/watchface-complications-rendering/build.gradle
@@ -61,7 +61,6 @@
 androidx {
     name = "Android Wear Watchface Complication Rendering"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.WEAR_WATCHFACE
     inceptionYear = "2020"
     description = "Support for rendering complications on the watch face"
 }
diff --git a/wear/watchface/watchface-complications/build.gradle b/wear/watchface/watchface-complications/build.gradle
index 6d6f514..2a8ba78 100644
--- a/wear/watchface/watchface-complications/build.gradle
+++ b/wear/watchface/watchface-complications/build.gradle
@@ -61,7 +61,6 @@
 androidx {
     name = "Android Wear Complications"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.WEAR_WATCHFACE
     inceptionYear = "2021"
     description = "Android Wear Complications"
 }
diff --git a/wear/watchface/watchface-data/build.gradle b/wear/watchface/watchface-data/build.gradle
index abf1300..f42390ec 100644
--- a/wear/watchface/watchface-data/build.gradle
+++ b/wear/watchface/watchface-data/build.gradle
@@ -50,7 +50,6 @@
 androidx {
     name = "Android Wear Watchface Data"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.WEAR_WATCHFACE
     inceptionYear = "2020"
     description = "Android Wear Watchface hidden AIDL implementaion details"
 }
diff --git a/wear/watchface/watchface-editor-guava/build.gradle b/wear/watchface/watchface-editor-guava/build.gradle
index ec769ce..c8cb24c 100644
--- a/wear/watchface/watchface-editor-guava/build.gradle
+++ b/wear/watchface/watchface-editor-guava/build.gradle
@@ -40,7 +40,6 @@
 androidx {
     name = "Android Wear Watchface Client Editor"
     type = LibraryType.PUBLISHED_LIBRARY
-    mavenGroup = LibraryGroups.WEAR_WATCHFACE
     inceptionYear = "2021"
     description = "Guava wrappers for the Androidx Wear Watchface Editor library"
 }
diff --git a/wear/watchface/watchface-editor/build.gradle b/wear/watchface/watchface-editor/build.gradle
index fcd5e21..91c2e2d 100644
--- a/wear/watchface/watchface-editor/build.gradle
+++ b/wear/watchface/watchface-editor/build.gradle
@@ -61,7 +61,6 @@
 androidx {
     name = "Android Wear Watchface Editor"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.WEAR_WATCHFACE
     inceptionYear = "2020"
     description = "Classes for building Android Wear watchface editors"
 }
diff --git a/wear/watchface/watchface-editor/samples/build.gradle b/wear/watchface/watchface-editor/samples/build.gradle
index bde520f..85c5449 100644
--- a/wear/watchface/watchface-editor/samples/build.gradle
+++ b/wear/watchface/watchface-editor/samples/build.gradle
@@ -34,7 +34,6 @@
 androidx {
     name = "AndroidX Wear Editor Samples"
     type = LibraryType.SAMPLES
-    mavenGroup = LibraryGroups.WEAR_WATCHFACE
     inceptionYear = "2020"
     description = "Contains sample code for the Androidx Wear Editor library"
 }
diff --git a/wear/watchface/watchface-guava/build.gradle b/wear/watchface/watchface-guava/build.gradle
index 03f8acd..6571f63 100644
--- a/wear/watchface/watchface-guava/build.gradle
+++ b/wear/watchface/watchface-guava/build.gradle
@@ -47,7 +47,6 @@
 androidx {
     name = "AndroidX Wear Watchface Guava"
     type = LibraryType.PUBLISHED_LIBRARY
-    mavenGroup = LibraryGroups.WEAR_WATCHFACE
     inceptionYear = "2021"
     description = "Guava wrappers for the Androidx Wear Watchface library"
 }
diff --git a/wear/watchface/watchface-samples-minimal-complications/build.gradle b/wear/watchface/watchface-samples-minimal-complications/build.gradle
index 1bbe66d..ce74910 100644
--- a/wear/watchface/watchface-samples-minimal-complications/build.gradle
+++ b/wear/watchface/watchface-samples-minimal-complications/build.gradle
@@ -37,7 +37,6 @@
 androidx {
     name = "AndroidX Wear Watchface Minimal Complications Sample"
     type = LibraryType.SAMPLES
-    mavenGroup = LibraryGroups.WEAR_WATCHFACE
     inceptionYear = "2021"
     description = "Contains the sample code for the Androidx Wear Watchface library"
 }
diff --git a/wear/watchface/watchface-samples-minimal-instances/build.gradle b/wear/watchface/watchface-samples-minimal-instances/build.gradle
index 4249bd3..9fd911c 100644
--- a/wear/watchface/watchface-samples-minimal-instances/build.gradle
+++ b/wear/watchface/watchface-samples-minimal-instances/build.gradle
@@ -36,7 +36,6 @@
 androidx {
     name = "AndroidX Wear Watchface Minimal Style Sample"
     type = LibraryType.SAMPLES
-    mavenGroup = LibraryGroups.WEAR_WATCHFACE
     inceptionYear = "2021"
     description = "Contains the sample code for the Androidx Wear Watchface library"
 }
diff --git a/wear/watchface/watchface-samples-minimal-style/build.gradle b/wear/watchface/watchface-samples-minimal-style/build.gradle
index df0cb91..3931645 100644
--- a/wear/watchface/watchface-samples-minimal-style/build.gradle
+++ b/wear/watchface/watchface-samples-minimal-style/build.gradle
@@ -34,7 +34,6 @@
 androidx {
     name = "AndroidX Wear Watchface Minimal Style Sample"
     type = LibraryType.SAMPLES
-    mavenGroup = LibraryGroups.WEAR_WATCHFACE
     inceptionYear = "2021"
     description = "Contains the sample code for the Androidx Wear Watchface library"
 }
diff --git a/wear/watchface/watchface-style/build.gradle b/wear/watchface/watchface-style/build.gradle
index 9d0ba2c..8f3b413 100644
--- a/wear/watchface/watchface-style/build.gradle
+++ b/wear/watchface/watchface-style/build.gradle
@@ -60,7 +60,6 @@
 androidx {
     name = "Android Wear Watchface Style"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.WEAR_WATCHFACE
     inceptionYear = "2020"
     description = "Android Wear Watchface Style"
 }
\ No newline at end of file
diff --git a/wear/watchface/watchface/build.gradle b/wear/watchface/watchface/build.gradle
index ddfc94c..9fa7c1c 100644
--- a/wear/watchface/watchface/build.gradle
+++ b/wear/watchface/watchface/build.gradle
@@ -75,7 +75,6 @@
 androidx {
     name = "Android Wear Watchface"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.WEAR_WATCHFACE
     inceptionYear = "2020"
     description = "Android Wear Watchface"
 }
diff --git a/wear/watchface/watchface/samples/app/build.gradle b/wear/watchface/watchface/samples/app/build.gradle
index cdd2ca2..875f848 100644
--- a/wear/watchface/watchface/samples/app/build.gradle
+++ b/wear/watchface/watchface/samples/app/build.gradle
@@ -28,7 +28,6 @@
 androidx {
     name = "AndroidX Wear Watchface Samples app"
     type = LibraryType.SAMPLES
-    mavenGroup = LibraryGroups.WEAR_WATCHFACE
     inceptionYear = "2021"
     description = "APK for the sample code for the Androidx Wear Watchface library"
 }
diff --git a/wear/watchface/watchface/samples/build.gradle b/wear/watchface/watchface/samples/build.gradle
index d5f3596..0e89628 100644
--- a/wear/watchface/watchface/samples/build.gradle
+++ b/wear/watchface/watchface/samples/build.gradle
@@ -35,7 +35,6 @@
 androidx {
     name = "AndroidX Wear Watchface Samples"
     type = LibraryType.SAMPLES
-    mavenGroup = LibraryGroups.WEAR_WATCHFACE
     inceptionYear = "2020"
     description = "Contains the sample code for the Androidx Wear Watchface library"
 }
diff --git a/wear/watchface/watchface/samples/minimal/build.gradle b/wear/watchface/watchface/samples/minimal/build.gradle
index f8f155d..38d5ed5 100644
--- a/wear/watchface/watchface/samples/minimal/build.gradle
+++ b/wear/watchface/watchface/samples/minimal/build.gradle
@@ -30,7 +30,6 @@
 androidx {
     name = "AndroidX Wear Watchface Minimal Sample"
     type = LibraryType.SAMPLES
-    mavenGroup = LibraryGroups.WEAR_WATCHFACE
     inceptionYear = "2021"
     description = "Contains the sample code for the Androidx Wear Watchface library"
 }
diff --git a/wear/wear-input-testing/build.gradle b/wear/wear-input-testing/build.gradle
index 2a35c02..6952126 100644
--- a/wear/wear-input-testing/build.gradle
+++ b/wear/wear-input-testing/build.gradle
@@ -36,7 +36,6 @@
 androidx {
     name = "Android Wear Support Input Testing Helpers"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.WEAR
     mavenVersion = LibraryVersions.WEAR_INPUT_TESTING
     inceptionYear = "2020"
     description = "Android Wear Support Input  Testing Helpers"
diff --git a/wear/wear-input/build.gradle b/wear/wear-input/build.gradle
index 3338f9b..8301f64d 100644
--- a/wear/wear-input/build.gradle
+++ b/wear/wear-input/build.gradle
@@ -53,7 +53,6 @@
 androidx {
     name = "Android Wear Support Input"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.WEAR
     mavenVersion = LibraryVersions.WEAR_INPUT
     inceptionYear = "2020"
     description = "Android Wear Support Input"
diff --git a/wear/wear-input/samples/build.gradle b/wear/wear-input/samples/build.gradle
index 036ffa5..01f8339 100644
--- a/wear/wear-input/samples/build.gradle
+++ b/wear/wear-input/samples/build.gradle
@@ -40,7 +40,6 @@
 androidx {
     name = "Android Wear Input Samples"
     type = LibraryType.SAMPLES
-    mavenGroup = LibraryGroups.WEAR
     mavenVersion = LibraryVersions.WEAR_INPUT
     inceptionYear = "2021"
     description = "Contains the sample code for the Android Wear Input Classes"
diff --git a/wear/wear-ongoing/build.gradle b/wear/wear-ongoing/build.gradle
index c4eae59..8baebed 100644
--- a/wear/wear-ongoing/build.gradle
+++ b/wear/wear-ongoing/build.gradle
@@ -34,7 +34,6 @@
 androidx {
     name = "Android Wear Ongoing Activities"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.WEAR
     mavenVersion = LibraryVersions.WEAR_ONGOING
     inceptionYear = "2021"
     description = "Android Wear Ongoing Activities"
diff --git a/wear/wear-phone-interactions/build.gradle b/wear/wear-phone-interactions/build.gradle
index 70b1fa7..fbe41de 100644
--- a/wear/wear-phone-interactions/build.gradle
+++ b/wear/wear-phone-interactions/build.gradle
@@ -55,7 +55,6 @@
 androidx {
     name = "Android Wear Phone Interactions"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.WEAR
     mavenVersion = LibraryVersions.WEAR_PHONE_INTERACTIONS
     inceptionYear = "2021"
     description = "Android Wear Phone Interactions"
diff --git a/wear/wear-remote-interactions/build.gradle b/wear/wear-remote-interactions/build.gradle
index d7fb72e..2396d640 100644
--- a/wear/wear-remote-interactions/build.gradle
+++ b/wear/wear-remote-interactions/build.gradle
@@ -62,7 +62,6 @@
 androidx {
     name = "Android Wear Remote Interactions"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.WEAR
     mavenVersion = LibraryVersions.WEAR_REMOTE_INTERACTIONS
     inceptionYear = "2020"
     description = "Android Wear Remote Interactions"
diff --git a/wear/wear-samples-ambient/build.gradle b/wear/wear-samples-ambient/build.gradle
index 00d04e6..1cf4e6a 100644
--- a/wear/wear-samples-ambient/build.gradle
+++ b/wear/wear-samples-ambient/build.gradle
@@ -31,7 +31,6 @@
 androidx {
     name = "Android Wear Ambient Sample"
     type = LibraryType.SAMPLES
-    mavenGroup = LibraryGroups.WEAR
     inceptionYear = "2021"
     description = "Contains the sample code for the ambient APIs defined in the androidx.wear:wear library"
 }
diff --git a/wear/wear/build.gradle b/wear/wear/build.gradle
index 0b8d171..a85136e 100644
--- a/wear/wear/build.gradle
+++ b/wear/wear/build.gradle
@@ -63,7 +63,6 @@
 androidx {
     name = "Android Wear Support UI"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.WEAR
     mavenVersion = LibraryVersions.WEAR
     inceptionYear = "2016"
     description = "Android Wear Support UI"
diff --git a/webkit/webkit/build.gradle b/webkit/webkit/build.gradle
index 8f681c0..bb84e97 100644
--- a/webkit/webkit/build.gradle
+++ b/webkit/webkit/build.gradle
@@ -70,7 +70,6 @@
 androidx {
     name = "WebView Support Library"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.WEBKIT
     inceptionYear = "2017"
     description = "The WebView Support Library is a static library you can add to your Android application in order to use android.webkit APIs that are not available for older platform versions."
 }
diff --git a/window/extensions/extensions/build.gradle b/window/extensions/extensions/build.gradle
index eb25ebd..f9deca6 100644
--- a/window/extensions/extensions/build.gradle
+++ b/window/extensions/extensions/build.gradle
@@ -38,7 +38,6 @@
     name = "Jetpack WindowManager library Extensions"
     publish = Publish.SNAPSHOT_AND_RELEASE // Only to generate per-project-zips
     runApiTasks = new RunApiTasks.Yes("Need to track API surface before moving to publish")
-    mavenGroup = LibraryGroups.WINDOW_EXTENSIONS
     inceptionYear = "2020"
     description = "OEM extension interface definition for the Jetpack WindowManager. " +
             "This module declares the interface the the core component of this library " +
diff --git a/window/sidecar/sidecar/build.gradle b/window/sidecar/sidecar/build.gradle
index 5ff1fff..742646c 100644
--- a/window/sidecar/sidecar/build.gradle
+++ b/window/sidecar/sidecar/build.gradle
@@ -30,7 +30,6 @@
     name = "Jetpack WindowManager library Sidecar"
     publish = Publish.SNAPSHOT_AND_RELEASE // Only to generate per-project-zips
     runApiTasks = new RunApiTasks.Yes("Need to track API surface but should never publish")
-    mavenGroup = LibraryGroups.WINDOW_SIDECAR
     inceptionYear = "2020"
     description = "This version of the OEM extension is deprecated. Please use window:extensions:extensions." +
             "module instead."
diff --git a/window/window-core/build.gradle b/window/window-core/build.gradle
index e4cb437..e0e80a3 100644
--- a/window/window-core/build.gradle
+++ b/window/window-core/build.gradle
@@ -38,7 +38,6 @@
 androidx {
     name = "androidx.window:window-core"
     type = LibraryType.PUBLISHED_LIBRARY
-    mavenGroup = LibraryGroups.WINDOW
     inceptionYear = "2022"
     description = "WindowManager Core Library."
 }
diff --git a/window/window-java/build.gradle b/window/window-java/build.gradle
index 5390e0c..ad4a7de 100644
--- a/window/window-java/build.gradle
+++ b/window/window-java/build.gradle
@@ -48,7 +48,6 @@
 androidx {
     name = "WindowManager Java Support"
     type = LibraryType.PUBLISHED_LIBRARY
-    mavenGroup = LibraryGroups.WINDOW
     inceptionYear = "2021"
     description = "WindowManager Java Support"
 }
diff --git a/window/window-rxjava2/build.gradle b/window/window-rxjava2/build.gradle
index 0fee52f..389a75c 100644
--- a/window/window-rxjava2/build.gradle
+++ b/window/window-rxjava2/build.gradle
@@ -52,7 +52,6 @@
     name = "WindowManager RxJava 2"
     publish = Publish.SNAPSHOT_AND_RELEASE
     type = LibraryType.PUBLISHED_LIBRARY
-    mavenGroup = LibraryGroups.WINDOW
     inceptionYear = "2021"
     description = "WindowManager RxJava 2"
 }
diff --git a/window/window-rxjava3/build.gradle b/window/window-rxjava3/build.gradle
index 3c2706b..6874507 100644
--- a/window/window-rxjava3/build.gradle
+++ b/window/window-rxjava3/build.gradle
@@ -50,7 +50,6 @@
 androidx {
     name = "WindowManager RxJava 3 Support"
     type = LibraryType.PUBLISHED_LIBRARY
-    mavenGroup = LibraryGroups.WINDOW
     inceptionYear = "2021"
     description = "WindowManager RxJava 3 Support"
 }
diff --git a/window/window-samples/build.gradle b/window/window-samples/build.gradle
index be67188..99cf856 100644
--- a/window/window-samples/build.gradle
+++ b/window/window-samples/build.gradle
@@ -60,7 +60,6 @@
 androidx {
     name = "Jetpack WindowManager library samples"
     publish = Publish.NONE
-    mavenGroup = LibraryGroups.WINDOW
     inceptionYear = "2020"
     description = "Demo of Jetpack WindowManager library APIs"
 }
diff --git a/window/window-testing/build.gradle b/window/window-testing/build.gradle
index 3631174..f1a00a3 100644
--- a/window/window-testing/build.gradle
+++ b/window/window-testing/build.gradle
@@ -48,7 +48,6 @@
 androidx {
     name = "WindowManager Test Library"
     type = LibraryType.PUBLISHED_TEST_LIBRARY
-    mavenGroup = LibraryGroups.WINDOW
     inceptionYear = "2021"
     description = "WindowManager Test Library"
 }
\ No newline at end of file
diff --git a/window/window/build.gradle b/window/window/build.gradle
index 581da26..5236d42 100644
--- a/window/window/build.gradle
+++ b/window/window/build.gradle
@@ -83,7 +83,6 @@
 androidx {
     name = "Jetpack WindowManager Library"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.WINDOW
     inceptionYear = "2020"
     description = "WindowManager Jetpack library. Currently only provides additional " +
             "functionality on foldable devices."
diff --git a/work/work-benchmark/build.gradle b/work/work-benchmark/build.gradle
index 3dc9841..d4a2c31 100644
--- a/work/work-benchmark/build.gradle
+++ b/work/work-benchmark/build.gradle
@@ -40,7 +40,6 @@
 androidx {
     name = "Android WorkManager Benchmarks"
      publish = Publish.NONE
-    mavenGroup = LibraryGroups.WORK
     inceptionYear = "2019"
     description = "Android WorkManager Benchmark Library"
 }
diff --git a/work/work-gcm/build.gradle b/work/work-gcm/build.gradle
index 79b7b9f..4e9ee99 100644
--- a/work/work-gcm/build.gradle
+++ b/work/work-gcm/build.gradle
@@ -49,7 +49,6 @@
 androidx {
     name = "Android WorkManager GCMNetworkManager Support"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.WORK
     inceptionYear = "2019"
     description = "Android WorkManager GCMNetworkManager Support"
 }
diff --git a/work/work-inspection/build.gradle b/work/work-inspection/build.gradle
index 8de2604..5083c43 100644
--- a/work/work-inspection/build.gradle
+++ b/work/work-inspection/build.gradle
@@ -44,7 +44,6 @@
 androidx {
     name = "Android WorkManager Inspector"
     type = LibraryType.IDE_PLUGIN
-    mavenGroup = LibraryGroups.WORK
     inceptionYear = "2020"
     description = "The implementation of WorkManager Inspector."
 }
diff --git a/work/work-lint/build.gradle b/work/work-lint/build.gradle
index 8249efe..083e406 100644
--- a/work/work-lint/build.gradle
+++ b/work/work-lint/build.gradle
@@ -34,7 +34,6 @@
 androidx {
     name = "Android WorkManager Runtime Lint Checks"
     type = LibraryType.LINT
-    mavenGroup = LibraryGroups.WORK
     inceptionYear = "2019"
     description = "Android WorkManager Runtime Lint Checks"
 }
diff --git a/work/work-multiprocess/build.gradle b/work/work-multiprocess/build.gradle
index f960c4e..67f4356 100644
--- a/work/work-multiprocess/build.gradle
+++ b/work/work-multiprocess/build.gradle
@@ -51,7 +51,6 @@
 androidx {
     name = "Android WorkManager Multiprocess Implementation"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.WORK
     inceptionYear = "2020"
     description = "Android WorkManager runtime library"
     failOnDeprecationWarnings = false
diff --git a/work/work-runtime-ktx/build.gradle b/work/work-runtime-ktx/build.gradle
index a202b23..9de4d41 100644
--- a/work/work-runtime-ktx/build.gradle
+++ b/work/work-runtime-ktx/build.gradle
@@ -42,7 +42,6 @@
 androidx {
     name = "Android WorkManager Kotlin Extensions"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.WORK
     inceptionYear = "2018"
     description = "Android WorkManager Kotlin Extensions"
 }
diff --git a/work/work-runtime/build.gradle b/work/work-runtime/build.gradle
index 83a47ba..124033e 100644
--- a/work/work-runtime/build.gradle
+++ b/work/work-runtime/build.gradle
@@ -94,7 +94,6 @@
 androidx {
     name = "Android WorkManager Runtime"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.WORK
     inceptionYear = "2018"
     description = "Android WorkManager runtime library"
     failOnDeprecationWarnings = false
diff --git a/work/work-rxjava2/build.gradle b/work/work-rxjava2/build.gradle
index 4e66b7a..e8e0e7e 100644
--- a/work/work-rxjava2/build.gradle
+++ b/work/work-rxjava2/build.gradle
@@ -34,7 +34,6 @@
 androidx {
     name = "Android WorkManager RxJava2 Support"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.WORK
     inceptionYear = "2018"
     description = "Android WorkManager RxJava2 interoperatibility library"
     failOnDeprecationWarnings = false
diff --git a/work/work-rxjava3/build.gradle b/work/work-rxjava3/build.gradle
index 2996856..a725099 100644
--- a/work/work-rxjava3/build.gradle
+++ b/work/work-rxjava3/build.gradle
@@ -34,7 +34,6 @@
 androidx {
     name = "Android WorkManager RxJava3 Support"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.WORK
     inceptionYear = "2020"
     description = "Android WorkManager RxJava3 interoperatibility library"
 }
diff --git a/work/work-testing/build.gradle b/work/work-testing/build.gradle
index 32d8428..7e10fd1 100644
--- a/work/work-testing/build.gradle
+++ b/work/work-testing/build.gradle
@@ -44,7 +44,6 @@
 androidx {
     name = "Android WorkManager Testing"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenGroup = LibraryGroups.WORK
     inceptionYear = "2018"
     description = "Android WorkManager testing library"
 }