Merge pull request #974 from alexarchambault/tweaking

Tweaking
almond-sh · Aug 18, 2022 · 4f158e0 · 4f158e0
2 parents 29dafb3 + 4d15564
commit 4f158e0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/build.sc b/build.sc
@@ -149,8 +149,8 @@ class ScalaInterpreter(val crossScalaVersion: String) extends AlmondModule with
       Deps.coursierApi,
       Deps.directories,
       Deps.jansi,
-      Deps.ammoniteCompiler(crossScalaVersion),
-      Deps.ammoniteRepl(crossScalaVersion)
+      Deps.ammoniteCompiler(crossScalaVersion).exclude(("net.java.dev.jna", "jna")),
+      Deps.ammoniteRepl(crossScalaVersion).exclude(("net.java.dev.jna", "jna"))
     )
   }
   object test extends Tests with AlmondTestModule {

diff --git a/project/settings.sc b/project/settings.sc
@@ -183,8 +183,7 @@ trait AlmondScalaCliCompile extends ScalaCliCompile {
     // as support for Java 8 or 11 in Scala CLI relies on the --release flag of Java 17,
     // and it seems --release puts in the class path stuff not supported by those
     // Scala versions.
-    val tmp17Opts = if (needs17) Seq("--jvm", "temurin:17") else Nil
-    super.extraScalaCliOptions() ++ tmp17Opts
+    super.extraScalaCliOptions() ++ Seq("--jvm", "8", "--bloop-version", "1.5.3-sc-1")
   }
 }