mirror of https://github.com/sbt/sbt.git
Merge pull request #5476 from eed3si9n/wip/scala-2.12.11
Update scala to 2.12.11
This commit is contained in:
commit
a6c727a4ae
|
|
@ -5,7 +5,7 @@ language: scala
|
|||
env:
|
||||
global:
|
||||
- TRAVIS_JDK=adopt@1.11.0-1
|
||||
- SCALA_212=2.12.10
|
||||
- SCALA_212=2.12.11
|
||||
- SCALA_213=2.13.1
|
||||
- UTIL_TESTS="utilCache/test;utilControl/test;utilInterface/test;utilLogging/test;utilPosition/test;utilRelation/test;utilScripted/test;utilTracking/test"
|
||||
# WHITESOURCE_PASSWORD=
|
||||
|
|
|
|||
|
|
@ -96,7 +96,7 @@ private[sbt] object PluginCross {
|
|||
VersionNumber(sv) match {
|
||||
case VersionNumber(Seq(0, 12, _*), _, _) => "2.9.2"
|
||||
case VersionNumber(Seq(0, 13, _*), _, _) => "2.10.7"
|
||||
case VersionNumber(Seq(1, 0, _*), _, _) => "2.12.10"
|
||||
case VersionNumber(Seq(1, 0, _*), _, _) => "2.12.11"
|
||||
case _ => sys.error(s"Unsupported sbt binary version: $sv")
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ import sbt.contraband.ContrabandPlugin.autoImport._
|
|||
|
||||
object Dependencies {
|
||||
// WARNING: Please Scala update versions in PluginCross.scala too
|
||||
val scala212 = "2.12.10"
|
||||
val scala212 = "2.12.11"
|
||||
val scala213 = "2.13.1"
|
||||
val checkPluginCross = settingKey[Unit]("Make sure scalaVersion match up")
|
||||
val baseScalaVersion = scala212
|
||||
|
|
|
|||
|
|
@ -121,7 +121,7 @@ object Scripted {
|
|||
prescripted: java.util.List[File],
|
||||
scalaVersion: String,
|
||||
sbtVersion: String,
|
||||
classpath: Seq[File],
|
||||
classpath: Array[File],
|
||||
instances: Int
|
||||
): Unit
|
||||
}
|
||||
|
|
@ -154,7 +154,7 @@ object Scripted {
|
|||
callback,
|
||||
scalaVersion,
|
||||
sbtVersion,
|
||||
classpath,
|
||||
classpath.toArray,
|
||||
instances
|
||||
)
|
||||
} catch { case ite: InvocationTargetException => throw ite.getCause }
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
scalaVersion := "2.12.10"
|
||||
crossScalaVersions := List("2.12.10", "2.13.0")
|
||||
scalaVersion := "2.12.11"
|
||||
crossScalaVersions := List("2.12.11", "2.13.0")
|
||||
|
||||
val setLastModified = taskKey[Unit]("Sets the last modified time for classfiles")
|
||||
setLastModified := {
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
crossScalaVersions := Seq[String]("2.11.12", "2.12.10")
|
||||
crossScalaVersions := Seq[String]("2.11.12", "2.12.11")
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
> ++2.11.12; compile
|
||||
|
||||
> ++ 2.12.10 ; compile;
|
||||
> ++ 2.12.11 ; compile;
|
||||
|
||||
> ++ 2.12.10 ; compile
|
||||
> ++ 2.12.11 ; compile
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
lazy val scala212 = "2.12.10"
|
||||
lazy val scala212 = "2.12.11"
|
||||
// keep this at M5 to test full version
|
||||
lazy val scala213 = "2.13.1"
|
||||
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ $ exists lib/target/scala-2.13
|
|||
|
||||
# test safe switching
|
||||
> clean
|
||||
> ++ 2.12.10 -v compile
|
||||
> ++ 2.12.11 -v compile
|
||||
$ exists lib/target/scala-2.12
|
||||
-$ exists lib/target/scala-2.13
|
||||
$ exists sbt-foo/target/scala-2.12
|
||||
|
|
@ -29,7 +29,7 @@ $ exists sbt-foo/target/scala-2.12
|
|||
|
||||
# Test ++ leaves crossScalaVersions unchanged
|
||||
> clean
|
||||
> ++2.12.10
|
||||
> ++2.12.11
|
||||
> +extrasProj/compile
|
||||
$ exists extras/target/scala-2.13
|
||||
$ exists extras/target/scala-2.12
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
lazy val scala212 = "2.12.10"
|
||||
lazy val scala212 = "2.12.11"
|
||||
lazy val scala213 = "2.13.1"
|
||||
|
||||
ThisBuild / scalaVersion := scala212
|
||||
|
|
|
|||
|
|
@ -6,11 +6,11 @@ lazy val root = (project in file("."))
|
|||
|
||||
lazy val foo = project
|
||||
.settings(
|
||||
crossScalaVersions := Seq("2.12.10", "2.13.1"),
|
||||
crossScalaVersions := Seq("2.12.11", "2.13.1"),
|
||||
libraryDependencies += "org.scalatest" %% "scalatest" % "3.1.0",
|
||||
)
|
||||
|
||||
lazy val client = project
|
||||
.settings(
|
||||
crossScalaVersions := Seq("2.12.10", "2.13.1"),
|
||||
crossScalaVersions := Seq("2.12.11", "2.13.1"),
|
||||
)
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ val newContents = "bbbbbbbbb"
|
|||
|
||||
val rootContentFile = "root.txt"
|
||||
|
||||
ThisBuild / scalaVersion := "2.12.10"
|
||||
ThisBuild / scalaVersion := "2.12.11"
|
||||
|
||||
lazy val root = (project in file("."))
|
||||
.settings(
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
val buildInfo = taskKey[Seq[File]]("generates the build info")
|
||||
|
||||
ThisBuild / scalaVersion := "2.12.10"
|
||||
ThisBuild / scalaVersion := "2.12.11"
|
||||
|
||||
lazy val root = (project in file("."))
|
||||
.settings(
|
||||
|
|
|
|||
|
|
@ -19,4 +19,4 @@ val dynamicTask = taskKey[Unit]("dynamic input task")
|
|||
|
||||
dynamicTask := { println("not yet et") }
|
||||
|
||||
crossScalaVersions := "2.11.12" :: "2.12.10" :: Nil
|
||||
crossScalaVersions := "2.11.12" :: "2.12.11" :: Nil
|
||||
|
|
|
|||
|
|
@ -37,4 +37,4 @@
|
|||
|
||||
> ++ 2.11.12 compile; setStringValue bar; checkStringValue bar
|
||||
|
||||
> ++2.12.10 compile; setStringValue foo; checkStringValue foo
|
||||
> ++2.12.11 compile; setStringValue foo; checkStringValue foo
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ ThisBuild / turbo := true
|
|||
|
||||
val akkaTest = (project in file(".")).settings(
|
||||
name := "akka-test",
|
||||
scalaVersion := "2.12.10",
|
||||
scalaVersion := "2.12.11",
|
||||
libraryDependencies ++= Seq(
|
||||
"com.typesafe.akka" %% "akka-actor" % "2.5.16",
|
||||
"com.lihaoyi" %% "utest" % "0.6.6" % "test"
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ def wrap(task: InputKey[Unit]): Def.Initialize[Task[Unit]] =
|
|||
ThisBuild / turbo := true
|
||||
|
||||
val root = (project in file(".")).settings(
|
||||
scalaVersion := "2.12.10",
|
||||
scalaVersion := "2.12.11",
|
||||
javacOptions ++= Seq("-source", "1.8", "-target", "1.8", "-h",
|
||||
sourceDirectory.value.toPath.resolve("main/native/include").toString),
|
||||
libraryDependencies += "com.lihaoyi" %% "utest" % "0.6.6" % "test",
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ ThisBuild / turbo := true
|
|||
|
||||
val snapshot = (project in file(".")).settings(
|
||||
name := "mismatched-libraries",
|
||||
scalaVersion := "2.12.10",
|
||||
scalaVersion := "2.12.11",
|
||||
libraryDependencies ++= Seq("com.lihaoyi" %% "utest" % "0.6.6" % "test"),
|
||||
testFrameworks := Seq(TestFramework("utest.runner.Framework")),
|
||||
resolvers += "Local Maven" at file("libraries/ivy").toURI.toURL.toString,
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
val layeringStrategyTest = (project in file(".")).settings(
|
||||
name := "layering-strategy-test",
|
||||
scalaVersion := "2.12.10",
|
||||
scalaVersion := "2.12.11",
|
||||
organization := "sbt",
|
||||
libraryDependencies += "com.typesafe.akka" %% "akka-actor" % "2.5.16",
|
||||
)
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ ThisBuild / useCoursier := false
|
|||
|
||||
val snapshot = (project in file(".")).settings(
|
||||
name := "akka-test",
|
||||
scalaVersion := "2.12.10",
|
||||
scalaVersion := "2.12.11",
|
||||
libraryDependencies ++= Seq(
|
||||
"com.lihaoyi" %% "utest" % "0.6.6" % "test"
|
||||
),
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
<dependency>
|
||||
<groupId>org.scala-lang</groupId>
|
||||
<artifactId>scala-library</artifactId>
|
||||
<version>2.12.10</version>
|
||||
<version>2.12.11</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</project>
|
||||
</project>
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
<dependency>
|
||||
<groupId>org.scala-lang</groupId>
|
||||
<artifactId>scala-library</artifactId>
|
||||
<version>2.12.10</version>
|
||||
<version>2.12.11</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</project>
|
||||
</project>
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ name := "Simple Project"
|
|||
|
||||
version := "1.0"
|
||||
|
||||
scalaVersion := "2.12.10"
|
||||
scalaVersion := "2.12.11"
|
||||
|
||||
libraryDependencies += "org.apache.spark" %% "spark-sql" % "2.4.3"
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ ThisBuild / turbo := true
|
|||
|
||||
val utestTest = (project in file(".")).settings(
|
||||
name := "utest-test",
|
||||
scalaVersion := "2.12.10",
|
||||
scalaVersion := "2.12.11",
|
||||
libraryDependencies ++= Seq(
|
||||
"com.lihaoyi" %% "utest" % "0.6.6" % "test"
|
||||
),
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
ThisBuild / scalaVersion := "2.12.10"
|
||||
ThisBuild / scalaVersion := "2.12.11"
|
||||
|
||||
lazy val root = (project in file(".")).
|
||||
settings(
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
lazy val scala212 = "2.12.10"
|
||||
lazy val scala212 = "2.12.11"
|
||||
lazy val scala213 = "2.13.1"
|
||||
ThisBuild / scalaVersion := scala212
|
||||
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
scalaVersion := "2.12.10"
|
||||
scalaVersion := "2.12.11"
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ lazy val check = taskKey[Unit]("")
|
|||
lazy val checkArtifact = taskKey[Unit]("")
|
||||
|
||||
ThisBuild / useCoursier := false
|
||||
ThisBuild / scalaVersion := "2.12.10"
|
||||
ThisBuild / scalaVersion := "2.12.11"
|
||||
ThisBuild / version := "0.1.0-SNAPSHOT"
|
||||
ThisBuild / organization := "com.example"
|
||||
ThisBuild / organizationName := "example"
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
ThisBuild / scalaVersion := "2.12.10"
|
||||
ThisBuild / scalaVersion := "2.12.11"
|
||||
|
||||
// TTL of Coursier is 24h
|
||||
ThisBuild / useCoursier := false
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ lazy val check = taskKey[Unit]("Runs the check")
|
|||
val scalatest = "org.scalatest" %% "scalatest" % "3.0.5"
|
||||
val junit = "junit" % "junit" % "4.11"
|
||||
|
||||
ThisBuild / scalaVersion := "2.12.10"
|
||||
ThisBuild / scalaVersion := "2.12.11"
|
||||
|
||||
def commonSettings: Seq[Def.Setting[_]] =
|
||||
Seq(
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
ThisBuild / scalaVersion := "2.12.10"
|
||||
ThisBuild / scalaVersion := "2.12.11"
|
||||
|
||||
lazy val check = taskKey[Unit]("")
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
ThisBuild / scalaVersion := "2.12.10"
|
||||
ThisBuild / scalaVersion := "2.12.11"
|
||||
libraryDependencies ++= List(
|
||||
"org.webjars.npm" % "randomatic" % "1.1.7",
|
||||
"org.webjars.npm" % "is-odd" % "2.0.0",
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
scalaVersion := "2.12.10"
|
||||
scalaVersion := "2.12.11"
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
ThisBuild / organization := "com.example"
|
||||
ThisBuild / scalaVersion := "2.12.10"
|
||||
ThisBuild / scalaVersion := "2.12.11"
|
||||
|
||||
def customIvyPaths: Seq[Def.Setting[_]] = Seq(
|
||||
ivyPaths := IvyPaths((baseDirectory in ThisBuild).value, Some((baseDirectory in ThisBuild).value / "ivy-cache"))
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
ThisBuild / organization := "com.example"
|
||||
ThisBuild / scalaVersion := "2.12.10"
|
||||
ThisBuild / scalaVersion := "2.12.11"
|
||||
|
||||
// TTL is 24h so we can't detect the change
|
||||
ThisBuild / useCoursier := false
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
ThisBuild / scalaVersion := "2.12.10"
|
||||
ThisBuild / scalaVersion := "2.12.11"
|
||||
|
||||
lazy val root = (project in file("."))
|
||||
.settings(
|
||||
|
|
@ -14,14 +14,14 @@ def checkSources(report: UpdateReport): Unit = {
|
|||
sys.error(s"No sources retrieved\n\n$report")
|
||||
else if (srcs.size != 9 || !srcs.exists(_ == "akka-actor_2.12-2.5.22-sources.jar")) {
|
||||
// [info] [error] scala-java8-compat_2.12-0.8.0-sources.jar
|
||||
// [info] [error] scala-library-2.12.10-sources.jar
|
||||
// [info] [error] scala-library-2.12.11-sources.jar
|
||||
// [info] [error] config-1.3.3-sources.jar
|
||||
// [info] [error] akka-actor_2.12-2.5.22-sources.jar
|
||||
// [info] [error] scala-compiler-2.12.10-sources.jar
|
||||
// [info] [error] scala-compiler-2.12.11-sources.jar
|
||||
// [info] [error] jline-2.14.6-sources.jar
|
||||
// [info] [error] jansi-1.12-sources.jar
|
||||
// [info] [error] scala-xml_2.12-1.0.6-sources.jar
|
||||
// [info] [error] scala-reflect-2.12.10-sources.jar
|
||||
// [info] [error] scala-reflect-2.12.11-sources.jar
|
||||
sys.error("Incorrect sources retrieved:\n\t" + srcs.mkString("\n\t"))
|
||||
} else ()
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
ThisBuild / scalaVersion := "2.12.10"
|
||||
ThisBuild / scalaVersion := "2.12.11"
|
||||
|
||||
lazy val check = taskKey[Unit]("")
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
ThisBuild / scalaVersion := "2.12.10"
|
||||
ThisBuild / scalaVersion := "2.12.11"
|
||||
|
||||
name := "hello"
|
||||
enablePlugins(JavaAppPackaging)
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
name := "projA"
|
||||
|
||||
scalaVersion := "2.12.10"
|
||||
scalaVersion := "2.12.11"
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
val baseSbt = "1."
|
||||
|
||||
val buildCrossList = List("2.10.7", "2.11.12", "2.12.10")
|
||||
scalaVersion in ThisBuild := "2.12.10"
|
||||
val buildCrossList = List("2.10.7", "2.11.12", "2.12.11")
|
||||
scalaVersion in ThisBuild := "2.12.11"
|
||||
crossScalaVersions in ThisBuild := buildCrossList
|
||||
|
||||
addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.7.0")
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
val unpackage = TaskKey[Unit]("unpackage")
|
||||
|
||||
ThisBuild / scalaVersion := "2.12.10"
|
||||
ThisBuild / scalaVersion := "2.12.11"
|
||||
|
||||
lazy val root = (project in file("."))
|
||||
.settings(
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
ThisBuild / scalaVersion := "2.12.10"
|
||||
ThisBuild / scalaVersion := "2.12.11"
|
||||
ThisBuild / trackInternalDependencies := TrackLevel.NoTracking
|
||||
|
||||
lazy val root = (project in file("."))
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
// TODO: bump to 2.12.10 once scalameta is available
|
||||
// TODO: bump to 2.12.11 once scalameta is available
|
||||
ThisBuild / scalaVersion := "2.12.8"
|
||||
ThisBuild / semanticdbEnabled := true
|
||||
ThisBuild / semanticdbIncludeInJar := true
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
val scalcheck = "org.scalacheck" %% "scalacheck" % "1.14.0"
|
||||
|
||||
ThisBuild / scalaVersion := "2.12.10"
|
||||
ThisBuild / scalaVersion := "2.12.11"
|
||||
|
||||
lazy val root = (project in file("."))
|
||||
.settings(
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
ThisBuild / scalaVersion := "2.12.10"
|
||||
ThisBuild / scalaVersion := "2.12.11"
|
||||
|
||||
lazy val dep = project
|
||||
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
# A.scala needs B.scala, it would be in source list
|
||||
> ++2.12.10!
|
||||
> ++2.12.11!
|
||||
> compile
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
// TODO: bump to 2.12.10 once macro paradise is available
|
||||
ThisBuild / scalaVersion := "2.12.8"
|
||||
ThisBuild / scalaVersion := "2.12.11"
|
||||
|
||||
val paradiseVersion = "2.1.1"
|
||||
val commonSettings = Seq(
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
ThisBuild / scalaVersion := "2.12.10"
|
||||
ThisBuild / scalaVersion := "2.12.11"
|
||||
|
||||
val defaultSettings = Seq(
|
||||
libraryDependencies += scalaVersion("org.scala-lang" % "scala-reflect" % _ ).value
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
ThisBuild / scalaVersion := "2.12.10"
|
||||
ThisBuild / scalaVersion := "2.12.11"
|
||||
|
||||
val defaultSettings = Seq(
|
||||
libraryDependencies += scalaVersion("org.scala-lang" % "scala-reflect" % _ ).value
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
ThisBuild / scalaVersion := "2.12.10"
|
||||
ThisBuild / scalaVersion := "2.12.11"
|
||||
|
||||
val defaultSettings = Seq(
|
||||
libraryDependencies += scalaVersion("org.scala-lang" % "scala-reflect" % _ ).value
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
ThisBuild / scalaVersion := "2.12.10"
|
||||
ThisBuild / scalaVersion := "2.12.11"
|
||||
|
||||
val defaultSettings = Seq(
|
||||
libraryDependencies += scalaVersion("org.scala-lang" % "scala-reflect" % _ ).value
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
val scalatest = "org.scalatest" %% "scalatest" % "3.0.5"
|
||||
|
||||
ThisBuild / scalaVersion := "2.12.10"
|
||||
ThisBuild / scalaVersion := "2.12.11"
|
||||
|
||||
val foo = settingKey[Seq[String]]("foo")
|
||||
val checkFoo = inputKey[Unit]("check contents of foo")
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
val scalatest = "org.scalatest" %% "scalatest" % "3.0.5"
|
||||
|
||||
ThisBuild / scalaVersion := "2.12.10"
|
||||
ThisBuild / scalaVersion := "2.12.11"
|
||||
|
||||
lazy val root = (project in file("."))
|
||||
.settings(
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
val scalatest = "org.scalatest" %% "scalatest" % "3.0.5"
|
||||
|
||||
ThisBuild / scalaVersion := "2.12.10"
|
||||
ThisBuild / scalaVersion := "2.12.11"
|
||||
|
||||
lazy val root = (project in file("."))
|
||||
.settings(
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
ThisBuild / scalaVersion := "2.12.10"
|
||||
ThisBuild / scalaVersion := "2.12.11"
|
||||
|
||||
lazy val root = (project in file("."))
|
||||
.settings(
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
import Tests._
|
||||
import Defaults._
|
||||
|
||||
ThisBuild / scalaVersion := "2.12.10"
|
||||
ThisBuild / scalaVersion := "2.12.11"
|
||||
val check = taskKey[Unit]("Check that tests are executed in parallel")
|
||||
|
||||
lazy val root = (project in file("."))
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
val specs = "org.specs2" %% "specs2-core" % "4.3.4"
|
||||
ThisBuild / scalaVersion := "2.12.10"
|
||||
ThisBuild / scalaVersion := "2.12.11"
|
||||
|
||||
Global / concurrentRestrictions := Seq(Tags.limitAll(4))
|
||||
libraryDependencies += specs % Test
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
ThisBuild / scalaVersion := "2.12.10"
|
||||
ThisBuild / scalaVersion := "2.12.11"
|
||||
|
||||
libraryDependencies += "org.scala-sbt" % "test-interface" % "1.0"
|
||||
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ val scalaxml = "org.scala-lang.modules" %% "scala-xml" % "1.1.1"
|
|||
def groupId(idx: Int) = "group_" + (idx + 1)
|
||||
def groupPrefix(idx: Int) = groupId(idx) + "_file_"
|
||||
|
||||
ThisBuild / scalaVersion := "2.12.10"
|
||||
ThisBuild / scalaVersion := "2.12.11"
|
||||
ThisBuild / organization := "org.example"
|
||||
|
||||
lazy val root = (project in file("."))
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
val scalatest = "org.scalatest" %% "scalatest" % "3.0.5"
|
||||
|
||||
ThisBuild / scalaVersion := "2.12.10"
|
||||
ThisBuild / scalaVersion := "2.12.11"
|
||||
|
||||
fork := true
|
||||
libraryDependencies += scalatest % Test
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
ThisBuild / scalaVersion := "2.12.10"
|
||||
ThisBuild / scalaVersion := "2.12.11"
|
||||
|
||||
val specs = "org.specs2" %% "specs2-core" % "4.3.4"
|
||||
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ val nestedSuitesReportFile = "target/test-reports/TEST-my.scalatest.MyNestedSuit
|
|||
val scalatest = "org.scalatest" %% "scalatest" % "3.0.5"
|
||||
val junitinterface = "com.novocode" % "junit-interface" % "0.11"
|
||||
|
||||
ThisBuild / scalaVersion := "2.12.10"
|
||||
ThisBuild / scalaVersion := "2.12.11"
|
||||
|
||||
lazy val root = (project in file(".")).
|
||||
settings(
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
val scalatest = "org.scalatest" %% "scalatest" % "3.0.5"
|
||||
|
||||
ThisBuild / scalaVersion := "2.12.10"
|
||||
ThisBuild / scalaVersion := "2.12.11"
|
||||
|
||||
lazy val root = (project in file("."))
|
||||
.settings(
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
val scalatest = "org.scalatest" %% "scalatest" % "3.0.5"
|
||||
|
||||
ThisBuild / scalaVersion := "2.12.10"
|
||||
ThisBuild / scalaVersion := "2.12.11"
|
||||
|
||||
lazy val root = (project in file("."))
|
||||
.settings(
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
val scalatest = "org.scalatest" %% "scalatest" % "3.0.5"
|
||||
val scalaxml = "org.scala-lang.modules" %% "scala-xml" % "1.1.1"
|
||||
|
||||
ThisBuild / scalaVersion := "2.12.10"
|
||||
ThisBuild / scalaVersion := "2.12.11"
|
||||
|
||||
lazy val root = (project in file("."))
|
||||
.settings(
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
val scalcheck = "org.scalacheck" %% "scalacheck" % "1.14.0"
|
||||
|
||||
ThisBuild / scalaVersion := "2.12.10"
|
||||
ThisBuild / scalaVersion := "2.12.11"
|
||||
ThisBuild / version := "0.0.1"
|
||||
ThisBuild / organization := "org.catastrophe"
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
val specsJunit = "org.specs2" %% "specs2-junit" % "4.3.4"
|
||||
val junitinterface = "com.novocode" % "junit-interface" % "0.11"
|
||||
ThisBuild / scalaVersion := "2.12.10"
|
||||
ThisBuild / scalaVersion := "2.12.11"
|
||||
libraryDependencies += junitinterface % Test
|
||||
libraryDependencies += specsJunit % Test
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
val scalcheck = "org.scalacheck" %% "scalacheck" % "1.14.0"
|
||||
|
||||
ThisBuild / scalaVersion := "2.12.10"
|
||||
ThisBuild / scalaVersion := "2.12.11"
|
||||
Test / parallelExecution := false
|
||||
libraryDependencies += scalcheck % Test
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
val specs = "org.specs2" %% "specs2-core" % "4.3.4"
|
||||
ThisBuild / scalaVersion := "2.12.10"
|
||||
ThisBuild / scalaVersion := "2.12.11"
|
||||
libraryDependencies += specs % Test
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ import sbt.internal.inc.ScalaInstance
|
|||
lazy val OtherScala = config("other-scala").hide
|
||||
lazy val junitinterface = "com.novocode" % "junit-interface" % "0.11"
|
||||
lazy val akkaActor = "com.typesafe.akka" %% "akka-actor" % "2.5.17"
|
||||
ThisBuild / scalaVersion := "2.12.10"
|
||||
ThisBuild / scalaVersion := "2.12.11"
|
||||
|
||||
lazy val root = (project in file("."))
|
||||
.configs(OtherScala)
|
||||
|
|
@ -18,7 +18,7 @@ lazy val root = (project in file("."))
|
|||
val rawJars = (managedClasspath in OtherScala).value.map(_.data)
|
||||
val scalaHome = (target.value / "scala-home")
|
||||
def removeVersion(name: String): String =
|
||||
name.replaceAll("\\-2.12.10", "")
|
||||
name.replaceAll("\\-2.12.11", "")
|
||||
for(jar <- rawJars) {
|
||||
val tjar = scalaHome / s"lib/${removeVersion(jar.getName)}"
|
||||
IO.copyFile(jar, tjar)
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
val scalatest = "org.scalatest" %% "scalatest" % "3.0.5"
|
||||
|
||||
ThisBuild / scalaVersion := "2.12.10"
|
||||
ThisBuild / scalaVersion := "2.12.11"
|
||||
ThisBuild / organization := "com.example"
|
||||
ThisBuild / version := "0.0.1-SNAPSHOT"
|
||||
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
val scalatest = "org.scalatest" %% "scalatest" % "3.0.5"
|
||||
ThisBuild / scalaVersion := "2.12.10"
|
||||
ThisBuild / scalaVersion := "2.12.11"
|
||||
libraryDependencies += scalatest
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
val scalatest = "org.scalatest" %% "scalatest" % "3.0.5"
|
||||
ThisBuild / scalaVersion := "2.12.10"
|
||||
ThisBuild / scalaVersion := "2.12.11"
|
||||
libraryDependencies += scalatest
|
||||
Test / testOptions += Tests.Argument("-C", "custom.CustomReporter")
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
val specs = "org.specs2" %% "specs2-core" % "4.3.4"
|
||||
ThisBuild / scalaVersion := "2.12.10"
|
||||
ThisBuild / scalaVersion := "2.12.11"
|
||||
|
||||
libraryDependencies += specs % Test
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ val check = TaskKey[Unit]("check", "Check correct error has been returned.")
|
|||
val scalatest = "org.scalatest" %% "scalatest" % "3.0.5"
|
||||
val scalaxml = "org.scala-lang.modules" %% "scala-xml" % "1.1.1"
|
||||
|
||||
ThisBuild / scalaVersion := "2.12.10"
|
||||
ThisBuild / scalaVersion := "2.12.11"
|
||||
|
||||
lazy val root = (project in file(".")).
|
||||
settings(
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
val scalatest = "org.scalatest" %% "scalatest" % "3.0.5"
|
||||
ThisBuild / scalaVersion := "2.12.10"
|
||||
ThisBuild / scalaVersion := "2.12.11"
|
||||
libraryDependencies += scalatest
|
||||
Test / testOptions += Tests.Argument("-C", "custom.CustomReporter")
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
val scalatest = "org.scalatest" %% "scalatest" % "3.0.5"
|
||||
ThisBuild / scalaVersion := "2.12.10"
|
||||
ThisBuild / scalaVersion := "2.12.11"
|
||||
|
||||
lazy val root = (project in file("."))
|
||||
.settings(
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
val scalatest = "org.scalatest" %% "scalatest" % "3.0.5"
|
||||
val scalaxml = "org.scala-lang.modules" %% "scala-xml" % "1.1.1"
|
||||
ThisBuild / scalaVersion := "2.12.10"
|
||||
ThisBuild / scalaVersion := "2.12.11"
|
||||
|
||||
lazy val root = (project in file("."))
|
||||
.settings(
|
||||
|
|
|
|||
|
|
@ -53,4 +53,4 @@ expectFailure / watchOnFileInputEvent := { (_, e) =>
|
|||
}
|
||||
|
||||
|
||||
crossScalaVersions := Seq("2.11.12", "2.12.10")
|
||||
crossScalaVersions := Seq("2.11.12", "2.12.11")
|
||||
|
|
|
|||
|
|
@ -392,7 +392,7 @@ object ScriptedTests extends ScriptedRunner {
|
|||
new java.util.ArrayList[File],
|
||||
defScalaVersion,
|
||||
sbtVersion,
|
||||
cp.toSeq,
|
||||
cp,
|
||||
1
|
||||
)
|
||||
}
|
||||
|
|
@ -413,7 +413,7 @@ class ScriptedRunner {
|
|||
prescripted: java.util.List[File],
|
||||
scalaVersion: String,
|
||||
sbtVersion: String,
|
||||
classpath: Seq[File],
|
||||
classpath: Array[File],
|
||||
instances: Int
|
||||
): Unit = {
|
||||
val addTestFile = (f: File) => { prescripted.add(f); () }
|
||||
|
|
@ -444,7 +444,7 @@ class ScriptedRunner {
|
|||
prescripted: java.util.List[File],
|
||||
sbtVersion: String,
|
||||
scalaVersion: String,
|
||||
classpath: Seq[File],
|
||||
classpath: Array[File],
|
||||
instances: Int
|
||||
): Unit =
|
||||
runInParallel(
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
import sbt.internal.server.{ ServerHandler, ServerIntent }
|
||||
|
||||
ThisBuild / scalaVersion := "2.12.10"
|
||||
ThisBuild / scalaVersion := "2.12.11"
|
||||
|
||||
lazy val root = (project in file("."))
|
||||
.settings(
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
import sbt.internal.server.{ ServerHandler, ServerIntent }
|
||||
|
||||
ThisBuild / scalaVersion := "2.12.10"
|
||||
ThisBuild / scalaVersion := "2.12.11"
|
||||
|
||||
Global / serverLog / logLevel := Level.Debug
|
||||
// custom handler
|
||||
|
|
|
|||
Loading…
Reference in New Issue