Skip to content

Commit 2ee040b

Browse files
committed
Update slf4j-nop to 2.0.16
1 parent 08c3afb commit 2ee040b

File tree

1 file changed

+17
-14
lines changed

1 file changed

+17
-14
lines changed

build.sc

+17-14
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,17 @@ val isPublishableCommit =
3333
publishBranches.exists(suffix => x.endsWith(s"/${suffix}"))
3434
)
3535

36-
val latestTaggedVersion = try{
37-
os.proc("git", "describe", "--abbrev=0", "--tags").call().out.trim
38-
}catch{case e: os.SubprocessException =>
39-
"dev"
40-
}
36+
val latestTaggedVersion =
37+
try {
38+
os.proc("git", "describe", "--abbrev=0", "--tags").call().out.trim
39+
} catch {
40+
case e: os.SubprocessException =>
41+
"dev"
42+
}
4143

4244
val gitHead = os.proc("git", "rev-parse", "HEAD").call().out.trim
4345

44-
val commitsSinceTaggedVersion = latestTaggedVersion match{
46+
val commitsSinceTaggedVersion = latestTaggedVersion match {
4547
case "dev" => 0
4648
case latest =>
4749
os.proc("git", "rev-list", gitHead, "--not", latest, "--count")
@@ -74,7 +76,7 @@ val assemblyCrossScalaVersions = Seq(
7476
scala2_12Versions.last,
7577
scala2_13Versions.last,
7678
scala34Versions.last,
77-
scala35Versions.last,
79+
scala35Versions.last
7880
)
7981
def isScala2_12_10OrLater(sv: String): Boolean = {
8082
(sv.startsWith("2.12.") && sv.stripPrefix("2.12.").length > 1) || sv.startsWith("2.13.")
@@ -137,7 +139,7 @@ object Deps {
137139
val scalazCore = ivy"org.scalaz::scalaz-core:7.2.36"
138140
val semanticDbScalac = ivy"org.scalameta:::semanticdb-scalac:$scalametaVersion"
139141
val shapeless = ivy"com.chuusai::shapeless:2.3.3"
140-
val slf4jNop = ivy"org.slf4j:slf4j-nop:1.7.36"
142+
val slf4jNop = ivy"org.slf4j:slf4j-nop:2.0.16"
141143
val sourcecode = ivy"com.lihaoyi::sourcecode:0.4.3-M1"
142144
val sshdCore = ivy"org.apache.sshd:sshd-core:1.2.0"
143145
val scalametaCommon = ivy"org.scalameta::common:$scalametaVersion"
@@ -247,9 +249,11 @@ trait AmmInternalModule extends CrossSbtModule with Bloop.Module {
247249
def externalSources = T {
248250
resolveDeps(allBoundIvyDeps, sources = true)()
249251
}
250-
def repositoriesTask = T.task {super.repositoriesTask() ++ Seq(
251-
mvn"https://scala-ci.typesafe.com/artifactory/scala-integration"
252-
) }
252+
def repositoriesTask = T.task {
253+
super.repositoriesTask() ++ Seq(
254+
mvn"https://scala-ci.typesafe.com/artifactory/scala-integration"
255+
)
256+
}
253257
override implicit def crossSbtModuleResolver: mill.define.Cross.Resolver[CrossModuleBase] =
254258
new mill.define.Cross.Resolver[CrossModuleBase] {
255259
def resolve[V <: CrossModuleBase](c: Cross[V]): V = {
@@ -545,7 +549,7 @@ object amm extends Cross[MainModule](fullCrossScalaVersions) {
545549
(super.resources() ++
546550
ReplModule.this.sources() ++
547551
ReplModule.this.externalSources() ++
548-
resolveDeps(T.task{ ivyDeps().map(bindDependency())}, sources = true)()).distinct
552+
resolveDeps(T.task { ivyDeps().map(bindDependency()) }, sources = true)()).distinct
549553
}
550554
def ivyDeps = super.ivyDeps() ++ amm.compiler().ivyDeps() ++ Agg(
551555
Deps.scalazCore
@@ -657,7 +661,7 @@ trait MainModule extends AmmModule {
657661
// Need to duplicate this from MainModule due to Mill not properly propagating it through
658662
def runClasspath =
659663
Seq(thinWhitelist()) ++
660-
super.runClasspath() ++
664+
super.runClasspath() ++
661665
terminal().sources() ++
662666
amm.util().sources() ++
663667
amm.runtime().sources() ++
@@ -668,7 +672,6 @@ trait MainModule extends AmmModule {
668672
sources() ++
669673
externalSources()
670674

671-
672675
}
673676
}
674677

0 commit comments

Comments
 (0)