diff options
| author | Adriaan Moors <adriaan@lightbend.com> | 2016-11-01 11:31:04 -0700 |
|---|---|---|
| committer | Adriaan Moors <adriaan@lightbend.com> | 2016-11-01 11:34:07 -0700 |
| commit | ad9f66ed00a264f1d2c51f280aaeec0184d1457b (patch) | |
| tree | 72836eba2ba7e720c99d54259e991addac58cfa8 /build.sbt | |
| parent | 9aafca3a362b3f4e0105c8bb561663945d42e9e0 (diff) | |
| download | scala-ad9f66ed00a264f1d2c51f280aaeec0184d1457b.tar.gz scala-ad9f66ed00a264f1d2c51f280aaeec0184d1457b.tar.bz2 scala-ad9f66ed00a264f1d2c51f280aaeec0184d1457b.zip | |
Revert "Temporarily insource Scalacheck 1.11.6"
This reverts commit 22dac3118e97b2a4707d42ef1f47ac292a8ed385.
Diffstat (limited to 'build.sbt')
| -rw-r--r-- | build.sbt | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -39,6 +39,7 @@ val scalaSwingDep = scalaDep("org.scala-lang.modules", "scala-swi val scalaXmlDep = scalaDep("org.scala-lang.modules", "scala-xml") val scalaParserCombinatorsDep = scalaDep("org.scala-lang.modules", "scala-parser-combinators") val partestDep = scalaDep("org.scala-lang.modules", "scala-partest", versionProp = "partest") +val scalacheckDep = scalaDep("org.scalacheck", "scalacheck", scope = "it") // Non-Scala dependencies: val junitDep = "junit" % "junit" % "4.11" @@ -549,7 +550,7 @@ lazy val junit = project.in(file("test") / "junit") javaOptions in Test += "-Xss1M", libraryDependencies ++= Seq(junitDep, junitInterfaceDep, jolDep), testOptions += Tests.Argument(TestFrameworks.JUnit, "-a", "-v"), - testFrameworks -= new TestFramework("org.scalacheck.ScalaCheckFramework"), + // testFrameworks -= new TestFramework("org.scalacheck.ScalaCheckFramework"), unmanagedSourceDirectories in Test := List(baseDirectory.value) ) @@ -628,7 +629,7 @@ lazy val test = project .settings(disablePublishing: _*) .settings(Defaults.itSettings: _*) .settings( - libraryDependencies ++= Seq(asmDep, partestDep, scalaXmlDep), + libraryDependencies ++= Seq(asmDep, partestDep, scalaXmlDep, scalacheckDep), libraryDependencies ++= { // Resolve the JARs for all test/files/lib/*.jar.desired.sha1 files through Ivy val baseDir = (baseDirectory in ThisBuild).value @@ -645,7 +646,7 @@ lazy val test = project fork in IntegrationTest := true, javaOptions in IntegrationTest += "-Xmx2G", testFrameworks += new TestFramework("scala.tools.partest.sbt.Framework"), - testFrameworks -= new TestFramework("org.scalacheck.ScalaCheckFramework"), + // testFrameworks -= new TestFramework("org.scalacheck.ScalaCheckFramework"), testOptions in IntegrationTest += Tests.Argument("-Dpartest.java_opts=-Xmx1024M -Xms64M"), testOptions in IntegrationTest += Tests.Argument("-Dpartest.scalac_opts=" + (scalacOptions in Compile).value.mkString(" ")), testOptions in IntegrationTest += Tests.Setup { () => |