.github/workflows/ci.yml

@@ -241,7 +241,7 @@ jobs:
           fetch-depth: 0
       - uses: coursier/setup-action@v1
         with:
-          jvm: 'temurin:11.0.18'
+          jvm: 'temurin:8'
       - uses: actions/setup-node@v3
         with:
           node-version: "16"

.scalafmt.conf

@@ -1,4 +1,4 @@
-version = "3.7.5"
+version = "3.7.6"
 runner.dialect = scala213
 maxColumn = 100
 docstrings.style = Asterisk

docs/build-tools/overview.md

@@ -14,7 +14,6 @@ Bloop supports several build tools with varying degree of functionality.
 | Mill       |         ✅          |                                   |
 | Bazel      |         ❌          |                                   |
 | Pants      | 🚧 work-in-progress |                                   |
-| Fury       |         ✅          |                                   |
 
 ## Build Export
 
@@ -26,7 +25,7 @@ all you need to get started with Bloop.
 Exporting your build is supported by a large array of popular Scala and Java
 build tools. However, it's a tedious process that users must remember to run
 whenever their build changes (client integrations such as
-[Metals](https://metals.rocks) can export the build automatically, but that's
+[Metals](https://scalameta.org/metals/) can export the build automatically, but that's
 usually not the case if you're interfacing directly with the bloop CLI).
 
 ## Built-in compile, test and run

etc/bloop-coursier.json

@@ -8,6 +8,6 @@
   "launcherType": "graalvm-native-image",
   "prebuilt": "$PREBUILT",
   "dependencies": [
-    "ch.epfl.scala:bloopgun_2.12:$VERSION"
+    "ch.epfl.scala:bloopgun-core_2.13:$VERSION"
   ]
 }

frontend/src/main/scala/bloop/engine/caches/SemanticDBCache.scala

@@ -2,21 +2,30 @@ package bloop.engine.caches
 
 import java.nio.file.Path
 
+import scala.collection.JavaConverters._
+import scala.concurrent.Await
+import scala.concurrent.duration.FiniteDuration
 import scala.util.Failure
 import scala.util.Success
 import scala.util.Try
 
 import bloop.DependencyResolution
 import bloop.SemanticDBCacheLock
+import bloop.engine.ExecutionContext
 import bloop.io.AbsolutePath
 import bloop.io.Paths
 import bloop.logging.Logger
+import bloop.task.Task
 
 import sbt.internal.inc.BloopComponentCompiler
 import sbt.internal.inc.BloopComponentManager
 import sbt.internal.inc.IfMissing
+import java.util.concurrent.ConcurrentHashMap
+import scala.concurrent.Future
 
 object SemanticDBCache {
+  // to avoid resolving the same fallback semanticdb version multiple times
+  private val supportedFallbackSemanticdbVersions = new ConcurrentHashMap[String, String]()
   private def fetchPlugin(
       artifact: DependencyResolution.Artifact,
       logger: Logger
@@ -57,6 +66,41 @@ object SemanticDBCache {
     }
   }
 
+  private def fallbackSemanticdbFetch(
+      scalaVersion: String,
+      artifact: DependencyResolution.Artifact,
+      logger: Logger
+  ): Either[String, AbsolutePath] = {
+    // if scala version is no longer supported find the latest supported semanticdb version
+    def versionFuture =
+      Future {
+        coursierapi.Complete
+          .create()
+          .withScalaVersion(scalaVersion)
+          .withScalaBinaryVersion(scalaVersion.split('.').take(2).mkString("."))
+          .withInput(s"org.scalameta:semanticdb-scalac_$scalaVersion:")
+          .complete()
+          .getCompletions()
+          .asScala
+          .lastOption
+      }(ExecutionContext.ioScheduler)
+
+    def version =
+      try
+        Await.result(versionFuture, FiniteDuration(10, "s"))
+      catch {
+        case _: Throwable => None
+      }
+
+    Option(supportedFallbackSemanticdbVersions.get(scalaVersion)).orElse(version) match {
+      case None =>
+        Left(s"After retry no existing semanticdb version found for scala version $scalaVersion")
+      case Some(semanticdbVersion) =>
+        supportedFallbackSemanticdbVersions.put(scalaVersion, semanticdbVersion)
+        fetchPlugin(artifact.copy(version = semanticdbVersion), logger)
+    }
+  }
+
   @volatile private var latestResolvedScalaSemanticDB: Path = null
   def fetchScalaPlugin(
       scalaVersion: String,
@@ -77,7 +121,16 @@ object SemanticDBCache {
           latestResolvedPlugin
         }
       }
-    } else fetchPlugin(artifact, logger)
+    } else {
+      fetchPlugin(artifact, logger) match {
+        case Right(plugin) => Right(plugin)
+        case Left(error) =>
+          fallbackSemanticdbFetch(scalaVersion, artifact, logger) match {
+            case Left(newError) => Left(error + "\n" + newError)
+            case Right(plugin) => Right(plugin)
+          }
+      }
+    }
   }
 
   @volatile private var latestResolvedJavaSemanticDB: Path = null

