Simplify Gradle cleanup

Author: jupblb

build-logic/src/main/kotlin/com/sourcegraph/buildlogic/ScipCompile.kt

@@ -4,6 +4,7 @@ import java.io.File
 import org.gradle.api.Task
 import org.gradle.api.artifacts.Configuration
 import org.gradle.api.file.Directory
+import org.gradle.api.file.FileSystemLocation
 import org.gradle.api.provider.Provider
 import org.gradle.api.tasks.compile.JavaCompile
 
@@ -26,6 +27,29 @@ fun JavaCompile.useScipJavac(
         (options.forkOptions.jvmArgs ?: emptyList()) + JavacInternals.jvmOptions(rootDir)
 }
 
+/**
+ * Builds the `kotlinc` arguments that load the scip-kotlinc compiler plugin from [pluginClasspath]
+ * (the resolved shaded jar) and point it at [sourceroot]/[targetroot].
+ *
+ * The mapping lives here, in compiled build logic, rather than in a build script: a `.map {}`
+ * lambda declared in a `.gradle.kts` file captures a hidden reference to the script object, which
+ * the configuration cache cannot serialize.
+ */
+fun scipKotlincPluginArgs(
+    pluginClasspath: Provider<Set<FileSystemLocation>>,
+    sourceroot: String,
+    targetroot: String,
+): Provider<List<String>> =
+    pluginClasspath.map { locations ->
+        listOf(
+            "-Xplugin=${locations.single().asFile.absolutePath}",
+            "-P",
+            "plugin:scip-kotlinc:sourceroot=$sourceroot",
+            "-P",
+            "plugin:scip-kotlinc:targetroot=$targetroot",
+        )
+    }
+
 /**
  * Registers a `doFirst` action that empties [dir] (deletes then recreates it) before the task runs.
  *

build-logic/src/main/kotlin/com/sourcegraph/buildlogic/SharedArtifacts.kt

@@ -3,7 +3,6 @@ package com.sourcegraph.buildlogic
 import org.gradle.api.Project
 import org.gradle.api.artifacts.Configuration
 import org.gradle.api.file.Directory
-import org.gradle.api.file.FileSystemLocation
 import org.gradle.api.provider.Provider
 
 /**
@@ -43,26 +42,3 @@ fun Project.publishDirectoryArtifact(
     val elements = configurations.consumable(name).get()
     artifacts.add(elements.name, directory) { builtBy(producedBy) }
 }
-
-/**
- * Builds the `kotlinc` arguments that load the scip-kotlinc compiler plugin from [pluginClasspath]
- * (the resolved shaded jar) and point it at [sourceroot]/[targetroot].
- *
- * The mapping lives here, in compiled build logic, rather than in a build script: a `.map {}`
- * lambda declared in a `.gradle.kts` file captures a hidden reference to the script object, which
- * the configuration cache cannot serialize.
- */
-fun scipKotlincPluginArgs(
-    pluginClasspath: Provider<Set<FileSystemLocation>>,
-    sourceroot: String,
-    targetroot: String,
-): Provider<List<String>> =
-    pluginClasspath.map { locations ->
-        listOf(
-            "-Xplugin=${locations.single().asFile.absolutePath}",
-            "-P",
-            "plugin:scip-kotlinc:sourceroot=$sourceroot",
-            "-P",
-            "plugin:scip-kotlinc:targetroot=$targetroot",
-        )
-    }

scip-aggregator/build.gradle.kts

@@ -1,4 +1,3 @@
-import com.google.protobuf.gradle.ProtobufExtension
 import com.google.protobuf.gradle.proto
 
 plugins {

scip-snapshots/build.gradle.kts

@@ -33,7 +33,6 @@ tasks.named<Test>("test") {
 tasks.register<JavaExec>("saveSnapshots") {
     group = "verification"
     description = "Regenerates Java and Kotlin SCIP snapshot goldens."
-    dependsOn(tasks.named("classes"))
     inputs.files(javaTargetroot, kotlinTargetroot)
     val sourceSets = project.extensions.getByType<SourceSetContainer>()
     classpath = sourceSets.named("main").get().runtimeClasspath

scip-snapshots/src/main/java/tests/MinimizedSnapshotScipGenerator.java

@@ -11,7 +11,6 @@
 import java.util.Arrays;
 import java.util.Comparator;
 import java.util.List;
-import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import org.scip_code.scip.Document;
 import org.scip_code.scip.Index;
@@ -115,35 +114,19 @@ public void onTargetroot(
    * target-root (as {@code -Dsnapshot.case.<id>.targetroot}) and the source root, which are
    * build-time paths.
    */
-  private static final List<CaseSpec> CASE_SPECS =
-      Arrays.asList(
-          new CaseSpec("java-common", "scip-snapshots/expected/java/common", false),
-          new CaseSpec("kotlin-common", "scip-snapshots/expected/kotlin/common", true));
-
-  private static final class CaseSpec {
-    final String id;
-    final String relativeExpectDirectory;
-    final boolean aggregateNoEmitInverseRelationships;
-
-    CaseSpec(
-        String id, String relativeExpectDirectory, boolean aggregateNoEmitInverseRelationships) {
-      this.id = id;
-      this.relativeExpectDirectory = relativeExpectDirectory;
-      this.aggregateNoEmitInverseRelationships = aggregateNoEmitInverseRelationships;
-    }
-  }
-
   public static List<SnapshotCase> snapshotCases() {
     Path sourceroot = requiredPathProperty("snapshot.sourceroot");
-    return CASE_SPECS.stream()
-        .map(
-            spec ->
-                new SnapshotCase(
-                    spec.id,
-                    sourceroot.resolve(spec.relativeExpectDirectory),
-                    requiredPathProperty("snapshot.case." + spec.id + ".targetroot"),
-                    spec.aggregateNoEmitInverseRelationships))
-        .collect(Collectors.toList());
+    return Arrays.asList(
+        new SnapshotCase(
+            "java-common",
+            sourceroot.resolve("scip-snapshots/expected/java/common"),
+            requiredPathProperty("snapshot.case.java-common.targetroot"),
+            false),
+        new SnapshotCase(
+            "kotlin-common",
+            sourceroot.resolve("scip-snapshots/expected/kotlin/common"),
+            requiredPathProperty("snapshot.case.kotlin-common.targetroot"),
+            true));
   }
 
   public static Path requiredPathProperty(String name) {