Move DSL namespace from supportLibrary to androidx.

Test: ./gradlew createArchive
Change-Id: I07a66c4685daec2b72c83a8fbff9430ec9764a64
diff --git a/activity/build.gradle b/activity/build.gradle
index 96270d9..9da96b1 100644
--- a/activity/build.gradle
+++ b/activity/build.gradle
@@ -35,7 +35,7 @@
     androidTestImplementation(DEXMAKER_MOCKITO, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker
 }
 
-supportLibrary {
+androidx {
     name = "Activity"
     publish = true
     mavenVersion = LibraryVersions.ACTIVITY
diff --git a/activity/ktx/build.gradle b/activity/ktx/build.gradle
index 2ed6707..220bb73 100644
--- a/activity/ktx/build.gradle
+++ b/activity/ktx/build.gradle
@@ -43,7 +43,7 @@
     androidTestImplementation(TEST_RULES)
 }
 
-supportLibrary {
+androidx {
     name = "Activity Kotlin Extensions"
     publish = true
     mavenVersion = LibraryVersions.ACTIVITY
diff --git a/animation/build.gradle b/animation/build.gradle
index 63a343f..69e25c6 100644
--- a/animation/build.gradle
+++ b/animation/build.gradle
@@ -31,7 +31,7 @@
     androidTestImplementation(TEST_RULES, libs.exclude_for_espresso)
 }
 
-supportLibrary {
+androidx {
     name = "Android Support Animation"
     publish = false
     mavenVersion = LibraryVersions.ANIMATION
diff --git a/animation/testing/build.gradle b/animation/testing/build.gradle
index d823fa1..83412ae 100644
--- a/animation/testing/build.gradle
+++ b/animation/testing/build.gradle
@@ -30,7 +30,7 @@
     implementation(TEST_CORE)
 }
 
-supportLibrary {
+androidx {
     name = "Android Support Animation Testing"
     publish = false
     mavenVersion = LibraryVersions.ANIMATION_TESTING
diff --git a/annotations/build.gradle b/annotations/build.gradle
index 12307ad..b1e4b46 100644
--- a/annotations/build.gradle
+++ b/annotations/build.gradle
@@ -53,7 +53,7 @@
     archives annotationsZip
 }
 
-supportLibrary {
+androidx {
     name = "Android Support Library Annotations"
     publish = true
     mavenVersion = LibraryVersions.ANNOTATION
diff --git a/appcompat/build.gradle b/appcompat/build.gradle
index 2d6dd6f..0dc5996 100644
--- a/appcompat/build.gradle
+++ b/appcompat/build.gradle
@@ -50,7 +50,7 @@
     }
 }
 
-supportLibrary {
+androidx {
     name = "Android AppCompat Library v7"
     publish = true
     mavenVersion = LibraryVersions.APPCOMPAT
diff --git a/appcompat/resources/build.gradle b/appcompat/resources/build.gradle
index b78317e..c9d5a3b 100644
--- a/appcompat/resources/build.gradle
+++ b/appcompat/resources/build.gradle
@@ -55,7 +55,7 @@
     }
 }
 
-supportLibrary {
+androidx {
     name = "Android Resources Library"
     publish = true
     mavenVersion = LibraryVersions.APPCOMPAT
diff --git a/arch/core-common/build.gradle b/arch/core-common/build.gradle
index ed1ecbe..d2c6d97 100644
--- a/arch/core-common/build.gradle
+++ b/arch/core-common/build.gradle
@@ -30,7 +30,7 @@
     testCompile(MOCKITO_CORE)
 }
 
-supportLibrary {
+androidx {
     name = "Android Arch-Common"
     publish = true
     mavenVersion = LibraryVersions.ARCH_CORE
diff --git a/arch/core-runtime/build.gradle b/arch/core-runtime/build.gradle
index 7091d76..ec0cd22 100644
--- a/arch/core-runtime/build.gradle
+++ b/arch/core-runtime/build.gradle
@@ -28,7 +28,7 @@
     api(project(":arch:core-common"))
 }
 
-supportLibrary {
+androidx {
     name = "Android Arch-Runtime"
     publish = true
     mavenVersion = LibraryVersions.ARCH_RUNTIME
diff --git a/arch/core-testing/build.gradle b/arch/core-testing/build.gradle
index 2dec495..a327a9c 100644
--- a/arch/core-testing/build.gradle
+++ b/arch/core-testing/build.gradle
@@ -38,7 +38,7 @@
     androidTestImplementation(ESPRESSO_CORE)
 }
 
-supportLibrary {
+androidx {
     name = "Android Core-Testing"
     publish = true
     mavenVersion = LibraryVersions.ARCH_CORE_TESTING
diff --git a/asynclayoutinflater/build.gradle b/asynclayoutinflater/build.gradle
index 1671c98..fffdefd 100644
--- a/asynclayoutinflater/build.gradle
+++ b/asynclayoutinflater/build.gradle
@@ -10,7 +10,7 @@
     api(project(":core"))
 }
 
-supportLibrary {
+androidx {
     name = "Android Support Library Async Layout Inflater"
     publish = true
     mavenVersion = LibraryVersions.ASYNCLAYOUTINFLATER
diff --git a/benchmark/build.gradle b/benchmark/build.gradle
index 6bdfc44..fb56c60 100644
--- a/benchmark/build.gradle
+++ b/benchmark/build.gradle
@@ -31,7 +31,7 @@
     implementation(KOTLIN_STDLIB)
 }
 
-supportLibrary {
+androidx {
     name = "Android Benchmark"
     publish = false
     mavenVersion = LibraryVersions.BENCHMARK
diff --git a/benchmark/gradle-plugin/build.gradle b/benchmark/gradle-plugin/build.gradle
index b3c8b788..d2d11a7 100644
--- a/benchmark/gradle-plugin/build.gradle
+++ b/benchmark/gradle-plugin/build.gradle
@@ -47,7 +47,7 @@
     }
 }
 
-supportLibrary {
+androidx {
     name = "Android Benchmark Gradle Plugin"
     publish = true
     toolingProject = true
diff --git a/biometric/build.gradle b/biometric/build.gradle
index 4d1450f..dc2c86b 100644
--- a/biometric/build.gradle
+++ b/biometric/build.gradle
@@ -21,7 +21,7 @@
     }
 }
 
-supportLibrary {
+androidx {
     name = "Biometric"
     publish = true
     mavenVersion = LibraryVersions.BIOMETRIC
diff --git a/browser/build.gradle b/browser/build.gradle
index feed454..5d8ba8b 100644
--- a/browser/build.gradle
+++ b/browser/build.gradle
@@ -29,7 +29,7 @@
     androidTestImplementation(project(":internal-testutils"))
 }
 
-supportLibrary {
+androidx {
     name = "Android Support Custom Tabs"
     publish = true
     mavenVersion = LibraryVersions.BROWSER
diff --git a/buildSrc/src/main/kotlin/androidx/build/SupportAndroidLibraryPlugin.kt b/buildSrc/src/main/kotlin/androidx/build/SupportAndroidLibraryPlugin.kt
index dcb0def..a53cb0d9 100644
--- a/buildSrc/src/main/kotlin/androidx/build/SupportAndroidLibraryPlugin.kt
+++ b/buildSrc/src/main/kotlin/androidx/build/SupportAndroidLibraryPlugin.kt
@@ -35,7 +35,7 @@
     override fun apply(project: Project) {
         project.apply<AndroidXPlugin>()
 
-        val supportLibraryExtension = project.extensions.create("supportLibrary",
+        val supportLibraryExtension = project.extensions.create("androidx",
                 SupportLibraryExtension::class.java, project)
         project.configureMavenArtifactUpload(supportLibraryExtension)
 
diff --git a/buildSrc/src/main/kotlin/androidx/build/SupportJavaLibraryPlugin.kt b/buildSrc/src/main/kotlin/androidx/build/SupportJavaLibraryPlugin.kt
index 65a4b95..fc496fc 100644
--- a/buildSrc/src/main/kotlin/androidx/build/SupportJavaLibraryPlugin.kt
+++ b/buildSrc/src/main/kotlin/androidx/build/SupportJavaLibraryPlugin.kt
@@ -32,7 +32,7 @@
     override fun apply(project: Project) {
         project.apply<AndroidXPlugin>()
 
-        val supportLibraryExtension = project.extensions.create("supportLibrary",
+        val supportLibraryExtension = project.extensions.create("androidx",
                 SupportLibraryExtension::class.java, project)
         project.configureMavenArtifactUpload(supportLibraryExtension)
 
diff --git a/buildSrc/src/main/kotlin/androidx/build/SupportKotlinLibraryPlugin.kt b/buildSrc/src/main/kotlin/androidx/build/SupportKotlinLibraryPlugin.kt
index b5359be3..486ed39 100644
--- a/buildSrc/src/main/kotlin/androidx/build/SupportKotlinLibraryPlugin.kt
+++ b/buildSrc/src/main/kotlin/androidx/build/SupportKotlinLibraryPlugin.kt
@@ -25,7 +25,7 @@
     override fun apply(project: Project) {
         project.apply<AndroidXPlugin>()
 
-        val supportLibraryExtension = project.extensions.create("supportLibrary",
+        val supportLibraryExtension = project.extensions.create("androidx",
                 SupportLibraryExtension::class.java, project)
         project.configureMavenArtifactUpload(supportLibraryExtension)
         project.apply(mapOf("plugin" to "kotlin"))
diff --git a/car/cluster/build.gradle b/car/cluster/build.gradle
index ee87717..9ca372b 100644
--- a/car/cluster/build.gradle
+++ b/car/cluster/build.gradle
@@ -58,7 +58,7 @@
     }
 }
 
-supportLibrary {
+androidx {
     name = "Android Car Instrument Cluster Support"
     publish = true
     mavenVersion = LibraryVersions.CAR_CLUSTER
diff --git a/car/core/build.gradle b/car/core/build.gradle
index 8f4c678..0ec5848 100644
--- a/car/core/build.gradle
+++ b/car/core/build.gradle
@@ -52,7 +52,7 @@
     }
 }
 
-supportLibrary {
+androidx {
     name = "Android Car Support UI"
     publish = true
     mavenVersion = LibraryVersions.CAR
diff --git a/car/moderator/build.gradle b/car/moderator/build.gradle
index db6a3dd..931f82f 100644
--- a/car/moderator/build.gradle
+++ b/car/moderator/build.gradle
@@ -56,7 +56,7 @@
     }
 }
 
-supportLibrary {
+androidx {
     name = "Android Car Support Moderator"
     publish = true
     mavenVersion = LibraryVersions.CAR_MODERATOR
diff --git a/cardview/build.gradle b/cardview/build.gradle
index 7df2ca3..1179eaf 100644
--- a/cardview/build.gradle
+++ b/cardview/build.gradle
@@ -15,7 +15,7 @@
     }
 }
 
-supportLibrary {
+androidx {
     name = "Android Support CardView v7"
     publish = true
     mavenVersion = LibraryVersions.CARDVIEW
diff --git a/collection/build.gradle b/collection/build.gradle
index 11fac32..e87ce2c 100644
--- a/collection/build.gradle
+++ b/collection/build.gradle
@@ -28,7 +28,7 @@
     testCompile(JUNIT)
 }
 
-supportLibrary {
+androidx {
     name = "Android Support Library collections"
     publish = true
     mavenVersion = LibraryVersions.COLLECTION
diff --git a/collection/ktx/build.gradle b/collection/ktx/build.gradle
index 046ffd9..fda5f1f 100644
--- a/collection/ktx/build.gradle
+++ b/collection/ktx/build.gradle
@@ -30,7 +30,7 @@
     testCompile(project(":internal-testutils-ktx"))
 }
 
-supportLibrary {
+androidx {
     name = "Collections Kotlin Extensions"
     publish = true
     mavenVersion = LibraryVersions.COLLECTION
diff --git a/concurrent/futures/build.gradle b/concurrent/futures/build.gradle
index 2af5f1c..7796000 100644
--- a/concurrent/futures/build.gradle
+++ b/concurrent/futures/build.gradle
@@ -31,7 +31,7 @@
     testCompile(TRUTH)
 }
 
-supportLibrary {
+androidx {
     name = "AndroidX Futures"
     publish = true
     mavenVersion = LibraryVersions.FUTURES
diff --git a/content/build.gradle b/content/build.gradle
index b4f1374..690f1bf 100644
--- a/content/build.gradle
+++ b/content/build.gradle
@@ -35,7 +35,7 @@
     androidTestImplementation(ESPRESSO_CORE, libs.exclude_for_espresso)
 }
 
-supportLibrary {
+androidx {
     name = "Android Support Content"
     publish = true
     mavenVersion = LibraryVersions.CONTENTPAGER
diff --git a/coordinatorlayout/build.gradle b/coordinatorlayout/build.gradle
index 7bbacfd..0a2febb 100644
--- a/coordinatorlayout/build.gradle
+++ b/coordinatorlayout/build.gradle
@@ -38,7 +38,7 @@
     }
 }
 
-supportLibrary {
+androidx {
     name = "Android Support Library Coordinator Layout"
     publish = true
     mavenVersion = LibraryVersions.COORDINATORLAYOUT
diff --git a/core/build.gradle b/core/build.gradle
index a17073f..5282172 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -41,7 +41,7 @@
     }
 }
 
-supportLibrary {
+androidx {
     name = "Android Support Library compat"
     publish = true
     mavenVersion = LibraryVersions.CORE
diff --git a/core/ktx/build.gradle b/core/ktx/build.gradle
index 0d717d0..7277af5 100644
--- a/core/ktx/build.gradle
+++ b/core/ktx/build.gradle
@@ -29,7 +29,7 @@
     androidTestImplementation(project(":internal-testutils-ktx"))
 }
 
-supportLibrary {
+androidx {
     name = "Core Kotlin Extensions"
     publish = true
     mavenVersion = LibraryVersions.CORE
diff --git a/cursoradapter/build.gradle b/cursoradapter/build.gradle
index b137fc9..7c84102 100644
--- a/cursoradapter/build.gradle
+++ b/cursoradapter/build.gradle
@@ -9,7 +9,7 @@
     api(project(":annotation"))
 }
 
-supportLibrary {
+androidx {
     name = "Android Support Library Cursor Adapter"
     publish = true
     mavenVersion = LibraryVersions.CURSORADAPTER
diff --git a/customview/build.gradle b/customview/build.gradle
index b3eb22e..82fda22 100644
--- a/customview/build.gradle
+++ b/customview/build.gradle
@@ -18,7 +18,7 @@
     androidTestImplementation(TEST_RULES)
 }
 
-supportLibrary {
+androidx {
     name = "Android Support Library Custom View"
     publish = true
     mavenVersion = LibraryVersions.CUSTOMVIEW
diff --git a/documentfile/build.gradle b/documentfile/build.gradle
index 13ea2df..fcc8f41 100644
--- a/documentfile/build.gradle
+++ b/documentfile/build.gradle
@@ -16,7 +16,7 @@
     androidTestImplementation(TEST_RUNNER)
 }
 
-supportLibrary {
+androidx {
     name = "Android Support Library Document File"
     publish = true
     mavenVersion = LibraryVersions.DOCUMENTFILE
diff --git a/drawerlayout/build.gradle b/drawerlayout/build.gradle
index 875e4a0..dcbd911 100644
--- a/drawerlayout/build.gradle
+++ b/drawerlayout/build.gradle
@@ -11,7 +11,7 @@
     api(project(":customview"))
 }
 
-supportLibrary {
+androidx {
     name = "Android Support Library Drawer Layout"
     publish = true
     mavenVersion = LibraryVersions.DRAWERLAYOUT
diff --git a/dumb-tests/build.gradle b/dumb-tests/build.gradle
index f26410b..0a29cc5 100644
--- a/dumb-tests/build.gradle
+++ b/dumb-tests/build.gradle
@@ -32,7 +32,7 @@
 
 uploadArchives.enabled = false
 
-supportLibrary {
+androidx {
     name = "Dummy Project for test runner"
     publish = false
 }
\ No newline at end of file
diff --git a/dynamic-animation/build.gradle b/dynamic-animation/build.gradle
index 802fbef..43f6fff 100644
--- a/dynamic-animation/build.gradle
+++ b/dynamic-animation/build.gradle
@@ -20,7 +20,7 @@
     androidTestImplementation(DEXMAKER_MOCKITO, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker
 }
 
-supportLibrary {
+androidx {
     name = "Android Support DynamicAnimation"
     publish = true
     mavenVersion = LibraryVersions.DYNAMICANIMATION
diff --git a/dynamic-animation/ktx/build.gradle b/dynamic-animation/ktx/build.gradle
index b14cc2d..4ab53ca 100644
--- a/dynamic-animation/ktx/build.gradle
+++ b/dynamic-animation/ktx/build.gradle
@@ -48,7 +48,7 @@
     androidTestImplementation(DEXMAKER_MOCKITO, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker
 }
 
-supportLibrary {
+androidx {
     name = "Dynamic animation Kotlin Extensions"
     publish = true
     mavenVersion = LibraryVersions.DYNAMICANIMATION_KTX
diff --git a/emoji/appcompat/build.gradle b/emoji/appcompat/build.gradle
index 2e8e6d6..d5d6ef6 100644
--- a/emoji/appcompat/build.gradle
+++ b/emoji/appcompat/build.gradle
@@ -26,7 +26,7 @@
     api(project(":appcompat"))
 }
 
-supportLibrary {
+androidx {
     name = "Android Emoji AppCompat"
     publish = true
     mavenVersion = LibraryVersions.EMOJI
diff --git a/emoji/bundled/build.gradle b/emoji/bundled/build.gradle
index 8b72f6f..e644e7c 100644
--- a/emoji/bundled/build.gradle
+++ b/emoji/bundled/build.gradle
@@ -19,7 +19,7 @@
     api(project(":emoji"))
 }
 
-supportLibrary {
+androidx {
     name = "Android Emoji Compat"
     publish = true
     mavenVersion = LibraryVersions.EMOJI
diff --git a/emoji/core/build.gradle b/emoji/core/build.gradle
index e0ac029..9d3a5da 100644
--- a/emoji/core/build.gradle
+++ b/emoji/core/build.gradle
@@ -56,7 +56,7 @@
     }
 }
 
-supportLibrary {
+androidx {
     name = "Android Emoji Compat"
     publish = true
     mavenVersion = LibraryVersions.EMOJI
diff --git a/enterprise/feedback/build.gradle b/enterprise/feedback/build.gradle
index aa8ad4c..eba9824 100644
--- a/enterprise/feedback/build.gradle
+++ b/enterprise/feedback/build.gradle
@@ -22,7 +22,7 @@
 
     testOptions.unitTests.includeAndroidResources = true
 }
-supportLibrary {
+androidx {
     name = "Enterprise Feedback"
     publish = true
     mavenVersion = LibraryVersions.ENTERPRISE
diff --git a/exifinterface/build.gradle b/exifinterface/build.gradle
index c3c9027..fd7b8b0 100644
--- a/exifinterface/build.gradle
+++ b/exifinterface/build.gradle
@@ -14,7 +14,7 @@
     androidTestImplementation(TEST_RUNNER)
 }
 
-supportLibrary {
+androidx {
     name = "Android Support ExifInterface"
     publish = true
     mavenVersion = LibraryVersions.EXIFINTERFACE
diff --git a/fragment/build.gradle b/fragment/build.gradle
index 2b6c14a..e77d51b 100644
--- a/fragment/build.gradle
+++ b/fragment/build.gradle
@@ -39,7 +39,7 @@
     }
 }
 
-supportLibrary {
+androidx {
     name = "Android Support Library fragment"
     publish = true
     mavenVersion = LibraryVersions.FRAGMENT
diff --git a/fragment/ktx/build.gradle b/fragment/ktx/build.gradle
index b150f6a..ecffc6c 100644
--- a/fragment/ktx/build.gradle
+++ b/fragment/ktx/build.gradle
@@ -47,7 +47,7 @@
     androidTestImplementation(TEST_RULES)
 }
 
-supportLibrary {
+androidx {
     name = "Fragment Kotlin Extensions"
     publish = true
     mavenVersion = LibraryVersions.FRAGMENT
diff --git a/fragment/testing/build.gradle b/fragment/testing/build.gradle
index 5e46add..34544f7 100644
--- a/fragment/testing/build.gradle
+++ b/fragment/testing/build.gradle
@@ -52,7 +52,7 @@
     androidTestImplementation(DEXMAKER_MOCKITO, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker
 }
 
-supportLibrary {
+androidx {
     name = "Fragment Test Extensions"
     publish = true
     mavenVersion = LibraryVersions.FRAGMENT
diff --git a/graphics/drawable/animated/build.gradle b/graphics/drawable/animated/build.gradle
index fae5204..23f477d 100644
--- a/graphics/drawable/animated/build.gradle
+++ b/graphics/drawable/animated/build.gradle
@@ -33,7 +33,7 @@
     }
 }
 
-supportLibrary {
+androidx {
     name = "Android Support AnimatedVectorDrawable"
     publish = true
     mavenVersion = LibraryVersions.VECTORDRAWABLE_ANIMATED
diff --git a/graphics/drawable/static/build.gradle b/graphics/drawable/static/build.gradle
index ea9130d..af89885 100644
--- a/graphics/drawable/static/build.gradle
+++ b/graphics/drawable/static/build.gradle
@@ -28,7 +28,7 @@
     }
 }
 
-supportLibrary {
+androidx {
     name = "Android Support VectorDrawable"
     publish = true
     mavenVersion = LibraryVersions.VECTORDRAWABLE
diff --git a/gridlayout/build.gradle b/gridlayout/build.gradle
index 1acf0e3..2ba41ad 100644
--- a/gridlayout/build.gradle
+++ b/gridlayout/build.gradle
@@ -16,7 +16,7 @@
     androidTestImplementation(ESPRESSO_CORE, libs.exclude_for_espresso)
 }
 
-supportLibrary {
+androidx {
     name = "Android Support Grid Layout"
     publish = true
     mavenVersion = LibraryVersions.GRIDLAYOUT
diff --git a/heifwriter/build.gradle b/heifwriter/build.gradle
index a7193e0..43cbb06 100644
--- a/heifwriter/build.gradle
+++ b/heifwriter/build.gradle
@@ -22,7 +22,7 @@
     androidTestImplementation(ESPRESSO_CORE, libs.exclude_for_espresso)
 }
 
-supportLibrary {
+androidx {
     name = "Android Support HeifWriter"
     publish = true
     mavenVersion = LibraryVersions.HEIFWRITER
diff --git a/interpolator/build.gradle b/interpolator/build.gradle
index 8ec605a..b75c880 100644
--- a/interpolator/build.gradle
+++ b/interpolator/build.gradle
@@ -9,7 +9,7 @@
     api(project(":annotation"))
 }
 
-supportLibrary {
+androidx {
     name = "Android Support Library Interpolators"
     publish = true
     mavenVersion = LibraryVersions.INTERPOLATOR
diff --git a/jetifier/jetifier/core/build.gradle b/jetifier/jetifier/core/build.gradle
index 39874ad..d356e2c 100644
--- a/jetifier/jetifier/core/build.gradle
+++ b/jetifier/jetifier/core/build.gradle
@@ -29,7 +29,7 @@
     testCompile(TRUTH)
 }
 
-supportLibrary {
+androidx {
     name = "Android Jetifier Core"
     publish = true
     mavenVersion = LibraryVersions.JETIFIER
diff --git a/jetifier/jetifier/gradle-plugin/build.gradle b/jetifier/jetifier/gradle-plugin/build.gradle
index b287eba..d367ea8 100644
--- a/jetifier/jetifier/gradle-plugin/build.gradle
+++ b/jetifier/jetifier/gradle-plugin/build.gradle
@@ -31,7 +31,7 @@
 }
 
 
-supportLibrary {
+androidx {
     name = "Android Jetifier Gradle Plugin"
     publish = false
     mavenVersion = LibraryVersions.JETIFIER
diff --git a/jetifier/jetifier/processor/build.gradle b/jetifier/jetifier/processor/build.gradle
index e468cf6..22917d0 100644
--- a/jetifier/jetifier/processor/build.gradle
+++ b/jetifier/jetifier/processor/build.gradle
@@ -33,7 +33,7 @@
     testCompile(TRUTH)
 }
 
-supportLibrary {
+androidx {
     name = "Android Jetifier Processor"
     publish = true
     mavenVersion = LibraryVersions.JETIFIER
diff --git a/leanback-preference/build.gradle b/leanback-preference/build.gradle
index e14e08c..21d56c4 100644
--- a/leanback-preference/build.gradle
+++ b/leanback-preference/build.gradle
@@ -26,7 +26,7 @@
     }
 }
 
-supportLibrary {
+androidx {
     name = "AndroidX Leanback Preference"
     publish = true
     mavenVersion = LibraryVersions.LEANBACK_PREFERENCE
diff --git a/leanback/build.gradle b/leanback/build.gradle
index e9cf2a8..7e251f2 100644
--- a/leanback/build.gradle
+++ b/leanback/build.gradle
@@ -38,7 +38,7 @@
     }
 }
 
-supportLibrary {
+androidx {
     name = "Android Support Leanback v17"
     publish = true
     mavenVersion = LibraryVersions.LEANBACK
diff --git a/legacy/core-ui/build.gradle b/legacy/core-ui/build.gradle
index 1298d4e..7b96262 100644
--- a/legacy/core-ui/build.gradle
+++ b/legacy/core-ui/build.gradle
@@ -20,7 +20,7 @@
     api(project(":cursoradapter"))
 }
 
-supportLibrary {
+androidx {
     name = "Android Support Library core UI"
     publish = true
     mavenVersion = LibraryVersions.LEGACY
diff --git a/legacy/core-utils/build.gradle b/legacy/core-utils/build.gradle
index 10eb003..f00084c 100644
--- a/legacy/core-utils/build.gradle
+++ b/legacy/core-utils/build.gradle
@@ -14,7 +14,7 @@
     api(project(":print"))
 }
 
-supportLibrary {
+androidx {
     name = "Android Support Library core utils"
     publish = true
     mavenVersion = LibraryVersions.LEGACY
diff --git a/legacy/v13/build.gradle b/legacy/v13/build.gradle
index 9a6041e..dfd90b5e 100644
--- a/legacy/v13/build.gradle
+++ b/legacy/v13/build.gradle
@@ -11,7 +11,7 @@
     api(project(":viewpager"))
 }
 
-supportLibrary {
+androidx {
     name = "Android Support Library v13"
     publish = true
     mavenVersion = LibraryVersions.LEGACY
diff --git a/lifecycle/common-java8/build.gradle b/lifecycle/common-java8/build.gradle
index cf02115..42fcf99 100644
--- a/lifecycle/common-java8/build.gradle
+++ b/lifecycle/common-java8/build.gradle
@@ -34,7 +34,7 @@
     testCompile(MOCKITO_CORE)
 }
 
-supportLibrary {
+androidx {
     name = "Android Lifecycle-Common for Java 8 Language"
     publish = true
     mavenVersion = LibraryVersions.LIFECYCLE
diff --git a/lifecycle/common/build.gradle b/lifecycle/common/build.gradle
index 75037fa..f2c17e5 100644
--- a/lifecycle/common/build.gradle
+++ b/lifecycle/common/build.gradle
@@ -31,7 +31,7 @@
     compile(project(":annotation"))
 }
 
-supportLibrary {
+androidx {
     name = "Android Lifecycle-Common"
     publish = true
     mavenVersion = LibraryVersions.LIFECYCLE
diff --git a/lifecycle/compiler/build.gradle b/lifecycle/compiler/build.gradle
index 9db71e6..727eb93 100644
--- a/lifecycle/compiler/build.gradle
+++ b/lifecycle/compiler/build.gradle
@@ -42,7 +42,7 @@
     destinationDir = file("src/tests/test-data/lib/")
 }
 
-supportLibrary {
+androidx {
     name = "Android Lifecycles Compiler"
     toolingProject = true
     publish = true
diff --git a/lifecycle/extensions/build.gradle b/lifecycle/extensions/build.gradle
index 0a04c44..90b82f0 100644
--- a/lifecycle/extensions/build.gradle
+++ b/lifecycle/extensions/build.gradle
@@ -52,7 +52,7 @@
     androidTestImplementation(SUPPORT_APPCOMPAT, libs.support_exclude_config)
 }
 
-supportLibrary {
+androidx {
     name = "Android Lifecycle Extensions"
     publish = true
     mavenVersion = LibraryVersions.LIFECYCLE
diff --git a/lifecycle/livedata-core/build.gradle b/lifecycle/livedata-core/build.gradle
index c49a937..31cf35b 100644
--- a/lifecycle/livedata-core/build.gradle
+++ b/lifecycle/livedata-core/build.gradle
@@ -34,7 +34,7 @@
     testImplementation(MOCKITO_CORE)
 }
 
-supportLibrary {
+androidx {
     name = "Android Lifecycle LiveData Core"
     publish = true
     mavenVersion = LibraryVersions.LIFECYCLE
diff --git a/lifecycle/livedata-core/ktx/build.gradle b/lifecycle/livedata-core/ktx/build.gradle
index 8aec136..0b5d169 100644
--- a/lifecycle/livedata-core/ktx/build.gradle
+++ b/lifecycle/livedata-core/ktx/build.gradle
@@ -44,7 +44,7 @@
     testImplementation(TEST_RULES)
 }
 
-supportLibrary {
+androidx {
     name = "LiveData Core Kotlin Extensions"
     publish = true
     mavenVersion = LibraryVersions.LIFECYCLE
diff --git a/lifecycle/livedata/build.gradle b/lifecycle/livedata/build.gradle
index 6077eb4..e64780a 100644
--- a/lifecycle/livedata/build.gradle
+++ b/lifecycle/livedata/build.gradle
@@ -40,7 +40,7 @@
     testImplementation(MOCKITO_CORE)
 }
 
-supportLibrary {
+androidx {
     name = "Android Lifecycle LiveData"
     publish = true
     mavenVersion = LibraryVersions.LIFECYCLE
diff --git a/lifecycle/livedata/eap/build.gradle b/lifecycle/livedata/eap/build.gradle
index e00aabe..94393bd9e 100644
--- a/lifecycle/livedata/eap/build.gradle
+++ b/lifecycle/livedata/eap/build.gradle
@@ -48,7 +48,7 @@
     testImplementation(KOTLIN_COROUTINES_TEST)
 }
 
-supportLibrary {
+androidx {
     name = "LiveData Coroutine Extensions EAP"
     publish = false
     mavenVersion = LibraryVersions.LIFECYCLES_COROUTINES
diff --git a/lifecycle/livedata/ktx/build.gradle b/lifecycle/livedata/ktx/build.gradle
index ae36720..e8d3797 100644
--- a/lifecycle/livedata/ktx/build.gradle
+++ b/lifecycle/livedata/ktx/build.gradle
@@ -45,7 +45,7 @@
     testImplementation(TEST_RULES)
 }
 
-supportLibrary {
+androidx {
     name = "LiveData Kotlin Extensions"
     publish = true
     mavenVersion = LibraryVersions.LIFECYCLE
diff --git a/lifecycle/process/build.gradle b/lifecycle/process/build.gradle
index dfa35d1..ef16d9f 100644
--- a/lifecycle/process/build.gradle
+++ b/lifecycle/process/build.gradle
@@ -36,7 +36,7 @@
     testImplementation(MOCKITO_CORE)
 }
 
-supportLibrary {
+androidx {
     name = "Android Lifecycle Process"
     publish = true
     mavenVersion = LibraryVersions.LIFECYCLE
diff --git a/lifecycle/reactivestreams/build.gradle b/lifecycle/reactivestreams/build.gradle
index bed1534..a5c64f9 100644
--- a/lifecycle/reactivestreams/build.gradle
+++ b/lifecycle/reactivestreams/build.gradle
@@ -44,7 +44,7 @@
     testImplementation(project(":arch:core-testing"))
 }
 
-supportLibrary {
+androidx {
     name = "Android Lifecycle Reactivestreams"
     publish = true
     mavenVersion = LibraryVersions.LIFECYCLE
diff --git a/lifecycle/reactivestreams/ktx/build.gradle b/lifecycle/reactivestreams/ktx/build.gradle
index 961113a..b988a36 100644
--- a/lifecycle/reactivestreams/ktx/build.gradle
+++ b/lifecycle/reactivestreams/ktx/build.gradle
@@ -34,7 +34,7 @@
   testImplementation(project(":arch:core-testing"))
 }
 
-supportLibrary {
+androidx {
   name = "Android Lifecycle ReactiveStreams KTX"
   publish = true
   mavenVersion = LibraryVersions.LIFECYCLE
diff --git a/lifecycle/runtime/build.gradle b/lifecycle/runtime/build.gradle
index ab40c7d..c30845e 100644
--- a/lifecycle/runtime/build.gradle
+++ b/lifecycle/runtime/build.gradle
@@ -32,7 +32,7 @@
     androidTestImplementation(TEST_RUNNER)
 }
 
-supportLibrary {
+androidx {
     name 'Android Lifecycle Runtime'
     publish true
     mavenVersion = LibraryVersions.LIFECYCLE
diff --git a/lifecycle/runtime/eap/build.gradle b/lifecycle/runtime/eap/build.gradle
index b684318..60bc785 100644
--- a/lifecycle/runtime/eap/build.gradle
+++ b/lifecycle/runtime/eap/build.gradle
@@ -55,7 +55,7 @@
     lintPublish(project(':lifecycle:lifecycle-runtime-eap-lint'))
 }
 
-supportLibrary {
+androidx {
     name = "Android Lifecycle Kotlin Extensions"
     publish = false
     mavenVersion = LibraryVersions.LIFECYCLES_COROUTINES
diff --git a/lifecycle/runtime/eap/lint/build.gradle b/lifecycle/runtime/eap/lint/build.gradle
index 3fbf1e9..0a74408 100644
--- a/lifecycle/runtime/eap/lint/build.gradle
+++ b/lifecycle/runtime/eap/lint/build.gradle
@@ -40,7 +40,7 @@
     testImplementation LINT_TESTS
 }
 
-supportLibrary {
+androidx {
     name = "Android Lifecycles Lint Checks"
     toolingProject = true
     publish = false
diff --git a/lifecycle/service/build.gradle b/lifecycle/service/build.gradle
index 382b322..3a373e8 100644
--- a/lifecycle/service/build.gradle
+++ b/lifecycle/service/build.gradle
@@ -38,7 +38,7 @@
     androidTestImplementation(SUPPORT_CORE_UTILS, libs.support_exclude_config)
 }
 
-supportLibrary {
+androidx {
     name = "Android Lifecycle Service"
     publish = true
     mavenVersion = LibraryVersions.LIFECYCLE
diff --git a/lifecycle/viewmodel-savedstate/build.gradle b/lifecycle/viewmodel-savedstate/build.gradle
index a49ed71..9e86a18 100644
--- a/lifecycle/viewmodel-savedstate/build.gradle
+++ b/lifecycle/viewmodel-savedstate/build.gradle
@@ -49,7 +49,7 @@
     androidTestImplementation(TEST_RULES)
 }
 
-supportLibrary {
+androidx {
     name = "Android Lifecycle ViewModel with SavedState"
     publish = true
     mavenVersion = LibraryVersions.LIFECYCLES_SAVEDSTATE
diff --git a/lifecycle/viewmodel/build.gradle b/lifecycle/viewmodel/build.gradle
index bdb416e..c972aa4 100644
--- a/lifecycle/viewmodel/build.gradle
+++ b/lifecycle/viewmodel/build.gradle
@@ -40,7 +40,7 @@
     testImplementation(MOCKITO_CORE)
 }
 
-supportLibrary {
+androidx {
     name = "Android Lifecycle ViewModel"
     publish = true
     mavenVersion = LibraryVersions.LIFECYCLE
diff --git a/lifecycle/viewmodel/ktx/build.gradle b/lifecycle/viewmodel/ktx/build.gradle
index 667e159..5c6aaea 100644
--- a/lifecycle/viewmodel/ktx/build.gradle
+++ b/lifecycle/viewmodel/ktx/build.gradle
@@ -48,7 +48,7 @@
     androidTestImplementation(TEST_RUNNER)
 }
 
-supportLibrary {
+androidx {
     name = "Android Lifecycle ViewModel Kotlin Extensions"
     publish = true
     mavenVersion = LibraryVersions.LIFECYCLE
diff --git a/loader/build.gradle b/loader/build.gradle
index d599582..bf569d7 100644
--- a/loader/build.gradle
+++ b/loader/build.gradle
@@ -22,7 +22,7 @@
     androidTestImplementation(DEXMAKER_MOCKITO, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker
 }
 
-supportLibrary {
+androidx {
     name = "Android Support Library loader"
     publish = true
     mavenVersion = LibraryVersions.LOADER
diff --git a/localbroadcastmanager/build.gradle b/localbroadcastmanager/build.gradle
index c97f62f..e8b6ebd 100644
--- a/localbroadcastmanager/build.gradle
+++ b/localbroadcastmanager/build.gradle
@@ -9,7 +9,7 @@
     api(project(":annotation"))
 }
 
-supportLibrary {
+androidx {
     name = "Android Support Library Local Broadcast Manager"
     publish = true
     mavenVersion = LibraryVersions.LOCALBROADCASTMANAGER
diff --git a/media/build.gradle b/media/build.gradle
index 16eb997..f2f423c 100644
--- a/media/build.gradle
+++ b/media/build.gradle
@@ -30,7 +30,7 @@
     }
 }
 
-supportLibrary {
+androidx {
     name = "Android Support Library media compat"
     publish = true
     mavenVersion = LibraryVersions.MEDIA
diff --git a/media/version-compat-tests/current/service/build.gradle b/media/version-compat-tests/current/service/build.gradle
index 4974aaf..dcbd312 100644
--- a/media/version-compat-tests/current/service/build.gradle
+++ b/media/version-compat-tests/current/service/build.gradle
@@ -35,6 +35,6 @@
     }
 }
 
-supportLibrary {
+androidx {
     toolingProject = true
 }
diff --git a/media/version-compat-tests/lib/build.gradle b/media/version-compat-tests/lib/build.gradle
index 8fa1e4d..3c1fee2 100644
--- a/media/version-compat-tests/lib/build.gradle
+++ b/media/version-compat-tests/lib/build.gradle
@@ -26,7 +26,7 @@
     implementation(JUNIT)
 }
 
-supportLibrary {
+androidx {
     failOnUncheckedWarnings = false
     toolingProject = true
 }
diff --git a/media/version-compat-tests/previous/service/build.gradle b/media/version-compat-tests/previous/service/build.gradle
index 19ba56ef..c125997 100644
--- a/media/version-compat-tests/previous/service/build.gradle
+++ b/media/version-compat-tests/previous/service/build.gradle
@@ -29,6 +29,6 @@
     androidTestImplementation(TEST_RUNNER)
 }
 
-supportLibrary {
+androidx {
     toolingProject = true
 }
diff --git a/media2-widget/build.gradle b/media2-widget/build.gradle
index 7620fbd..43f4aa2 100644
--- a/media2-widget/build.gradle
+++ b/media2-widget/build.gradle
@@ -45,7 +45,7 @@
     }
 }
 
-supportLibrary {
+androidx {
     name = "AndroidX Media2 Widget library"
     publish = true
     mavenVersion = LibraryVersions.MEDIA2_WIDGET
diff --git a/media2/build.gradle b/media2/build.gradle
index d3afeab..fbc535e 100644
--- a/media2/build.gradle
+++ b/media2/build.gradle
@@ -36,7 +36,7 @@
     }
 }
 
-supportLibrary {
+androidx {
     name = "AndroidX media2 library"
     publish = true
     mavenVersion = LibraryVersions.MEDIA2
diff --git a/media2/media2-exoplayer/build.gradle b/media2/media2-exoplayer/build.gradle
index 9636daf..eedee50 100644
--- a/media2/media2-exoplayer/build.gradle
+++ b/media2/media2-exoplayer/build.gradle
@@ -35,7 +35,7 @@
     api files("src/main/libs/exoplayer-media2.jar")
 }
 
-supportLibrary {
+androidx {
     name = "Media2 repackaged ExoPlayer dependency"
     publish = true
     mavenVersion = LibraryVersions.MEDIA2_EXOPLAYER
diff --git a/media2/version-compat-tests/common/build.gradle b/media2/version-compat-tests/common/build.gradle
index afbdc66..78362e4 100644
--- a/media2/version-compat-tests/common/build.gradle
+++ b/media2/version-compat-tests/common/build.gradle
@@ -26,6 +26,6 @@
     implementation(JUNIT)
 }
 
-supportLibrary {
+androidx {
     toolingProject = true
 }
diff --git a/mediarouter/build.gradle b/mediarouter/build.gradle
index 98b4ae4..9cbdf6c 100644
--- a/mediarouter/build.gradle
+++ b/mediarouter/build.gradle
@@ -34,7 +34,7 @@
     }
 }
 
-supportLibrary {
+androidx {
     name = "Android MediaRouter Support Library"
     publish = true
     mavenVersion = LibraryVersions.MEDIAROUTER
diff --git a/navigation/benchmark/build.gradle b/navigation/benchmark/build.gradle
index 49de195..3bbd149 100644
--- a/navigation/benchmark/build.gradle
+++ b/navigation/benchmark/build.gradle
@@ -34,7 +34,7 @@
     androidTestImplementation(KOTLIN_STDLIB)
 }
 
-supportLibrary {
+androidx {
     name = "Navigation Benchmarks"
     publish = false
     mavenVersion = LibraryVersions.NAVIGATION
diff --git a/navigation/common/build.gradle b/navigation/common/build.gradle
index 9663e67..bf1cb79 100644
--- a/navigation/common/build.gradle
+++ b/navigation/common/build.gradle
@@ -63,7 +63,7 @@
     }
 }
 
-supportLibrary {
+androidx {
     name = "Android Navigation Common"
     publish = true
     mavenVersion = LibraryVersions.NAVIGATION
diff --git a/navigation/common/ktx/build.gradle b/navigation/common/ktx/build.gradle
index 2b496a5..2475614 100644
--- a/navigation/common/ktx/build.gradle
+++ b/navigation/common/ktx/build.gradle
@@ -55,7 +55,7 @@
     androidTestImplementation(DEXMAKER_MOCKITO, libs.exclude_bytebuddy)
 }
 
-supportLibrary {
+androidx {
     name = "Android Navigation Common Kotlin Extensions"
     publish = true
     mavenVersion = LibraryVersions.NAVIGATION
diff --git a/navigation/fragment/build.gradle b/navigation/fragment/build.gradle
index 6e279e7..5f079b9 100644
--- a/navigation/fragment/build.gradle
+++ b/navigation/fragment/build.gradle
@@ -53,7 +53,7 @@
     androidTestImplementation(KOTLIN_STDLIB)
 }
 
-supportLibrary {
+androidx {
     name = "Android Navigation Fragment"
     publish = true
     mavenVersion = LibraryVersions.NAVIGATION
diff --git a/navigation/fragment/ktx/build.gradle b/navigation/fragment/ktx/build.gradle
index 98450ec..f8fdc34 100644
--- a/navigation/fragment/ktx/build.gradle
+++ b/navigation/fragment/ktx/build.gradle
@@ -51,7 +51,7 @@
     androidTestImplementation(DEXMAKER_MOCKITO, libs.exclude_bytebuddy)
 }
 
-supportLibrary {
+androidx {
     name = "Android Navigation Fragment Kotlin Extensions"
     publish = true
     mavenVersion = LibraryVersions.NAVIGATION
diff --git a/navigation/runtime/build.gradle b/navigation/runtime/build.gradle
index d828cb7..e516243 100644
--- a/navigation/runtime/build.gradle
+++ b/navigation/runtime/build.gradle
@@ -52,7 +52,7 @@
     androidTestImplementation(KOTLIN_STDLIB)
 }
 
-supportLibrary {
+androidx {
     name = "Android Navigation Runtime"
     publish = true
     mavenVersion = LibraryVersions.NAVIGATION
diff --git a/navigation/runtime/ktx/build.gradle b/navigation/runtime/ktx/build.gradle
index ccda001..4e25911 100644
--- a/navigation/runtime/ktx/build.gradle
+++ b/navigation/runtime/ktx/build.gradle
@@ -46,7 +46,7 @@
     androidTestImplementation(ESPRESSO_CORE)
 }
 
-supportLibrary {
+androidx {
     name = "Android Navigation Runtime Kotlin Extensions"
     publish = true
     mavenVersion = LibraryVersions.NAVIGATION
diff --git a/navigation/safe-args-generator/build.gradle b/navigation/safe-args-generator/build.gradle
index 8ca2abc..da19c19 100644
--- a/navigation/safe-args-generator/build.gradle
+++ b/navigation/safe-args-generator/build.gradle
@@ -57,7 +57,7 @@
 
 tasks.findByName("compileKotlin").dependsOn(":navigation:navigation-common:jarDebug")
 
-supportLibrary {
+androidx {
     name = 'Android Navigation TypeSafe Arguments Generator'
     publish = true
     toolingProject = true
diff --git a/navigation/safe-args-gradle-plugin/build.gradle b/navigation/safe-args-gradle-plugin/build.gradle
index 67d3153..7cbff65 100644
--- a/navigation/safe-args-gradle-plugin/build.gradle
+++ b/navigation/safe-args-gradle-plugin/build.gradle
@@ -86,7 +86,7 @@
     }
 }
 
-supportLibrary {
+androidx {
     name = "Android Navigation TypeSafe Arguments Gradle Plugin"
     publish = true
     toolingProject = true
diff --git a/navigation/testing/build.gradle b/navigation/testing/build.gradle
index 0076dcf..de207d42 100644
--- a/navigation/testing/build.gradle
+++ b/navigation/testing/build.gradle
@@ -50,7 +50,7 @@
     androidTestImplementation(ESPRESSO_CORE)
 }
 
-supportLibrary {
+androidx {
     name = "Android Navigation Testing"
     publish = false
     mavenVersion = LibraryVersions.NAVIGATION_TESTING
diff --git a/navigation/ui/build.gradle b/navigation/ui/build.gradle
index 9f9805c..5b41f17 100644
--- a/navigation/ui/build.gradle
+++ b/navigation/ui/build.gradle
@@ -55,7 +55,7 @@
     androidTestImplementation(DEXMAKER_MOCKITO, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker
 }
 
-supportLibrary {
+androidx {
     name = "Android Navigation UI"
     publish = true
     mavenVersion = LibraryVersions.NAVIGATION
diff --git a/navigation/ui/ktx/build.gradle b/navigation/ui/ktx/build.gradle
index 005b1d2..8ef8d01 100644
--- a/navigation/ui/ktx/build.gradle
+++ b/navigation/ui/ktx/build.gradle
@@ -43,7 +43,7 @@
     androidTestImplementation(ESPRESSO_CORE)
 }
 
-supportLibrary {
+androidx {
     name = "Android Navigation UI Kotlin Extensions"
     publish = true
     mavenVersion = LibraryVersions.NAVIGATION
diff --git a/paging/common/build.gradle b/paging/common/build.gradle
index c30b40e..9d524a6 100644
--- a/paging/common/build.gradle
+++ b/paging/common/build.gradle
@@ -39,7 +39,7 @@
     testCompile(GUAVA)
 }
 
-supportLibrary {
+androidx {
     name = "Android Paging-Common"
     publish = true
     mavenVersion = LibraryVersions.PAGING
diff --git a/paging/common/ktx/build.gradle b/paging/common/ktx/build.gradle
index 55b0ff0..72cf238 100644
--- a/paging/common/ktx/build.gradle
+++ b/paging/common/ktx/build.gradle
@@ -34,7 +34,7 @@
     testImplementation(TEST_RUNNER)
 }
 
-supportLibrary {
+androidx {
     name = "Android Paging-Common Kotlin Extensions"
     publish = true
     mavenVersion = LibraryVersions.PAGING
diff --git a/paging/runtime/build.gradle b/paging/runtime/build.gradle
index cd9287f..fd3b1a9 100644
--- a/paging/runtime/build.gradle
+++ b/paging/runtime/build.gradle
@@ -47,7 +47,7 @@
     androidTestImplementation(KOTLIN_STDLIB)
 }
 
-supportLibrary {
+androidx {
     name = "Android Paging-Runtime"
     publish = true
     mavenVersion = LibraryVersions.PAGING
diff --git a/paging/runtime/ktx/build.gradle b/paging/runtime/ktx/build.gradle
index fec7c4f..9ed1de4 100644
--- a/paging/runtime/ktx/build.gradle
+++ b/paging/runtime/ktx/build.gradle
@@ -44,7 +44,7 @@
     androidTestImplementation(ARCH_CORE_TESTING)
 }
 
-supportLibrary {
+androidx {
     name = "Android Paging-Runtime Kotlin Extensions"
     publish = true
     mavenVersion = LibraryVersions.PAGING
diff --git a/paging/rxjava2/build.gradle b/paging/rxjava2/build.gradle
index 64d5e83..da2f09a 100644
--- a/paging/rxjava2/build.gradle
+++ b/paging/rxjava2/build.gradle
@@ -46,7 +46,7 @@
     androidTestImplementation(KOTLIN_STDLIB)
 }
 
-supportLibrary {
+androidx {
     name = "Android Paging RXJava2"
     publish = true
     mavenVersion = LibraryVersions.PAGING
diff --git a/paging/rxjava2/ktx/build.gradle b/paging/rxjava2/ktx/build.gradle
index 7f972b2..7663138 100644
--- a/paging/rxjava2/ktx/build.gradle
+++ b/paging/rxjava2/ktx/build.gradle
@@ -44,7 +44,7 @@
     androidTestImplementation(ARCH_CORE_TESTING)
 }
 
-supportLibrary {
+androidx {
     name = "Android Paging-RxJava2 Kotlin Extensions"
     publish = true
     mavenVersion = LibraryVersions.PAGING
diff --git a/palette/build.gradle b/palette/build.gradle
index ba1ed7f..ff3a31e 100644
--- a/palette/build.gradle
+++ b/palette/build.gradle
@@ -23,7 +23,7 @@
     androidTestImplementation(TEST_RUNNER)
 }
 
-supportLibrary {
+androidx {
     name = "Android Support Palette v7"
     publish = true
     mavenVersion = LibraryVersions.PALETTE
diff --git a/palette/ktx/build.gradle b/palette/ktx/build.gradle
index a327eb2..7f614e1 100644
--- a/palette/ktx/build.gradle
+++ b/palette/ktx/build.gradle
@@ -40,7 +40,7 @@
     androidTestImplementation(TEST_RUNNER)
 }
 
-supportLibrary {
+androidx {
     name = "Palette Kotlin Extensions"
     publish = true
     mavenVersion = LibraryVersions.PALETTE
diff --git a/percent/build.gradle b/percent/build.gradle
index 844beea..860ae38 100644
--- a/percent/build.gradle
+++ b/percent/build.gradle
@@ -22,7 +22,7 @@
     }
 }
 
-supportLibrary {
+androidx {
     name = "Android Percent Support Library"
     publish = true
     mavenVersion = LibraryVersions.PERCENTLAYOUT
diff --git a/persistence/db-framework/build.gradle b/persistence/db-framework/build.gradle
index e35baa3..51882cd 100644
--- a/persistence/db-framework/build.gradle
+++ b/persistence/db-framework/build.gradle
@@ -28,7 +28,7 @@
     api(project(":sqlite:sqlite"))
 }
 
-supportLibrary {
+androidx {
     name = "Android Support SQLite - Framework Implementation"
     publish = true
     mavenVersion = LibraryVersions.PERSISTENCE
diff --git a/persistence/db/build.gradle b/persistence/db/build.gradle
index d459f63..6266848 100644
--- a/persistence/db/build.gradle
+++ b/persistence/db/build.gradle
@@ -40,7 +40,7 @@
     }
 }
 
-supportLibrary {
+androidx {
     name = "Android DB"
     publish = true
     mavenVersion = LibraryVersions.PERSISTENCE
diff --git a/persistence/db/ktx/build.gradle b/persistence/db/ktx/build.gradle
index 6d73022..060146e 100644
--- a/persistence/db/ktx/build.gradle
+++ b/persistence/db/ktx/build.gradle
@@ -32,7 +32,7 @@
     testImplementation(MOCKITO_CORE)
 }
 
-supportLibrary {
+androidx {
     name = "Android DB KTX"
     publish = true
     mavenVersion = LibraryVersions.PERSISTENCE
diff --git a/preference/build.gradle b/preference/build.gradle
index 680046c..7c51328 100644
--- a/preference/build.gradle
+++ b/preference/build.gradle
@@ -60,7 +60,7 @@
     }
 }
 
-supportLibrary {
+androidx {
     name = "AndroidX Preference"
     publish = true
     mavenVersion = LibraryVersions.PREFERENCE
diff --git a/preference/ktx/build.gradle b/preference/ktx/build.gradle
index e6af5f3..27c639f 100644
--- a/preference/ktx/build.gradle
+++ b/preference/ktx/build.gradle
@@ -46,7 +46,7 @@
     androidTestImplementation(project(":internal-testutils-ktx"))
 }
 
-supportLibrary {
+androidx {
     name = "Android Preferences KTX"
     publish = true
     mavenVersion = LibraryVersions.PREFERENCE
diff --git a/print/build.gradle b/print/build.gradle
index 98a973c..11b94a6 100644
--- a/print/build.gradle
+++ b/print/build.gradle
@@ -9,7 +9,7 @@
     api(project(":annotation"))
 }
 
-supportLibrary {
+androidx {
     name = "Android Support Library Print"
     publish = true
     mavenVersion = LibraryVersions.PRINT
diff --git a/recommendation/build.gradle b/recommendation/build.gradle
index 37ffe4b..f309d67 100644
--- a/recommendation/build.gradle
+++ b/recommendation/build.gradle
@@ -15,7 +15,7 @@
     }
 }
 
-supportLibrary {
+androidx {
     name = "Android Support Recommendation"
     publish = true
     mavenVersion = LibraryVersions.RECOMMENDATION
diff --git a/recyclerview/benchmark/build.gradle b/recyclerview/benchmark/build.gradle
index d90c85b..60112bb 100644
--- a/recyclerview/benchmark/build.gradle
+++ b/recyclerview/benchmark/build.gradle
@@ -34,7 +34,7 @@
     androidTestImplementation(KOTLIN_STDLIB)
 }
 
-supportLibrary {
+androidx {
     name = "RecyclerView Benchmarks"
     publish = false
     mavenVersion = LibraryVersions.RECYCLERVIEW
diff --git a/recyclerview/recyclerview/build.gradle b/recyclerview/recyclerview/build.gradle
index 7747ae8..9f54302 100644
--- a/recyclerview/recyclerview/build.gradle
+++ b/recyclerview/recyclerview/build.gradle
@@ -41,7 +41,7 @@
     }
 }
 
-supportLibrary {
+androidx {
     name = "Android Support RecyclerView v7"
     publish = true
     mavenVersion = LibraryVersions.RECYCLERVIEW
diff --git a/recyclerview/selection/build.gradle b/recyclerview/selection/build.gradle
index 0745937..191aa67 100644
--- a/recyclerview/selection/build.gradle
+++ b/recyclerview/selection/build.gradle
@@ -37,7 +37,7 @@
     androidTestImplementation(JUNIT)
 }
 
-supportLibrary {
+androidx {
     name = "Android RecyclerView Selection"
     publish = true
     mavenVersion = LibraryVersions.RECYCLERVIEW
diff --git a/remotecallback/build.gradle b/remotecallback/build.gradle
index 4f9ffe3..7da4ae2 100644
--- a/remotecallback/build.gradle
+++ b/remotecallback/build.gradle
@@ -41,7 +41,7 @@
     }
 }
 
-supportLibrary {
+androidx {
     name = "Remote Callback"
     publish = true
     mavenVersion = LibraryVersions.REMOTECALLBACK
diff --git a/remotecallback/processor/build.gradle b/remotecallback/processor/build.gradle
index 687a7a02..0e2fb5b 100644
--- a/remotecallback/processor/build.gradle
+++ b/remotecallback/processor/build.gradle
@@ -31,7 +31,7 @@
     compile(JAVAPOET)
 }
 
-supportLibrary {
+androidx {
     name = "Remote Callback Compiler"
     publish = true
     toolingProject = true
diff --git a/room/benchmark/build.gradle b/room/benchmark/build.gradle
index 99413a3..d932b10 100644
--- a/room/benchmark/build.gradle
+++ b/room/benchmark/build.gradle
@@ -42,7 +42,7 @@
     androidTestImplementation(KOTLIN_STDLIB)
 }
 
-supportLibrary {
+androidx {
     name = "Room Benchmarks"
     publish = false
     mavenVersion = LibraryVersions.ROOM
diff --git a/room/common-java8/build.gradle b/room/common-java8/build.gradle
index 4bd7f60..69f86d3 100644
--- a/room/common-java8/build.gradle
+++ b/room/common-java8/build.gradle
@@ -30,7 +30,7 @@
     compile(ANDROIDX_ANNOTATION)
 }
 
-supportLibrary {
+androidx {
     name = "Android Room-Common-Java8"
     publish = false
     mavenVersion = LibraryVersions.ROOM
diff --git a/room/common/build.gradle b/room/common/build.gradle
index 7a2b07f..1f82657 100644
--- a/room/common/build.gradle
+++ b/room/common/build.gradle
@@ -29,7 +29,7 @@
     testCompile(MOCKITO_CORE)
 }
 
-supportLibrary {
+androidx {
     name = "Android Room-Common"
     publish = true
     mavenVersion = LibraryVersions.ROOM
diff --git a/room/compiler/build.gradle b/room/compiler/build.gradle
index 4c74d26..8835418 100644
--- a/room/compiler/build.gradle
+++ b/room/compiler/build.gradle
@@ -82,7 +82,7 @@
 tasks.findByName("compileKotlin").dependsOn(":room:room-runtime:jarDebug")
 tasks.findByName("compileKotlin").dependsOn(":sqlite:sqlite:jarDebug")
 
-supportLibrary {
+androidx {
     name = "Android Room Compiler"
     publish = true
     toolingProject = true
diff --git a/room/guava/build.gradle b/room/guava/build.gradle
index 6d8d92d..dd9a18d 100644
--- a/room/guava/build.gradle
+++ b/room/guava/build.gradle
@@ -35,7 +35,7 @@
     api(GUAVA_LISTENABLE_FUTURE)
 }
 
-supportLibrary {
+androidx {
     name = "Android Room Guava"
     publish = true
     mavenVersion = LibraryVersions.ROOM
diff --git a/room/ktx/build.gradle b/room/ktx/build.gradle
index cf774cd..a60319e 100644
--- a/room/ktx/build.gradle
+++ b/room/ktx/build.gradle
@@ -33,7 +33,7 @@
     testImplementation(MOCKITO_CORE)
 }
 
-supportLibrary {
+androidx {
     name = "Android Room Kotlin Extensions"
     publish = true
     mavenVersion = LibraryVersions.ROOM
diff --git a/room/migration/build.gradle b/room/migration/build.gradle
index c869d10..53d285a 100644
--- a/room/migration/build.gradle
+++ b/room/migration/build.gradle
@@ -32,7 +32,7 @@
     testCompile(MOCKITO_CORE)
 }
 
-supportLibrary {
+androidx {
     name = "Android Room Migration"
     publish = true
     mavenVersion = LibraryVersions.ROOM
diff --git a/room/runtime/build.gradle b/room/runtime/build.gradle
index 634aea6..900cc3a 100644
--- a/room/runtime/build.gradle
+++ b/room/runtime/build.gradle
@@ -78,7 +78,7 @@
     }
 }
 
-supportLibrary {
+androidx {
     name = "Android Room-Runtime"
     publish = true
     mavenVersion = LibraryVersions.ROOM
diff --git a/room/rxjava2/build.gradle b/room/rxjava2/build.gradle
index f624d23..dde0cbb 100644
--- a/room/rxjava2/build.gradle
+++ b/room/rxjava2/build.gradle
@@ -35,7 +35,7 @@
     testImplementation(ARCH_LIFECYCLE_LIVEDATA) // for mocking invalidation tracker
 }
 
-supportLibrary {
+androidx {
     name = "Android Room RXJava2"
     publish = true
     mavenVersion = LibraryVersions.ROOM
diff --git a/room/testing/build.gradle b/room/testing/build.gradle
index f98f7cf..99d3cc9 100644
--- a/room/testing/build.gradle
+++ b/room/testing/build.gradle
@@ -34,7 +34,7 @@
     api(JUNIT)
 }
 
-supportLibrary {
+androidx {
     name = "Android Room Testing"
     publish = true
     mavenVersion = LibraryVersions.ROOM
diff --git a/savedstate/build.gradle b/savedstate/build.gradle
index 1f73a3d..69cec39 100644
--- a/savedstate/build.gradle
+++ b/savedstate/build.gradle
@@ -29,7 +29,7 @@
     androidTestImplementation(TRUTH)
 }
 
-supportLibrary {
+androidx {
     name = "Activity"
     publish = true
     mavenVersion = LibraryVersions.SAVEDSTATE
diff --git a/security/crypto/build.gradle b/security/crypto/build.gradle
index 143950b..f9b812c 100644
--- a/security/crypto/build.gradle
+++ b/security/crypto/build.gradle
@@ -41,7 +41,7 @@
     }
 }
 
-supportLibrary {
+androidx {
     name = "AndroidX Security"
     publish = true
     mavenVersion = LibraryVersions.SECURITY
diff --git a/sharetarget/build.gradle b/sharetarget/build.gradle
index b036596..4c6cbc5 100644
--- a/sharetarget/build.gradle
+++ b/sharetarget/build.gradle
@@ -36,7 +36,7 @@
     androidTestImplementation(DEXMAKER_MOCKITO, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker
 }
 
-supportLibrary {
+androidx {
     name = "AndroidX Share Target Support Library"
     publish = true
     mavenVersion = LibraryVersions.SHARETARGET
diff --git a/slices/benchmark/build.gradle b/slices/benchmark/build.gradle
index 27af6f0..34afe20 100644
--- a/slices/benchmark/build.gradle
+++ b/slices/benchmark/build.gradle
@@ -37,7 +37,7 @@
     androidTestImplementation(DEXMAKER_MOCKITO, libs.exclude_bytebuddy)
 }
 
-supportLibrary {
+androidx {
     name = "Slices Benchmarks"
     publish = false
     mavenVersion = LibraryVersions.SLICE_BENCHMARK
diff --git a/slices/builders/build.gradle b/slices/builders/build.gradle
index 368e052..dcd0ec7 100644
--- a/slices/builders/build.gradle
+++ b/slices/builders/build.gradle
@@ -30,7 +30,7 @@
     implementation project(':collection')
 }
 
-supportLibrary {
+androidx {
     name = "Slice builders"
     publish = true
     mavenVersion = LibraryVersions.SLICE
diff --git a/slices/builders/ktx/build.gradle b/slices/builders/ktx/build.gradle
index 5bb4e95..0caf19a 100644
--- a/slices/builders/ktx/build.gradle
+++ b/slices/builders/ktx/build.gradle
@@ -48,7 +48,7 @@
     implementation project(path: ':core')
 }
 
-supportLibrary {
+androidx {
     name = "Slice builders KTX"
     publish = true
     mavenVersion = LibraryVersions.SLICE_BUILDERS_KTX
diff --git a/slices/core/build.gradle b/slices/core/build.gradle
index 6fb3c0d..55a4afc 100644
--- a/slices/core/build.gradle
+++ b/slices/core/build.gradle
@@ -39,7 +39,7 @@
     annotationProcessor project(":versionedparcelable-annotation")
 }
 
-supportLibrary {
+androidx {
     name = "Common utilities for slices"
     publish = true
     mavenVersion = LibraryVersions.SLICE
diff --git a/slices/test/build.gradle b/slices/test/build.gradle
index e481b64..fbbc213 100644
--- a/slices/test/build.gradle
+++ b/slices/test/build.gradle
@@ -36,7 +36,7 @@
     androidTestImplementation(DEXMAKER_MOCKITO, libs.exclude_bytebuddy)
 }
 
-supportLibrary {
+androidx {
     name = "Slice test code"
     publish = false
     mavenVersion = LibraryVersions.SLICE
diff --git a/slices/view/build.gradle b/slices/view/build.gradle
index acce371..8f4b1a5 100644
--- a/slices/view/build.gradle
+++ b/slices/view/build.gradle
@@ -39,7 +39,7 @@
     androidTestImplementation(DEXMAKER_MOCKITO, libs.exclude_bytebuddy)
 }
 
-supportLibrary {
+androidx {
     name = "Slice views"
     publish = true
     mavenVersion = LibraryVersions.SLICE
diff --git a/slidingpanelayout/build.gradle b/slidingpanelayout/build.gradle
index 44b08bc..68aed38 100644
--- a/slidingpanelayout/build.gradle
+++ b/slidingpanelayout/build.gradle
@@ -11,7 +11,7 @@
     api(project(":customview"))
 }
 
-supportLibrary {
+androidx {
     name = "Android Support Library Sliding Pane Layout"
     publish = true
     mavenVersion = LibraryVersions.SLIDINGPANELAYOUT
diff --git a/swiperefreshlayout/build.gradle b/swiperefreshlayout/build.gradle
index 8248007..32ab611 100644
--- a/swiperefreshlayout/build.gradle
+++ b/swiperefreshlayout/build.gradle
@@ -25,7 +25,7 @@
     }
 }
 
-supportLibrary {
+androidx {
     name = "Android Support Library Custom View"
     publish = true
     mavenVersion = LibraryVersions.SWIPE_REFRESH_LAYOUT
diff --git a/testutils-ktx/build.gradle b/testutils-ktx/build.gradle
index 204be9d..9ec310b 100644
--- a/testutils-ktx/build.gradle
+++ b/testutils-ktx/build.gradle
@@ -25,6 +25,6 @@
     compile(TRUTH)
 }
 
-supportLibrary {
+androidx {
     toolingProject = true
 }
diff --git a/testutils/build.gradle b/testutils/build.gradle
index 4924dca..08a2428 100644
--- a/testutils/build.gradle
+++ b/testutils/build.gradle
@@ -41,7 +41,7 @@
     }
 }
 
-supportLibrary {
+androidx {
     failOnUncheckedWarnings = false
     toolingProject = true
 }
diff --git a/textclassifier/build.gradle b/textclassifier/build.gradle
index f9f51cd..3a39ef6 100644
--- a/textclassifier/build.gradle
+++ b/textclassifier/build.gradle
@@ -29,7 +29,7 @@
     }
 }
 
-supportLibrary {
+androidx {
     name = "Android TextClassifier Support Library"
     publish = true
     mavenVersion = LibraryVersions.TEXTCLASSIFIER
diff --git a/transition/build.gradle b/transition/build.gradle
index 7b37abe..c94d692 100644
--- a/transition/build.gradle
+++ b/transition/build.gradle
@@ -33,7 +33,7 @@
     }
 }
 
-supportLibrary {
+androidx {
     name = "Android Transition Support Library"
     publish = true
     mavenVersion = LibraryVersions.TRANSITION
diff --git a/tv-provider/build.gradle b/tv-provider/build.gradle
index 2c18244..9c705e7 100644
--- a/tv-provider/build.gradle
+++ b/tv-provider/build.gradle
@@ -23,7 +23,7 @@
     }
 }
 
-supportLibrary {
+androidx {
     name = "Android Support TV Provider"
     publish = true
     mavenVersion = LibraryVersions.TVPROVIDER
diff --git a/versionedparcelable/build.gradle b/versionedparcelable/build.gradle
index 27858d6..617113f 100644
--- a/versionedparcelable/build.gradle
+++ b/versionedparcelable/build.gradle
@@ -41,7 +41,7 @@
     }
 }
 
-supportLibrary {
+androidx {
     name = "VersionedParcelable and friends"
     publish = true
     mavenVersion = LibraryVersions.VERSIONED_PARCELABLE
diff --git a/viewpager/build.gradle b/viewpager/build.gradle
index 481fe67..220f5f9 100644
--- a/viewpager/build.gradle
+++ b/viewpager/build.gradle
@@ -20,7 +20,7 @@
     androidTestImplementation(DEXMAKER_MOCKITO, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker
 }
 
-supportLibrary {
+androidx {
     name = "Android Support Library View Pager"
     publish = true
     mavenVersion = LibraryVersions.VIEWPAGER
diff --git a/viewpager2/build.gradle b/viewpager2/build.gradle
index 2b642f0..65be870 100644
--- a/viewpager2/build.gradle
+++ b/viewpager2/build.gradle
@@ -48,7 +48,7 @@
     }
 }
 
-supportLibrary {
+androidx {
     name = "AndroidX Widget ViewPager2"
     publish = true
     mavenVersion = LibraryVersions.VIEWPAGER2
diff --git a/wear/build.gradle b/wear/build.gradle
index 4a940fc..8c2d984 100644
--- a/wear/build.gradle
+++ b/wear/build.gradle
@@ -37,7 +37,7 @@
     }
 }
 
-supportLibrary {
+androidx {
     name = "Android Wear Support UI"
     publish = true
     mavenVersion = LibraryVersions.WEAR
diff --git a/webkit/build.gradle b/webkit/build.gradle
index 8f9ac2d..3ab1c70 100644
--- a/webkit/build.gradle
+++ b/webkit/build.gradle
@@ -49,7 +49,7 @@
     }
 }
 
-supportLibrary {
+androidx {
     name = "WebView Support Library"
     publish = true
     mavenVersion = LibraryVersions.WEBKIT
diff --git a/work/workmanager-gcm/build.gradle b/work/workmanager-gcm/build.gradle
index 726fa8f..b97ec5a 100644
--- a/work/workmanager-gcm/build.gradle
+++ b/work/workmanager-gcm/build.gradle
@@ -60,7 +60,7 @@
     testImplementation(JUNIT)
 }
 
-supportLibrary {
+androidx {
     name = "Android WorkManager GCMNetworkManager Support"
     publish = false
     mavenVersion = LibraryVersions.WORKMANAGER
diff --git a/work/workmanager-ktx/build.gradle b/work/workmanager-ktx/build.gradle
index 175802e..2e6e4a6 100644
--- a/work/workmanager-ktx/build.gradle
+++ b/work/workmanager-ktx/build.gradle
@@ -49,7 +49,7 @@
     testImplementation(JUNIT)
 }
 
-supportLibrary {
+androidx {
     name = "Android WorkManager Kotlin Extensions"
     publish = true
     mavenVersion = LibraryVersions.WORKMANAGER
diff --git a/work/workmanager-rxjava2/build.gradle b/work/workmanager-rxjava2/build.gradle
index e494c21..d3aef10 100644
--- a/work/workmanager-rxjava2/build.gradle
+++ b/work/workmanager-rxjava2/build.gradle
@@ -34,7 +34,7 @@
     testImplementation(MOCKITO_CORE)
 }
 
-supportLibrary {
+androidx {
     name = "Android WorkManager RxJava2 Support"
     publish = true
     mavenVersion = LibraryVersions.WORKMANAGER
diff --git a/work/workmanager-testing/build.gradle b/work/workmanager-testing/build.gradle
index 2bbc54f..a679d4a 100644
--- a/work/workmanager-testing/build.gradle
+++ b/work/workmanager-testing/build.gradle
@@ -46,7 +46,7 @@
     testImplementation(TEST_RUNNER)
 }
 
-supportLibrary {
+androidx {
     name = "Android WorkManager Testing"
     publish = true
     mavenVersion = LibraryVersions.WORKMANAGER
diff --git a/work/workmanager/build.gradle b/work/workmanager/build.gradle
index d424b64..1ec2b4c 100644
--- a/work/workmanager/build.gradle
+++ b/work/workmanager/build.gradle
@@ -66,7 +66,7 @@
     testImplementation(JUNIT)
 }
 
-supportLibrary {
+androidx {
     name = "Android WorkManager Runtime"
     publish = true
     mavenVersion = LibraryVersions.WORKMANAGER