Merge pull request #12 from olafurpg/lsif-java

Author: olafurpg

.github/workflows/sourcegraph.yml

@@ -14,7 +14,6 @@ jobs:
       - uses: actions/setup-go@v2
         with:
           go-version: "1.15.6"
-      - run: go get github.com/sourcegraph/lsif-semanticdb/cmd/lsif-semanticdb
       - run: |
           mkdir -p bin
           curl -L https://sourcegraph.com/.api/src-cli/src_linux_amd64 -o bin/src

build.sbt

@@ -22,7 +22,7 @@ inThisBuild(
   )
 )
 
-skip in publish := true
+publish / skip := true
 
 lazy val plugin = project
   .settings(

plugin/src/main/resources/sbt-sourcegraph/coursier

@@ -2,6 +2,8 @@ import sbt._
 import sbt.Keys._
 import sbt.plugins.JvmPlugin
 import scala.sys.process._
+import java.nio.file.Files
+import java.nio.file.StandardCopyOption
 
 object SourcegraphPlugin extends AutoPlugin {
   override def trigger = allRequirements
@@ -24,9 +26,9 @@ object SourcegraphPlugin extends AutoPlugin {
       taskKey[Option[String]](
         "URL of your Sourcegraph instance. By default, uploads to https://sourcegraph.com."
       )
-    val sourcegraphLsifSemanticdbBinary: SettingKey[String] =
-      settingKey[String](
-        "Binary name of the lsif-semanticdb command-line tool. By default, assumes the binary name 'lsif-semanticdb' is available on the $PATH."
+    val sourcegraphCoursierBinary: TaskKey[String] =
+      taskKey[String](
+        "Binary name of the Coursier command-line tool. By default, Coursier is launched from a small binary that's embedded in resources."
       )
     val sourcegraphSrcBinary: SettingKey[String] =
       settingKey[String](
@@ -52,20 +54,40 @@ object SourcegraphPlugin extends AutoPlugin {
   import autoImport._
 
   override lazy val globalSettings: Seq[Def.Setting[_]] = List(
-    sourcegraphLsifSemanticdbBinary := "lsif-semanticdb",
     sourcegraphSrcBinary := "src",
     sourcegraphEndpoint := None,
     sourcegraphExtraUploadArguments := Nil,
-    sourcegraphRoot := baseDirectory.in(ThisBuild).value,
-    target.in(Sourcegraph) := baseDirectory.in(ThisBuild).value /
+    sourcegraphRoot := (ThisBuild / baseDirectory).value,
+    Sourcegraph / target := (ThisBuild / baseDirectory).value /
       "target" / "sbt-sourcegraph",
+    sourcegraphCoursierBinary := {
+      val out = (Sourcegraph / target).value / "coursier"
+      if (!out.exists()) {
+        val key = "/sbt-sourcegraph/coursier"
+        val in = this.getClass().getResourceAsStream(key)
+        if (in == null) {
+          throw new NoSuchElementException(
+            s"the resource '$key' does not exist. " +
+              "To fix this problem, define the `sourcegraphCoursierBinary` setting."
+          )
+        }
+        try {
+          out.getParentFile().mkdirs()
+          Files.copy(in, out.toPath(), StandardCopyOption.REPLACE_EXISTING)
+        } finally {
+          in.close()
+        }
+        out.setExecutable(true)
+      }
+      out.getAbsolutePath()
+    },
     sourcegraphLsif := {
-      val out = target.in(Sourcegraph).value / "dump.lsif"
+      val out = (Sourcegraph / target).value / "dump.lsif"
       out.getParentFile.mkdirs()
       val directories =
         sourcegraphSemanticdbDirectories.all(anyProjectFilter).value
       val directoryArguments = directories.iterator.flatten
-        .map(dir => s"--semanticdbDir=${dir.getAbsolutePath()}")
+        .map(_.getAbsolutePath())
         .toList
       if (directoryArguments.isEmpty) {
         throw new TaskException(
@@ -74,8 +96,13 @@ object SourcegraphPlugin extends AutoPlugin {
         )
       }
       runProcess(
-        sourcegraphLsifSemanticdbBinary.value ::
-          s"--out=$out" ::
+        sourcegraphCoursierBinary.value ::
+          "launch" ::
+          "--contrib" ::
+          "lsif-java" ::
+          "--" ::
+          "index-semanticdb" ::
+          s"--output=$out" ::
           directoryArguments
       )
       out

plugin/src/main/scala/com/sourcegraph/sbtsourcegraph/SourcegraphPlugin.scala

@@ -1 +1 @@
-sbt.version=1.4.6
+sbt.version=1.5.2

project/build.properties

@@ -3,6 +3,9 @@ addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.10.0")
 addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.3.4")
 addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.25")
 
-unmanagedSourceDirectories.in(Compile) +=
-  baseDirectory.in(ThisBuild).value.getParentFile /
+Compile / unmanagedSourceDirectories +=
+  (ThisBuild / baseDirectory).value.getParentFile /
     "plugin" / "src" / "main" / "scala"
+Compile / unmanagedResourceDirectories +=
+  (ThisBuild / baseDirectory).value.getParentFile /
+    "plugin" / "src" / "main" / "resources"

project/plugins.sbt

@@ -110,10 +110,8 @@ can adjust the installation steps from
 [`sourcegraph.yml`](.github/workflows/sourcegraph.yml) to work with your own CI
 system.
 
-In short, first install the following binaries to `$PATH`.
-
-- https://github.com/sourcegraph/lsif-semanticdb as `lsif-semanticdb`
-- https://github.com/sourcegraph/src-cli as `src`
+First, install the `src` command-line tool
+(https://github.com/sourcegraph/src-cli) to `$PATH`.
 
 Next, create a GitHub access token following the instructions
 [here](https://docs.sourcegraph.com/admin/external_service/github#github-api-token-and-access).
@@ -145,9 +143,9 @@ sbt sourcegraphUpload
 **Optional settings**:
 
 - `sourcegraphEndpoint: String`: URL of the Sourcegraph instance.
-- `sourcegraphLsifSemanticdbBinary: String`: path to the
-  [`lsif-semanticdb`](https://github.com/sourcegraph/lsif-semanticdb/) binary.
-  The `lsif-semanticdb` binary needs to be installed separately.
+- `sourcegraphCoursierBinary: String`: name of the `coursier` command-line
+  interface. By default, sbt-sourcegraph launches coursier from a binary that's
+  embedded in the resources.
 - `sourcegraphSrcBinary: String`: path to the
   [`src`](https://github.com/sourcegraph/src-cli) binary. The `src` binary needs
   to be installed separately.
@@ -156,6 +154,11 @@ sbt sourcegraphUpload
   flags you may want to configure.
 - `sourcegraphRoot: String`: root directory of this sbt build.
 
+**Removed settings**:
+
+- (no longer used) `sourcegraphLsifSemanticdbBinary: String`: path to the
+  [`lsif-semanticdb`](https://github.com/sourcegraph/lsif-semanticdb/) binary.
+
 ## Disable plugin for specific project
 
 Use `.disablePlugins(SourcegraphPlugin))` to disable this plugin for a specific