Merge pull request #2771 from dwijnand/dbuild

Workaround #1696 & bump to JDK 1.8

.java-version

@@ -0,0 +1 @@
+1.8

.travis.yml

@@ -9,7 +9,7 @@ cache:
 language: scala
 
 jdk:
-  - oraclejdk7
+  - oraclejdk8
 
 matrix:
   fast_finish: true

build.sbt

@@ -38,7 +38,7 @@ def commonSettings: Seq[Setting[_]] = Seq[SettingsDefinition](
   componentID := None,
   resolvers += Resolver.typesafeIvyRepo("releases"),
   resolvers += Resolver.sonatypeRepo("snapshots"),
-  resolvers += Resolver.bintrayRepo("sbt", "maven-releases"),
+  resolvers += "bintray-sbt-maven-releases" at "https://dl.bintray.com/sbt/maven-releases/",
   concurrentRestrictions in Global += Util.testExclusiveRestriction,
   testOptions += Tests.Argument(TestFrameworks.ScalaCheck, "-w", "1"),
   javacOptions in compile ++= Seq("-target", "6", "-source", "6", "-Xlint", "-Xlint:-serial"),

project/Release.scala

@@ -20,6 +20,6 @@ object Release {
   )
 
   def javaVersionCheckSettings = Seq(
-    javaVersionPrefix in javaVersionCheck := Some("1.7")
+    javaVersionPrefix in javaVersionCheck := Some("1.8")
   )
 }

sbt/src/sbt-test/actions/doc-scala-instance/build.sbt

@@ -6,5 +6,5 @@ lazy val a = project.settings(
 )
 
 lazy val b = project.settings(
-	scalaVersion := "2.10.1"
+	scalaVersion := "2.10.6"
 )

sbt/src/sbt-test/dependency-management/ext-pom-classifier/build.sbt

@@ -1,3 +1,3 @@
-scalaVersion := "2.10.1"
+scalaVersion := "2.10.6"
 
 externalPom()

sbt/src/sbt-test/tests/do-not-discover/build.sbt

@@ -1,4 +1,4 @@
-scalaVersion := "2.10.1"
+scalaVersion := "2.10.6"
 
 libraryDependencies += "org.scalatest" %% "scalatest" % "2.0.M6-SNAP28"
 

sbt/src/sbt-test/tests/done/build.sbt

@@ -1,4 +1,4 @@
-scalaVersion := "2.10.1"
+scalaVersion := "2.10.6"
 
 libraryDependencies += "org.scalatest" %% "scalatest" % "2.0.M6-SNAP28"
 

sbt/src/sbt-test/tests/nested-inproc-par/build.sbt

@@ -1,4 +1,4 @@
-scalaVersion := "2.10.1"
+scalaVersion := "2.10.6"
 
 libraryDependencies += "org.scalatest" %% "scalatest" % "2.0.M6-SNAP28"
 

sbt/src/sbt-test/tests/nested-inproc-seq/build.sbt

@@ -1,4 +1,4 @@
-scalaVersion := "2.10.1"
+scalaVersion := "2.10.6"
 
 libraryDependencies += "org.scalatest" %% "scalatest" % "2.0.M6-SNAP28"
 

sbt/src/sbt-test/tests/serial/build.sbt

@@ -7,7 +7,7 @@ lazy val root = (project in file(".")).
   settings(inThisBuild(List(
       organization := "com.softwaremill",
       version := "0.0.1-SNAPSHOT",
-      scalaVersion := "2.10.0"
+      scalaVersion := "2.10.6"
     )),
     commonSettings
   )

sbt/src/sbt-test/tests/single-runner/build.sbt

@@ -1,4 +1,4 @@
-scalaVersion := "2.10.1"
+scalaVersion := "2.10.6"
 
 libraryDependencies += "org.scalatest" %% "scalatest" % "2.0.M6-SNAP28"
 

sbt/src/sbt-test/tests/task/build.sbt

@@ -1,4 +1,4 @@
-scalaVersion := "2.10.1"
+scalaVersion := "2.10.6"
 
 libraryDependencies += "org.scalatest" %% "scalatest" % "2.0.M6-SNAP28"