Remove BuildInfo

Author: jupblb

build.gradle.kts

@@ -14,6 +14,7 @@ import org.gradle.api.tasks.compile.JavaCompile
 import org.gradle.api.tasks.javadoc.Javadoc
 import org.gradle.api.tasks.testing.Test
 import org.gradle.external.javadoc.StandardJavadocDocletOptions
+import org.gradle.jvm.tasks.Jar
 import org.gradle.language.jvm.tasks.ProcessResources
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
@@ -311,16 +312,18 @@ project(":scip-java") {
             rename { "scip-kotlinc.jar" }
         }
         into(layout.buildDirectory.dir("generated/resources/embedded"))
-        inputs.property("version", project.version.toString())
-        doLast {
-            destinationDir.resolve("scip-java.properties").writeText("version=${project.version}\n")
-        }
     }
 
     tasks.named<ProcessResources>("processResources") {
         from(generateEmbeddedResources)
     }
 
+    tasks.named<Jar>("jar") {
+        manifest {
+            attributes("Implementation-Version" to project.version)
+        }
+    }
+
     val generateDistributionVersion = tasks.register("generateDistributionVersion") {
         val output = layout.buildDirectory.file("generated/distribution/VERSION")
         inputs.property("version", project.version.toString())

scip-java/src/main/kotlin/com/sourcegraph/scip_java/BuildInfo.kt

@@ -8,6 +8,16 @@ import java.nio.file.StandardCopyOption
 
 object Embedded {
 
+    /** `javac` launcher flags required by the SCIP plugin to access internal javac APIs. */
+    val javacModuleOptions: List<String> =
+        listOf(
+            "-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED",
+            "-J--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED",
+            "-J--add-exports=jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED",
+            "-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED",
+            "-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED",
+        )
+
     fun scipJar(tmpDir: Path): Path = copyFile(tmpDir, "scip-plugin.jar")
 
     fun gradlePluginJar(tmpDir: Path): Path = copyFile(tmpDir, "gradle-plugin.jar")
@@ -32,7 +42,7 @@ object Embedded {
         val newJavacopts = tmp.resolve("javac_newarguments")
         // --add-exports flags required to access internal javac APIs from our
         // SCIP plugin. Always set; Java 11+ is the supported baseline.
-        val javacModuleOptions = BuildInfo.javacModuleOptions.joinToString(" ")
+        val javacModuleOptionsText = javacModuleOptions.joinToString(" ")
         val injectScipArguments =
             listOf(
                     "java",
@@ -59,9 +69,11 @@ object Embedded {
             append("done\n")
             append(injectScipArguments).append('\n')
             append("if [ \${#LAUNCHER_ARGS[@]} -eq 0 ]; then\n")
-            append("  javac $javacModuleOptions \"@\$NEW_JAVAC_OPTS\"\n")
+            append("  javac $javacModuleOptionsText \"@\$NEW_JAVAC_OPTS\"\n")
             append("else\n")
-            append("  javac $javacModuleOptions \"@\$NEW_JAVAC_OPTS\" \"\${LAUNCHER_ARGS[@]}\"\n")
+            append(
+                "  javac $javacModuleOptionsText \"@\$NEW_JAVAC_OPTS\" \"\${LAUNCHER_ARGS[@]}\"\n"
+            )
             append("fi\n")
         }
         Files.write(javac, script.toByteArray(StandardCharsets.UTF_8))

scip-java/src/main/kotlin/com/sourcegraph/scip_java/Embedded.kt

@@ -10,6 +10,10 @@ object ScipJava {
 
     @JvmField val app: ScipJavaApp = ScipJavaApp()
 
+    val version: String by lazy {
+        ScipJava::class.java.`package`?.implementationVersion ?: "0.0.0-SNAPSHOT"
+    }
+
     @JvmStatic
     fun main(args: Array<String>) {
         app.runAndExitIfNonZero(args.toList())

scip-java/src/main/kotlin/com/sourcegraph/scip_java/ScipJava.kt

@@ -65,7 +65,7 @@ class ScipJavaApp {
         reporter.reset()
         val processedArgs = applyGlobalCwd(rewriteNestedOptions(args))
         val root = RootCommand(this)
-        root.versionOption(BuildInfo.version, names = setOf("--version", "-v"))
+        root.versionOption(ScipJava.version, names = setOf("--version", "-v"))
         root.subcommands(IndexCommand(), AggregateCommand(), SnapshotCommand())
         return try {
             root.parse(processedArgs)

scip-java/src/main/kotlin/com/sourcegraph/scip_java/ScipJavaApp.kt

@@ -1,6 +1,5 @@
 package com.sourcegraph.scip_java.buildtools
 
-import com.sourcegraph.scip_java.BuildInfo
 import com.sourcegraph.scip_java.Embedded
 import com.sourcegraph.scip_java.commands.IndexCommand
 import java.io.File
@@ -300,13 +299,12 @@ class ScipBuildTool(index: IndexCommand) : BuildTool("SCIP", index) {
         }
         val javac = javacPath(config)
         index.app.reporter.info("$ $javac @$argsfile")
-        val javacModuleOptions = BuildInfo.javacModuleOptions
         val jvmOptions = config.jvmOptions.map { "-J$it" }
 
         val cmd = mutableListOf<String>()
         cmd += javac.toString()
         cmd += "@$argsfile"
-        cmd += javacModuleOptions
+        cmd += Embedded.javacModuleOptions
         cmd += jvmOptions
         val result =
             ProcessRunner.run(

scip-java/src/main/kotlin/com/sourcegraph/scip_java/buildtools/ScipBuildTool.kt

@@ -2,7 +2,7 @@ package com.sourcegraph.scip_java.commands
 
 import com.sourcegraph.scip_aggregator.ScipAggregator
 import com.sourcegraph.scip_aggregator.ScipAggregatorOptions
-import com.sourcegraph.scip_java.BuildInfo
+import com.sourcegraph.scip_java.ScipJava
 import com.sourcegraph.scip_java.ScipJavaApp
 import com.sourcegraph.scip_java.buildtools.ClasspathEntry
 import java.nio.file.Path
@@ -41,7 +41,7 @@ object AggregateRunner {
                 absoluteOutput,
                 sourceroot,
                 app.reporter,
-                ToolInfo.newBuilder().setName("scip-java").setVersion(BuildInfo.version).build(),
+                ToolInfo.newBuilder().setName("scip-java").setVersion(ScipJava.version).build(),
                 parallel,
                 packages.map { it.toPackageInformation() },
                 emitInverseRelationships,