Skip to content

Commit 7324ca9

Browse files
committed
Fix amm compilation for scala 3.6.2
1 parent 916a063 commit 7324ca9

File tree

8 files changed

+6
-3
lines changed

8 files changed

+6
-3
lines changed

build.mill

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ trait AmmInternalModule extends CrossSbtModule with Bloop.Module {
241241
else Nil
242242
val extraDir5 =
243243
if (sv.startsWith("3.6"))
244-
Seq(PathRef(millSourcePath / "src" / "main" / "scala-3.6.3+"))
244+
Seq(PathRef(millSourcePath / "src" / "main" / "scala-3.6.2+"))
245245
else if (sv.startsWith("3.5"))
246246
Seq(PathRef(millSourcePath / "src" / "main" / "scala-3.5.0+"))
247247
else if (sv.startsWith("3.4"))
@@ -255,8 +255,11 @@ trait AmmInternalModule extends CrossSbtModule with Bloop.Module {
255255
Seq(PathRef(millSourcePath / "src" / "main" / "scala-3.0.0-3.3.1"))
256256
else Nil
257257
val extraDir6 =
258-
if (sv.startsWith("3") && !sv.startsWith("3.6"))
259-
Seq(PathRef(millSourcePath / "src" / "main" / "scala-3.0.0-3.5.0+"))
258+
if (sv.startsWith("3"))
259+
if (sv.startsWith("3.6.") && sv.stripPrefix("3.6.").toInt >= 3)
260+
Seq(PathRef(millSourcePath / "src" / "main" / "scala-3.6.3+"))
261+
else
262+
Seq(PathRef(millSourcePath / "src" / "main" / "scala-3.0.0-3.6.2"))
260263
else Nil
261264

262265
super.sources() ++ extraDir ++ extraDir2 ++ extraDir3 ++ extraDir4 ++ extraDir5 ++ extraDir6

0 commit comments

Comments
 (0)