Merge pull request #3405 from Gedochao/feature/bloop-snapshots

Allow to use Bloop snapshot versions
VirtusLab · Jan 9, 2025 · 51bebb0 · 51bebb0
2 parents 73183b4 + 2bac0d2
commit 51bebb0
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 1 deletion.
diff --git a/build.sc b/build.sc
@@ -368,6 +368,7 @@ trait Core extends ScalaCliCrossSbtModule
     with HasTests
     with ScalaCliScalafixModule {
   def crossScalaVersion = crossValue
+
   def moduleDeps = Seq(
     config(crossScalaVersion)
   )
@@ -378,6 +379,9 @@ trait Core extends ScalaCliCrossSbtModule
     super.scalacOptions() ++ asyncScalacOptions(crossScalaVersion)
   }
 
+  def repositoriesTask =
+    T.task(super.repositoriesTask() ++ deps.customRepositories)
+
   def ivyDeps = super.ivyDeps() ++ Agg(
     Deps.bloopRifle.exclude(("org.scala-lang.modules", "scala-collection-compat_2.13")),
     Deps.collectionCompat,

diff --git a/modules/build/src/main/scala/scala/build/Bloop.scala b/modules/build/src/main/scala/scala/build/Bloop.scala
@@ -73,7 +73,10 @@ object Bloop {
       val res = value {
         Artifacts.artifacts(
           Seq(Positioned.none(dep)),
-          Nil,
+          Seq(
+            coursier.Repositories.sonatype("snapshots"),
+            coursier.Repositories.sonatypeS01("snapshots")
+          ),
           Some(params),
           logger,
           cache.withMessage(s"Downloading compilation server ${dep.version}")

diff --git a/modules/integration/src/test/scala/scala/cli/integration/BloopTests.scala b/modules/integration/src/test/scala/scala/cli/integration/BloopTests.scala
@@ -241,4 +241,15 @@ class BloopTests extends ScalaCliSuite {
         assert(compilationError.contains(message))
       }
     }
+
+  {
+    val bloopSnapshotVersion = "2.0.6-51-38c118d4-SNAPSHOT"
+    test(s"compilation works with a Bloop snapshot version: $bloopSnapshotVersion") {
+      val input = "script.sc"
+      TestInputs(os.rel / input -> """println("Hello")""").fromRoot { root =>
+        os.proc(TestUtil.cli, "compile", input, "--bloop-version", bloopSnapshotVersion)
+          .call(cwd = root)
+      }
+    }
+  }
 }