From b5cfdf483977e7b320657defb5cbb1fac059cb2f Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Thu, 12 Sep 2024 14:26:13 +0000 Subject: [PATCH] Update scala3-compiler, scala3-library to 3.4.3 --- build.sc | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/build.sc b/build.sc index 39c2df8ac..15de9d8c5 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") @@ -63,7 +65,7 @@ val scala2_13Versions = 2.to(14) .map(v => s"2.13.${v}") val scala33Versions = Seq("3.3.0", "3.3.1", "3.3.2", "3.3.3") // .dropWhile(v => isJava21 && v == "3.3.0") -val scala34Versions = Seq("3.4.2") +val scala34Versions = Seq("3.4.3") val scala35Versions = Seq("3.5.0") val scala2Versions = scala2_12Versions ++ scala2_13Versions @@ -76,7 +78,7 @@ val assemblyCrossScalaVersions = Seq( scala2_13Versions.last, scala33Versions.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.") @@ -253,9 +255,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 = { @@ -551,7 +555,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 @@ -663,7 +667,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() ++ @@ -674,7 +678,6 @@ trait MainModule extends AmmModule { sources() ++ externalSources() - } }