Skip to content

Commit 0985a7b

Browse files
Merge pull request #940 from alexarchambault/pure-java
Add pure Java projects support
2 parents 08aa9f2 + 9f3ebad commit 0985a7b

File tree

56 files changed

+1310
-859
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+1310
-859
lines changed

build.sc

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -611,7 +611,7 @@ trait CliOptions extends SbtModule with ScalaCliPublishModule with ScalaCliCompi
611611
Deps.jsoniterCore,
612612
Deps.jsoniterMacros,
613613
Deps.osLib,
614-
Deps.signingCliShared
614+
Deps.signingCliOptions
615615
)
616616
def scalaVersion = Scala.scala213
617617
def repositories = super.repositories ++ customRepositories
@@ -658,7 +658,11 @@ trait Cli extends SbtModule with ProtoBuildModule with CliLaunchers
658658

659659
def localRepoJar = `local-repo`.localRepoJar()
660660

661-
trait Tests extends super.Tests with ScalaCliScalafixModule
661+
trait Tests extends super.Tests with ScalaCliScalafixModule {
662+
def runClasspath = T {
663+
super.runClasspath() ++ Seq(localRepoJar())
664+
}
665+
}
662666
}
663667

664668
trait Cli3 extends Cli {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ object Bloop {
5656
Artifacts.artifacts(
5757
Positioned.none(Seq(dep)),
5858
Nil,
59-
params,
59+
Some(params),
6060
logger,
6161
cache.withMessage(s"Downloading compilation server ${dep.version}")
6262
)

0 commit comments

Comments
 (0)