Consolidate to only use AndroidXExtension.type to control publishing

Removing all uses of AndroidXExtension.publish replacing it with appropriate AndroidXExtension.type within build.gradle files Also refactor LibraryTypes by a single class `ConfigurableLibray` to make it simpler to add new types, reducing code dups BUG: 327630926 TESTED: Ran ./gradlew bOS --dry-run and it was the same as HEAD Change-Id: I0f65a086a1c47e537864ce1fdca8975cbb2da581
huanshankeji · Dec 19, 2024 · a293b97 · a293b97
1 parent d99a1f6
commit a293b97
Show file tree

Hide file tree

Showing 90 changed files with 439 additions and 304 deletions.
diff --git a/appcompat/appcompat-benchmark/build.gradle b/appcompat/appcompat-benchmark/build.gradle
@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+import androidx.build.LibraryType
+
 plugins {
     id("AndroidXPlugin")
     id("com.android.library")
@@ -34,3 +36,7 @@ dependencies {
 android {
     namespace = "androidx.appcompat.benchmark"
 }
+
+androidx {
+    type = LibraryType.BENCHMARK
+}
diff --git a/benchmark/benchmark-darwin-core/build.gradle b/benchmark/benchmark-darwin-core/build.gradle
@@ -6,7 +6,7 @@
  * modifying its settings.
  */
 import androidx.build.PlatformIdentifier
-import androidx.build.Publish
+import androidx.build.LibraryType
 import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType
 import org.jetbrains.kotlin.gradle.plugin.mpp.BitcodeEmbeddingMode
 
@@ -54,7 +54,7 @@ androidXMultiplatform {
 
 androidx {
     name = "Benchmarks - Darwin Core"
+    type = LibraryType.SNAPSHOT_ONLY_LIBRARY
     inceptionYear = "2022"
     description = "AndroidX Benchmarks - Darwin Core"
-    publish = Publish.SNAPSHOT_ONLY
 }
diff --git a/benchmark/benchmark-darwin-gradle-plugin/build.gradle b/benchmark/benchmark-darwin-gradle-plugin/build.gradle
@@ -50,7 +50,7 @@ gradlePlugin {
 
 androidx {
     name = "Benchmarks - Darwin Gradle Plugin"
-    type = LibraryType.GRADLE_PLUGIN
+    type = LibraryType.INTERNAL_GRADLE_PLUGIN
     inceptionYear = "2022"
     description = "AndroidX Benchmarks - Darwin Gradle Plugin"
 }
diff --git a/benchmark/benchmark-darwin/build.gradle b/benchmark/benchmark-darwin/build.gradle
@@ -6,7 +6,7 @@
  * modifying its settings.
  */
 import androidx.build.PlatformIdentifier
-import androidx.build.Publish
+import androidx.build.LibraryType
 import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType
 import org.jetbrains.kotlin.gradle.plugin.mpp.BitcodeEmbeddingMode
 import org.jetbrains.kotlin.gradle.plugin.mpp.apple.XCFrameworkConfig
@@ -87,5 +87,5 @@ androidx {
     name = "Benchmarks - Darwin"
     inceptionYear = "2022"
     description = "AndroidX Benchmarks - Darwin"
-    publish = Publish.SNAPSHOT_ONLY
+    type = LibraryType.SNAPSHOT_ONLY_LIBRARY
 }
diff --git a/benchmark/benchmark/build.gradle b/benchmark/benchmark/build.gradle
@@ -56,5 +56,5 @@ android {
 }
 
 androidx {
-    type = LibraryType.INTERNAL_TEST_LIBRARY
+    type = LibraryType.BENCHMARK
 }
diff --git a/benchmark/integration-tests/dry-run-benchmark/build.gradle b/benchmark/integration-tests/dry-run-benchmark/build.gradle
@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+import androidx.build.LibraryType
+
 plugins {
     id("AndroidXPlugin")
     id("com.android.library")
@@ -32,3 +34,7 @@ dependencies {
 android {
     namespace = "androidx.benchmark.integration.dryrun.benchmark"
 }
+
+androidx {
+    type = LibraryType.BENCHMARK
+}
diff --git a/benchmark/integration-tests/startup-benchmark/build.gradle b/benchmark/integration-tests/startup-benchmark/build.gradle
@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+import androidx.build.LibraryType
+
 plugins {
     id("AndroidXPlugin")
     id("com.android.library")
@@ -32,3 +34,7 @@ dependencies {
 android {
     namespace = "androidx.benchmark.integration.startup.benchmark"
 }
+
+androidx {
+    type = LibraryType.BENCHMARK
+}
diff --git a/bluetooth/integration-tests/testapp/build.gradle b/bluetooth/integration-tests/testapp/build.gradle
@@ -5,7 +5,6 @@
  * Please use that script when creating a new project, rather than copying an existing project and
  * modifying its settings.
  */
-import androidx.build.Publish
 
 /*
  * Copyright 2022 The Android Open Source Project

diff --git a/buildSrc-tests/build.gradle b/buildSrc-tests/build.gradle
@@ -19,7 +19,6 @@
 
 import androidx.build.LibraryType
 import androidx.build.KotlinTarget
-import androidx.build.Publish
 
 plugins {
     id("AndroidXPlugin")
@@ -90,8 +89,7 @@ tasks.withType(Test).configureEach {
 }
 
 androidx {
-    type = LibraryType.GRADLE_PLUGIN
-    publish = Publish.NONE
+    type = LibraryType.INTERNAL_GRADLE_PLUGIN
     kotlinTarget = KotlinTarget.KOTLIN_1_9
 }
 

diff --git a/buildSrc-tests/max-dep-versions/buildSrc-tests-max-dep-versions-dep/build.gradle b/buildSrc-tests/max-dep-versions/buildSrc-tests-max-dep-versions-dep/build.gradle
@@ -6,7 +6,6 @@
  * modifying its settings.
  */
 import androidx.build.LibraryType
-import androidx.build.Publish
 
 plugins {
     id("AndroidXPlugin")

diff --git a/buildSrc/private/src/main/kotlin/androidx/build/AndroidXImplPlugin.kt b/buildSrc/private/src/main/kotlin/androidx/build/AndroidXImplPlugin.kt
@@ -1062,8 +1062,7 @@ constructor(private val componentFactory: SoftwareComponentFactory) : Plugin<Pro
             val isProbablyPublished =
                 androidXExtension.type == LibraryType.PUBLISHED_LIBRARY ||
                     androidXExtension.type ==
-                        LibraryType.PUBLISHED_LIBRARY_ONLY_USED_BY_KOTLIN_CONSUMERS ||
-                    androidXExtension.type == LibraryType.UNSET
+                        LibraryType.PUBLISHED_LIBRARY_ONLY_USED_BY_KOTLIN_CONSUMERS
             if (mavenGroup != null && isProbablyPublished && androidXExtension.shouldPublish()) {
                 validateProjectMavenGroup(mavenGroup.group)
                 validateProjectMavenName(androidXExtension.name.get(), mavenGroup.group)
@@ -1310,7 +1309,7 @@ constructor(private val componentFactory: SoftwareComponentFactory) : Plugin<Pro
     ) {
         if (buildFeatures.isIsolatedProjectsEnabled()) return
         afterEvaluate {
-            if (androidXExtension.type !in listOf(LibraryType.UNSET, LibraryType.SAMPLES)) {
+            if (androidXExtension.type.requiresDependencyVerification()) {
                 val verifyDependencyVersionsTask = project.createVerifyDependencyVersionsTask()
                 if (verifyDependencyVersionsTask != null) {
                     taskConfigurator(verifyDependencyVersionsTask)
@@ -1635,10 +1634,6 @@ fun Project.validateProjectParser(androidXExtension: AndroidXExtension) {
             "$errorPrefix Incorrectly computed libraryType = ${parsed.libraryType} " +
                 "instead of ${androidXExtension.type}"
         }
-        check(androidXExtension.publish == parsed.publish) {
-            "$errorPrefix Incorrectly computed publish = ${parsed.publish} " +
-                "instead of ${androidXExtension.publish}"
-        }
         check(androidXExtension.shouldPublish() == parsed.shouldPublish()) {
             "$errorPrefix Incorrectly computed shouldPublish() = ${parsed.shouldPublish()} " +
                 "instead of ${androidXExtension.shouldPublish()}"

diff --git a/buildSrc/private/src/main/kotlin/androidx/build/LintConfiguration.kt b/buildSrc/private/src/main/kotlin/androidx/build/LintConfiguration.kt
@@ -164,7 +164,10 @@ private fun Project.configureLint(lint: Lint, isLibrary: Boolean) {
     val lintChecksProject = findLintProject(":lint-checks") ?: return
     project.dependencies.add("lintChecks", lintChecksProject)
 
-    if (extension.type == LibraryType.GRADLE_PLUGIN) {
+    if (
+        extension.type == LibraryType.GRADLE_PLUGIN ||
+            extension.type == LibraryType.INTERNAL_GRADLE_PLUGIN
+    ) {
         project.rootProject.findProject(":lint:lint-gradle")?.let {
             project.dependencies.add("lintChecks", it)
         }

diff --git a/buildSrc/public/src/main/kotlin/androidx/build/AndroidXExtension.kt b/buildSrc/public/src/main/kotlin/androidx/build/AndroidXExtension.kt
@@ -294,22 +294,15 @@ abstract class AndroidXExtension(
 
     private var extraLicenses: MutableCollection<License> = ArrayList()
 
-    // Should only be used to override LibraryType.publish, if a library isn't ready to publish yet
-    var publish: Publish = Publish.UNSET
-
     fun shouldPublish(): Boolean =
-        if (publish != Publish.UNSET) {
-            publish.shouldPublish()
-        } else if (type != LibraryType.UNSET) {
+        if (type != LibraryType.UNSET) {
             type.publish.shouldPublish()
         } else {
             false
         }
 
     fun shouldRelease(): Boolean =
-        if (publish != Publish.UNSET) {
-            publish.shouldRelease()
-        } else if (type != LibraryType.UNSET) {
+        if (type != LibraryType.UNSET) {
             type.publish.shouldRelease()
         } else {
             false
@@ -323,7 +316,7 @@ abstract class AndroidXExtension(
         }
     }
 
-    fun isPublishConfigured(): Boolean = (publish != Publish.UNSET || type.publish != Publish.UNSET)
+    fun isPublishConfigured(): Boolean = type.publish != Publish.UNSET
 
     fun shouldPublishSbom(): Boolean {
         if (isIsolatedProjectsEnabled()) return false