Merge pull request #25 from olafurpg/javacopts-pure-java

Miscellaneous fixes

Author: olafurpg

src/main/scala/com/sourcegraph/sbtsourcegraph/SourcegraphEnable.scala

@@ -28,17 +28,16 @@ object SourcegraphEnable {
     val scalacOptionsSettings = Seq(Compile, Test).flatMap(
       inConfig(_)(SourcegraphPlugin.relaxScalacOptionsConfigSettings)
     )
+    val semanticdbJavacVersion = Versions.semanticdbJavacVersion()
     val settings = for {
       (p, semanticdbVersion, overriddenScalaVersion) <- collectProjects(
         extracted
       )
-      enableSemanticdbPlugin <-
+      enableSemanticdbPlugin =
         List(
           Option(
-            allDependencies.in(
-              p
-            ) += "com.sourcegraph" % "semanticdb-javac" % Versions
-              .semanticdbJavacVersion()
+            allDependencies.in(p) +=
+              "com.sourcegraph" % "semanticdb-javac" % semanticdbJavacVersion
           ),
           Option(
             javacOptions.in(p) += s"-Xplugin:semanticdb " +
@@ -47,14 +46,16 @@ object SourcegraphEnable {
               s"-targetroot:${classDirectory.in(Compile).value.toPath().resolveSibling("semanticdb-classes")}"
           ),
           overriddenScalaVersion.map(v => scalaVersion.in(p) := v),
-          Option(SemanticdbPlugin.semanticdbEnabled := true),
-          Option(SemanticdbPlugin.semanticdbVersion := semanticdbVersion)
+          Option(SemanticdbPlugin.semanticdbEnabled.in(p) := true),
+          Option(SemanticdbPlugin.semanticdbVersion.in(p) := semanticdbVersion)
         ).flatten
       settings <-
         inScope(ThisScope.in(p))(
           scalacOptionsSettings
         ) ++ enableSemanticdbPlugin
     } yield settings
+    println("SETTINGS:")
+    settings.foreach(println)
     Compat.append(extracted, settings, s)
   }
 
@@ -101,6 +102,8 @@ object SourcegraphEnable {
           scalacOptionsSettings
         ) ++ addSemanticdbCompilerPlugin
     } yield settings
+    println("SETTINGS:")
+    settings.foreach(println)
     Compat.append(extracted, settings, s)
   }
 

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

@@ -167,23 +167,25 @@ object SourcegraphPlugin extends AutoPlugin {
     },
     sourcegraphSemanticdbDirectories := {
       val javacTargetroot = sourcegraphJavacTargetroot.value
-      val jars = fullClasspath.value.map(_.data)
-      val javacopts =
-        sourcegraphScalacTargetroot.value / "META-INF" / "semanticdb" / "javacopts.txt"
-      if (Files.isDirectory(javacopts.toPath().getParent())) {
-        Files.write(
-          javacopts.toPath,
-          List("-classpath", jars.mkString(File.pathSeparator)).asJava,
-          StandardOpenOption.CREATE,
-          StandardOpenOption.TRUNCATE_EXISTING
-        )
+      val jars = fullClasspath.result.value match {
+        case Value(value) => value.map(_.data)
+        case _            => Nil
       }
-      List(
+      val results = List(
         javacTargetroot,
         Option(sourcegraphScalacTargetroot.value)
       ).flatten
         .map(f => f / "META-INF" / "semanticdb")
         .filter(_.isDirectory())
+      results.headOption.foreach { dir =>
+        Files.write(
+          dir.toPath.resolve("javacopts.txt"),
+          List("-classpath", jars.mkString(File.pathSeparator)).asJava,
+          StandardOpenOption.CREATE,
+          StandardOpenOption.TRUNCATE_EXISTING
+        )
+      }
+      results
     }
   )
 

src/main/scala/com/sourcegraph/sbtsourcegraph/Versions.scala

@@ -7,7 +7,7 @@ import scala.collection.JavaConverters._
 import scala.sys.process._
 
 object Versions {
-  def scalametaVersion = "4.4.25"
+  def scalametaVersion = "4.4.26"
   private def semanticdbJavacKey = "semanticdb-javac"
 
   def semanticdbJavacVersion(): String =