From a86b5c06b4c59b8ead8e0f8296845eba4bea0d11 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Fri, 20 Sep 2024 14:59:48 +0000 Subject: [PATCH] Update jline-reader, jline-terminal, ... to 3.27.0 --- build.sc | 35 +++++++++++++++++++---------------- 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/build.sc b/build.sc index 95d928b62..73195d97a 100644 --- a/build.sc +++ b/build.sc @@ -33,15 +33,17 @@ val isPublishableCommit = publishBranches.exists(suffix => x.endsWith(s"/${suffix}")) ) -val latestTaggedVersion = try{ - os.proc("git", "describe", "--abbrev=0", "--tags").call().out.trim -}catch{case e: os.SubprocessException => - "dev" -} +val latestTaggedVersion = + try { + os.proc("git", "describe", "--abbrev=0", "--tags").call().out.trim + } catch { + case e: os.SubprocessException => + "dev" + } val gitHead = os.proc("git", "rev-parse", "HEAD").call().out.trim -val commitsSinceTaggedVersion = latestTaggedVersion match{ +val commitsSinceTaggedVersion = latestTaggedVersion match { case "dev" => 0 case latest => os.proc("git", "rev-list", gitHead, "--not", latest, "--count") @@ -74,7 +76,7 @@ val assemblyCrossScalaVersions = Seq( scala2_12Versions.last, scala2_13Versions.last, scala34Versions.last, - scala35Versions.last, + scala35Versions.last ) def isScala2_12_10OrLater(sv: String): Boolean = { (sv.startsWith("2.12.") && sv.stripPrefix("2.12.").length > 1) || sv.startsWith("2.13.") @@ -114,9 +116,9 @@ object Deps { val geny = ivy"com.lihaoyi::geny:1.1.1" val javaparserCore = ivy"com.github.javaparser:javaparser-core:3.2.12" val javassist = ivy"org.javassist:javassist:3.21.0-GA" - val jlineJna = ivy"org.jline:jline-terminal-jna:3.14.1" - val jlineReader = ivy"org.jline:jline-reader:3.14.1" - val jlineTerminal = ivy"org.jline:jline-terminal:3.14.1" + val jlineJna = ivy"org.jline:jline-terminal-jna:3.27.0" + val jlineReader = ivy"org.jline:jline-reader:3.27.0" + val jlineTerminal = ivy"org.jline:jline-terminal:3.27.0" val jsch = ivy"com.jcraft:jsch:0.1.55" val mainargs = ivy"com.lihaoyi::mainargs:0.7.5" val osLib = ivy"com.lihaoyi::os-lib:0.10.7" @@ -247,9 +249,11 @@ trait AmmInternalModule extends CrossSbtModule with Bloop.Module { def externalSources = T { resolveDeps(allBoundIvyDeps, sources = true)() } - def repositoriesTask = T.task {super.repositoriesTask() ++ Seq( - mvn"https://scala-ci.typesafe.com/artifactory/scala-integration" - ) } + def repositoriesTask = T.task { + super.repositoriesTask() ++ Seq( + mvn"https://scala-ci.typesafe.com/artifactory/scala-integration" + ) + } override implicit def crossSbtModuleResolver: mill.define.Cross.Resolver[CrossModuleBase] = new mill.define.Cross.Resolver[CrossModuleBase] { def resolve[V <: CrossModuleBase](c: Cross[V]): V = { @@ -545,7 +549,7 @@ object amm extends Cross[MainModule](fullCrossScalaVersions) { (super.resources() ++ ReplModule.this.sources() ++ ReplModule.this.externalSources() ++ - resolveDeps(T.task{ ivyDeps().map(bindDependency())}, sources = true)()).distinct + resolveDeps(T.task { ivyDeps().map(bindDependency()) }, sources = true)()).distinct } def ivyDeps = super.ivyDeps() ++ amm.compiler().ivyDeps() ++ Agg( Deps.scalazCore @@ -657,7 +661,7 @@ trait MainModule extends AmmModule { // Need to duplicate this from MainModule due to Mill not properly propagating it through def runClasspath = Seq(thinWhitelist()) ++ - super.runClasspath() ++ + super.runClasspath() ++ terminal().sources() ++ amm.util().sources() ++ amm.runtime().sources() ++ @@ -668,7 +672,6 @@ trait MainModule extends AmmModule { sources() ++ externalSources() - } }