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
scala · Aug 1, 2022 · a541401 · a541401
1 parent fb4f10f
commit a541401
Show file tree

Hide file tree

Showing 14 changed files with 21 additions and 24 deletions.
diff --git a/community-build/community-projects/cats b/community-build/community-projects/cats
diff --git a/community-build/community-projects/discipline b/community-build/community-projects/discipline
diff --git a/community-build/community-projects/discipline-munit b/community-build/community-projects/discipline-munit
diff --git a/community-build/community-projects/fs2 b/community-build/community-projects/fs2
diff --git a/community-build/community-projects/http4s b/community-build/community-projects/http4s
diff --git a/community-build/community-projects/munit-cats-effect b/community-build/community-projects/munit-cats-effect
diff --git a/community-build/community-projects/scala-java8-compat b/community-build/community-projects/scala-java8-compat
diff --git a/community-build/community-projects/scalacheck b/community-build/community-projects/scalacheck
diff --git 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
@@ -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
@@ -1 +1 @@
-sbt.version=1.6.2
+sbt.version=1.7.1
diff --git 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
@@ -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
@@ -1 +1 @@
-sbt.version=1.6.2
+sbt.version=1.7.1
+58 −32		.github/workflows/ci.yml
+1 −1		.scalafmt.conf
+3 −3		README.md
+18 −14		build.sbt
+1 −1		project/build.properties
+4 −4		project/plugins.sbt
+256 −0		.github/workflows/ci.yml
+59 −0		.github/workflows/clean.yml
+0 −23		.github/workflows/release.yml
+0 −27		.github/workflows/scala.yml
+1 −1		.scalafmt.conf
+12 −45		build.sbt
+30 −0		core/shared/src/main/scala/munit/DisciplineSuite.scala
+30 −0		core/shared/src/test/scala/munit/DisciplineSuiteTest.scala
+30 −0		core/shared/src/test/scala/munit/laws.scala
+1 −1		project/build.properties
+4 −10		project/plugins.sbt
+165 −33		.github/workflows/ci.yml
+1 −1		.scalafmt.conf
+3 −3		README.md
+25 −63		build.sbt
+5 −0		ce2/js/src/main/scala/munit/CatsEffectSuitePlatform.scala
+4 −0		ce2/jvm/src/main/scala/munit/CatsEffectSuitePlatform.scala
+4 −2		ce2/shared/src/main/scala/munit/CatsEffectSuite.scala
+16 −16		common/shared/src/main/scala/munit/CatsEffectAssertions.scala
+123 −0		docs/index.md
+1 −1		project/build.properties
+3 −5		project/plugins.sbt
+25 −0		.github/workflows/ci.yml
+21 −0		.github/workflows/release.yml
+0 −25		.travis.yml
+2 −2		NOTICE
+1 −2		README.md
+2 −2		benchmark/build.sbt
+24 −38		build.sbt
+0 −50		build.sh
+0 −314		fnGen/WrapFnGen.scala
+236 −0		project/WrapFnGen.scala
+1 −1		project/build.properties
+1 −2		project/plugins.sbt
+12 −0		src/main/scala-2.13+/scala/compat/java8/collectionImpl/package.scala
+12 −0		src/main/scala-2.13+/scala/compat/java8/converterImpl/StepperExtensions.scala
+12 −0		src/main/scala-2.13+/scala/concurrent/java8/FuturesConvertersImplCompat.scala
+12 −0		src/main/scala-2.13-/scala/concurrent/java8/FuturesConvertersImplCompat.scala
+13 −0		src/test/java-2.11/scala/compat/java8/runtime/LambdaDeserializerTest.java
+83 −0		src/test/scala/scala/compat/java8/Issue247Test.scala
+27 −0		src/test/scala/scala/compat/java8/issue247/Main.scala
+343 −61		.github/workflows/ci.yml
+1 −1		.github/workflows/clean.yml
+3 −0		README.markdown
+80 −225		build.sbt
+0 −0		core/js/src/main/scala/org/scalacheck/Platform.scala
+0 −0		core/js/src/main/scala/org/scalacheck/time/JavaTimeArbitrary.scala
+0 −0		core/js/src/main/scala/org/scalacheck/time/JavaTimeChoose.scala
+0 −0		core/js/src/main/scala/org/scalacheck/time/JavaTimeCogen.scala
+0 −0		core/js/src/main/scala/org/scalacheck/time/JavaTimeShrink.scala
+0 −0		core/jvm/src/main/scala/org/scalacheck/Platform.scala
+5 −8		core/jvm/src/main/scala/org/scalacheck/time/JavaTimeArbitrary.scala
+0 −0		core/jvm/src/main/scala/org/scalacheck/time/JavaTimeChoose.scala
+0 −0		core/jvm/src/main/scala/org/scalacheck/time/JavaTimeCogen.scala
+0 −0		core/jvm/src/main/scala/org/scalacheck/time/JavaTimeShrink.scala
+7 −1		core/jvm/src/test/scala/org/scalacheck/ArbitrarySpecification.scala
+0 −0		core/jvm/src/test/scala/org/scalacheck/ChooseSpecification.scala
+0 −0		core/jvm/src/test/scala/org/scalacheck/CogenSpecification.scala
+1 −1		core/jvm/src/test/scala/org/scalacheck/GenSpecification.scala
+0 −0		core/jvm/src/test/scala/org/scalacheck/LazyPropertiesSpecification.scala
+0 −0		core/jvm/src/test/scala/org/scalacheck/PropertyFilterSpecification.scala
+8 −20		core/jvm/src/test/scala/org/scalacheck/SerializabilitySpecification.scala
+0 −0		core/jvm/src/test/scala/org/scalacheck/ShrinkSpecificationJVM.scala
+0 −0		core/jvm/src/test/scala/org/scalacheck/TestAll.scala
+0 −0		core/jvm/src/test/scala/org/scalacheck/TestSpecification.scala
+137 −0		core/jvm/src/test/scala/org/scalacheck/commands/CommandsShrinkSpecification.scala
+0 −0		core/jvm/src/test/scala/org/scalacheck/commands/CommandsSpecification.scala
+0 −0		core/jvm/src/test/scala/org/scalacheck/examples/IntMapSpec.scala
+0 −0		core/jvm/src/test/scala/org/scalacheck/examples/StringUtils.scala
+0 −0		core/jvm/src/test/scala/org/scalacheck/rng/SeedSpecification.scala
+0 −0		core/jvm/src/test/scala/org/scalacheck/time/ShrinkSpecification.scala
+0 −0		core/native/src/main/scala/org/scalacheck/Platform.scala
+0 −0		core/native/src/main/scala/org/scalacheck/time/JavaTimeArbitrary.scala
+0 −0		core/native/src/main/scala/org/scalacheck/time/JavaTimeChoose.scala
+0 −0		core/native/src/main/scala/org/scalacheck/time/JavaTimeCogen.scala
+0 −0		core/native/src/main/scala/org/scalacheck/time/JavaTimeShrink.scala
+0 −0		core/shared/src/main/scala-2.13+/org/scalacheck/ScalaVersionSpecific.scala
+0 −0		core/shared/src/main/scala-2.13+/org/scalacheck/util/BuildableVersionSpecific.scala
+0 −0		core/shared/src/main/scala-2.13-/org/scalacheck/ScalaVersionSpecific.scala
+0 −0		core/shared/src/main/scala-2.13-/org/scalacheck/util/BuildableVersionSpecific.scala
+65 −36		core/shared/src/main/scala/org/scalacheck/Arbitrary.scala
+0 −0		core/shared/src/main/scala/org/scalacheck/Cogen.scala
+4 −4		core/shared/src/main/scala/org/scalacheck/Gen.scala
+0 −0		core/shared/src/main/scala/org/scalacheck/Prop.scala
+1 −1		core/shared/src/main/scala/org/scalacheck/Properties.scala
+0 −0		core/shared/src/main/scala/org/scalacheck/ScalaCheckFramework.scala
+0 −0		core/shared/src/main/scala/org/scalacheck/Shrink.scala
+0 −0		core/shared/src/main/scala/org/scalacheck/Test.scala
+29 −1		core/shared/src/main/scala/org/scalacheck/commands/Commands.scala
+0 −0		core/shared/src/main/scala/org/scalacheck/rng/Seed.scala
+3 −1		core/shared/src/main/scala/org/scalacheck/util/Buildable.scala
+0 −0		core/shared/src/main/scala/org/scalacheck/util/CmdLineParser.scala
+0 −0		core/shared/src/main/scala/org/scalacheck/util/ConsoleReporter.scala
+0 −0		core/shared/src/main/scala/org/scalacheck/util/FreqMap.scala
+0 −0		core/shared/src/main/scala/org/scalacheck/util/Pretty.scala
+0 −0		core/shared/src/test/scala-2.13+/org/scalacheck/time/OrderingVersionSpecific.scala
+0 −0		core/shared/src/test/scala-2.13-/org/scalacheck/time/OrderingVersionSpecific.scala
+1 −1		core/shared/src/test/scala/org/scalacheck/NoPropertyNestingSpecification.scala
+0 −0		core/shared/src/test/scala/org/scalacheck/PropSpecification.scala
+4 −4		core/shared/src/test/scala/org/scalacheck/ShrinkSpecification.scala
+0 −0		core/shared/src/test/scala/org/scalacheck/StatsSpecification.scala
+0 −0		core/shared/src/test/scala/org/scalacheck/TestFingerprint.scala
+0 −0		core/shared/src/test/scala/org/scalacheck/examples/Examples.scala
+0 −0		core/shared/src/test/scala/org/scalacheck/examples/MathSpec.scala
+0 −0		core/shared/src/test/scala/org/scalacheck/util/BuildableSpecification.scala
+0 −0		core/shared/src/test/scala/org/scalacheck/util/PrettySpecification.scala
+0 −0		core/shared/src/test/scala/scala/StringSpecification.scala
+2 −2		examples/commands-leveldb/build.sbt
+1 −1		examples/commands-leveldb/project/build.properties
+2 −2		examples/commands-leveldb/src/test/scala/CommandsLevelDB.scala
+2 −2		examples/commands-nix/build.sbt
+1 −1		examples/commands-nix/project/build.properties
+2 −2		examples/commands-nix/src/test/scala/CommandsNix.scala
+4 −4		examples/commands-redis/build.sbt
+1 −1		examples/commands-redis/project/build.properties
+3 −3		examples/commands-redis/src/test/scala/CommandsRedis.scala
+1 −1		examples/scalajs/README.md
+2 −2		examples/scalajs/build.sbt
+1 −1		examples/scalajs/project/build.properties
+1 −1		examples/scalajs/project/plugins.sbt
+1 −1		examples/scalajs/src/test/scala/example/ScalaJSExampleTest.scala
+2 −2		examples/simple-sbt/build.sbt
+1 −1		examples/simple-sbt/project/build.properties
+1 −1		examples/simple-sbt/src/test/scala/Demo.scala
+0 −30		project/MimaSettings.scala
+1 −1		project/build.properties
+8 −19		project/plugin.sbt
+0 −59		release.sh
+0 −18		tools/travis-script.sh