Skip to content

Commit b570136

Browse files
committed
support sbt 2
1 parent 31d98e2 commit b570136

File tree

3 files changed

+36
-3
lines changed

3 files changed

+36
-3
lines changed

build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ lazy val core = myCrossProject("core")
236236
}
237237
outFile
238238
}
239-
Seq(downloadPlugin("1_0_0"), downloadPlugin("1_3_11"))
239+
Seq(downloadPlugin("1_0_0"), downloadPlugin("1_3_11"), downloadPlugin("2_0_0"))
240240
}.taskValue
241241
)
242242

modules/core/src/main/scala/org/scalasteward/core/buildtool/sbt/SbtAlg.scala

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,9 @@ final class SbtAlg[F[_]](config: Config)(implicit
8585
for {
8686
_ <- Resource.unit[F]
8787
pluginVersion = maybeSbtVersion match {
88-
case Some(v) if v < Version("1.3.11") => "1_0_0"
89-
case _ => "1_3_11"
88+
case Some(v) if v < Version("1.3.11") => "1_0_0"
89+
case Some(v) if v.value.startsWith("2.") => "2_0_0"
90+
case _ => "1_3_11"
9091
}
9192
plugin <- Resource.eval(stewardPlugin(pluginVersion))
9293
_ <- List

modules/core/src/test/scala/org/scalasteward/core/buildtool/sbt/SbtAlgTest.scala

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,38 @@ class SbtAlgTest extends FunSuite {
4646
assertEquals(state, expected)
4747
}
4848

49+
test("sbt 2") {
50+
val repo = Repo("sbt-alg", "test-2")
51+
val buildRoot = BuildRoot(repo, ".")
52+
val repoDir = workspaceAlg.repoDir(repo).unsafeRunSync()
53+
val initial = MockState.empty
54+
.addFiles(repoDir / "project" / "build.properties" -> "sbt.version=2.0.0-RC3")
55+
.unsafeRunSync()
56+
val state = sbtAlg.getDependencies(buildRoot).runS(initial).unsafeRunSync()
57+
val expected = initial.copy(
58+
trace = Vector(
59+
Cmd("read", s"$repoDir/project/build.properties"),
60+
Cmd("test", "-d", s"$repoDir/project"),
61+
Cmd("test", "-d", s"$repoDir/project/project"),
62+
Cmd("read", "classpath:StewardPlugin_2_0_0.scala"),
63+
Cmd("write", s"$repoDir/project/scala-steward-StewardPlugin_2_0_0.scala"),
64+
Cmd("write", s"$repoDir/project/project/scala-steward-StewardPlugin_2_0_0.scala"),
65+
Cmd.execSandboxed(
66+
repoDir,
67+
"sbt",
68+
"-Dsbt.color=false",
69+
"-Dsbt.log.noformat=true",
70+
"-Dsbt.supershell=false",
71+
"-Dsbt.server.forcestart=true",
72+
s";$crossStewardDependencies;$reloadPlugins;$stewardDependencies"
73+
),
74+
Cmd("rm", "-rf", s"$repoDir/project/project/scala-steward-StewardPlugin_2_0_0.scala"),
75+
Cmd("rm", "-rf", s"$repoDir/project/scala-steward-StewardPlugin_2_0_0.scala")
76+
)
77+
)
78+
assertEquals(state, expected)
79+
}
80+
4981
test("runMigrations") {
5082
val repo = Repo("fthomas", "scala-steward")
5183
val buildRoot = BuildRoot(repo, ".")

0 commit comments

Comments
 (0)