Address review comments

olafurpg · olafurpg · commit e313c2e6191f · 2023-07-20T16:19:53.000+02:00
diff --git a/scip-java/src/main/scala/com/sourcegraph/scip_java/buildtools/ClasspathEntry.scala b/scip-java/src/main/scala/com/sourcegraph/scip_java/buildtools/ClasspathEntry.scala
@@ -12,8 +12,9 @@ import scala.jdk.CollectionConverters._
 import com.sourcegraph.scip_semanticdb.MavenPackage
 
 /**
- * Represents a single jar file on the classpath of a project, used to emit SCIP
- * "packageInformation" nodes.
+ * Represents a single classpath entry on the classpath of a project, used to
+ * emit SCIP "packageInformation" nodes. A classpath entry can either be a jar
+ * file or a directory path.
  */
 case class ClasspathEntry(
     entry: Path,
diff --git a/semanticdb-gradle-plugin/src/main/scala/SemanticdbGradlePlugin.scala b/semanticdb-gradle-plugin/src/main/scala/SemanticdbGradlePlugin.scala
@@ -5,7 +5,7 @@ import java.nio.file.Paths
 import java.{util => ju}
 
 import scala.jdk.CollectionConverters._
-import scala.util.Try
+import scala.util.control.NonFatal
 
 import com.sourcegraph.scip_java.BuildInfo
 import org.gradle.api.DefaultTask
@@ -405,35 +405,42 @@ class WriteDependencies extends DefaultTask {
     // List the project itself as a dependency so that we can assign project name/version to symbols that are defined in this project.
     // The code below is roughly equivalent to the following with Groovy:
     //   deps += "$publication.groupId $publication.artifactId $publication.version $sourceSets.main.output.classesDirectory"
-    Try(
-      project
-        .getExtensions()
-        .getByType(classOf[SourceSetContainer])
-        .getByName("main")
-        .getOutput()
-        .getClassesDirs()
-        .getFiles()
-        .asScala
-        .toList
-        .map(_.getAbsolutePath())
-        .sorted
-        .headOption
-    ).collect { case Some(classesDirectory) =>
-      project
-        .getExtensions()
-        .findByType(classOf[PublishingExtension])
-        .getPublications()
-        .withType(classOf[MavenPublication])
-        .asScala
-        .foreach { publication =>
-          deps +=
-            List(
-              publication.getGroupId(),
-              publication.getArtifactId(),
-              publication.getVersion(),
-              classesDirectory
-            ).mkString("\t")
-        }
+    try {
+      for {
+        classesDirectory <- project
+          .getExtensions()
+          .getByType(classOf[SourceSetContainer])
+          .getByName("main")
+          .getOutput()
+          .getClassesDirs()
+          .getFiles()
+          .asScala
+          .toList
+          .map(_.getAbsolutePath())
+          .sorted
+          .take(1)
+        publication <-
+          project
+            .getExtensions()
+            .findByType(classOf[PublishingExtension])
+            .getPublications()
+            .withType(classOf[MavenPublication])
+            .asScala
+      } {
+        deps +=
+          List(
+            publication.getGroupId(),
+            publication.getArtifactId(),
+            publication.getVersion(),
+            classesDirectory
+          ).mkString("\t")
+      }
+    } catch {
+      case NonFatal(ex) =>
+        println(
+          s"Failed to extract publication from project ${project.getName()}"
+        )
+        ex.printStackTrace()
     }
 
     project
