Skip to content

dep: bump sbt to 1.7.1 #15728

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 16 commits into from
Jul 28, 2022
Merged

dep: bump sbt to 1.7.1 #15728

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
de97d4b
dep: bump sbt to 1.7.1
ckipp01 Jul 22, 2022
e3d552d
dep: update fs2 submodule
ckipp01 Jul 22, 2022
327662e
dep: bump fs2 submodule to include latest commit
ckipp01 Jul 22, 2022
3c0dcec
dep: move back to staging fs2
ckipp01 Jul 22, 2022
df7bdf9
dep: sync with latest staging http4s
ckipp01 Jul 23, 2022
3c08936
dep: sync with latest staging munit
ckipp01 Jul 23, 2022
cf7d6fc
dep: sync with latest scala-java8-compat
ckipp01 Jul 24, 2022
d30ad71
dep: back up munit a bit to avoid @implicitNotFound test error
ckipp01 Jul 24, 2022
30a387f
dep: sync with latest cats in staging
ckipp01 Jul 25, 2022
3c93ad6
dep: sync with latest munit-cats-effect and scalacheck
ckipp01 Jul 25, 2022
e0bb0b7
dep: sync with latest discipline and discipline-munit
ckipp01 Jul 25, 2022
653d50a
dep: lock munit at 0.7.29
ckipp01 Jul 25, 2022
fa9154e
dep: sync with 3.x series not main for cats effect
ckipp01 Jul 26, 2022
91a0294
dep: rollback cats-effect and turn off xfatal for it
ckipp01 Jul 26, 2022
7a30d5e
try with `tlFatalWarnings` turned off
ckipp01 Jul 26, 2022
1329582
dep: lock scalacheck at 1.16.0
ckipp01 Jul 27, 2022
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
2 changes: 1 addition & 1 deletion community-build/community-projects/cats
Open in desktop
Submodule cats updated 942 files
2 changes: 1 addition & 1 deletion community-build/community-projects/discipline
Open in desktop
Submodule discipline updated 6 files
+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
2 changes: 1 addition & 1 deletion community-build/community-projects/discipline-munit
Open in desktop
Submodule discipline-munit updated 11 files
+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
2 changes: 1 addition & 1 deletion community-build/community-projects/fs2
Open in desktop
Submodule fs2 updated 118 files
2 changes: 1 addition & 1 deletion community-build/community-projects/http4s
Open in desktop
Submodule http4s updated 577 files
2 changes: 1 addition & 1 deletion community-build/community-projects/munit-cats-effect
Open in desktop
Submodule munit-cats-effect updated 11 files
+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
2 changes: 1 addition & 1 deletion community-build/community-projects/scala-java8-compat
Open in desktop
Submodule scala-java8-compat updated 19 files
+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
2 changes: 1 addition & 1 deletion community-build/community-projects/scalacheck
Open in desktop
Submodule scalacheck updated 88 files
+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
19 changes: 8 additions & 11 deletions community-build/src/scala/dotty/communitybuild/projects.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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(
Expand Down Expand Up @@ -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(
Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.6.2
sbt.version=1.7.1
2 changes: 1 addition & 1 deletion sbt-test/sbt-dotty/dotty-knowledge.i17/project/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.6.2
sbt.version=1.7.1
2 changes: 1 addition & 1 deletion semanticdb/project/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.6.2
sbt.version=1.7.1
2 changes: 1 addition & 1 deletion tests/cmdTest-sbt-tests/sourcepath-with-inline-api-hash/project/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.6.2
sbt.version=1.7.1
2 changes: 1 addition & 1 deletion tests/cmdTest-sbt-tests/sourcepath-with-inline/project/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.6.2
sbt.version=1.7.1