Merge pull request #4518 from SethTisue/version-bumps

0.13 branch: sbt 0.13.18, Scala 2.10.7

.travis.yml

@@ -44,8 +44,8 @@ before_install:
   - curl -sL https://raw.githubusercontent.com/shyiko/jabba/0.10.1/install.sh | bash && . ~/.jabba/jabba.sh
 
 install:
-  - curl -L --fail https://piccolo.link/sbt-0.13.17.tgz > sbt-0.13.17.tgz
-  - tar zxf ./sbt-0.13.17.tgz -C $HOME/
+  - curl -L --fail https://piccolo.link/sbt-0.13.18.tgz > sbt-0.13.18.tgz
+  - tar zxf ./sbt-0.13.18.tgz -C $HOME/
   - export PATH="$HOME/sbt/bin:$PATH"
   - export SBT_OPTS="-Xms2048M -Xmx2048M -Xss2M -XX:MaxPermSize=512M"
   - sbt about

project/NightlyPlugin.scala

@@ -36,8 +36,7 @@ object NightlyPlugin extends AutoPlugin {
         case sv if sv startsWith "2.8." => crossVersion.value
         case sv if sv startsWith "2.9." => crossVersion.value
         case sv if sv startsWith "2.10." => crossVersion.value
-        case sv if sv startsWith "2.11." => CrossVersion.full
-        case sv if sv startsWith "2.12." => CrossVersion.full
+        case _ => CrossVersion.full
       }
     },
     resolvers += Resolver.typesafeIvyRepo("releases")

project/build.properties

@@ -1 +1 @@
-sbt.version=0.13.17
+sbt.version=0.13.18

project/plugins.sbt

@@ -1,4 +1,4 @@
-scalaVersion := "2.10.6"
+scalaVersion := "2.10.7"
 
 addSbtPlugin("com.eed3si9n" % "sbt-doge" % "0.1.5")
 addSbtPlugin("com.typesafe.sbt" % "sbt-ghpages" % "0.5.4")

sbt/src/sbt-test/dependency-management/dynamic-revision/build.sbt

@@ -3,7 +3,7 @@ lazy val check = taskKey[Unit]("Runs the check")
 def commonSettings: Seq[Def.Setting[_]] =
   Seq(
     ivyPaths := new IvyPaths( (baseDirectory in ThisBuild).value, Some((target in LocalRootProject).value / "ivy-cache")),
-    scalaVersion := "2.10.6"
+    scalaVersion := "2.10.7"
   )
 
 lazy val root = (project in file(".")).

sbt/src/sbt-test/dependency-management/pom-type/build.sbt

