Skip to content

Commit 8c75fa0

Browse files
committed
Use an import instead of compat traits.
1 parent a59e556 commit 8c75fa0

File tree

4 files changed

+10
-16
lines changed

4 files changed

+10
-16
lines changed

sbt-plugin/build.sbt

+5-3
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,11 @@ val `sbt-github-dependency-submission` = project
4343
"UTF-8",
4444
"-feature",
4545
"-unchecked",
46-
"-Xfatal-warnings",
47-
"-Ywarn-unused-import"
48-
),
46+
"-Xfatal-warnings"
47+
) ++ (scalaBinaryVersion.value match {
48+
case "2.12" => Seq("-Ywarn-unused-import")
49+
case _ => Seq("-Wunused:imports")
50+
}),
4951
libraryDependencies ++= Seq(
5052
"com.eed3si9n" %% "gigahorse-asynchttpclient" % "0.7.0",
5153
"org.scalameta" %% "munit" % "1.1.0" % Test

sbt-plugin/src/main/scala-2/ch/epfl/scala/GithubDependencyGraphPlugin.scala

-6
This file was deleted.

sbt-plugin/src/main/scala-3/ch/epfl/scala/GithubDependencyGraphPlugin.scala

-6
This file was deleted.

sbt-plugin/src/main/scala/ch/epfl/scala/GithubDependencyGraphPlugin.scala

+5-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,11 @@ import sbt.internal.util.complete.Parsers
1313
import sbt.plugins.JvmPlugin
1414
import sjsonnew.shaded.scalajson.ast.unsafe.JString
1515

16-
object GithubDependencyGraphPlugin extends AutoPlugin with GithubDependencyGraphPluginCompat {
16+
// `import sbt.Result._` is unused in Scala 2/sbt 1 but necessary in Scala 3/sbt 2
17+
@annotation.nowarn("msg=Unused import")
18+
object GithubDependencyGraphPlugin extends AutoPlugin {
19+
import sbt.Result._
20+
1721
private val runtimeConfigs =
1822
Set(
1923
Compile,

0 commit comments

Comments
 (0)