Skip to content

Commit aa10628

Browse files
committed
Cap JLine version at 3.25.0
1 parent fae8a7b commit aa10628

File tree

1 file changed

+25
-12
lines changed

1 file changed

+25
-12
lines changed

build.sc

+25-12
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ object Versions {
1919
def coursier = "2.1.14"
2020
def osLib = "0.11.3"
2121
def uTest = "0.8.4"
22+
def jline = "3.25.0"
2223
}
2324

2425
trait JavaMainClassNativeImage extends NativeImage {
@@ -45,17 +46,30 @@ trait JavaMainClassNativeImage extends NativeImage {
4546
}
4647
}
4748

48-
object `scala3-graal-processor` extends ScalaModule {
49-
def scalaVersion = Versions.scala
50-
def mainClass = Some("scala.cli.graal.CoursierCacheProcessor")
51-
def ivyDeps = Agg(
52-
ivy"org.virtuslab.scala-cli::scala3-graal:${Versions.scalaCli}"
49+
trait JavaClassNameModule extends ScalaModule {
50+
override def scalaVersion = Versions.scala
51+
override def transitiveIvyDeps = T {
52+
super.transitiveIvyDeps()
53+
.map(_.exclude("org.jline" -> "jline-reader"))
54+
.map(_.exclude("org.jline" -> "jline-terminal"))
55+
.map(_.exclude("org.jline" -> "jline-terminal-jna"))
56+
}
57+
def jlineDeps = Agg(
58+
ivy"org.jline:jline-reader:${Versions.jline}",
59+
ivy"org.jline:jline-terminal:${Versions.jline}",
60+
ivy"org.jline:jline-terminal-jna:${Versions.jline}"
5361
)
62+
override def ivyDeps = super.ivyDeps() ++ jlineDeps
5463
}
5564

56-
object `java-class-name` extends ScalaModule with JavaMainClassNativeImage with JavaClassNamePublishModule {
57-
def scalaVersion = Versions.scala
65+
object `scala3-graal-processor` extends JavaClassNameModule {
66+
override def mainClass = Some("scala.cli.graal.CoursierCacheProcessor")
67+
override def ivyDeps = jlineDeps ++ Agg(
68+
ivy"org.virtuslab.scala-cli::scala3-graal:${Versions.scalaCli}"
69+
)
70+
}
5871

72+
object `java-class-name` extends JavaClassNameModule with JavaMainClassNativeImage with JavaClassNamePublishModule {
5973
def nativeImageClassPath = T {
6074
// adapted from https://github.com/VirtusLab/scala-cli/blob/b19086697401827a6f8185040ceb248d8865bf21/build.sc#L732-L744
6175

@@ -77,10 +91,10 @@ object `java-class-name` extends ScalaModule with JavaMainClassNativeImage with
7791
System.err.println(s" $f")
7892
cp.split(File.pathSeparator).toSeq.map(p => mill.PathRef(os.Path(p)))
7993
}
80-
def ivyDeps = super.ivyDeps() ++ Seq(
94+
override def ivyDeps = super.ivyDeps() ++ jlineDeps ++ Agg(
8195
ivy"org.scala-lang::scala3-compiler:${Versions.scala}"
8296
)
83-
def compileIvyDeps = super.compileIvyDeps() ++ Seq(
97+
override def compileIvyDeps = super.compileIvyDeps() ++ Agg(
8498
ivy"org.graalvm.nativeimage:svm:${Versions.graalVmVersion}"
8599
)
86100

@@ -123,11 +137,10 @@ object `java-class-name` extends ScalaModule with JavaMainClassNativeImage with
123137
}
124138
}
125139

126-
object `java-class-name-tests` extends ScalaModule with SbtModule {
127-
def scalaVersion = Versions.scala
140+
object `java-class-name-tests` extends JavaClassNameModule with SbtModule {
128141
trait Tests extends ScalaModule with super.SbtModuleTests with TestModule.Utest {
129142
def launcher: T[PathRef]
130-
def ivyDeps = super.ivyDeps() ++ Seq(
143+
def ivyDeps = super.ivyDeps() ++ jlineDeps ++ Seq(
131144
ivy"com.lihaoyi::os-lib:${Versions.osLib}",
132145
ivy"com.lihaoyi::utest:${Versions.uTest}"
133146
)

0 commit comments

Comments
 (0)