@@ -33,15 +33,17 @@ val isPublishableCommit =
33
33
publishBranches.exists(suffix => x.endsWith(s " / ${suffix}" ))
34
34
)
35
35
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
+ }
41
43
42
44
val gitHead = os.proc(" git" , " rev-parse" , " HEAD" ).call().out.trim
43
45
44
- val commitsSinceTaggedVersion = latestTaggedVersion match {
46
+ val commitsSinceTaggedVersion = latestTaggedVersion match {
45
47
case " dev" => 0
46
48
case latest =>
47
49
os.proc(" git" , " rev-list" , gitHead, " --not" , latest, " --count" )
@@ -74,7 +76,7 @@ val assemblyCrossScalaVersions = Seq(
74
76
scala2_12Versions.last,
75
77
scala2_13Versions.last,
76
78
scala34Versions.last,
77
- scala35Versions.last,
79
+ scala35Versions.last
78
80
)
79
81
def isScala2_12_10OrLater (sv : String ): Boolean = {
80
82
(sv.startsWith(" 2.12." ) && sv.stripPrefix(" 2.12." ).length > 1 ) || sv.startsWith(" 2.13." )
@@ -137,7 +139,7 @@ object Deps {
137
139
val scalazCore = ivy " org.scalaz::scalaz-core:7.2.36 "
138
140
val semanticDbScalac = ivy " org.scalameta:::semanticdb-scalac: $scalametaVersion"
139
141
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 "
141
143
val sourcecode = ivy " com.lihaoyi::sourcecode:0.4.3-M1 "
142
144
val sshdCore = ivy " org.apache.sshd:sshd-core:1.2.0 "
143
145
val scalametaCommon = ivy " org.scalameta::common: $scalametaVersion"
@@ -247,9 +249,11 @@ trait AmmInternalModule extends CrossSbtModule with Bloop.Module {
247
249
def externalSources = T {
248
250
resolveDeps(allBoundIvyDeps, sources = true )()
249
251
}
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
+ }
253
257
override implicit def crossSbtModuleResolver : mill.define.Cross .Resolver [CrossModuleBase ] =
254
258
new mill.define.Cross .Resolver [CrossModuleBase ] {
255
259
def resolve [V <: CrossModuleBase ](c : Cross [V ]): V = {
@@ -545,7 +549,7 @@ object amm extends Cross[MainModule](fullCrossScalaVersions) {
545
549
(super .resources() ++
546
550
ReplModule .this .sources() ++
547
551
ReplModule .this .externalSources() ++
548
- resolveDeps(T .task{ ivyDeps().map(bindDependency())}, sources = true )()).distinct
552
+ resolveDeps(T .task { ivyDeps().map(bindDependency()) }, sources = true )()).distinct
549
553
}
550
554
def ivyDeps = super .ivyDeps() ++ amm.compiler().ivyDeps() ++ Agg (
551
555
Deps .scalazCore
@@ -657,7 +661,7 @@ trait MainModule extends AmmModule {
657
661
// Need to duplicate this from MainModule due to Mill not properly propagating it through
658
662
def runClasspath =
659
663
Seq (thinWhitelist()) ++
660
- super .runClasspath() ++
664
+ super .runClasspath() ++
661
665
terminal().sources() ++
662
666
amm.util().sources() ++
663
667
amm.runtime().sources() ++
@@ -668,7 +672,6 @@ trait MainModule extends AmmModule {
668
672
sources() ++
669
673
externalSources()
670
674
671
-
672
675
}
673
676
}
674
677
0 commit comments