Switch to using gradle artifact APIs for root project tasks

build.gradle.kts

@@ -75,7 +75,12 @@ tasks.withType<Detekt>().configureEach {
 
 val ktfmtVersion = libs.versions.ktfmt.get()
 
-val externalFiles = listOf("SkateErrorHandler", "MemoizedSequence").map { "src/**/$it.kt" }
+val externalFiles = listOf(
+  "SkateErrorHandler",
+  "MemoizedSequence",
+  "Publisher",
+  "Resolver",
+).map { "src/**/$it.kt" }
 
 allprojects {
   apply(plugin = "com.diffplug.spotless")

slack-plugin/best-practices-baseline.json

@@ -0,0 +1 @@
+{"issues":[{"type":"get_subprojects","name":"getSubprojects","trace":{"trace":[{"owner":"slack/gradle/artifacts/Resolver$Companion","name":"interProjectResolver$default","descriptor":"(Lslack/gradle/artifacts/Resolver$Companion;Lorg/gradle/api/Project;Lorg/gradle/api/attributes/Attribute;Ljava/io/Serializable;Ljava/lang/String;ZILjava/lang/Object;)Lslack/gradle/artifacts/Resolver;","metadata":{"isTaskAction":false,"isVirtual":false}},{"owner":"slack/gradle/artifacts/Resolver$Companion","name":"interProjectResolver","descriptor":"(Lorg/gradle/api/Project;Lorg/gradle/api/attributes/Attribute;Ljava/io/Serializable;Ljava/lang/String;Z)Lslack/gradle/artifacts/Resolver;","metadata":{"isTaskAction":false,"isVirtual":false}},{"owner":"slack/gradle/artifacts/Resolver","name":"addSubprojectDependencies","descriptor":"(Lorg/gradle/api/Project;)V","metadata":{"isTaskAction":false,"isVirtual":false}},{"owner":"org/gradle/api/Project","name":"getSubprojects","descriptor":"()Ljava/util/Set;","metadata":{"isTaskAction":false,"isVirtual":false}}]}},{"type":"get_subprojects","name":"getSubprojects","trace":{"trace":[{"owner":"slack/stats/ModuleStatsTasks$configureRoot$1$1","name":"call","descriptor":"()Ljava/lang/Object;","metadata":{"isTaskAction":false,"isVirtual":false}},{"owner":"slack/stats/ModuleStatsTasks$configureRoot$1$1","name":"call","descriptor":"()Ljava/util/Map;","metadata":{"isTaskAction":false,"isVirtual":false}},{"owner":"org/gradle/api/Project","name":"getSubprojects","descriptor":"()Ljava/util/Set;","metadata":{"isTaskAction":false,"isVirtual":false}}]}},{"type":"get_subprojects","name":"getSubprojects","trace":{"trace":[{"owner":"slack/gradle/SlackRootPlugin","name":"apply","descriptor":"(Ljava/lang/Object;)V","metadata":{"isTaskAction":false,"isVirtual":false}},{"owner":"slack/gradle/SlackRootPlugin","name":"apply","descriptor":"(Lorg/gradle/api/Project;)V","metadata":{"isTaskAction":false,"isVirtual":false}},{"owner":"slack/gradle/SlackRootPlugin","name":"configureRootProject","descriptor":"(Lorg/gradle/api/Project;Lslack/gradle/SlackProperties;Lorg/gradle/api/provider/Provider;)V","metadata":{"isTaskAction":false,"isVirtual":false}},{"owner":"slack/gradle/tasks/AndroidTestApksTask$Companion","name":"register$slack_plugin","descriptor":"(Lorg/gradle/api/Project;)Lorg/gradle/api/tasks/TaskProvider;","metadata":{"isTaskAction":false,"isVirtual":false}},{"owner":"slack/gradle/artifacts/Resolver$Companion","name":"interProjectResolver$default","descriptor":"(Lslack/gradle/artifacts/Resolver$Companion;Lorg/gradle/api/Project;Lslack/gradle/artifacts/SgpArtifact;ZILjava/lang/Object;)Lslack/gradle/artifacts/Resolver;","metadata":{"isTaskAction":false,"isVirtual":false}},{"owner":"slack/gradle/artifacts/Resolver$Companion","name":"interProjectResolver","descriptor":"(Lorg/gradle/api/Project;Lslack/gradle/artifacts/SgpArtifact;Z)Lslack/gradle/artifacts/Resolver;","metadata":{"isTaskAction":false,"isVirtual":false}},{"owner":"slack/gradle/artifacts/Resolver$Companion","name":"interProjectResolver","descriptor":"(Lorg/gradle/api/Project;Lorg/gradle/api/attributes/Attribute;Ljava/io/Serializable;Ljava/lang/String;Z)Lslack/gradle/artifacts/Resolver;","metadata":{"isTaskAction":false,"isVirtual":false}},{"owner":"slack/gradle/artifacts/Resolver","name":"addSubprojectDependencies","descriptor":"(Lorg/gradle/api/Project;)V","metadata":{"isTaskAction":false,"isVirtual":false}},{"owner":"org/gradle/api/Project","name":"getSubprojects","descriptor":"()Ljava/util/Set;","metadata":{"isTaskAction":false,"isVirtual":false}}]}},{"type":"get_subprojects","name":"getSubprojects","trace":{"trace":[{"owner":"slack/gradle/SlackRootPlugin$configureRootProject$10","name":"execute","descriptor":"(Ljava/lang/Object;)V","metadata":{"isTaskAction":false,"isVirtual":false}},{"owner":"slack/gradle/SlackRootPlugin$configureRootProject$10","name":"execute","descriptor":"(Lorg/gradle/api/plugins/AppliedPlugin;)V","metadata":{"isTaskAction":false,"isVirtual":false}},{"owner":"slack/dependencyrake/MissingIdentifiersAggregatorTask$Companion","name":"register","descriptor":"(Lorg/gradle/api/Project;)Lorg/gradle/api/tasks/TaskProvider;","metadata":{"isTaskAction":false,"isVirtual":false}},{"owner":"slack/gradle/artifacts/Resolver$Companion","name":"interProjectResolver$default","descriptor":"(Lslack/gradle/artifacts/Resolver$Companion;Lorg/gradle/api/Project;Lslack/gradle/artifacts/SgpArtifact;ZILjava/lang/Object;)Lslack/gradle/artifacts/Resolver;","metadata":{"isTaskAction":false,"isVirtual":false}},{"owner":"slack/gradle/artifacts/Resolver$Companion","name":"interProjectResolver","descriptor":"(Lorg/gradle/api/Project;Lslack/gradle/artifacts/SgpArtifact;Z)Lslack/gradle/artifacts/Resolver;","metadata":{"isTaskAction":false,"isVirtual":false}},{"owner":"slack/gradle/artifacts/Resolver$Companion","name":"interProjectResolver","descriptor":"(Lorg/gradle/api/Project;Lorg/gradle/api/attributes/Attribute;Ljava/io/Serializable;Ljava/lang/String;Z)Lslack/gradle/artifacts/Resolver;","metadata":{"isTaskAction":false,"isVirtual":false}},{"owner":"slack/gradle/artifacts/Resolver","name":"addSubprojectDependencies","descriptor":"(Lorg/gradle/api/Project;)V","metadata":{"isTaskAction":false,"isVirtual":false}},{"owner":"org/gradle/api/Project","name":"getSubprojects","descriptor":"()Ljava/util/Set;","metadata":{"isTaskAction":false,"isVirtual":false}}]}}]}

slack-plugin/src/main/kotlin/slack/dependencyrake/DependencyRake.kt

@@ -43,6 +43,8 @@ import org.gradle.api.tasks.PathSensitivity
 import org.gradle.api.tasks.TaskAction
 import org.gradle.api.tasks.TaskProvider
 import org.gradle.api.tasks.UntrackedTask
+import slack.gradle.artifacts.Resolver
+import slack.gradle.artifacts.SgpArtifact
 import slack.gradle.convertProjectPathToAccessor
 import slack.gradle.property
 import slack.gradle.util.mapToBoolean
@@ -459,7 +461,10 @@ internal abstract class MissingIdentifiersAggregatorTask : DefaultTask() {
     const val NAME = "aggregateMissingIdentifiers"
 
     fun register(rootProject: Project): TaskProvider<MissingIdentifiersAggregatorTask> {
+      val resolver =
+        Resolver.interProjectResolver(rootProject, SgpArtifact.DAGP_MISSING_IDENTIFIERS)
       return rootProject.tasks.register(NAME, MissingIdentifiersAggregatorTask::class.java) {
+        inputFiles.from(resolver.artifactView())
         outputFile.set(
           rootProject.layout.buildDirectory.file("rake/aggregated_missing_identifiers.txt")
         )

slack-plugin/src/main/kotlin/slack/gradle/GlobalConfig.kt

@@ -16,14 +16,11 @@
 package slack.gradle
 
 import org.gradle.api.Project
-import org.gradle.api.tasks.TaskProvider
 import org.gradle.jvm.toolchain.JvmVendorSpec
-import slack.gradle.tasks.robolectric.UpdateRobolectricJarsTask
 
 /** Registry of global configuration info. */
 public class GlobalConfig
 private constructor(
-  internal val updateRobolectricJarsTask: TaskProvider<UpdateRobolectricJarsTask>?,
   internal val kotlinDaemonArgs: List<String>,
   internal val errorProneCheckNamesAsErrors: List<String>,
   internal val affectedProjects: Set<String>?,
@@ -34,10 +31,7 @@ private constructor(
     operator fun invoke(project: Project): GlobalConfig {
       check(project == project.rootProject) { "Project is not root project!" }
       val globalSlackProperties = SlackProperties(project)
-      val robolectricJarsDownloadTask =
-        project.createRobolectricJarsDownloadTask(globalSlackProperties)
       return GlobalConfig(
-        updateRobolectricJarsTask = robolectricJarsDownloadTask,
         kotlinDaemonArgs = globalSlackProperties.kotlinDaemonArgs.split(" "),
         errorProneCheckNamesAsErrors =
           globalSlackProperties.errorProneCheckNamesAsErrors?.split(":").orEmpty(),
@@ -63,18 +57,3 @@ private constructor(
     }
   }
 }
-
-private fun Project.createRobolectricJarsDownloadTask(
-  slackProperties: SlackProperties
-): TaskProvider<UpdateRobolectricJarsTask>? {
-  if (slackProperties.versions.robolectric == null) {
-    // Not enabled
-    return null
-  }
-
-  check(isRootProject) {
-    "Robolectric jars task should only be created once on the root project. Tried to apply on $name"
-  }
-
-  return UpdateRobolectricJarsTask.register(this, slackProperties)
-}

slack-plugin/src/main/kotlin/slack/gradle/GradleExt.kt

@@ -321,3 +321,13 @@ internal inline fun <reified T : Any> Project.serviceOf(): T =
   (this as ProjectInternal).services.get()
 
 internal inline fun <reified T : Any> ServiceRegistry.get(): T = this[T::class.java]!!
+
+@Suppress("UNCHECKED_CAST")
+internal inline fun <reified T : Task> TaskContainer.registerOrConfigure(
+  taskName: String,
+  crossinline configureAction: T.() -> Unit
+): TaskProvider<T> =
+  when (taskName) {
+    in names -> named(taskName) as TaskProvider<T>
+    else -> register(taskName, T::class.java)
+  }.apply { configure { configureAction() } }

slack-plugin/src/main/kotlin/slack/gradle/SlackBasePlugin.kt

@@ -25,7 +25,6 @@ import org.gradle.api.Project
 import org.gradle.api.artifacts.Configuration
 import org.gradle.api.artifacts.MinimalExternalModuleDependency
 import org.gradle.api.provider.Provider
-import slack.gradle.tasks.CoreBootstrapTask
 import slack.stats.ModuleStatsTasks
 
 /**
@@ -43,7 +42,6 @@ internal class SlackBasePlugin : Plugin<Project> {
         target.getVersionsCatalogOrNull() ?: error("SGP requires use of version catalogs!")
       val slackTools = target.slackTools()
       StandardProjectConfigurations(slackProperties, versionCatalog, slackTools).applyTo(target)
-      CoreBootstrapTask.configureSubprojectBootstrapTasks(target)
 
       // Configure Gradle's test-retry plugin for insights on build scans on CI only
       // Thinking here is that we don't want them to retry when iterating since failure

slack-plugin/src/main/kotlin/slack/gradle/SlackRootPlugin.kt

@@ -42,6 +42,7 @@ import slack.gradle.tasks.InstallCommitHooksTask
 import slack.gradle.tasks.KtLintDownloadTask
 import slack.gradle.tasks.KtfmtDownloadTask
 import slack.gradle.tasks.SortDependenciesDownloadTask
+import slack.gradle.tasks.robolectric.UpdateRobolectricJarsTask
 import slack.gradle.util.JsonTools
 import slack.gradle.util.Thermals
 import slack.gradle.util.ThermalsData
@@ -92,6 +93,7 @@ internal class SlackRootPlugin @Inject constructor(private val buildFeatures: Bu
     } else {
       project.logger.debug("Skippy is disabled")
     }
+
     SlackTools.register(
       project = project,
       logThermals = logThermals,
@@ -145,6 +147,11 @@ internal class SlackRootPlugin @Inject constructor(private val buildFeatures: Bu
     UnitTests.configureRootProject(project)
     ModuleStatsTasks.configureRoot(project, slackProperties)
     ComputeAffectedProjectsTask.register(project, slackProperties)
+    // Register robolectric jar downloads if requested
+    slackProperties.versions.robolectric?.let {
+      UpdateRobolectricJarsTask.register(project, slackProperties)
+    }
+
     val scanApi = ScanApi(project)
     if (slackProperties.applyCommonBuildTags) {
       project.configureBuildScanMetadata(scanApi)

slack-plugin/src/main/kotlin/slack/gradle/StandardProjectConfigurations.kt

@@ -57,19 +57,21 @@ import org.jetbrains.kotlin.gradle.dsl.kotlinExtension
 import org.jetbrains.kotlin.gradle.internal.KaptGenerateStubsTask
 import org.jetbrains.kotlin.gradle.plugin.KaptExtension
 import org.jetbrains.kotlin.gradle.plugin.KotlinBasePlugin
-import org.jetbrains.kotlin.gradle.utils.named
-import slack.dependencyrake.MissingIdentifiersAggregatorTask
 import slack.dependencyrake.RakeDependencies
 import slack.gradle.AptOptionsConfig.AptOptionsConfigurer
 import slack.gradle.AptOptionsConfigs.invoke
-import slack.gradle.avoidance.ComputeAffectedProjectsTask
+import slack.gradle.artifacts.Publisher
+import slack.gradle.artifacts.SgpArtifact
 import slack.gradle.dependencies.BuildConfig
 import slack.gradle.dependencies.SlackDependencies
 import slack.gradle.lint.DetektTasks
 import slack.gradle.lint.LintTasks
 import slack.gradle.permissionchecks.PermissionChecks
 import slack.gradle.tasks.AndroidTestApksTask
 import slack.gradle.tasks.CheckManifestPermissionsTask
+import slack.gradle.tasks.SimpleFileProducerTask
+import slack.gradle.tasks.publishWith
+import slack.gradle.tasks.robolectric.UpdateRobolectricJarsTask
 import slack.gradle.util.booleanProperty
 import slack.gradle.util.configureKotlinCompilationTask
 import slack.gradle.util.setDisallowChanges
@@ -231,13 +233,9 @@ internal class StandardProjectConfigurations(
               configure<DependencyAnalysisSubExtension> {
                 registerPostProcessingTask(rakeDependencies)
               }
-              val aggregator =
-                project.rootProject.tasks.named<MissingIdentifiersAggregatorTask>(
-                  MissingIdentifiersAggregatorTask.NAME
-                )
-              aggregator.configure {
-                inputFiles.from(rakeDependencies.flatMap { it.missingIdentifiersFile })
-              }
+              val publisher =
+                Publisher.interProjectPublisher(project, SgpArtifact.DAGP_MISSING_IDENTIFIERS)
+              publisher.publish(rakeDependencies.flatMap { it.missingIdentifiersFile })
             }
           }
         }
@@ -449,16 +447,13 @@ internal class StandardProjectConfigurations(
     slackProperties: SlackProperties,
   ) {
     val javaVersion = JavaVersion.toVersion(jvmTargetVersion)
-    val computeAffectedProjectsTask =
-      project.rootProject.tasks.named(
-        ComputeAffectedProjectsTask.NAME,
-        ComputeAffectedProjectsTask::class.java
-      )
     // Contribute these libraries to Fladle if they opt into it
-    val androidTestApksAggregator =
-      project.rootProject.tasks.named(AndroidTestApksTask.NAME, AndroidTestApksTask::class.java)
+    val androidTestApksPublisher =
+      Publisher.interProjectPublisher(project, SgpArtifact.ANDROID_TEST_APK_DIRS)
     val projectPath = project.path
     val isAffectedProject = slackTools.globalConfig.affectedProjects?.contains(projectPath) ?: true
+    val skippyAndroidTestProjectPublisher =
+      Publisher.interProjectPublisher(project, SgpArtifact.SKIPPY_ANDROID_TEST_PROJECT)
 
     val commonComponentsExtension =
       Action<AndroidComponentsExtension<*, *, *>> {
@@ -505,12 +500,22 @@ internal class StandardProjectConfigurations(
           val isAndroidTestEnabled = variant is HasAndroidTest && variant.androidTest != null
           if (isAndroidTestEnabled) {
             if (!excluded && isAffectedProject) {
-              computeAffectedProjectsTask.configure { androidTestProjects.add(projectPath) }
+              // Note this intentionally just uses the same task each time as they always produce
+              // the same output
+              SimpleFileProducerTask.registerOrConfigure(
+                  project,
+                  name = "androidTestProjectMetadata",
+                  description =
+                    "Produces a metadata artifact indicating this project path produces an androidTest APK.",
+                  input = projectPath,
+                  group = "skippy"
+                )
+                .publishWith(skippyAndroidTestProjectPublisher)
               if (isLibraryVariant) {
                 (variant as LibraryVariant).androidTest?.artifacts?.get(SingleArtifact.APK)?.let {
                   apkArtifactsDir ->
-                  // Wire this up to the aggregator
-                  androidTestApksAggregator.configure { androidTestApkDirs.from(apkArtifactsDir) }
+                  // Wire this up to the aggregator. No need for an intermediate task here.
+                  androidTestApksPublisher.publishDirs(apkArtifactsDir)
                 }
               }
             } else {
@@ -588,12 +593,12 @@ internal class StandardProjectConfigurations(
                 //
                 // Note that we can't configure this to _just_ be enabled for robolectric projects
                 // based on dependencies unfortunately, as the task graph is already wired by the
-                // time
-                // dependencies start getting resolved.
+                // time dependencies start getting resolved.
                 //
-                slackTools.globalConfig.updateRobolectricJarsTask?.let {
+                slackProperties.versions.robolectric?.let {
                   logger.debug("Configuring $name test task to depend on Robolectric jar downloads")
-                  test.dependsOn(it)
+                  // Depending on the root project task by name alone is ok for Project Isolation
+                  test.dependsOn(UpdateRobolectricJarsTask.NAME)
                 }
 
                 // Necessary for some OkHttp-using tests to work on JDK 11 in Robolectric