Skip to content

Commit 775bcd2

Browse files
authored
Merge pull request #719 from armanbilge/feature/stable-kind-projector
Use stable option for kind-projector in 3.5+
2 parents 04886b3 + 70eabd1 commit 775bcd2

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

settings/src/main/scala/org/typelevel/sbt/TypelevelSettingsPlugin.scala

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -194,11 +194,12 @@ object TypelevelSettingsPlugin extends AutoPlugin {
194194
},
195195
scalacOptions ++= {
196196
scalaVersion.value match {
197-
case V(V(3, _, _, _)) if onlyScala3.value =>
198-
Seq("-Ykind-projector:underscores")
199-
200-
case V(V(3, _, _, _)) =>
201-
Seq("-language:implicitConversions", "-Ykind-projector")
197+
case V(V(3, minor, _, _)) =>
198+
val kpFlag = if (minor >= 5) "-Xkind-projector" else "-Ykind-projector"
199+
if (onlyScala3.value)
200+
Seq(s"$kpFlag:underscores")
201+
else
202+
Seq("-language:implicitConversions", kpFlag)
202203

203204
case V(V(2, minor, _, _)) if minor >= 12 =>
204205
Seq("-language:_", "-Xsource:3")

0 commit comments

Comments
 (0)