Skip to content

Commit 51bebb0

Browse files
authored
Merge pull request #3405 from Gedochao/feature/bloop-snapshots
Allow to use Bloop snapshot versions
2 parents 73183b4 + 2bac0d2 commit 51bebb0

File tree

3 files changed

+19
-1
lines changed

3 files changed

+19
-1
lines changed

build.sc

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -368,6 +368,7 @@ trait Core extends ScalaCliCrossSbtModule
368368
with HasTests
369369
with ScalaCliScalafixModule {
370370
def crossScalaVersion = crossValue
371+
371372
def moduleDeps = Seq(
372373
config(crossScalaVersion)
373374
)
@@ -378,6 +379,9 @@ trait Core extends ScalaCliCrossSbtModule
378379
super.scalacOptions() ++ asyncScalacOptions(crossScalaVersion)
379380
}
380381

382+
def repositoriesTask =
383+
T.task(super.repositoriesTask() ++ deps.customRepositories)
384+
381385
def ivyDeps = super.ivyDeps() ++ Agg(
382386
Deps.bloopRifle.exclude(("org.scala-lang.modules", "scala-collection-compat_2.13")),
383387
Deps.collectionCompat,

modules/build/src/main/scala/scala/build/Bloop.scala

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,10 @@ object Bloop {
7373
val res = value {
7474
Artifacts.artifacts(
7575
Seq(Positioned.none(dep)),
76-
Nil,
76+
Seq(
77+
coursier.Repositories.sonatype("snapshots"),
78+
coursier.Repositories.sonatypeS01("snapshots")
79+
),
7780
Some(params),
7881
logger,
7982
cache.withMessage(s"Downloading compilation server ${dep.version}")

modules/integration/src/test/scala/scala/cli/integration/BloopTests.scala

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -241,4 +241,15 @@ class BloopTests extends ScalaCliSuite {
241241
assert(compilationError.contains(message))
242242
}
243243
}
244+
245+
{
246+
val bloopSnapshotVersion = "2.0.6-51-38c118d4-SNAPSHOT"
247+
test(s"compilation works with a Bloop snapshot version: $bloopSnapshotVersion") {
248+
val input = "script.sc"
249+
TestInputs(os.rel / input -> """println("Hello")""").fromRoot { root =>
250+
os.proc(TestUtil.cli, "compile", input, "--bloop-version", bloopSnapshotVersion)
251+
.call(cwd = root)
252+
}
253+
}
254+
}
244255
}

0 commit comments

Comments
 (0)