Skip to content

Commit a2d9635

Browse files
authored
Update sbt to 1.7.1 (#15728)
* dep: update fs2 submodule This is needed due to some scalablytyped stuff that changed in fs2. Without it, you'll get an error when updating the sbt 1.7.x that scalably typed doesn't support 1.7.x * dep: sync with latest staging http4s * dep: sync with latest scala-java8-compat This also allows us to get rid of the fnGen stuff and simplify the sbtTestCommand and sbtPublishCommand * dep: sync with latest cats in staging * dep: sync with latest munit-cats-effect * dep: sync with latest discipline and discipline-munit * dep: lock munit at 0.7.29 If not you'll have issues with http4s tests since http4s isn't using the 1.x version of munit yet * disable `tlFatalWarnings` in http4s * dep: lock scalacheck at 1.16.0 Without doing this it was getting stuck in CI
1 parent 0c4c967 commit a2d9635

File tree

14 files changed

+21
-24
lines changed

14 files changed

+21
-24
lines changed
Submodule cats updated 942 files
Submodule fs2 updated 118 files
Submodule http4s updated 577 files
Submodule scalacheck updated 88 files

community-build/src/scala/dotty/communitybuild/projects.scala

+8-11
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ final case class SbtCommunityProject(
140140
case Some(ivyHome) => List(s"-Dsbt.ivy.home=$ivyHome")
141141
case _ => Nil
142142
extraSbtArgs ++ sbtProps ++ List(
143-
"-sbt-version", "1.6.2",
143+
"-sbt-version", "1.7.1",
144144
"-Dsbt.supershell=false",
145145
s"-Ddotty.communitybuild.dir=$communitybuildDir",
146146
s"--addPluginSbtFile=$sbtPluginFilePath"
@@ -265,9 +265,8 @@ object projects:
265265

266266
lazy val scalacheck = SbtCommunityProject(
267267
project = "scalacheck",
268-
sbtTestCommand = "jvm/test;js/test",
269-
sbtPublishCommand = "jvm/publishLocal;js/publishLocal",
270-
sbtDocCommand = forceDoc("jvm")
268+
sbtTestCommand = "coreJVM/test;coreJS/test",
269+
sbtPublishCommand = "coreJVM/publishLocal;coreJS/publishLocal"
271270
)
272271

273272
lazy val scalatest: SbtCommunityProject = SbtCommunityProject(
@@ -506,10 +505,8 @@ object projects:
506505

507506
lazy val scalaJava8Compat = SbtCommunityProject(
508507
project = "scala-java8-compat",
509-
// the fnGen subproject must be built with 2.12.x
510-
sbtTestCommand = s"++2.12.14; ++$compilerVersion; set fnGen/dependencyOverrides := Nil; test",
511-
sbtPublishCommand = s"++2.12.14; ++$compilerVersion; set fnGen/dependencyOverrides := Nil; publishLocal",
512-
scalacOptions = Nil // avoid passing Scala 3 options to Scala 2.12 in fnGen subproject
508+
sbtTestCommand = "test",
509+
sbtPublishCommand = "publishLocal",
513510
)
514511

515512
lazy val verify = SbtCommunityProject(
@@ -550,8 +547,8 @@ object projects:
550547

551548
lazy val cats = SbtCommunityProject(
552549
project = "cats",
553-
sbtTestCommand = "set Global/scalaJSStage := FastOptStage;buildJVM;validateAllJS",
554-
sbtPublishCommand = "catsJVM/publishLocal;catsJS/publishLocal",
550+
sbtTestCommand = "set Global/scalaJSStage := FastOptStage;rootJVM/test;rootJS/test",
551+
sbtPublishCommand = "rootJVM/publishLocal;rootJS/publishLocal",
555552
dependencies = List(discipline, disciplineMunit, scalacheck, simulacrumScalafixAnnotations),
556553
scalacOptions = SbtCommunityProject.scalacOptions.filter(_ != "-Ysafe-init") // disable -Ysafe-init, due to -Xfatal-warning
557554

@@ -755,7 +752,7 @@ object projects:
755752

756753
lazy val http4s = SbtCommunityProject(
757754
project = "http4s",
758-
sbtTestCommand = "tests/test; server/test; client/test; ember-core/test; ember-server/test; ember-client/test; circe/test",
755+
sbtTestCommand = """set ThisBuild / tlFatalWarnings := false; server/test; client/test; ember-core/test; ember-server/test; ember-client/test; circe/test""",
759756
sbtPublishCommand = "publishLocal",
760757
scalacOptions = SbtCommunityProject.scalacOptions.filter(_ != "-Ysafe-init"),
761758
dependencies = List(cats, catsEffect3, fs2, disciplineMunit, scalacheckEffect)

project/build.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.6.2
1+
sbt.version=1.7.1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.6.2
1+
sbt.version=1.7.1

semanticdb/project/build.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.6.2
1+
sbt.version=1.7.1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.6.2
1+
sbt.version=1.7.1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.6.2
1+
sbt.version=1.7.1

0 commit comments

Comments
 (0)