@@ -2,7 +2,7 @@ lazy val checkPom = taskKey[Unit]("check pom to ensure no <type> sections are ge
 
 lazy val root = (project in file(".")).
   settings(
-    scalaVersion := "2.10.6",
+    scalaVersion := "2.10.7",
     libraryDependencies += "org.scala-tools.sbinary" %% "sbinary" % "0.4.1" withSources() withJavadoc(),
     libraryDependencies += "org.scala-sbt" % "io" % "0.13.8" intransitive(),
     checkPom := {

sbt/src/sbt-test/project/cross-plugins-defaults/build.sbt

@@ -1,7 +1,7 @@
 val baseSbt = "0.13"
 
-val buildCrossList = List("2.10.6", "2.11.11", "2.12.2")
-scalaVersion in ThisBuild := "2.10.6"
+val buildCrossList = List("2.10.7", "2.11.11", "2.12.2")
+scalaVersion in ThisBuild := "2.10.7"
 crossScalaVersions in ThisBuild := buildCrossList
 
 addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.7.0")

sbt/src/sbt-test/source-dependencies/macro-arg-dep-nested/build.sbt

@@ -1,5 +1,5 @@
 val defaultSettings = Seq(
-  scalaVersion := "2.10.6",
+  scalaVersion := "2.10.7",
   libraryDependencies += scalaVersion("org.scala-lang" % "scala-reflect" % _ ).value
 )
 

sbt/src/sbt-test/source-dependencies/macro-arg-dep/build.sbt

@@ -1,5 +1,5 @@
 val defaultSettings = Seq(
-  scalaVersion := "2.10.6",
+  scalaVersion := "2.10.7",
   libraryDependencies += scalaVersion("org.scala-lang" % "scala-reflect" % _ ).value
 )
 

sbt/src/sbt-test/tests/fork-parallel/project/ForkParallelTest.scala

@@ -1,27 +0,0 @@
-import sbt._
-import Keys._
-import Tests._
-import Defaults._
-
-object ForkParallelTest extends Build {
-	val check = taskKey[Unit]("Check that tests are executed in parallel")
-
-	lazy val root = Project("root", file("."), settings = defaultSettings ++ Seq(
-		scalaVersion := "2.9.2",
-		libraryDependencies += "com.novocode" % "junit-interface" % "0.10" % "test",
-		fork in Test := true,
-		check := {
-			val nbProc = java.lang.Runtime.getRuntime().availableProcessors()
-			if( nbProc < 4 ) {
-				streams.value.log.warn("With fewer than 4 processors this test is meaningless")
-			} else {
-				// we've got at least 4 processors, we'll check the upper end but also 3 and 4 as the upper might not
-				// be reached if the system is under heavy load.
-				if( ! (file("max-concurrent-tests_3").exists() || file("max-concurrent-tests_4").exists() ||
-							 file("max-concurrent-tests_" + (nbProc -1)).exists() || file("max-concurrent-tests_" + nbProc).exists())) {
-					sys.error("Forked tests were not executed in parallel!")
-				}
-			}
-		}
-	))
-}

sbt/src/sbt-test/tests/fork-parallel/src/test/scala/tests.scala

@@ -1,53 +0,0 @@
-
-import java.io.File
-import java.util.concurrent.atomic.AtomicInteger
-import org.junit.Test
-import scala.annotation.tailrec
-
-object ParallelTest {
-	val nbConcurrentTests = new AtomicInteger(0)
-	val maxConcurrentTests = new AtomicInteger(0)
-
-	private def updateMaxConcurrentTests(currentMax: Int, newMax: Int) : Boolean = {
-		if( maxConcurrentTests.compareAndSet(currentMax, newMax) ) {
-			val f = new File("max-concurrent-tests_" + newMax)
-			f.createNewFile
-			true
-		} else {
-			false
-		}
-	}
-
-	@tailrec
-	def execute(f : => Unit): Unit = {
-		val nb = nbConcurrentTests.incrementAndGet()
-		val max = maxConcurrentTests.get()
-		if( nb <= max || updateMaxConcurrentTests(max, nb)) {
-			f
-			nbConcurrentTests.getAndDecrement
-		} else {
-			nbConcurrentTests.getAndDecrement
-			execute(f)
-		}
-	}
-}
-
-class Test1 {
-	@Test
-	def slow(): Unit = ParallelTest.execute { Thread.sleep(1000) }
-}
-
-class Test2 {
-	@Test
-	def slow(): Unit = ParallelTest.execute { Thread.sleep(1000) }
-}
-
-class Test3 {
-	@Test
-	def slow(): Unit = ParallelTest.execute { Thread.sleep(1000) }
-}
-
-class Test4 {
-	@Test
-	def slow(): Unit = ParallelTest.execute { Thread.sleep(1000) }
-}

sbt/src/sbt-test/tests/fork-parallel/test

@@ -1,7 +0,0 @@
-> test
--> check
-
-> clean
-> set testForkedParallel := true
-> test
-> check

sbt/src/sbt-test/tests/nested-subproc/build.sbt

@@ -1,6 +1,6 @@
 lazy val root = (project in file("."))
   .settings(
-    scalaVersion := "2.10.6",
+    scalaVersion := "2.10.7",
     libraryDependencies += "org.scalatest" %% "scalatest" % "2.0.M6-SNAP28",
     testOptions in Test += Tests.Argument("-r", "custom.CustomReporter"),
     fork := true,

src/main/conscript/scalas/launchconfig

@@ -4,7 +4,7 @@
 [app]
   org: ${sbt.organization-org.scala-sbt}
   name: sbt
-  version: ${sbt.version-read(sbt.version)[0.13.17]}
+  version: ${sbt.version-read(sbt.version)[0.13.18]}
   class: sbt.ScriptMain
   components: xsbti,extra
   cross-versioned: ${sbt.cross.versioned-false}

src/main/conscript/screpl/launchconfig

@@ -4,7 +4,7 @@
 [app]
   org: ${sbt.organization-org.scala-sbt}
   name: sbt
-  version: ${sbt.version-read(sbt.version)[0.13.17]}
+  version: ${sbt.version-read(sbt.version)[0.13.18]}
   class: sbt.ConsoleMain
   components: xsbti,extra
   cross-versioned: ${sbt.cross.versioned-false}

src/main/conscript/xsbt/launchconfig

@@ -4,7 +4,7 @@
 [app]
   org: ${sbt.organization-org.scala-sbt}
   name: sbt
-  version: ${sbt.version-read(sbt.version)[0.13.17]}
+  version: ${sbt.version-read(sbt.version)[0.13.18]}
   class: sbt.xMain
   components: xsbti,extra
   cross-versioned: ${sbt.cross.versioned-false}