Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 8 additions & 26 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ lazy val V =
"3.17.3" // the oldest protoc version with Apple M1 support, see https://github.com/scalapb/ScalaPB/issues/1024#issuecomment-860126568
val coursier = "2.1.9"
val scalaXml = "2.1.0"
val bsp = "2.0.0-M13"
val moped = "0.2.0"
val gradle = "7.0"
val scala213 = "2.13.13"
Expand All @@ -24,7 +23,6 @@ lazy val V =
val metals = "1.2.2"
val scalameta = "4.9.3"
val semanticdbKotlin = "0.5.0"
val testcontainers = "0.39.3"
val requests = "0.8.0"
val minimalMillVersion = "0.10.0"
val millScipVersion = "0.3.6"
Expand All @@ -48,16 +46,16 @@ inThisBuild(
developers :=
List(
Developer(
"olafurpg",
"Ólafur Páll Geirsson",
"olafurpg@sourcegraph.com",
url("https://github.com/olafurpg")
"jupblb",
"Michal Kielbowicz",
"michal.kielbowicz@sourcegraph.com",
url("https://github.com/jupblb")
),
Developer(
"Strum355",
"Noah Santschi-Cooney",
"noah@sourcegraph.com",
url("https://github.com/Strum355")
"chrapkowski-sg",
"Adam Chrapkowski",
"adam.chrapkowski@sourcegraph.com",
url("https://github.com/chrapkowski-sg")
)
)
)
Expand Down Expand Up @@ -144,7 +142,6 @@ lazy val gradlePlugin = project
"scala212" -> V.scala212,
"scala213" -> V.scala213,
"scala3" -> V.scala3,
"bspVersion" -> V.bsp,
"minimalMillVersion" -> V.minimalMillVersion,
"millScipVersion" -> V.millScipVersion
)
Expand Down Expand Up @@ -272,7 +269,6 @@ lazy val cli = project
"scala212" -> V.scala212,
"scala213" -> V.scala213,
"scala3" -> V.scala3,
"bspVersion" -> V.bsp,
"minimalMillVersion" -> V.minimalMillVersion,
"millScipVersion" -> V.millScipVersion
),
Expand Down Expand Up @@ -360,18 +356,6 @@ lazy val cli = project
.enablePlugins(PackPlugin, DockerPlugin, BuildInfoPlugin)
.dependsOn(scip)

def commitAll(): Unit = {
import scala.sys.process._
"git add .".!!
"git commit --allow-empty -m WIP".!!

}
commands +=
Command.command("commitall") { s =>
commitAll()
s
}

commands +=
Command.command("nativeImageProfiled") { s =>
val targetroot =
Expand Down Expand Up @@ -574,8 +558,6 @@ val testSettings = List(
List(
"org.scalameta" %% "munit" % "0.7.29",
"org.scalameta" %% "mtags" % V.metals cross CrossVersion.full,
"com.dimafeng" %% "testcontainers-scala-munit" % V.testcontainers,
"com.dimafeng" %% "testcontainers-scala-postgresql" % V.testcontainers,
"org.scalameta" %% "moped-testkit" % V.moped,
"org.scalameta" %% "scalameta" % V.scalameta,
"io.get-coursier" %% "coursier" % V.coursier,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -108,15 +108,12 @@ class SbtBuildTool(index: IndexCommand) extends BuildTool("sbt", index) {
object SbtBuildTool {
def isSupportedSbtVersion(version: String): Either[String, Boolean] = {
SbtVersionParser.versionSegments(version) match {
case major :: minor :: patch :: _ =>
Right {
(major == 0 && minor == 13 && patch >= 17) ||
(major == 1 && minor >= 2)
}
case major :: minor :: _ :: _ =>
Right(major == 1 && minor >= 2)

case _ =>
Left(
s"Failed to parse SBT version: [$version]. Only SBT 0.13.17+ or SBT 1.2+ are supported"
s"Failed to parse SBT version: [$version]. Only SBT 1.2+ is supported"
)

}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,13 @@ class SbtVersionParserSuite extends munit.FunSuite {
}

checkSupported("1.10.0-RC1")
checkSupported("0.13.17")
checkSupported("1.5.6")
checkSupported("1.9.7")
checkSupported("1.2.0")

checkUnsupported("1.0.0-RC1")
checkUnsupported("0.13.16")
checkUnsupported("1.1.6")
checkUnsupported("0.12.15")
checkUnsupported("0.13.16")

checkFailed("1.0-RC1")
checkFailed("0.13")
Expand Down