diff --git a/community-build/community-projects/cats b/community-build/community-projects/cats index 704c7fd5d207..771c6c802f59 160000 --- a/community-build/community-projects/cats +++ b/community-build/community-projects/cats @@ -1 +1 @@ -Subproject commit 704c7fd5d2079854637885514fccb62165e267f7 +Subproject commit 771c6c802f59c72dbc1be1898081c9c882ddfeb0 diff --git a/community-build/community-projects/discipline b/community-build/community-projects/discipline index afd001326789..09c975b18dc0 160000 --- a/community-build/community-projects/discipline +++ b/community-build/community-projects/discipline @@ -1 +1 @@ -Subproject commit afd00132678985341db210b56f3b2ead1a8405c2 +Subproject commit 09c975b18dc0b4e10499fb2922abac82ea8b5252 diff --git a/community-build/community-projects/discipline-munit b/community-build/community-projects/discipline-munit index 38ea89226b8d..4e61f1861956 160000 --- a/community-build/community-projects/discipline-munit +++ b/community-build/community-projects/discipline-munit @@ -1 +1 @@ -Subproject commit 38ea89226b8ddedc891b160f75d57ae5177f19a1 +Subproject commit 4e61f186195660529e7a6f7461b939477735e3f4 diff --git a/community-build/community-projects/fs2 b/community-build/community-projects/fs2 index 1ba97a221819..ac5275baf33b 160000 --- a/community-build/community-projects/fs2 +++ b/community-build/community-projects/fs2 @@ -1 +1 @@ -Subproject commit 1ba97a221819aa3d44f3e2e3a3266e1947bce8dc +Subproject commit ac5275baf33b03da0a461b5de735ee6a1f5a524e diff --git a/community-build/community-projects/http4s b/community-build/community-projects/http4s index 6f22ebe18cd2..c3d46f561ed1 160000 --- a/community-build/community-projects/http4s +++ b/community-build/community-projects/http4s @@ -1 +1 @@ -Subproject commit 6f22ebe18cd262e58cf31c86448891d860b7a03b +Subproject commit c3d46f561ed1026ae54e1acbd5e4730f0498ea93 diff --git a/community-build/community-projects/munit-cats-effect b/community-build/community-projects/munit-cats-effect index 248187bec8dc..40e442827669 160000 --- a/community-build/community-projects/munit-cats-effect +++ b/community-build/community-projects/munit-cats-effect @@ -1 +1 @@ -Subproject commit 248187bec8dc540e06950b7faf8d0e0be1ad31b1 +Subproject commit 40e44282766919a105e9dbbccbc3d14b79fee335 diff --git a/community-build/community-projects/scala-java8-compat b/community-build/community-projects/scala-java8-compat index 57e1f7ccaa67..eb16484fe841 160000 --- a/community-build/community-projects/scala-java8-compat +++ b/community-build/community-projects/scala-java8-compat @@ -1 +1 @@ -Subproject commit 57e1f7ccaa67dcac2b4227ab1a6ee0fcb5f42023 +Subproject commit eb16484fe8410643e157696421eeb79910ba36d5 diff --git a/community-build/community-projects/scalacheck b/community-build/community-projects/scalacheck index 976db31cd549..0ac8005753ab 160000 --- a/community-build/community-projects/scalacheck +++ b/community-build/community-projects/scalacheck @@ -1 +1 @@ -Subproject commit 976db31cd549328167a90ecc6f5f31efa83cd845 +Subproject commit 0ac8005753ab98b6494fd631502201b97a103638 diff --git a/community-build/src/scala/dotty/communitybuild/projects.scala b/community-build/src/scala/dotty/communitybuild/projects.scala index 4784daca6bb5..97b5fe15e971 100644 --- a/community-build/src/scala/dotty/communitybuild/projects.scala +++ b/community-build/src/scala/dotty/communitybuild/projects.scala @@ -140,7 +140,7 @@ final case class SbtCommunityProject( case Some(ivyHome) => List(s"-Dsbt.ivy.home=$ivyHome") case _ => Nil extraSbtArgs ++ sbtProps ++ List( - "-sbt-version", "1.6.2", + "-sbt-version", "1.7.1", "-Dsbt.supershell=false", s"-Ddotty.communitybuild.dir=$communitybuildDir", s"--addPluginSbtFile=$sbtPluginFilePath" @@ -265,9 +265,8 @@ object projects: lazy val scalacheck = SbtCommunityProject( project = "scalacheck", - sbtTestCommand = "jvm/test;js/test", - sbtPublishCommand = "jvm/publishLocal;js/publishLocal", - sbtDocCommand = forceDoc("jvm") + sbtTestCommand = "coreJVM/test;coreJS/test", + sbtPublishCommand = "coreJVM/publishLocal;coreJS/publishLocal" ) lazy val scalatest: SbtCommunityProject = SbtCommunityProject( @@ -506,10 +505,8 @@ object projects: lazy val scalaJava8Compat = SbtCommunityProject( project = "scala-java8-compat", - // the fnGen subproject must be built with 2.12.x - sbtTestCommand = s"++2.12.14; ++$compilerVersion; set fnGen/dependencyOverrides := Nil; test", - sbtPublishCommand = s"++2.12.14; ++$compilerVersion; set fnGen/dependencyOverrides := Nil; publishLocal", - scalacOptions = Nil // avoid passing Scala 3 options to Scala 2.12 in fnGen subproject + sbtTestCommand = "test", + sbtPublishCommand = "publishLocal", ) lazy val verify = SbtCommunityProject( @@ -550,8 +547,8 @@ object projects: lazy val cats = SbtCommunityProject( project = "cats", - sbtTestCommand = "set Global/scalaJSStage := FastOptStage;buildJVM;validateAllJS", - sbtPublishCommand = "catsJVM/publishLocal;catsJS/publishLocal", + sbtTestCommand = "set Global/scalaJSStage := FastOptStage;rootJVM/test;rootJS/test", + sbtPublishCommand = "rootJVM/publishLocal;rootJS/publishLocal", dependencies = List(discipline, disciplineMunit, scalacheck, simulacrumScalafixAnnotations), scalacOptions = SbtCommunityProject.scalacOptions.filter(_ != "-Ysafe-init") // disable -Ysafe-init, due to -Xfatal-warning @@ -755,7 +752,7 @@ object projects: lazy val http4s = SbtCommunityProject( project = "http4s", - sbtTestCommand = "tests/test; server/test; client/test; ember-core/test; ember-server/test; ember-client/test; circe/test", + sbtTestCommand = """set ThisBuild / tlFatalWarnings := false; server/test; client/test; ember-core/test; ember-server/test; ember-client/test; circe/test""", sbtPublishCommand = "publishLocal", scalacOptions = SbtCommunityProject.scalacOptions.filter(_ != "-Ysafe-init"), dependencies = List(cats, catsEffect3, fs2, disciplineMunit, scalacheckEffect) diff --git a/project/build.properties b/project/build.properties index c8fcab543a9c..22af2628c413 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.6.2 +sbt.version=1.7.1 diff --git a/sbt-test/sbt-dotty/dotty-knowledge.i17/project/build.properties b/sbt-test/sbt-dotty/dotty-knowledge.i17/project/build.properties index c8fcab543a9c..22af2628c413 100644 --- a/sbt-test/sbt-dotty/dotty-knowledge.i17/project/build.properties +++ b/sbt-test/sbt-dotty/dotty-knowledge.i17/project/build.properties @@ -1 +1 @@ -sbt.version=1.6.2 +sbt.version=1.7.1 diff --git a/semanticdb/project/build.properties b/semanticdb/project/build.properties index c8fcab543a9c..22af2628c413 100644 --- a/semanticdb/project/build.properties +++ b/semanticdb/project/build.properties @@ -1 +1 @@ -sbt.version=1.6.2 +sbt.version=1.7.1 diff --git a/tests/cmdTest-sbt-tests/sourcepath-with-inline-api-hash/project/build.properties b/tests/cmdTest-sbt-tests/sourcepath-with-inline-api-hash/project/build.properties index c8fcab543a9c..22af2628c413 100644 --- a/tests/cmdTest-sbt-tests/sourcepath-with-inline-api-hash/project/build.properties +++ b/tests/cmdTest-sbt-tests/sourcepath-with-inline-api-hash/project/build.properties @@ -1 +1 @@ -sbt.version=1.6.2 +sbt.version=1.7.1 diff --git a/tests/cmdTest-sbt-tests/sourcepath-with-inline/project/build.properties b/tests/cmdTest-sbt-tests/sourcepath-with-inline/project/build.properties index c8fcab543a9c..22af2628c413 100644 --- a/tests/cmdTest-sbt-tests/sourcepath-with-inline/project/build.properties +++ b/tests/cmdTest-sbt-tests/sourcepath-with-inline/project/build.properties @@ -1 +1 @@ -sbt.version=1.6.2 +sbt.version=1.7.1