Merge changes I0feef20b,Idda6df2f,I07a66c46 into androidx-master-dev
am: 74222accd6
Change-Id: I09fdec75305380556518d74dd5711bd3f0301bf3
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..c479f61 100644
--- a/arch/core-common/build.gradle
+++ b/arch/core-common/build.gradle
@@ -17,7 +17,7 @@
import static androidx.build.dependencies.DependenciesKt.*
import androidx.build.LibraryGroups
import androidx.build.LibraryVersions
-import androidx.build.SupportLibraryExtension;
+import androidx.build.AndroidXExtension;
plugins {
id("SupportJavaLibraryPlugin")
@@ -30,13 +30,13 @@
testCompile(MOCKITO_CORE)
}
-supportLibrary {
+androidx {
name = "Android Arch-Common"
publish = true
mavenVersion = LibraryVersions.ARCH_CORE
mavenGroup = LibraryGroups.ARCH_CORE
inceptionYear = "2017"
description = "Android Arch-Common"
- url = SupportLibraryExtension.ARCHITECTURE_URL
+ url = AndroidXExtension.ARCHITECTURE_URL
trackRestrictedAPIs = false
}
diff --git a/arch/core-runtime/build.gradle b/arch/core-runtime/build.gradle
index 7091d76..095db87 100644
--- a/arch/core-runtime/build.gradle
+++ b/arch/core-runtime/build.gradle
@@ -16,7 +16,7 @@
import static androidx.build.dependencies.DependenciesKt.*
import androidx.build.LibraryGroups
-import androidx.build.SupportLibraryExtension
+import androidx.build.AndroidXExtension
import androidx.build.LibraryVersions
plugins {
@@ -28,12 +28,12 @@
api(project(":arch:core-common"))
}
-supportLibrary {
+androidx {
name = "Android Arch-Runtime"
publish = true
mavenVersion = LibraryVersions.ARCH_RUNTIME
mavenGroup = LibraryGroups.ARCH_CORE
inceptionYear = "2017"
description = "Android Arch-Runtime"
- url = SupportLibraryExtension.ARCHITECTURE_URL
+ url = AndroidXExtension.ARCHITECTURE_URL
}
\ No newline at end of file
diff --git a/arch/core-testing/build.gradle b/arch/core-testing/build.gradle
index 2dec495..84d1911 100644
--- a/arch/core-testing/build.gradle
+++ b/arch/core-testing/build.gradle
@@ -17,7 +17,7 @@
import static androidx.build.dependencies.DependenciesKt.*
import androidx.build.LibraryGroups
import androidx.build.LibraryVersions
-import androidx.build.SupportLibraryExtension
+import androidx.build.AndroidXExtension
plugins {
id("SupportAndroidLibraryPlugin")
@@ -38,12 +38,12 @@
androidTestImplementation(ESPRESSO_CORE)
}
-supportLibrary {
+androidx {
name = "Android Core-Testing"
publish = true
mavenVersion = LibraryVersions.ARCH_CORE_TESTING
mavenGroup = LibraryGroups.ARCH_CORE
inceptionYear = "2017"
description = "Android Core-Testing"
- url = SupportLibraryExtension.ARCHITECTURE_URL
+ url = AndroidXExtension.ARCHITECTURE_URL
}
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/SupportLibraryExtension.kt b/buildSrc/src/main/kotlin/androidx/build/AndroidXExtension.kt
similarity index 97%
rename from buildSrc/src/main/kotlin/androidx/build/SupportLibraryExtension.kt
rename to buildSrc/src/main/kotlin/androidx/build/AndroidXExtension.kt
index cf8b798..8a2e362 100644
--- a/buildSrc/src/main/kotlin/androidx/build/SupportLibraryExtension.kt
+++ b/buildSrc/src/main/kotlin/androidx/build/AndroidXExtension.kt
@@ -24,7 +24,7 @@
/**
* Extension for [SupportAndroidLibraryPlugin] and [SupportJavaLibraryPlugin].
*/
-open class SupportLibraryExtension(val project: Project) {
+open class AndroidXExtension(val project: Project) {
var name: String? = null
var mavenVersion: Version? by Delegates.observable<Version?>(null) { _, _, new: Version? ->
project.version = new?.toString()
diff --git a/buildSrc/src/main/kotlin/androidx/build/AndroidXPlugin.kt b/buildSrc/src/main/kotlin/androidx/build/AndroidXPlugin.kt
index cfde80e..7342df0 100644
--- a/buildSrc/src/main/kotlin/androidx/build/AndroidXPlugin.kt
+++ b/buildSrc/src/main/kotlin/androidx/build/AndroidXPlugin.kt
@@ -76,6 +76,8 @@
project.configureRootProject()
}
+ project.extensions.create("androidx", AndroidXExtension::class.java, project)
+
project.plugins.all {
when (it) {
is JavaPlugin,
diff --git a/buildSrc/src/main/kotlin/androidx/build/CheckSameVersionLibraryGroupsTask.kt b/buildSrc/src/main/kotlin/androidx/build/CheckSameVersionLibraryGroupsTask.kt
index 53005db..af2e582 100644
--- a/buildSrc/src/main/kotlin/androidx/build/CheckSameVersionLibraryGroupsTask.kt
+++ b/buildSrc/src/main/kotlin/androidx/build/CheckSameVersionLibraryGroupsTask.kt
@@ -30,10 +30,10 @@
fun checkSameVersionLibraryGroups() {
val map = HashMap<String, Pair<String, String>>()
project.subprojects { project ->
- val library = project.extensions.findByType(SupportLibraryExtension::class.java)
+ val library = project.extensions.findByType(AndroidXExtension::class.java)
val requireSameVersion = library?.mavenGroup?.requireSameVersion ?: false
if (requireSameVersion) {
- if (project.version == SupportLibraryExtension.DEFAULT_UNSPECIFIED_VERSION) {
+ if (project.version == AndroidXExtension.DEFAULT_UNSPECIFIED_VERSION) {
throw GradleException("Library $group:${project.name} does not specify " +
"a version, however it is within library group $group which requires" +
" all member libraries to be of the same version")
diff --git a/buildSrc/src/main/kotlin/androidx/build/DiffAndDocs.kt b/buildSrc/src/main/kotlin/androidx/build/DiffAndDocs.kt
index 8c6efff..69b3f3fc 100644
--- a/buildSrc/src/main/kotlin/androidx/build/DiffAndDocs.kt
+++ b/buildSrc/src/main/kotlin/androidx/build/DiffAndDocs.kt
@@ -20,7 +20,6 @@
import androidx.build.Strategy.TipOfTree
import androidx.build.checkapi.ApiXmlConversionTask
import androidx.build.checkapi.CheckApiTasks
-import androidx.build.checkapi.initializeApiChecksForProject
import androidx.build.doclava.ChecksConfig
import androidx.build.doclava.DEFAULT_DOCLAVA_CONFIG
import androidx.build.doclava.DoclavaTask
@@ -280,7 +279,7 @@
}
}
- fun registerPrebuilts(extension: SupportLibraryExtension) =
+ fun registerPrebuilts(extension: AndroidXExtension) =
docsProject?.afterEvaluate { docs ->
val depHandler = docs.dependencies
val root = docs.rootProject
@@ -301,7 +300,7 @@
}
private fun tipOfTreeTasks(
- extension: SupportLibraryExtension,
+ extension: AndroidXExtension,
setup: (TaskProvider<out DoclavaTask>) -> Unit
) {
rules.filter { rule -> rule.resolve(extension)?.strategy == TipOfTree }
@@ -313,7 +312,7 @@
* Registers a Java project to be included in docs generation, local API file generation, and
* local API diff generation tasks.
*/
- fun registerJavaProject(project: Project, extension: SupportLibraryExtension) {
+ fun registerJavaProject(project: Project, extension: AndroidXExtension) {
val compileJava = project.tasks.named("compileJava", JavaCompile::class.java)
registerPrebuilts(extension)
@@ -332,7 +331,7 @@
fun registerAndroidProject(
project: Project,
library: LibraryExtension,
- extension: SupportLibraryExtension
+ extension: AndroidXExtension
) {
registerPrebuilts(extension)
@@ -355,7 +354,7 @@
}
private fun setupApiVersioningInDocsTasks(
- extension: SupportLibraryExtension,
+ extension: AndroidXExtension,
checkApiTasks: CheckApiTasks
) {
rules.forEach { rules ->
@@ -518,8 +517,8 @@
version = getBuildId()
destinationDir = project.getDistributionDirectory()
group = JavaBasePlugin.DOCUMENTATION_GROUP
- description = "Zips ${ruleName} Java documentation (generated via Doclava in the " +
- "style of d.android.com) into ${archivePath}"
+ description = "Zips $ruleName Java documentation (generated via Doclava in the " +
+ "style of d.android.com) into $archivePath"
doLast {
logger.lifecycle("'Wrote API reference to $archivePath")
}
@@ -570,8 +569,8 @@
exclude("**/R.java")
dependsOn(generateSdkApiTask, doclavaConfig)
group = JavaBasePlugin.DOCUMENTATION_GROUP
- description = "Generates Java documentation in the style of d.android.com. To generate offline " +
- "docs use \'-PofflineDocs=true\' parameter."
+ description = "Generates Java documentation in the style of d.android.com. To " +
+ "generate offline docs use \'-PofflineDocs=true\' parameter."
setDocletpath(doclavaConfig.resolve())
destinationDir = File(destDir, if (offline) "offline" else "online")
diff --git a/buildSrc/src/main/kotlin/androidx/build/LintConfiguration.kt b/buildSrc/src/main/kotlin/androidx/build/LintConfiguration.kt
index 520fae6..9714924 100644
--- a/buildSrc/src/main/kotlin/androidx/build/LintConfiguration.kt
+++ b/buildSrc/src/main/kotlin/androidx/build/LintConfiguration.kt
@@ -21,7 +21,7 @@
import org.gradle.api.Project
import java.io.File
-fun Project.configureNonAndroidProjectForLint(extension: SupportLibraryExtension) {
+fun Project.configureNonAndroidProjectForLint(extension: AndroidXExtension) {
apply(mapOf("plugin" to "com.android.lint"))
// Create fake variant tasks since that is what is invoked on CI and by developers.
@@ -37,7 +37,7 @@
project.configureLint(lintOptions, extension)
}
-fun Project.configureLint(lintOptions: LintOptions, extension: SupportLibraryExtension) {
+fun Project.configureLint(lintOptions: LintOptions, extension: AndroidXExtension) {
// Lint is configured entirely in afterEvaluate so that individual projects cannot easily
// disable individual checks in the DSL for any reason. That being said, when rolling out a new
// check as fatal, it can be beneficial to set it to fatal above this comment. This allows you
diff --git a/buildSrc/src/main/kotlin/androidx/build/MavenUploadHelper.kt b/buildSrc/src/main/kotlin/androidx/build/MavenUploadHelper.kt
index b271aab..8db25ae5 100644
--- a/buildSrc/src/main/kotlin/androidx/build/MavenUploadHelper.kt
+++ b/buildSrc/src/main/kotlin/androidx/build/MavenUploadHelper.kt
@@ -29,7 +29,7 @@
import java.io.File
import java.util.concurrent.ConcurrentHashMap
-fun Project.configureMavenArtifactUpload(extension: SupportLibraryExtension) {
+fun Project.configureMavenArtifactUpload(extension: AndroidXExtension) {
afterEvaluate {
if (extension.publish) {
val mavenGroup = extension.mavenGroup?.group
diff --git a/buildSrc/src/main/kotlin/androidx/build/PublishDocsRules.kt b/buildSrc/src/main/kotlin/androidx/build/PublishDocsRules.kt
index b90db5b..baa5989 100644
--- a/buildSrc/src/main/kotlin/androidx/build/PublishDocsRules.kt
+++ b/buildSrc/src/main/kotlin/androidx/build/PublishDocsRules.kt
@@ -251,14 +251,14 @@
}
override fun toString() = "Prebuilts(\"$version\")"
- fun dependency(extension: SupportLibraryExtension): String {
+ fun dependency(extension: AndroidXExtension): String {
return "${extension.mavenGroup?.group}:${extension.project.name}:$version"
}
}
}
class PublishDocsRules(val name: String, val offline: Boolean, private val rules: List<DocsRule>) {
- fun resolve(extension: SupportLibraryExtension): DocsRule? {
+ fun resolve(extension: AndroidXExtension): DocsRule? {
val mavenGroup = extension.mavenGroup
return if (mavenGroup == null) null else resolve(mavenGroup.group, extension.project.name)
}
diff --git a/buildSrc/src/main/kotlin/androidx/build/Release.kt b/buildSrc/src/main/kotlin/androidx/build/Release.kt
index 911c0ad..273b3ed 100644
--- a/buildSrc/src/main/kotlin/androidx/build/Release.kt
+++ b/buildSrc/src/main/kotlin/androidx/build/Release.kt
@@ -190,7 +190,7 @@
/**
* Registers the project to be included in its group's zip file as well as the global zip files.
*/
- fun register(project: Project, extension: SupportLibraryExtension) {
+ fun register(project: Project, extension: AndroidXExtension) {
if (!extension.publish) {
throw IllegalArgumentException(
"Cannot register ${project.path} into the release" +
diff --git a/buildSrc/src/main/kotlin/androidx/build/SupportAndroidLibraryPlugin.kt b/buildSrc/src/main/kotlin/androidx/build/SupportAndroidLibraryPlugin.kt
index dcb0def..665f5e1 100644
--- a/buildSrc/src/main/kotlin/androidx/build/SupportAndroidLibraryPlugin.kt
+++ b/buildSrc/src/main/kotlin/androidx/build/SupportAndroidLibraryPlugin.kt
@@ -35,9 +35,8 @@
override fun apply(project: Project) {
project.apply<AndroidXPlugin>()
- val supportLibraryExtension = project.extensions.create("supportLibrary",
- SupportLibraryExtension::class.java, project)
- project.configureMavenArtifactUpload(supportLibraryExtension)
+ val androidXExtension = project.extensions.getByType(AndroidXExtension::class.java)
+ project.configureMavenArtifactUpload(androidXExtension)
// Workaround for concurrentfuture
project.dependencies.modules.module("com.google.guava:listenablefuture") {
@@ -53,22 +52,22 @@
it.resolutionStrategy.preferProjectModules()
}
}
- if (supportLibraryExtension.publish) {
+ if (androidXExtension.publish) {
project.extra.set("publish", true)
- project.addToProjectMap(supportLibraryExtension.mavenGroup?.group)
+ project.addToProjectMap(androidXExtension.mavenGroup?.group)
}
val library = project.extensions.findByType(LibraryExtension::class.java)
?: return@afterEvaluate
- Dokka.registerAndroidProject(project, library, supportLibraryExtension)
- if (supportLibraryExtension.useMetalava) {
- Metalava.registerAndroidProject(project, library, supportLibraryExtension)
+ Dokka.registerAndroidProject(project, library, androidXExtension)
+ if (androidXExtension.useMetalava) {
+ Metalava.registerAndroidProject(project, library, androidXExtension)
} else {
DiffAndDocs.get(project)
- .registerAndroidProject(project, library, supportLibraryExtension)
+ .registerAndroidProject(project, library, androidXExtension)
}
- if (supportLibraryExtension.compilationTarget != CompilationTarget.DEVICE) {
+ if (androidXExtension.compilationTarget != CompilationTarget.DEVICE) {
throw IllegalStateException(
"Android libraries must use a compilation target of DEVICE")
}
@@ -76,10 +75,10 @@
library.libraryVariants.all { libraryVariant ->
if (libraryVariant.getBuildType().getName().equals("debug")) {
libraryVariant.javaCompileProvider.configure { javaCompile ->
- if (supportLibraryExtension.failOnUncheckedWarnings) {
+ if (androidXExtension.failOnUncheckedWarnings) {
javaCompile.options.compilerArgs.add("-Xlint:unchecked")
}
- if (supportLibraryExtension.failOnDeprecationWarnings) {
+ if (androidXExtension.failOnDeprecationWarnings) {
javaCompile.options.compilerArgs.add("-Xlint:deprecation")
}
}
@@ -92,6 +91,6 @@
val library = project.extensions.findByType(LibraryExtension::class.java)
?: throw Exception("Failed to find Android extension")
- project.configureLint(library.lintOptions, supportLibraryExtension)
+ project.configureLint(library.lintOptions, androidXExtension)
}
}
diff --git a/buildSrc/src/main/kotlin/androidx/build/SupportJavaLibraryPlugin.kt b/buildSrc/src/main/kotlin/androidx/build/SupportJavaLibraryPlugin.kt
index 65a4b95..785c9b0 100644
--- a/buildSrc/src/main/kotlin/androidx/build/SupportJavaLibraryPlugin.kt
+++ b/buildSrc/src/main/kotlin/androidx/build/SupportJavaLibraryPlugin.kt
@@ -32,9 +32,8 @@
override fun apply(project: Project) {
project.apply<AndroidXPlugin>()
- val supportLibraryExtension = project.extensions.create("supportLibrary",
- SupportLibraryExtension::class.java, project)
- project.configureMavenArtifactUpload(supportLibraryExtension)
+ val androidXExtension = project.extensions.getByType(AndroidXExtension::class.java)
+ project.configureMavenArtifactUpload(androidXExtension)
project.apply(mapOf("plugin" to "java"))
project.afterEvaluate {
@@ -42,18 +41,18 @@
project.configurations.all {
it.resolutionStrategy.preferProjectModules()
}
- if (supportLibraryExtension.publish) {
+ if (androidXExtension.publish) {
project.extra.set("publish", true)
- project.addToProjectMap(supportLibraryExtension.mavenGroup?.group)
+ project.addToProjectMap(androidXExtension.mavenGroup?.group)
}
- Dokka.registerJavaProject(project, supportLibraryExtension)
- if (supportLibraryExtension.useMetalava) {
- Metalava.registerJavaProject(project, supportLibraryExtension)
+ Dokka.registerJavaProject(project, androidXExtension)
+ if (androidXExtension.useMetalava) {
+ Metalava.registerJavaProject(project, androidXExtension)
} else {
- DiffAndDocs.get(project).registerJavaProject(project, supportLibraryExtension)
+ DiffAndDocs.get(project).registerJavaProject(project, androidXExtension)
}
}
- project.configureNonAndroidProjectForLint(supportLibraryExtension)
+ project.configureNonAndroidProjectForLint(androidXExtension)
}
}
diff --git a/buildSrc/src/main/kotlin/androidx/build/SupportKotlinLibraryPlugin.kt b/buildSrc/src/main/kotlin/androidx/build/SupportKotlinLibraryPlugin.kt
index b5359be3..0e632ae 100644
--- a/buildSrc/src/main/kotlin/androidx/build/SupportKotlinLibraryPlugin.kt
+++ b/buildSrc/src/main/kotlin/androidx/build/SupportKotlinLibraryPlugin.kt
@@ -25,17 +25,16 @@
override fun apply(project: Project) {
project.apply<AndroidXPlugin>()
- val supportLibraryExtension = project.extensions.create("supportLibrary",
- SupportLibraryExtension::class.java, project)
- project.configureMavenArtifactUpload(supportLibraryExtension)
+ val androidXExtension = project.extensions.getByType(AndroidXExtension::class.java)
+ project.configureMavenArtifactUpload(androidXExtension)
project.apply(mapOf("plugin" to "kotlin"))
project.apply(mapOf("plugin" to "kotlin-kapt"))
- project.configureNonAndroidProjectForLint(supportLibraryExtension)
+ project.configureNonAndroidProjectForLint(androidXExtension)
project.afterEvaluate {
- Metalava.registerJavaProject(project, supportLibraryExtension)
- Dokka.registerJavaProject(project, supportLibraryExtension)
+ Metalava.registerJavaProject(project, androidXExtension)
+ Dokka.registerJavaProject(project, androidXExtension)
}
}
}
diff --git a/buildSrc/src/main/kotlin/androidx/build/VerifyDependencyVersionsTask.kt b/buildSrc/src/main/kotlin/androidx/build/VerifyDependencyVersionsTask.kt
index 54dfb097..c9ea108 100644
--- a/buildSrc/src/main/kotlin/androidx/build/VerifyDependencyVersionsTask.kt
+++ b/buildSrc/src/main/kotlin/androidx/build/VerifyDependencyVersionsTask.kt
@@ -57,10 +57,10 @@
// version is unspecified then it won't matter, and if the dependency's version is
// unspecified then any non alpha project won't be able to depend on it to ensure safety.
val projectVersionExtra = if (project.version ==
- SupportLibraryExtension.DEFAULT_UNSPECIFIED_VERSION) "-alpha01"
+ AndroidXExtension.DEFAULT_UNSPECIFIED_VERSION) "-alpha01"
else Version(project.version.toString()).extra ?: ""
val dependencyVersionExtra = if (dependency.version!! ==
- SupportLibraryExtension.DEFAULT_UNSPECIFIED_VERSION) "-alpha01" else
+ AndroidXExtension.DEFAULT_UNSPECIFIED_VERSION) "-alpha01" else
Version(dependency.version!!).extra ?: ""
val projectReleasePhase = releasePhase(projectVersionExtra)
if (projectReleasePhase < 0) {
diff --git a/buildSrc/src/main/kotlin/androidx/build/Version.kt b/buildSrc/src/main/kotlin/androidx/build/Version.kt
index 41d17d7..a493b3e 100644
--- a/buildSrc/src/main/kotlin/androidx/build/Version.kt
+++ b/buildSrc/src/main/kotlin/androidx/build/Version.kt
@@ -92,7 +92,7 @@
}
}
-fun Project.setupVersion(extension: SupportLibraryExtension) = afterEvaluate {
+fun Project.setupVersion(extension: AndroidXExtension) = afterEvaluate {
@Suppress("NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS")
version = extension.mavenVersion?.toString()
}
diff --git a/buildSrc/src/main/kotlin/androidx/build/checkapi/CheckApi.kt b/buildSrc/src/main/kotlin/androidx/build/checkapi/CheckApi.kt
index 99b486b..a304e46 100644
--- a/buildSrc/src/main/kotlin/androidx/build/checkapi/CheckApi.kt
+++ b/buildSrc/src/main/kotlin/androidx/build/checkapi/CheckApi.kt
@@ -16,7 +16,7 @@
package androidx.build.checkapi
-import androidx.build.SupportLibraryExtension
+import androidx.build.AndroidXExtension
import androidx.build.Version
import androidx.build.androidJarFile
import androidx.build.doclava.CHECK_API_CONFIG_DEVELOP
@@ -235,7 +235,7 @@
fun Project.hasApiFolder() = File(projectDir, "api").exists()
-fun hasApiTasks(project: Project, extension: SupportLibraryExtension): Boolean {
+fun hasApiTasks(project: Project, extension: AndroidXExtension): Boolean {
if (extension.toolingProject) {
project.logger.info("Project ${project.name} is tooling project ignoring API tasks.")
return false
@@ -349,7 +349,9 @@
private fun getApiFile(rootDir: File, version: Version): File {
if (version.patch != 0 && (version.isAlpha() || version.isBeta())) {
val suggestedVersion = Version("${version.major}.${version.minor}.${version.patch}-rc01")
- throw GradleException("Illegal version ${version} . It is not allowed to have a nonzero patch number and be alpha or beta at the same time.\nDid you mean ${suggestedVersion}?")
+ throw GradleException("Illegal version $version . It is not allowed to have a nonzero " +
+ "patch number and be alpha or beta at the same time.\n" +
+ "Did you mean $suggestedVersion?")
}
var extra = ""
@@ -357,7 +359,7 @@
extra = version.extra
}
val apiDir = File(rootDir, "api")
- return File(apiDir, "${version.major}.${version.minor}.0${extra}.txt")
+ return File(apiDir, "${version.major}.${version.minor}.0$extra.txt")
}
/**
diff --git a/buildSrc/src/main/kotlin/androidx/build/dokka/Dokka.kt b/buildSrc/src/main/kotlin/androidx/build/dokka/Dokka.kt
index eda7384..e1b6d23 100644
--- a/buildSrc/src/main/kotlin/androidx/build/dokka/Dokka.kt
+++ b/buildSrc/src/main/kotlin/androidx/build/dokka/Dokka.kt
@@ -22,7 +22,7 @@
import androidx.build.DiffAndDocs
import androidx.build.getBuildId
import androidx.build.getDistributionDirectory
-import androidx.build.SupportLibraryExtension
+import androidx.build.AndroidXExtension
import com.android.build.gradle.LibraryExtension
import org.gradle.api.Project
import org.gradle.api.plugins.JavaBasePlugin
@@ -54,7 +54,8 @@
throw Exception("Illegal project passed to createDocsTask: " + project.name)
}
val docsTask = project.tasks.create(taskName, DokkaAndroidTask::class.java) { docsTask ->
- docsTask.description = "Generates ${docsType} Kotlin documentation in the style of d.android.com"
+ docsTask.description = "Generates $docsType Kotlin documentation in the style of " +
+ "d.android.com"
docsTask.moduleName = project.name
docsTask.outputDirectory = File(project.buildDir, taskName).absolutePath
docsTask.outputFormat = "dac"
@@ -77,7 +78,7 @@
zipTask.baseName = taskName
zipTask.version = getBuildId()
zipTask.destinationDir = project.getDistributionDirectory()
- zipTask.description = "Zips ${docsType} Kotlin documentation (generated via "+
+ zipTask.description = "Zips $docsType Kotlin documentation (generated via " +
"Dokka in the style of d.android.com) into ${zipTask.archivePath}"
zipTask.group = JavaBasePlugin.DOCUMENTATION_GROUP
}
@@ -86,7 +87,7 @@
fun registerAndroidProject(
project: Project,
library: LibraryExtension,
- extension: SupportLibraryExtension
+ extension: AndroidXExtension
) {
if (project.name != "docs-runner") {
DiffAndDocs.get(project).registerAndroidProject(project, library, extension)
@@ -98,7 +99,7 @@
fun registerJavaProject(
project: Project,
- extension: SupportLibraryExtension
+ extension: AndroidXExtension
) {
if (project.name != "docs-runner") {
DiffAndDocs.get(project).registerJavaProject(project, extension)
diff --git a/buildSrc/src/main/kotlin/androidx/build/dokka/DokkaPublicDocs.kt b/buildSrc/src/main/kotlin/androidx/build/dokka/DokkaPublicDocs.kt
index 769ba0f..7f593a3 100644
--- a/buildSrc/src/main/kotlin/androidx/build/dokka/DokkaPublicDocs.kt
+++ b/buildSrc/src/main/kotlin/androidx/build/dokka/DokkaPublicDocs.kt
@@ -21,7 +21,7 @@
import java.io.File
import androidx.build.androidJarFile
import androidx.build.java.JavaCompileInputs
-import androidx.build.SupportLibraryExtension
+import androidx.build.AndroidXExtension
import androidx.build.RELEASE_RULE
import androidx.build.Strategy.Ignore
import androidx.build.Strategy.Prebuilts
@@ -98,7 +98,7 @@
// specifies that <project> exists and might need us to generate documentation for it
fun registerProject(
project: Project,
- extension: SupportLibraryExtension
+ extension: AndroidXExtension
) {
if (tryGetRunnerProject(project) == null) {
return
diff --git a/buildSrc/src/main/kotlin/androidx/build/dokka/DokkaSourceDocs.kt b/buildSrc/src/main/kotlin/androidx/build/dokka/DokkaSourceDocs.kt
index d4be41a..beffe9f 100644
--- a/buildSrc/src/main/kotlin/androidx/build/dokka/DokkaSourceDocs.kt
+++ b/buildSrc/src/main/kotlin/androidx/build/dokka/DokkaSourceDocs.kt
@@ -19,7 +19,7 @@
package androidx.build.dokka
import androidx.build.java.JavaCompileInputs
-import androidx.build.SupportLibraryExtension
+import androidx.build.AndroidXExtension
import androidx.build.Release
import com.android.build.gradle.LibraryExtension
import org.gradle.api.Project
@@ -65,7 +65,7 @@
fun registerAndroidProject(
project: Project,
library: LibraryExtension,
- extension: SupportLibraryExtension
+ extension: AndroidXExtension
) {
if (tryGetRunnerProject(project) == null) {
return
@@ -86,7 +86,7 @@
fun registerJavaProject(
project: Project,
- extension: SupportLibraryExtension
+ extension: AndroidXExtension
) {
if (tryGetRunnerProject(project) == null) {
return
diff --git a/buildSrc/src/main/kotlin/androidx/build/metalava/Metalava.kt b/buildSrc/src/main/kotlin/androidx/build/metalava/Metalava.kt
index 5afdc24..ffa0667 100644
--- a/buildSrc/src/main/kotlin/androidx/build/metalava/Metalava.kt
+++ b/buildSrc/src/main/kotlin/androidx/build/metalava/Metalava.kt
@@ -17,7 +17,7 @@
package androidx.build.metalava
import androidx.build.AndroidXPlugin.Companion.BUILD_ON_SERVER_TASK
-import androidx.build.SupportLibraryExtension
+import androidx.build.AndroidXExtension
import androidx.build.checkapi.ApiLocation
import androidx.build.checkapi.ApiViolationExclusions
import androidx.build.checkapi.getCurrentApiLocation
@@ -45,7 +45,7 @@
fun registerAndroidProject(
project: Project,
library: LibraryExtension,
- extension: SupportLibraryExtension
+ extension: AndroidXExtension
) {
if (!hasApiTasks(project, extension)) {
return
@@ -67,7 +67,7 @@
fun registerJavaProject(
project: Project,
- extension: SupportLibraryExtension
+ extension: AndroidXExtension
) {
if (!hasApiTasks(project, extension)) {
return
@@ -93,23 +93,26 @@
fun setupProject(
project: Project,
javaCompileInputs: JavaCompileInputs,
- extension: SupportLibraryExtension
+ extension: AndroidXExtension
) {
val metalavaConfiguration = project.createMetalavaConfiguration()
// the api files whose file names contain the version of the library
val libraryVersionApi = project.getCurrentApiLocation()
// the api files whose file names contain "current.txt"
- val currentTxtApi = ApiLocation.fromPublicApiFile(File(libraryVersionApi.publicApiFile.parentFile, "current.txt"))
+ val currentTxtApi = ApiLocation.fromPublicApiFile(File(
+ libraryVersionApi.publicApiFile.parentFile, "current.txt"))
// make sure to update current.txt if it wasn't previously planned to be updated
- val outputApiLocations: List<ApiLocation> = if (libraryVersionApi.publicApiFile.path.equals(currentTxtApi.publicApiFile.path)) {
- listOf(libraryVersionApi)
- } else {
- listOf(libraryVersionApi, currentTxtApi)
- }
+ val outputApiLocations: List<ApiLocation> =
+ if (libraryVersionApi.publicApiFile.path.equals(currentTxtApi.publicApiFile.path)) {
+ listOf(libraryVersionApi)
+ } else {
+ listOf(libraryVersionApi, currentTxtApi)
+ }
- val builtApiLocation = ApiLocation.fromPublicApiFile(File(project.docsDir(), "release/${project.name}/current.txt"))
+ val builtApiLocation = ApiLocation.fromPublicApiFile(
+ File(project.docsDir(), "release/${project.name}/current.txt"))
var generateApi = project.tasks.create("generateApi", GenerateApiTask::class.java) { task ->
task.group = "API"
@@ -121,18 +124,23 @@
}
applyInputs(javaCompileInputs, generateApi)
- val checkApi = project.tasks.create("checkApi", CheckApiEquivalenceTask::class.java) { task ->
- task.group = "API"
- task.description = "Checks that the API generated from source code matches the checked in API file"
- task.builtApi = generateApi.apiLocation
- task.checkedInApis = outputApiLocations
- task.checkRestrictedAPIs = extension.trackRestrictedAPIs
- task.dependsOn(generateApi)
- }
+ val checkApi =
+ project.tasks.create("checkApi", CheckApiEquivalenceTask::class.java) { task ->
+ task.group = "API"
+ task.description = "Checks that the API generated from source code matches the " +
+ "checked in API file"
+ task.builtApi = generateApi.apiLocation
+ task.checkedInApis = outputApiLocations
+ task.checkRestrictedAPIs = extension.trackRestrictedAPIs
+ task.dependsOn(generateApi)
+ }
val lastReleasedApiFile = project.getRequiredCompatibilityApiLocation()
if (lastReleasedApiFile != null) {
- val checkApiRelease = project.tasks.create("checkApiRelease", CheckApiCompatibilityTask::class.java) { task ->
+ val checkApiRelease = project.tasks.create(
+ "checkApiRelease",
+ CheckApiCompatibilityTask::class.java
+ ) { task ->
task.configuration = metalavaConfiguration
task.referenceApi = lastReleasedApiFile
task.exclusions = ApiViolationExclusions.fromApiLocation(libraryVersionApi)
@@ -142,13 +150,15 @@
applyInputs(javaCompileInputs, checkApiRelease)
checkApi.dependsOn(checkApiRelease)
- val updateApiTrackingExceptions = project.tasks.create("ignoreApiChanges", IgnoreApiChangesTask::class.java) { task ->
- task.configuration = metalavaConfiguration
- task.referenceApi = checkApiRelease.referenceApi
- task.exclusions = checkApiRelease.exclusions
- task.processRestrictedAPIs = extension.trackRestrictedAPIs
- task.intermediateExclusionsFile = File(project.docsDir(), "release/${project.name}/api-changes.ignore")
- }
+ val updateApiTrackingExceptions =
+ project.tasks.create("ignoreApiChanges", IgnoreApiChangesTask::class.java) { task ->
+ task.configuration = metalavaConfiguration
+ task.referenceApi = checkApiRelease.referenceApi
+ task.exclusions = checkApiRelease.exclusions
+ task.processRestrictedAPIs = extension.trackRestrictedAPIs
+ task.intermediateExclusionsFile =
+ File(project.docsDir(), "release/${project.name}/api-changes.ignore")
+ }
applyInputs(javaCompileInputs, updateApiTrackingExceptions)
}
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..4874159 100644
--- a/concurrent/futures/build.gradle
+++ b/concurrent/futures/build.gradle
@@ -16,7 +16,7 @@
import androidx.build.LibraryGroups
import androidx.build.LibraryVersions
-import androidx.build.SupportLibraryExtension
+import androidx.build.AndroidXExtension
import static androidx.build.dependencies.DependenciesKt.*
@@ -31,12 +31,12 @@
testCompile(TRUTH)
}
-supportLibrary {
+androidx {
name = "AndroidX Futures"
publish = true
mavenVersion = LibraryVersions.FUTURES
mavenGroup = LibraryGroups.CONCURRENT
inceptionYear = "2018"
description = "Androidx implementation of Guava's ListenableFuture"
- url = SupportLibraryExtension.ARCHITECTURE_URL
+ url = AndroidXExtension.ARCHITECTURE_URL
}
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..034c7df 100644
--- a/lifecycle/common-java8/build.gradle
+++ b/lifecycle/common-java8/build.gradle
@@ -17,7 +17,7 @@
import static androidx.build.dependencies.DependenciesKt.*
import androidx.build.LibraryGroups
import androidx.build.LibraryVersions;
-import androidx.build.SupportLibraryExtension;
+import androidx.build.AndroidXExtension;
plugins {
id("SupportJavaLibraryPlugin")
@@ -34,12 +34,12 @@
testCompile(MOCKITO_CORE)
}
-supportLibrary {
+androidx {
name = "Android Lifecycle-Common for Java 8 Language"
publish = true
mavenVersion = LibraryVersions.LIFECYCLE
mavenGroup = LibraryGroups.LIFECYCLE
inceptionYear = "2017"
description = "Android Lifecycle-Common for Java 8 Language"
- url = SupportLibraryExtension.ARCHITECTURE_URL
+ url = AndroidXExtension.ARCHITECTURE_URL
}
diff --git a/lifecycle/common/build.gradle b/lifecycle/common/build.gradle
index 75037fa..a87b5cd 100644
--- a/lifecycle/common/build.gradle
+++ b/lifecycle/common/build.gradle
@@ -17,7 +17,7 @@
import androidx.build.LibraryGroups
import androidx.build.LibraryVersions
-import androidx.build.SupportLibraryExtension
+import androidx.build.AndroidXExtension
import static androidx.build.dependencies.DependenciesKt.*
@@ -31,12 +31,12 @@
compile(project(":annotation"))
}
-supportLibrary {
+androidx {
name = "Android Lifecycle-Common"
publish = true
mavenVersion = LibraryVersions.LIFECYCLE
mavenGroup = LibraryGroups.LIFECYCLE
inceptionYear = "2017"
description = "Android Lifecycle-Common"
- url = SupportLibraryExtension.ARCHITECTURE_URL
+ url = AndroidXExtension.ARCHITECTURE_URL
}
\ No newline at end of file
diff --git a/lifecycle/compiler/build.gradle b/lifecycle/compiler/build.gradle
index 9db71e6..aa85d02 100644
--- a/lifecycle/compiler/build.gradle
+++ b/lifecycle/compiler/build.gradle
@@ -2,7 +2,7 @@
import androidx.build.CompilationTarget
import androidx.build.LibraryGroups
import androidx.build.LibraryVersions
-import androidx.build.SupportLibraryExtension
+import androidx.build.AndroidXExtension
plugins {
id("SupportKotlinLibraryPlugin")
@@ -42,7 +42,7 @@
destinationDir = file("src/tests/test-data/lib/")
}
-supportLibrary {
+androidx {
name = "Android Lifecycles Compiler"
toolingProject = true
publish = true
@@ -50,6 +50,6 @@
mavenGroup = LibraryGroups.LIFECYCLE
inceptionYear = "2017"
description = "Android Lifecycles annotation processor"
- url = SupportLibraryExtension.ARCHITECTURE_URL
+ url = AndroidXExtension.ARCHITECTURE_URL
compilationTarget = CompilationTarget.HOST
}
diff --git a/lifecycle/extensions/build.gradle b/lifecycle/extensions/build.gradle
index 0a04c44..67ce62a 100644
--- a/lifecycle/extensions/build.gradle
+++ b/lifecycle/extensions/build.gradle
@@ -17,7 +17,7 @@
import static androidx.build.dependencies.DependenciesKt.*
import androidx.build.LibraryGroups
import androidx.build.LibraryVersions
-import androidx.build.SupportLibraryExtension
+import androidx.build.AndroidXExtension
plugins {
id("SupportAndroidLibraryPlugin")
@@ -52,13 +52,13 @@
androidTestImplementation(SUPPORT_APPCOMPAT, libs.support_exclude_config)
}
-supportLibrary {
+androidx {
name = "Android Lifecycle Extensions"
publish = true
mavenVersion = LibraryVersions.LIFECYCLE
mavenGroup = LibraryGroups.LIFECYCLE
inceptionYear = "2017"
description = "Android Lifecycle Extensions"
- url = SupportLibraryExtension.ARCHITECTURE_URL
+ url = AndroidXExtension.ARCHITECTURE_URL
failOnDeprecationWarnings = false
}
diff --git a/lifecycle/livedata-core/build.gradle b/lifecycle/livedata-core/build.gradle
index c49a937..3c18c44 100644
--- a/lifecycle/livedata-core/build.gradle
+++ b/lifecycle/livedata-core/build.gradle
@@ -17,7 +17,7 @@
import static androidx.build.dependencies.DependenciesKt.*
import androidx.build.LibraryGroups
import androidx.build.LibraryVersions
-import androidx.build.SupportLibraryExtension
+import androidx.build.AndroidXExtension
plugins {
id("SupportAndroidLibraryPlugin")
@@ -34,13 +34,13 @@
testImplementation(MOCKITO_CORE)
}
-supportLibrary {
+androidx {
name = "Android Lifecycle LiveData Core"
publish = true
mavenVersion = LibraryVersions.LIFECYCLE
mavenGroup = LibraryGroups.LIFECYCLE
inceptionYear = "2017"
description = "Android Lifecycle LiveData Core"
- url = SupportLibraryExtension.ARCHITECTURE_URL
+ url = AndroidXExtension.ARCHITECTURE_URL
failOnUncheckedWarnings = false
}
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..4576285 100644
--- a/lifecycle/livedata/build.gradle
+++ b/lifecycle/livedata/build.gradle
@@ -17,7 +17,7 @@
import static androidx.build.dependencies.DependenciesKt.*
import androidx.build.LibraryGroups
import androidx.build.LibraryVersions
-import androidx.build.SupportLibraryExtension
+import androidx.build.AndroidXExtension
plugins {
id("SupportAndroidLibraryPlugin")
@@ -40,12 +40,12 @@
testImplementation(MOCKITO_CORE)
}
-supportLibrary {
+androidx {
name = "Android Lifecycle LiveData"
publish = true
mavenVersion = LibraryVersions.LIFECYCLE
mavenGroup = LibraryGroups.LIFECYCLE
inceptionYear = "2017"
description = "Android Lifecycle LiveData"
- url = SupportLibraryExtension.ARCHITECTURE_URL
+ url = AndroidXExtension.ARCHITECTURE_URL
}
diff --git a/lifecycle/livedata/eap/build.gradle b/lifecycle/livedata/eap/build.gradle
index e00aabe..94393bd 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..796d539 100644
--- a/lifecycle/process/build.gradle
+++ b/lifecycle/process/build.gradle
@@ -17,7 +17,7 @@
import static androidx.build.dependencies.DependenciesKt.*
import androidx.build.LibraryGroups
import androidx.build.LibraryVersions
-import androidx.build.SupportLibraryExtension
+import androidx.build.AndroidXExtension
plugins {
id("SupportAndroidLibraryPlugin")
@@ -36,12 +36,12 @@
testImplementation(MOCKITO_CORE)
}
-supportLibrary {
+androidx {
name = "Android Lifecycle Process"
publish = true
mavenVersion = LibraryVersions.LIFECYCLE
mavenGroup = LibraryGroups.LIFECYCLE
inceptionYear = "2018"
description = "Android Lifecycle Process"
- url = SupportLibraryExtension.ARCHITECTURE_URL
+ url = AndroidXExtension.ARCHITECTURE_URL
}
diff --git a/lifecycle/reactivestreams/build.gradle b/lifecycle/reactivestreams/build.gradle
index bed1534..d7e16ec 100644
--- a/lifecycle/reactivestreams/build.gradle
+++ b/lifecycle/reactivestreams/build.gradle
@@ -17,7 +17,7 @@
import static androidx.build.dependencies.DependenciesKt.*
import androidx.build.LibraryGroups
import androidx.build.LibraryVersions
-import androidx.build.SupportLibraryExtension
+import androidx.build.AndroidXExtension
plugins {
id("SupportAndroidLibraryPlugin")
@@ -44,12 +44,12 @@
testImplementation(project(":arch:core-testing"))
}
-supportLibrary {
+androidx {
name = "Android Lifecycle Reactivestreams"
publish = true
mavenVersion = LibraryVersions.LIFECYCLE
mavenGroup = LibraryGroups.LIFECYCLE
inceptionYear = "2017"
description = "Android Lifecycle Reactivestreams"
- url = SupportLibraryExtension.ARCHITECTURE_URL
+ url = AndroidXExtension.ARCHITECTURE_URL
}
diff --git a/lifecycle/reactivestreams/ktx/build.gradle b/lifecycle/reactivestreams/ktx/build.gradle
index 961113a..1ed0786 100644
--- a/lifecycle/reactivestreams/ktx/build.gradle
+++ b/lifecycle/reactivestreams/ktx/build.gradle
@@ -17,7 +17,7 @@
import static androidx.build.dependencies.DependenciesKt.*
import androidx.build.LibraryGroups
import androidx.build.LibraryVersions
-import androidx.build.SupportLibraryExtension
+import androidx.build.AndroidXExtension
plugins {
id("SupportAndroidLibraryPlugin")
@@ -34,13 +34,13 @@
testImplementation(project(":arch:core-testing"))
}
-supportLibrary {
+androidx {
name = "Android Lifecycle ReactiveStreams KTX"
publish = true
mavenVersion = LibraryVersions.LIFECYCLE
mavenGroup = LibraryGroups.LIFECYCLE
inceptionYear = "2018"
description = "Kotlin extensions for Lifecycle ReactiveStreams"
- url = SupportLibraryExtension.ARCHITECTURE_URL
+ url = AndroidXExtension.ARCHITECTURE_URL
useMetalava = true
}
diff --git a/lifecycle/runtime/build.gradle b/lifecycle/runtime/build.gradle
index ab40c7d..56a9423 100644
--- a/lifecycle/runtime/build.gradle
+++ b/lifecycle/runtime/build.gradle
@@ -1,7 +1,7 @@
import static androidx.build.dependencies.DependenciesKt.*
import androidx.build.LibraryGroups
import androidx.build.LibraryVersions
-import androidx.build.SupportLibraryExtension
+import androidx.build.AndroidXExtension
plugins {
id("SupportAndroidLibraryPlugin")
@@ -32,13 +32,13 @@
androidTestImplementation(TEST_RUNNER)
}
-supportLibrary {
+androidx {
name 'Android Lifecycle Runtime'
publish true
mavenVersion = LibraryVersions.LIFECYCLE
mavenGroup LibraryGroups.LIFECYCLE
inceptionYear '2017'
description "Android Lifecycle Runtime"
- url SupportLibraryExtension.ARCHITECTURE_URL
+ url AndroidXExtension.ARCHITECTURE_URL
failOnDeprecationWarnings = false
}
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..5c5a8fe 100644
--- a/lifecycle/runtime/eap/lint/build.gradle
+++ b/lifecycle/runtime/eap/lint/build.gradle
@@ -18,7 +18,7 @@
import androidx.build.CompilationTarget
import androidx.build.LibraryGroups
import androidx.build.LibraryVersions
-import androidx.build.SupportLibraryExtension
+import androidx.build.AndroidXExtension
plugins {
id("SupportKotlinLibraryPlugin")
@@ -40,7 +40,7 @@
testImplementation LINT_TESTS
}
-supportLibrary {
+androidx {
name = "Android Lifecycles Lint Checks"
toolingProject = true
publish = false
@@ -48,6 +48,6 @@
mavenGroup = LibraryGroups.LIFECYCLE
inceptionYear = "2019"
description = "Android Lifecycles Lint Checks"
- url = SupportLibraryExtension.ARCHITECTURE_URL
+ url = AndroidXExtension.ARCHITECTURE_URL
compilationTarget = CompilationTarget.HOST
}
diff --git a/lifecycle/service/build.gradle b/lifecycle/service/build.gradle
index 382b322..6b238c7 100644
--- a/lifecycle/service/build.gradle
+++ b/lifecycle/service/build.gradle
@@ -17,7 +17,7 @@
import static androidx.build.dependencies.DependenciesKt.*
import androidx.build.LibraryGroups
import androidx.build.LibraryVersions
-import androidx.build.SupportLibraryExtension
+import androidx.build.AndroidXExtension
plugins {
id("SupportAndroidLibraryPlugin")
@@ -38,12 +38,12 @@
androidTestImplementation(SUPPORT_CORE_UTILS, libs.support_exclude_config)
}
-supportLibrary {
+androidx {
name = "Android Lifecycle Service"
publish = true
mavenVersion = LibraryVersions.LIFECYCLE
mavenGroup = LibraryGroups.LIFECYCLE
inceptionYear = "2018"
description = "Android Lifecycle Service"
- url = SupportLibraryExtension.ARCHITECTURE_URL
+ url = AndroidXExtension.ARCHITECTURE_URL
}
diff --git a/lifecycle/viewmodel-savedstate/build.gradle b/lifecycle/viewmodel-savedstate/build.gradle
index a49ed71..1d85dee 100644
--- a/lifecycle/viewmodel-savedstate/build.gradle
+++ b/lifecycle/viewmodel-savedstate/build.gradle
@@ -17,7 +17,7 @@
import static androidx.build.dependencies.DependenciesKt.*
import androidx.build.LibraryGroups
import androidx.build.LibraryVersions
-import androidx.build.SupportLibraryExtension
+import androidx.build.AndroidXExtension
plugins {
id("SupportAndroidLibraryPlugin")
@@ -49,12 +49,12 @@
androidTestImplementation(TEST_RULES)
}
-supportLibrary {
+androidx {
name = "Android Lifecycle ViewModel with SavedState"
publish = true
mavenVersion = LibraryVersions.LIFECYCLES_SAVEDSTATE
mavenGroup = LibraryGroups.LIFECYCLE
inceptionYear = "2018"
description = "Android Lifecycle ViewModel"
- url = SupportLibraryExtension.ARCHITECTURE_URL
+ url = AndroidXExtension.ARCHITECTURE_URL
}
diff --git a/lifecycle/viewmodel/build.gradle b/lifecycle/viewmodel/build.gradle
index bdb416e..3c0bc971 100644
--- a/lifecycle/viewmodel/build.gradle
+++ b/lifecycle/viewmodel/build.gradle
@@ -17,7 +17,7 @@
import static androidx.build.dependencies.DependenciesKt.*
import androidx.build.LibraryGroups
import androidx.build.LibraryVersions
-import androidx.build.SupportLibraryExtension
+import androidx.build.AndroidXExtension
plugins {
id("SupportAndroidLibraryPlugin")
@@ -40,13 +40,13 @@
testImplementation(MOCKITO_CORE)
}
-supportLibrary {
+androidx {
name = "Android Lifecycle ViewModel"
publish = true
mavenVersion = LibraryVersions.LIFECYCLE
mavenGroup = LibraryGroups.LIFECYCLE
inceptionYear = "2017"
description = "Android Lifecycle ViewModel"
- url = SupportLibraryExtension.ARCHITECTURE_URL
+ url = AndroidXExtension.ARCHITECTURE_URL
failOnUncheckedWarnings = false
}
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..27e362f 100644
--- a/navigation/common/build.gradle
+++ b/navigation/common/build.gradle
@@ -17,7 +17,7 @@
import static androidx.build.dependencies.DependenciesKt.*
import androidx.build.LibraryGroups
import androidx.build.LibraryVersions
-import androidx.build.SupportLibraryExtension
+import androidx.build.AndroidXExtension
plugins {
id("SupportAndroidLibraryPlugin")
@@ -63,12 +63,12 @@
}
}
-supportLibrary {
+androidx {
name = "Android Navigation Common"
publish = true
mavenVersion = LibraryVersions.NAVIGATION
mavenGroup = LibraryGroups.NAVIGATION
inceptionYear = "2017"
description = "Android Navigation-Common"
- url = SupportLibraryExtension.ARCHITECTURE_URL
+ url = AndroidXExtension.ARCHITECTURE_URL
}
diff --git a/navigation/common/ktx/build.gradle b/navigation/common/ktx/build.gradle
index 2b496a5..bacbb74 100644
--- a/navigation/common/ktx/build.gradle
+++ b/navigation/common/ktx/build.gradle
@@ -17,7 +17,7 @@
import static androidx.build.dependencies.DependenciesKt.*
import androidx.build.LibraryGroups
import androidx.build.LibraryVersions
-import androidx.build.SupportLibraryExtension
+import androidx.build.AndroidXExtension
plugins {
id("SupportAndroidLibraryPlugin")
@@ -55,14 +55,14 @@
androidTestImplementation(DEXMAKER_MOCKITO, libs.exclude_bytebuddy)
}
-supportLibrary {
+androidx {
name = "Android Navigation Common Kotlin Extensions"
publish = true
mavenVersion = LibraryVersions.NAVIGATION
mavenGroup = LibraryGroups.NAVIGATION
inceptionYear = "2018"
description = "Android Navigation-Common-Ktx"
- url = SupportLibraryExtension.ARCHITECTURE_URL
+ url = AndroidXExtension.ARCHITECTURE_URL
// TODO useMetalava = true
// A bug in type parameter bound resolution causes metalava to always fail on validating the API
}
diff --git a/navigation/fragment/build.gradle b/navigation/fragment/build.gradle
index 6e279e7..8b1e817 100644
--- a/navigation/fragment/build.gradle
+++ b/navigation/fragment/build.gradle
@@ -17,7 +17,7 @@
import static androidx.build.dependencies.DependenciesKt.*
import androidx.build.LibraryGroups
import androidx.build.LibraryVersions
-import androidx.build.SupportLibraryExtension
+import androidx.build.AndroidXExtension
plugins {
id("SupportAndroidLibraryPlugin")
@@ -53,12 +53,12 @@
androidTestImplementation(KOTLIN_STDLIB)
}
-supportLibrary {
+androidx {
name = "Android Navigation Fragment"
publish = true
mavenVersion = LibraryVersions.NAVIGATION
mavenGroup = LibraryGroups.NAVIGATION
inceptionYear = "2017"
description = "Android Navigation-Fragment"
- url = SupportLibraryExtension.ARCHITECTURE_URL
+ url = AndroidXExtension.ARCHITECTURE_URL
}
diff --git a/navigation/fragment/ktx/build.gradle b/navigation/fragment/ktx/build.gradle
index 98450ec..bf2bfb6 100644
--- a/navigation/fragment/ktx/build.gradle
+++ b/navigation/fragment/ktx/build.gradle
@@ -17,7 +17,7 @@
import static androidx.build.dependencies.DependenciesKt.*
import androidx.build.LibraryGroups
import androidx.build.LibraryVersions
-import androidx.build.SupportLibraryExtension
+import androidx.build.AndroidXExtension
plugins {
id("SupportAndroidLibraryPlugin")
@@ -51,14 +51,14 @@
androidTestImplementation(DEXMAKER_MOCKITO, libs.exclude_bytebuddy)
}
-supportLibrary {
+androidx {
name = "Android Navigation Fragment Kotlin Extensions"
publish = true
mavenVersion = LibraryVersions.NAVIGATION
mavenGroup = LibraryGroups.NAVIGATION
inceptionYear = "2018"
description = "Android Navigation-Fragment-Ktx"
- url = SupportLibraryExtension.ARCHITECTURE_URL
+ url = AndroidXExtension.ARCHITECTURE_URL
// TODO useMetalava = true
// A bug in type parameter bound resolution causes metalava to always fail on validating the API
}
diff --git a/navigation/runtime/build.gradle b/navigation/runtime/build.gradle
index d828cb7..fa1ed63 100644
--- a/navigation/runtime/build.gradle
+++ b/navigation/runtime/build.gradle
@@ -17,7 +17,7 @@
import static androidx.build.dependencies.DependenciesKt.*
import androidx.build.LibraryGroups
import androidx.build.LibraryVersions
-import androidx.build.SupportLibraryExtension
+import androidx.build.AndroidXExtension
plugins {
id("SupportAndroidLibraryPlugin")
@@ -52,12 +52,12 @@
androidTestImplementation(KOTLIN_STDLIB)
}
-supportLibrary {
+androidx {
name = "Android Navigation Runtime"
publish = true
mavenVersion = LibraryVersions.NAVIGATION
mavenGroup = LibraryGroups.NAVIGATION
inceptionYear = "2017"
description = "Android Navigation-Runtime"
- url = SupportLibraryExtension.ARCHITECTURE_URL
+ url = AndroidXExtension.ARCHITECTURE_URL
}
diff --git a/navigation/runtime/ktx/build.gradle b/navigation/runtime/ktx/build.gradle
index ccda001..590fc945 100644
--- a/navigation/runtime/ktx/build.gradle
+++ b/navigation/runtime/ktx/build.gradle
@@ -17,7 +17,7 @@
import static androidx.build.dependencies.DependenciesKt.*
import androidx.build.LibraryGroups
import androidx.build.LibraryVersions
-import androidx.build.SupportLibraryExtension
+import androidx.build.AndroidXExtension
plugins {
id("SupportAndroidLibraryPlugin")
@@ -46,14 +46,14 @@
androidTestImplementation(ESPRESSO_CORE)
}
-supportLibrary {
+androidx {
name = "Android Navigation Runtime Kotlin Extensions"
publish = true
mavenVersion = LibraryVersions.NAVIGATION
mavenGroup = LibraryGroups.NAVIGATION
inceptionYear = "2018"
description = "Android Navigation-Runtime-Ktx"
- url = SupportLibraryExtension.ARCHITECTURE_URL
+ url = AndroidXExtension.ARCHITECTURE_URL
// TODO useMetalava = true
// A bug in type parameter bound resolution causes metalava to always fail on validating the API
}
diff --git a/navigation/safe-args-generator/build.gradle b/navigation/safe-args-generator/build.gradle
index 8ca2abc..06cb814 100644
--- a/navigation/safe-args-generator/build.gradle
+++ b/navigation/safe-args-generator/build.gradle
@@ -19,7 +19,7 @@
import androidx.build.LibraryGroups
import androidx.build.LibraryVersions
import androidx.build.SupportConfig
-import androidx.build.SupportLibraryExtension
+import androidx.build.AndroidXExtension
apply plugin: androidx.build.SupportKotlinLibraryPlugin
@@ -57,7 +57,7 @@
tasks.findByName("compileKotlin").dependsOn(":navigation:navigation-common:jarDebug")
-supportLibrary {
+androidx {
name = 'Android Navigation TypeSafe Arguments Generator'
publish = true
toolingProject = true
@@ -65,6 +65,6 @@
mavenGroup = LibraryGroups.NAVIGATION
inceptionYear = '2017'
description = "Android Navigation TypeSafe Arguments Generator"
- url = SupportLibraryExtension.ARCHITECTURE_URL
+ url = AndroidXExtension.ARCHITECTURE_URL
compilationTarget = CompilationTarget.HOST
}
diff --git a/navigation/safe-args-gradle-plugin/build.gradle b/navigation/safe-args-gradle-plugin/build.gradle
index 67d3153..f3e1e0e 100644
--- a/navigation/safe-args-gradle-plugin/build.gradle
+++ b/navigation/safe-args-gradle-plugin/build.gradle
@@ -18,7 +18,7 @@
import androidx.build.CompilationTarget
import androidx.build.LibraryGroups
import androidx.build.LibraryVersions
-import androidx.build.SupportLibraryExtension
+import androidx.build.AndroidXExtension
import androidx.build.SupportConfig
apply plugin: androidx.build.SupportKotlinLibraryPlugin
@@ -86,7 +86,7 @@
}
}
-supportLibrary {
+androidx {
name = "Android Navigation TypeSafe Arguments Gradle Plugin"
publish = true
toolingProject = true
@@ -94,6 +94,6 @@
mavenGroup = LibraryGroups.NAVIGATION
inceptionYear = "2017"
description = "Android Navigation TypeSafe Arguments Gradle Plugin"
- url = SupportLibraryExtension.ARCHITECTURE_URL
+ url = AndroidXExtension.ARCHITECTURE_URL
compilationTarget = CompilationTarget.HOST
}
diff --git a/navigation/testing/build.gradle b/navigation/testing/build.gradle
index 0076dcf..c1ae177 100644
--- a/navigation/testing/build.gradle
+++ b/navigation/testing/build.gradle
@@ -17,7 +17,7 @@
import static androidx.build.dependencies.DependenciesKt.*
import androidx.build.LibraryGroups
import androidx.build.LibraryVersions
-import androidx.build.SupportLibraryExtension
+import androidx.build.AndroidXExtension
plugins {
id("SupportAndroidLibraryPlugin")
@@ -50,14 +50,14 @@
androidTestImplementation(ESPRESSO_CORE)
}
-supportLibrary {
+androidx {
name = "Android Navigation Testing"
publish = false
mavenVersion = LibraryVersions.NAVIGATION_TESTING
mavenGroup = LibraryGroups.NAVIGATION
inceptionYear = "2017"
description = "Android Navigation-Testing"
- url = SupportLibraryExtension.ARCHITECTURE_URL
+ url = AndroidXExtension.ARCHITECTURE_URL
// TODO useMetalava = true
// A bug in type parameter bound resolution causes metalava to always fail on validating the API
}
diff --git a/navigation/ui/build.gradle b/navigation/ui/build.gradle
index 9f9805c..aebacb5 100644
--- a/navigation/ui/build.gradle
+++ b/navigation/ui/build.gradle
@@ -17,7 +17,7 @@
import static androidx.build.dependencies.DependenciesKt.*
import androidx.build.LibraryGroups
import androidx.build.LibraryVersions
-import androidx.build.SupportLibraryExtension
+import androidx.build.AndroidXExtension
plugins {
id("SupportAndroidLibraryPlugin")
@@ -55,12 +55,12 @@
androidTestImplementation(DEXMAKER_MOCKITO, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker
}
-supportLibrary {
+androidx {
name = "Android Navigation UI"
publish = true
mavenVersion = LibraryVersions.NAVIGATION
mavenGroup = LibraryGroups.NAVIGATION
inceptionYear = "2018"
description = "Android Navigation-UI"
- url = SupportLibraryExtension.ARCHITECTURE_URL
+ url = AndroidXExtension.ARCHITECTURE_URL
}
diff --git a/navigation/ui/ktx/build.gradle b/navigation/ui/ktx/build.gradle
index 005b1d2..f48283f1 100644
--- a/navigation/ui/ktx/build.gradle
+++ b/navigation/ui/ktx/build.gradle
@@ -17,7 +17,7 @@
import static androidx.build.dependencies.DependenciesKt.*
import androidx.build.LibraryGroups
import androidx.build.LibraryVersions
-import androidx.build.SupportLibraryExtension
+import androidx.build.AndroidXExtension
plugins {
id("SupportAndroidLibraryPlugin")
@@ -43,13 +43,13 @@
androidTestImplementation(ESPRESSO_CORE)
}
-supportLibrary {
+androidx {
name = "Android Navigation UI Kotlin Extensions"
publish = true
mavenVersion = LibraryVersions.NAVIGATION
mavenGroup = LibraryGroups.NAVIGATION
inceptionYear = "2018"
description = "Android Navigation-UI-Ktx"
- url = SupportLibraryExtension.ARCHITECTURE_URL
+ url = AndroidXExtension.ARCHITECTURE_URL
useMetalava = true
}
diff --git a/paging/common/build.gradle b/paging/common/build.gradle
index c30b40e..cfd53e6 100644
--- a/paging/common/build.gradle
+++ b/paging/common/build.gradle
@@ -17,7 +17,7 @@
import static androidx.build.dependencies.DependenciesKt.*
import androidx.build.LibraryGroups
import androidx.build.LibraryVersions
-import androidx.build.SupportLibraryExtension;
+import androidx.build.AndroidXExtension;
plugins {
id("SupportJavaLibraryPlugin")
@@ -39,12 +39,12 @@
testCompile(GUAVA)
}
-supportLibrary {
+androidx {
name = "Android Paging-Common"
publish = true
mavenVersion = LibraryVersions.PAGING
mavenGroup = LibraryGroups.PAGING
inceptionYear = "2017"
description = "Android Paging-Common"
- url = SupportLibraryExtension.ARCHITECTURE_URL
+ url = AndroidXExtension.ARCHITECTURE_URL
}
diff --git a/paging/common/ktx/build.gradle b/paging/common/ktx/build.gradle
index 55b0ff0..b5d36a2 100644
--- a/paging/common/ktx/build.gradle
+++ b/paging/common/ktx/build.gradle
@@ -17,7 +17,7 @@
import static androidx.build.dependencies.DependenciesKt.*
import androidx.build.LibraryGroups
import androidx.build.LibraryVersions
-import androidx.build.SupportLibraryExtension
+import androidx.build.AndroidXExtension
plugins {
id("SupportJavaLibraryPlugin")
@@ -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..b73494f 100644
--- a/paging/runtime/build.gradle
+++ b/paging/runtime/build.gradle
@@ -17,7 +17,7 @@
import static androidx.build.dependencies.DependenciesKt.*
import androidx.build.LibraryGroups
import androidx.build.LibraryVersions
-import androidx.build.SupportLibraryExtension
+import androidx.build.AndroidXExtension
plugins {
id("SupportAndroidLibraryPlugin")
@@ -47,12 +47,12 @@
androidTestImplementation(KOTLIN_STDLIB)
}
-supportLibrary {
+androidx {
name = "Android Paging-Runtime"
publish = true
mavenVersion = LibraryVersions.PAGING
mavenGroup = LibraryGroups.PAGING
inceptionYear = "2017"
description = "Android Paging-Runtime"
- url = SupportLibraryExtension.ARCHITECTURE_URL
+ url = AndroidXExtension.ARCHITECTURE_URL
}
diff --git a/paging/runtime/ktx/build.gradle b/paging/runtime/ktx/build.gradle
index fec7c4f..f76ecce 100644
--- a/paging/runtime/ktx/build.gradle
+++ b/paging/runtime/ktx/build.gradle
@@ -17,7 +17,7 @@
import static androidx.build.dependencies.DependenciesKt.*
import androidx.build.LibraryGroups
import androidx.build.LibraryVersions
-import androidx.build.SupportLibraryExtension
+import androidx.build.AndroidXExtension
plugins {
id("SupportAndroidLibraryPlugin")
@@ -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..3c3e1e0 100644
--- a/paging/rxjava2/build.gradle
+++ b/paging/rxjava2/build.gradle
@@ -17,7 +17,7 @@
import static androidx.build.dependencies.DependenciesKt.*
import androidx.build.LibraryGroups
import androidx.build.LibraryVersions
-import androidx.build.SupportLibraryExtension
+import androidx.build.AndroidXExtension
plugins {
id("SupportAndroidLibraryPlugin")
@@ -46,12 +46,12 @@
androidTestImplementation(KOTLIN_STDLIB)
}
-supportLibrary {
+androidx {
name = "Android Paging RXJava2"
publish = true
mavenVersion = LibraryVersions.PAGING
mavenGroup = LibraryGroups.PAGING
inceptionYear = "2018"
description = "Android Paging RXJava2"
- url = SupportLibraryExtension.ARCHITECTURE_URL
+ url = AndroidXExtension.ARCHITECTURE_URL
}
diff --git a/paging/rxjava2/ktx/build.gradle b/paging/rxjava2/ktx/build.gradle
index 7f972b2..cbc2946 100644
--- a/paging/rxjava2/ktx/build.gradle
+++ b/paging/rxjava2/ktx/build.gradle
@@ -17,7 +17,7 @@
import static androidx.build.dependencies.DependenciesKt.*
import androidx.build.LibraryGroups
import androidx.build.LibraryVersions
-import androidx.build.SupportLibraryExtension
+import androidx.build.AndroidXExtension
plugins {
id("SupportAndroidLibraryPlugin")
@@ -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..6b7dc14 100644
--- a/persistence/db-framework/build.gradle
+++ b/persistence/db-framework/build.gradle
@@ -17,7 +17,7 @@
import static androidx.build.dependencies.DependenciesKt.*
import androidx.build.LibraryGroups
import androidx.build.LibraryVersions
-import androidx.build.SupportLibraryExtension
+import androidx.build.AndroidXExtension
plugins {
id("SupportAndroidLibraryPlugin")
@@ -28,12 +28,12 @@
api(project(":sqlite:sqlite"))
}
-supportLibrary {
+androidx {
name = "Android Support SQLite - Framework Implementation"
publish = true
mavenVersion = LibraryVersions.PERSISTENCE
mavenGroup = LibraryGroups.PERSISTENCE
inceptionYear = "2017"
description = "The implementation of Support SQLite library using the framework code."
- url = SupportLibraryExtension.ARCHITECTURE_URL
+ url = AndroidXExtension.ARCHITECTURE_URL
}
\ No newline at end of file
diff --git a/persistence/db/build.gradle b/persistence/db/build.gradle
index d459f63..3cf8757 100644
--- a/persistence/db/build.gradle
+++ b/persistence/db/build.gradle
@@ -17,7 +17,7 @@
import static androidx.build.dependencies.DependenciesKt.*
import androidx.build.LibraryGroups
import androidx.build.LibraryVersions
-import androidx.build.SupportLibraryExtension
+import androidx.build.AndroidXExtension
plugins {
id("SupportAndroidLibraryPlugin")
@@ -40,12 +40,12 @@
}
}
-supportLibrary {
+androidx {
name = "Android DB"
publish = true
mavenVersion = LibraryVersions.PERSISTENCE
mavenGroup = LibraryGroups.PERSISTENCE
inceptionYear = "2017"
description = "Android DB"
- url = SupportLibraryExtension.ARCHITECTURE_URL
+ url = AndroidXExtension.ARCHITECTURE_URL
}
\ No newline at end of file
diff --git a/persistence/db/ktx/build.gradle b/persistence/db/ktx/build.gradle
index 6d73022..780e1fe 100644
--- a/persistence/db/ktx/build.gradle
+++ b/persistence/db/ktx/build.gradle
@@ -17,7 +17,7 @@
import static androidx.build.dependencies.DependenciesKt.*
import androidx.build.LibraryGroups
import androidx.build.LibraryVersions
-import androidx.build.SupportLibraryExtension
+import androidx.build.AndroidXExtension
plugins {
id("SupportAndroidLibraryPlugin")
@@ -32,13 +32,13 @@
testImplementation(MOCKITO_CORE)
}
-supportLibrary {
+androidx {
name = "Android DB KTX"
publish = true
mavenVersion = LibraryVersions.PERSISTENCE
mavenGroup = LibraryGroups.PERSISTENCE
inceptionYear = "2018"
description = "Kotlin extensions for DB"
- url = SupportLibraryExtension.ARCHITECTURE_URL
+ url = AndroidXExtension.ARCHITECTURE_URL
useMetalava = true
}
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..4effa22 100644
--- a/room/common-java8/build.gradle
+++ b/room/common-java8/build.gradle
@@ -17,7 +17,7 @@
import static androidx.build.dependencies.DependenciesKt.*
import androidx.build.LibraryGroups
import androidx.build.LibraryVersions
-import androidx.build.SupportLibraryExtension;
+import androidx.build.AndroidXExtension;
plugins {
id("SupportJavaLibraryPlugin")
@@ -30,12 +30,12 @@
compile(ANDROIDX_ANNOTATION)
}
-supportLibrary {
+androidx {
name = "Android Room-Common-Java8"
publish = false
mavenVersion = LibraryVersions.ROOM
mavenGroup = LibraryGroups.ROOM
inceptionYear = "2019"
description = "Android Room-Common-Java8"
- url = SupportLibraryExtension.ARCHITECTURE_URL
+ url = AndroidXExtension.ARCHITECTURE_URL
}
\ No newline at end of file
diff --git a/room/common/build.gradle b/room/common/build.gradle
index 7a2b07f..dbac4d3 100644
--- a/room/common/build.gradle
+++ b/room/common/build.gradle
@@ -17,7 +17,7 @@
import static androidx.build.dependencies.DependenciesKt.*
import androidx.build.LibraryGroups
import androidx.build.LibraryVersions
-import androidx.build.SupportLibraryExtension;
+import androidx.build.AndroidXExtension;
plugins {
id("SupportJavaLibraryPlugin")
@@ -29,12 +29,12 @@
testCompile(MOCKITO_CORE)
}
-supportLibrary {
+androidx {
name = "Android Room-Common"
publish = true
mavenVersion = LibraryVersions.ROOM
mavenGroup = LibraryGroups.ROOM
inceptionYear = "2017"
description = "Android Room-Common"
- url = SupportLibraryExtension.ARCHITECTURE_URL
+ url = AndroidXExtension.ARCHITECTURE_URL
}
\ No newline at end of file
diff --git a/room/compiler/build.gradle b/room/compiler/build.gradle
index 4c74d26..529d104 100644
--- a/room/compiler/build.gradle
+++ b/room/compiler/build.gradle
@@ -19,7 +19,7 @@
import androidx.build.LibraryGroups
import androidx.build.LibraryVersions
import androidx.build.SupportConfig
-import androidx.build.SupportLibraryExtension
+import androidx.build.AndroidXExtension
plugins {
id("SupportKotlinLibraryPlugin")
@@ -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
@@ -90,6 +90,6 @@
mavenGroup = LibraryGroups.ROOM
inceptionYear = "2017"
description = "Android Room annotation processor"
- url = SupportLibraryExtension.ARCHITECTURE_URL
+ url = AndroidXExtension.ARCHITECTURE_URL
compilationTarget = CompilationTarget.HOST
}
diff --git a/room/guava/build.gradle b/room/guava/build.gradle
index 6d8d92d..d480125 100644
--- a/room/guava/build.gradle
+++ b/room/guava/build.gradle
@@ -17,7 +17,7 @@
import static androidx.build.dependencies.DependenciesKt.*
import androidx.build.LibraryGroups
import androidx.build.LibraryVersions
-import androidx.build.SupportLibraryExtension
+import androidx.build.AndroidXExtension
plugins {
id("SupportAndroidLibraryPlugin")
@@ -35,12 +35,12 @@
api(GUAVA_LISTENABLE_FUTURE)
}
-supportLibrary {
+androidx {
name = "Android Room Guava"
publish = true
mavenVersion = LibraryVersions.ROOM
mavenGroup = LibraryGroups.ROOM
inceptionYear = "2018"
description = "Android Room Guava"
- url = SupportLibraryExtension.ARCHITECTURE_URL
+ url = AndroidXExtension.ARCHITECTURE_URL
}
\ No newline at end of file
diff --git a/room/ktx/build.gradle b/room/ktx/build.gradle
index cf774cd..e8af166 100644
--- a/room/ktx/build.gradle
+++ b/room/ktx/build.gradle
@@ -17,7 +17,7 @@
import static androidx.build.dependencies.DependenciesKt.*
import androidx.build.LibraryGroups
import androidx.build.LibraryVersions
-import androidx.build.SupportLibraryExtension
+import androidx.build.AndroidXExtension
plugins {
id("SupportAndroidLibraryPlugin")
@@ -33,12 +33,12 @@
testImplementation(MOCKITO_CORE)
}
-supportLibrary {
+androidx {
name = "Android Room Kotlin Extensions"
publish = true
mavenVersion = LibraryVersions.ROOM
mavenGroup = LibraryGroups.ROOM
inceptionYear = "2019"
description = "Android Room Kotlin Extensions"
- url = SupportLibraryExtension.ARCHITECTURE_URL
+ url = AndroidXExtension.ARCHITECTURE_URL
}
\ No newline at end of file
diff --git a/room/migration/build.gradle b/room/migration/build.gradle
index c869d10..bf979b3 100644
--- a/room/migration/build.gradle
+++ b/room/migration/build.gradle
@@ -17,7 +17,7 @@
import static androidx.build.dependencies.DependenciesKt.*
import androidx.build.LibraryGroups
import androidx.build.LibraryVersions
-import androidx.build.SupportLibraryExtension;
+import androidx.build.AndroidXExtension;
plugins {
id("SupportJavaLibraryPlugin")
@@ -32,12 +32,12 @@
testCompile(MOCKITO_CORE)
}
-supportLibrary {
+androidx {
name = "Android Room Migration"
publish = true
mavenVersion = LibraryVersions.ROOM
mavenGroup = LibraryGroups.ROOM
inceptionYear = "2017"
description = "Android Room Migration"
- url = SupportLibraryExtension.ARCHITECTURE_URL
+ url = AndroidXExtension.ARCHITECTURE_URL
}
\ No newline at end of file
diff --git a/room/runtime/build.gradle b/room/runtime/build.gradle
index 634aea6..5a662ae 100644
--- a/room/runtime/build.gradle
+++ b/room/runtime/build.gradle
@@ -17,7 +17,7 @@
import static androidx.build.dependencies.DependenciesKt.*
import androidx.build.LibraryGroups
import androidx.build.LibraryVersions
-import androidx.build.SupportLibraryExtension
+import androidx.build.AndroidXExtension
plugins {
id("SupportAndroidLibraryPlugin")
@@ -78,12 +78,12 @@
}
}
-supportLibrary {
+androidx {
name = "Android Room-Runtime"
publish = true
mavenVersion = LibraryVersions.ROOM
mavenGroup = LibraryGroups.ROOM
inceptionYear = "2017"
description = "Android Room-Runtime"
- url = SupportLibraryExtension.ARCHITECTURE_URL
+ url = AndroidXExtension.ARCHITECTURE_URL
}
\ No newline at end of file
diff --git a/room/rxjava2/build.gradle b/room/rxjava2/build.gradle
index f624d23..d5fc8a7 100644
--- a/room/rxjava2/build.gradle
+++ b/room/rxjava2/build.gradle
@@ -17,7 +17,7 @@
import static androidx.build.dependencies.DependenciesKt.*
import androidx.build.LibraryGroups
import androidx.build.LibraryVersions
-import androidx.build.SupportLibraryExtension
+import androidx.build.AndroidXExtension
plugins {
id("SupportAndroidLibraryPlugin")
@@ -35,12 +35,12 @@
testImplementation(ARCH_LIFECYCLE_LIVEDATA) // for mocking invalidation tracker
}
-supportLibrary {
+androidx {
name = "Android Room RXJava2"
publish = true
mavenVersion = LibraryVersions.ROOM
mavenGroup = LibraryGroups.ROOM
inceptionYear = "2017"
description = "Android Room RXJava2"
- url = SupportLibraryExtension.ARCHITECTURE_URL
+ url = AndroidXExtension.ARCHITECTURE_URL
}
\ No newline at end of file
diff --git a/room/testing/build.gradle b/room/testing/build.gradle
index f98f7cf..749fdfa 100644
--- a/room/testing/build.gradle
+++ b/room/testing/build.gradle
@@ -17,7 +17,7 @@
import static androidx.build.dependencies.DependenciesKt.*
import androidx.build.LibraryGroups
import androidx.build.LibraryVersions
-import androidx.build.SupportLibraryExtension
+import androidx.build.AndroidXExtension
plugins {
id("SupportAndroidLibraryPlugin")
@@ -34,12 +34,12 @@
api(JUNIT)
}
-supportLibrary {
+androidx {
name = "Android Room Testing"
publish = true
mavenVersion = LibraryVersions.ROOM
mavenGroup = LibraryGroups.ROOM
inceptionYear = "2017"
description = "Android Room Testing"
- url = SupportLibraryExtension.ARCHITECTURE_URL
+ url = AndroidXExtension.ARCHITECTURE_URL
}
\ No newline at end of file
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..cda64c3 100644
--- a/work/workmanager-gcm/build.gradle
+++ b/work/workmanager-gcm/build.gradle
@@ -17,7 +17,7 @@
import androidx.build.LibraryGroups
import androidx.build.LibraryVersions
-import androidx.build.SupportLibraryExtension
+import androidx.build.AndroidXExtension
import static androidx.build.dependencies.DependenciesKt.*
@@ -60,13 +60,13 @@
testImplementation(JUNIT)
}
-supportLibrary {
+androidx {
name = "Android WorkManager GCMNetworkManager Support"
publish = false
mavenVersion = LibraryVersions.WORKMANAGER
mavenGroup = LibraryGroups.WORKMANAGER
inceptionYear = "2019"
description = "Android WorkManager GCMNetworkManager Support"
- url = SupportLibraryExtension.ARCHITECTURE_URL
+ url = AndroidXExtension.ARCHITECTURE_URL
useMetalava = true
}
diff --git a/work/workmanager-ktx/build.gradle b/work/workmanager-ktx/build.gradle
index 175802e..0c85434 100644
--- a/work/workmanager-ktx/build.gradle
+++ b/work/workmanager-ktx/build.gradle
@@ -17,7 +17,7 @@
import androidx.build.LibraryGroups
import androidx.build.LibraryVersions
-import androidx.build.SupportLibraryExtension
+import androidx.build.AndroidXExtension
import static androidx.build.dependencies.DependenciesKt.*
@@ -49,13 +49,13 @@
testImplementation(JUNIT)
}
-supportLibrary {
+androidx {
name = "Android WorkManager Kotlin Extensions"
publish = true
mavenVersion = LibraryVersions.WORKMANAGER
mavenGroup = LibraryGroups.WORKMANAGER
inceptionYear = "2018"
description = "Android WorkManager Kotlin Extensions"
- url = SupportLibraryExtension.ARCHITECTURE_URL
+ url = AndroidXExtension.ARCHITECTURE_URL
useMetalava = true
}
diff --git a/work/workmanager-rxjava2/build.gradle b/work/workmanager-rxjava2/build.gradle
index e494c21..782a4a5 100644
--- a/work/workmanager-rxjava2/build.gradle
+++ b/work/workmanager-rxjava2/build.gradle
@@ -17,7 +17,7 @@
import static androidx.build.dependencies.DependenciesKt.*
import androidx.build.LibraryGroups
import androidx.build.LibraryVersions
-import androidx.build.SupportLibraryExtension
+import androidx.build.AndroidXExtension
plugins {
id("SupportAndroidLibraryPlugin")
@@ -34,14 +34,14 @@
testImplementation(MOCKITO_CORE)
}
-supportLibrary {
+androidx {
name = "Android WorkManager RxJava2 Support"
publish = true
mavenVersion = LibraryVersions.WORKMANAGER
mavenGroup = LibraryGroups.WORKMANAGER
inceptionYear = "2018"
description = "Android WorkManager RxJava2 interoperatibility library"
- url = SupportLibraryExtension.ARCHITECTURE_URL
+ url = AndroidXExtension.ARCHITECTURE_URL
failOnUncheckedWarnings = false
failOnDeprecationWarnings = false
}
\ No newline at end of file
diff --git a/work/workmanager-testing/build.gradle b/work/workmanager-testing/build.gradle
index 2bbc54f..fcfbbd5 100644
--- a/work/workmanager-testing/build.gradle
+++ b/work/workmanager-testing/build.gradle
@@ -17,7 +17,7 @@
import androidx.build.LibraryGroups
import androidx.build.LibraryVersions
-import androidx.build.SupportLibraryExtension
+import androidx.build.AndroidXExtension
import static androidx.build.dependencies.DependenciesKt.*
@@ -46,12 +46,12 @@
testImplementation(TEST_RUNNER)
}
-supportLibrary {
+androidx {
name = "Android WorkManager Testing"
publish = true
mavenVersion = LibraryVersions.WORKMANAGER
mavenGroup = LibraryGroups.WORKMANAGER
inceptionYear = "2018"
description = "Android WorkManager testing library"
- url = SupportLibraryExtension.ARCHITECTURE_URL
+ url = AndroidXExtension.ARCHITECTURE_URL
}
diff --git a/work/workmanager/build.gradle b/work/workmanager/build.gradle
index d424b64..4831402 100644
--- a/work/workmanager/build.gradle
+++ b/work/workmanager/build.gradle
@@ -17,7 +17,7 @@
import androidx.build.LibraryGroups
import androidx.build.LibraryVersions
-import androidx.build.SupportLibraryExtension
+import androidx.build.AndroidXExtension
import static androidx.build.dependencies.DependenciesKt.*
@@ -66,14 +66,14 @@
testImplementation(JUNIT)
}
-supportLibrary {
+androidx {
name = "Android WorkManager Runtime"
publish = true
mavenVersion = LibraryVersions.WORKMANAGER
mavenGroup = LibraryGroups.WORKMANAGER
inceptionYear = "2018"
description = "Android WorkManager runtime library"
- url = SupportLibraryExtension.ARCHITECTURE_URL
+ url = AndroidXExtension.ARCHITECTURE_URL
failOnUncheckedWarnings = false
failOnDeprecationWarnings = false
trackRestrictedAPIs = false