Merge pull request #6505 from adpi2/apply-fix-6492

Bump to 1.5.2 + Remove forking in Test
This commit is contained in:
eugene yokota 2021-05-10 10:03:47 -04:00 committed by GitHub
commit 5095ea0316
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 3 deletions

View File

@ -880,7 +880,6 @@ lazy val zincLmIntegrationProj = (project in file("zinc-lm-integration"))
exclude[IncompatibleSignatureProblem]("sbt.internal.inc.ZincLMHelper.update"),
),
libraryDependencies += launcherInterface,
Test / fork := true,
)
.configure(addSbtZincCompileCore, addSbtLmCore, addSbtLmIvyTest)
@ -919,7 +918,6 @@ lazy val mainProj = (project in file("main"))
Compile / generateContrabands / sourceManaged := baseDirectory.value / "src" / "main" / "contraband-scala",
Test / testOptions += Tests
.Argument(TestFrameworks.ScalaCheck, "-minSuccessfulTests", "1000"),
Test / fork := true,
SettingKey[Boolean]("usePipelining") := false,
mimaSettings,
mimaBinaryIssueFilters ++= Vector(

View File

@ -1 +1 @@
sbt.version=1.5.1
sbt.version=1.5.2