frontend/src/test/scala/bloop/SourceGeneratorSpec.scala

@@ -1,22 +1,41 @@
 package bloop
 
+import scala.sys.process
+import scala.util.control.NonFatal
+
 import bloop.Compiler.Result.Success
 import bloop.cli.ExitStatus
 import bloop.config.Config
 import bloop.internal.build.BuildTestInfo
 import bloop.io.AbsolutePath
 import bloop.logging.RecordingLogger
-import bloop.util.CrossPlatform
 import bloop.util.TestProject
 import bloop.util.TestUtil
 
 object SourceGeneratorSpec extends bloop.testing.BaseSuite {
 
+  lazy val hasPython3 = hasPythonNamed("python3")
+  lazy val hasPython2 = hasPythonNamed("python")
+
   private val generator: List[String] =
-    if (CrossPlatform.isWindows) List("python", BuildTestInfo.sampleSourceGenerator.getAbsolutePath)
-    else List(BuildTestInfo.sampleSourceGenerator.getAbsolutePath)
+    if (hasPython3) List("python3", BuildTestInfo.sampleSourceGenerator.getAbsolutePath)
+    else if (hasPython2) List("python", BuildTestInfo.sampleSourceGenerator.getAbsolutePath)
+    else Nil
+
+  private def hasPythonNamed(executable: String) = try {
+    process.Process(Seq(executable, "--version")).! == 0
+  } catch {
+    case NonFatal(_) => false
+  }
 
-  test("compile a project having a source generator") {
+  lazy val hasPython = hasPython2 || hasPython3
+
+  def testOnlyWithPython(name: String)(fun: => Any): Unit = {
+    if (hasPython) test(name)(fun)
+    else ignore(name, label = s"IGNORED: no python found on path")(fun)
+  }
+
+  testOnlyWithPython("compile a project having a source generator") {
     singleProjectWithSourceGenerator("glob:*.in" :: Nil) { (workspace, project, state) =>
       writeFile(project.srcFor("Foo.scala", exists = false), assertNInputs(n = 3))
       writeFile(workspace.resolve("file_one.in"), "file one")
@@ -30,7 +49,7 @@ object SourceGeneratorSpec extends bloop.testing.BaseSuite {
     }
   }
 
-  test("compile projects with dependent source generators") {
+  testOnlyWithPython("compile projects with dependent source generators") {
     TestUtil.withinWorkspace { workspace =>
       val sourcesA = List(
         """/main/scala/Foo.scala
@@ -91,7 +110,7 @@ object SourceGeneratorSpec extends bloop.testing.BaseSuite {
     }
   }
 
-  test("source generator failure yields compilation failure") {
+  testOnlyWithPython("source generator failure yields compilation failure") {
     TestUtil.withinWorkspace { workspace =>
       val logger = new RecordingLogger(ansiCodesSupported = false)
       val sourceGenerator = Config.SourceGenerator(
@@ -107,15 +126,15 @@ object SourceGeneratorSpec extends bloop.testing.BaseSuite {
     }
   }
 
-  test("source generator is run when there are no matching input files") {
+  testOnlyWithPython("source generator is run when there are no matching input files") {
     singleProjectWithSourceGenerator("glob:*.in" :: Nil) { (_, project, state) =>
       writeFile(project.srcFor("test.scala", exists = false), assertNInputs(n = 0))
       val compiledState = state.compile(project)
       assertExitStatus(compiledState, ExitStatus.Ok)
     }
   }
 
-  test("source generator is re-run when an input file is removed") {
+  testOnlyWithPython("source generator is re-run when an input file is removed") {
     singleProjectWithSourceGenerator("glob:*.in" :: Nil) { (workspace, project, state) =>
       writeFile(workspace.resolve("hello.in"), "hello")
       writeFile(project.srcFor("test.scala", exists = false), assertNInputs(n = 1))
@@ -130,7 +149,7 @@ object SourceGeneratorSpec extends bloop.testing.BaseSuite {
     }
   }
 
-  test("source generator is re-run when an input file is added") {
+  testOnlyWithPython("source generator is re-run when an input file is added") {
     singleProjectWithSourceGenerator("glob:*.in" :: Nil) { (workspace, project, state) =>
       writeFile(workspace.resolve("hello.in"), "hello")
       writeFile(project.srcFor("test.scala", exists = false), assertNInputs(n = 1))
@@ -145,7 +164,7 @@ object SourceGeneratorSpec extends bloop.testing.BaseSuite {
     }
   }
 
-  test("source generator is re-run when an input file is modified") {
+  testOnlyWithPython("source generator is re-run when an input file is modified") {
     singleProjectWithSourceGenerator("glob:*.in" :: Nil) { (workspace, project, state) =>
       writeFile(workspace.resolve("hello.in"), "hello")
       writeFile(project.srcFor("test.scala", exists = false), assertNInputs(n = 1))
@@ -163,7 +182,7 @@ object SourceGeneratorSpec extends bloop.testing.BaseSuite {
     }
   }
 
-  test("source generator is re-run when an output file is modified") {
+  testOnlyWithPython("source generator is re-run when an output file is modified") {
     singleProjectWithSourceGenerator("glob:*.in" :: Nil) { (workspace, project, state) =>
       val generatorOutput = project.config.sourceGenerators
         .flatMap(_.headOption)
@@ -186,7 +205,7 @@ object SourceGeneratorSpec extends bloop.testing.BaseSuite {
     }
   }
 
-  test("source generator is re-run when an output file is deleted") {
+  testOnlyWithPython("source generator is re-run when an output file is deleted") {
     singleProjectWithSourceGenerator("glob:*.in" :: Nil) { (workspace, project, state) =>
       val generatorOutput = project.config.sourceGenerators
         .flatMap(_.headOption)
@@ -209,11 +228,8 @@ object SourceGeneratorSpec extends bloop.testing.BaseSuite {
     }
   }
 
-  test("source generator is not re-run when nothing has changed") {
+  testOnlyWithPython("source generator is not re-run when nothing has changed") {
     singleProjectWithSourceGenerator("glob:*.in" :: Nil) { (workspace, project, state) =>
-      val generatorOutput = project.config.sourceGenerators
-        .flatMap(_.headOption)
-        .map(p => AbsolutePath(p.outputDirectory))
       writeFile(workspace.resolve("hello.in"), "hello")
       writeFile(project.srcFor("test.scala", exists = false), assertNInputs(n = 1))
       val compiledState1 = state.compile(project)

frontend/src/test/scala/bloop/bsp/BspMetalsClientSpec.scala

@@ -87,32 +87,6 @@ class BspMetalsClientSpec(
     }
   }
 
-  test("do not initialize metals client and save settings with unsupported scala version") {
-    TestUtil.withinWorkspace { workspace =>
-      val `A` = TestProject(workspace, "A", Nil, scalaVersion = Some("2.12.4"))
-      val projects = List(`A`)
-      val configDir = TestProject.populateWorkspace(workspace, projects)
-      val logger = new RecordingLogger(ansiCodesSupported = false)
-      val extraParams = BloopExtraBuildParams(
-        ownsBuildFiles = None,
-        clientClassesRootDir = None,
-        semanticdbVersion = Some(semanticdbVersion), // Doesn't support 2.12.4
-        supportedScalaVersions = Some(List(testedScalaVersion)),
-        javaSemanticdbVersion = Some(javaSemanticdbVersion)
-      )
-
-      loadBspState(workspace, projects, logger, "Metals", bloopExtraParams = extraParams) { state =>
-        assertNoDiffInSettingsFile(
-          configDir,
-          expectedConfig
-        )
-        // Expect only range positions to be added, semanticdb is not supported
-        assertScalacOptions(state, `A`, "-Yrangepos")
-        assertNoDiff(logger.warnings.mkString(lineSeparator), "")
-      }
-    }
-  }
-
   test("initialize metals client in workspace with already enabled semanticdb") {
     TestUtil.withinWorkspace { workspace =>
       val pluginPath = s"-Xplugin:path-to-plugin/$semanticdbJar"
@@ -333,6 +307,40 @@ class BspMetalsClientSpec(
     }
   }
 
+  test("compile with old semanticDB") {
+    TestUtil.withinWorkspace { workspace =>
+      object JavacOptions {
+        // This will cause to use the forked javac compiler, since addong any `-J` property causes it
+        val A = List("-J-Xms48m")
+      }
+
+      val `A` =
+        TestProject(
+          workspace,
+          "A",
+          dummyFooScalaAndBarJavaSources,
+          javacOptions = JavacOptions.A,
+          // this Scala version is not supported in the newest semanticdb
+          scalaVersion = Some("2.12.8")
+        )
+      val projects = List(`A`)
+      val configDir = TestProject.populateWorkspace(workspace, projects)
+      val logger = new RecordingLogger(ansiCodesSupported = false)
+      WorkspaceSettings.writeToFile(
+        configDir,
+        WorkspaceSettings
+          .fromSemanticdbSettings("0.5.7", semanticdbVersion, List(testedScalaVersion)),
+        logger
+      )
+      loadBspState(workspace, projects, logger) { state =>
+        val compiledState = state.compile(`A`).toTestState
+        assert(compiledState.status == ExitStatus.Ok)
+        assertSemanticdbFileFor("Foo.scala", compiledState)
+        assertSemanticdbFileFor("Bar.java", compiledState)
+      }
+    }
+  }
+
   test("compile with semanticDB using cached plugin") {
     TestUtil.withinWorkspace { workspace =>
       val `A` = TestProject(workspace, "A", dummyFooScalaAndBarJavaSources)

notes/v1.5.8.md

@@ -0,0 +1,32 @@
+# bloop `v1.5.8`
+
+Bloop v1.5.8 is a bugfix release.
+
+## Installing Bloop
+
+For more details about installing Bloop, please see [Bloop's Installation Guide](https://scalacenter.github.io/bloop/setup))
+
+## Merged pull requests
+
+Here's a list of pull requests that were merged:
+
+- Chore: Revert JGit to a version compatible with JDK 8 [#2101]
+- Docs: update overview.md with corrections [#2100]
+- Chore: Update coursier.json and run release on Java 8 for the time being [#2099]
+- Chore: Make source generator tests more resilient [#2085]
+- Build(deps): Update scalafmt-core from 3.7.5 to 3.7.6 [#2098]
+- Improvement: Try and find latest supported semanticdb version [#2097]
+
+
+[#2101]: https://github.com/scalacenter/bloop/pull/2101
+[#2100]: https://github.com/scalacenter/bloop/pull/2100
+[#2099]: https://github.com/scalacenter/bloop/pull/2099
+[#2085]: https://github.com/scalacenter/bloop/pull/2085
+[#2098]: https://github.com/scalacenter/bloop/pull/2098
+[#2097]: https://github.com/scalacenter/bloop/pull/2097
+
+
+## Contributors
+
+According to `git shortlog -sn --no-merges v1.5.7..v1.5.8`, the following people have contributed to
+this `v1.5.8` release: Tomasz Godzik, Chris Kipp, scala-center-steward[bot], tgodzik.

project/GitUtils.scala

@@ -78,9 +78,8 @@ object GitUtils {
   def authSshKey(keyFile: File = getEnvSshKey): GitAuth = {
     import _root_.com.jcraft.jsch.Session
     import _root_.org.eclipse.jgit.api.TransportConfigCallback
-    import _root_.org.eclipse.jgit.transport.{Transport, SshTransport}
-    import _root_.org.eclipse.jgit.transport.ssh.jsch.JschConfigSessionFactory
-    import _root_.org.eclipse.jgit.transport.ssh.jsch.OpenSshConfig.Host
+    import _root_.org.eclipse.jgit.transport.{JschConfigSessionFactory, Transport, SshTransport}
+    import _root_.org.eclipse.jgit.transport.OpenSshConfig.Host
     import _root_.org.eclipse.jgit.util.FS
 
     val sessionFactory = new JschConfigSessionFactory {

project/build.sbt

@@ -17,8 +17,10 @@ addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.11.0")
 
 updateOptions := updateOptions.value.withLatestSnapshots(false)
 libraryDependencies ++= List(
-  "org.eclipse.jgit" % "org.eclipse.jgit" % "6.6.0.202305301015-r",
-  "org.eclipse.jgit" % "org.eclipse.jgit.ssh.jsch" % "6.6.0.202305301015-r",
+  // set to jgit 5, because 6 is compatible only with java 11,
+  // context https://github.com/scalacenter/bloop/pull/2101
+  "org.eclipse.jgit" % "org.eclipse.jgit" % "5.13.2.202306221912-r",
+  "org.eclipse.jgit" % "org.eclipse.jgit.ssh.jsch" % "5.13.2.202306221912-r",
   "commons-codec" % "commons-codec" % "1.16.0",
   ("ch.epfl.scala" % "jarjar" % "1.7.2-patched")
     .exclude("org.apache.ant", "ant")