From 1124a88a5027a03f60035a23c28e782f63d575b4 Mon Sep 17 00:00:00 2001 From: Antonio Cunei Date: Wed, 21 Sep 2016 15:03:20 +0200 Subject: [PATCH 1/6] See sbt #1696 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 8c8fd074b..66f2f11a9 100644 --- a/build.sbt +++ b/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-typesafe-maven-releases" at "https://dl.bintray.com/typesafe/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"), From 1d146378f80a1e0966b22bf91281bea4096ca174 Mon Sep 17 00:00:00 2001 From: Antonio Cunei Date: Mon, 26 Sep 2016 16:07:42 +0200 Subject: [PATCH 2/6] Allow jdk1.8 --- project/Release.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Release.scala b/project/Release.scala index fbe2f255d..d53cc1875 100644 --- a/project/Release.scala +++ b/project/Release.scala @@ -20,6 +20,6 @@ object Release { ) def javaVersionCheckSettings = Seq( - javaVersionPrefix in javaVersionCheck := Some("1.7") + javaVersionPrefix in javaVersionCheck := Some("1.8") ) } From 6ea2cf1be4e13e41126b44c0254e804039aaefb7 Mon Sep 17 00:00:00 2001 From: Dale Wijnand Date: Fri, 7 Oct 2016 08:48:23 -0500 Subject: [PATCH 3/6] Configure JVM 1.8 in .java-version --- .java-version | 1 + 1 file changed, 1 insertion(+) create mode 100644 .java-version diff --git a/.java-version b/.java-version new file mode 100644 index 000000000..625934097 --- /dev/null +++ b/.java-version @@ -0,0 +1 @@ +1.8 From 24191d3eed95154785ef0406e2d84307cd2ba02e Mon Sep 17 00:00:00 2001 From: Dale Wijnand Date: Fri, 7 Oct 2016 10:21:30 -0500 Subject: [PATCH 4/6] Bump TravisCI config to oraclejdk8 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 68523f298..20fc55510 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,7 +9,7 @@ cache: language: scala jdk: - - oraclejdk7 + - oraclejdk8 matrix: fast_finish: true From ca53c68b8712d6f251fa9c9090950db5bc739609 Mon Sep 17 00:00:00 2001 From: cunei Date: Fri, 7 Oct 2016 13:37:25 -0500 Subject: [PATCH 5/6] Fix to bintray repo --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 66f2f11a9..648d72b52 100644 --- a/build.sbt +++ b/build.sbt @@ -38,7 +38,7 @@ def commonSettings: Seq[Setting[_]] = Seq[SettingsDefinition]( componentID := None, resolvers += Resolver.typesafeIvyRepo("releases"), resolvers += Resolver.sonatypeRepo("snapshots"), - resolvers += "bintray-typesafe-maven-releases" at "https://dl.bintray.com/typesafe/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"), From 685907014542d1c35d9dcda50a3f35494b5909da Mon Sep 17 00:00:00 2001 From: Dale Wijnand Date: Sun, 9 Oct 2016 12:50:11 -0500 Subject: [PATCH 6/6] Update Scala 2.10 versions to work on JDK 8 Must be at least 2.10.3, but I just went with the last stable release 2.10.6 --- sbt/src/sbt-test/actions/doc-scala-instance/build.sbt | 2 +- .../dependency-management/ext-pom-classifier/build.sbt | 2 +- sbt/src/sbt-test/tests/do-not-discover/build.sbt | 4 ++-- sbt/src/sbt-test/tests/done/build.sbt | 4 ++-- sbt/src/sbt-test/tests/nested-inproc-par/build.sbt | 4 ++-- sbt/src/sbt-test/tests/nested-inproc-seq/build.sbt | 4 ++-- sbt/src/sbt-test/tests/serial/build.sbt | 2 +- sbt/src/sbt-test/tests/single-runner/build.sbt | 4 ++-- sbt/src/sbt-test/tests/task/build.sbt | 4 ++-- 9 files changed, 15 insertions(+), 15 deletions(-) diff --git a/sbt/src/sbt-test/actions/doc-scala-instance/build.sbt b/sbt/src/sbt-test/actions/doc-scala-instance/build.sbt index 549ec33c7..fe9da4b6d 100644 --- a/sbt/src/sbt-test/actions/doc-scala-instance/build.sbt +++ b/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" ) diff --git a/sbt/src/sbt-test/dependency-management/ext-pom-classifier/build.sbt b/sbt/src/sbt-test/dependency-management/ext-pom-classifier/build.sbt index 273ac58dd..494d0b654 100644 --- a/sbt/src/sbt-test/dependency-management/ext-pom-classifier/build.sbt +++ b/sbt/src/sbt-test/dependency-management/ext-pom-classifier/build.sbt @@ -1,3 +1,3 @@ -scalaVersion := "2.10.1" +scalaVersion := "2.10.6" externalPom() diff --git a/sbt/src/sbt-test/tests/do-not-discover/build.sbt b/sbt/src/sbt-test/tests/do-not-discover/build.sbt index 914fa2813..c6097a06c 100644 --- a/sbt/src/sbt-test/tests/do-not-discover/build.sbt +++ b/sbt/src/sbt-test/tests/do-not-discover/build.sbt @@ -1,5 +1,5 @@ -scalaVersion := "2.10.1" +scalaVersion := "2.10.6" libraryDependencies += "org.scalatest" %% "scalatest" % "2.0.M6-SNAP28" -testOptions in Test += Tests.Argument("-r", "custom.CustomReporter") \ No newline at end of file +testOptions in Test += Tests.Argument("-r", "custom.CustomReporter") diff --git a/sbt/src/sbt-test/tests/done/build.sbt b/sbt/src/sbt-test/tests/done/build.sbt index 914fa2813..c6097a06c 100644 --- a/sbt/src/sbt-test/tests/done/build.sbt +++ b/sbt/src/sbt-test/tests/done/build.sbt @@ -1,5 +1,5 @@ -scalaVersion := "2.10.1" +scalaVersion := "2.10.6" libraryDependencies += "org.scalatest" %% "scalatest" % "2.0.M6-SNAP28" -testOptions in Test += Tests.Argument("-r", "custom.CustomReporter") \ No newline at end of file +testOptions in Test += Tests.Argument("-r", "custom.CustomReporter") diff --git a/sbt/src/sbt-test/tests/nested-inproc-par/build.sbt b/sbt/src/sbt-test/tests/nested-inproc-par/build.sbt index 171e6675c..a6b9aba9a 100644 --- a/sbt/src/sbt-test/tests/nested-inproc-par/build.sbt +++ b/sbt/src/sbt-test/tests/nested-inproc-par/build.sbt @@ -1,7 +1,7 @@ -scalaVersion := "2.10.1" +scalaVersion := "2.10.6" libraryDependencies += "org.scalatest" %% "scalatest" % "2.0.M6-SNAP28" testOptions in Test += Tests.Argument("-r", "custom.CustomReporter") -parallelExecution in Test := true \ No newline at end of file +parallelExecution in Test := true diff --git a/sbt/src/sbt-test/tests/nested-inproc-seq/build.sbt b/sbt/src/sbt-test/tests/nested-inproc-seq/build.sbt index 433459d68..85610ee5d 100644 --- a/sbt/src/sbt-test/tests/nested-inproc-seq/build.sbt +++ b/sbt/src/sbt-test/tests/nested-inproc-seq/build.sbt @@ -1,7 +1,7 @@ -scalaVersion := "2.10.1" +scalaVersion := "2.10.6" libraryDependencies += "org.scalatest" %% "scalatest" % "2.0.M6-SNAP28" testOptions in Test += Tests.Argument("-r", "custom.CustomReporter") -parallelExecution in Test := false \ No newline at end of file +parallelExecution in Test := false diff --git a/sbt/src/sbt-test/tests/serial/build.sbt b/sbt/src/sbt-test/tests/serial/build.sbt index 394f0b27c..eed39ce49 100644 --- a/sbt/src/sbt-test/tests/serial/build.sbt +++ b/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 ) diff --git a/sbt/src/sbt-test/tests/single-runner/build.sbt b/sbt/src/sbt-test/tests/single-runner/build.sbt index 914fa2813..c6097a06c 100644 --- a/sbt/src/sbt-test/tests/single-runner/build.sbt +++ b/sbt/src/sbt-test/tests/single-runner/build.sbt @@ -1,5 +1,5 @@ -scalaVersion := "2.10.1" +scalaVersion := "2.10.6" libraryDependencies += "org.scalatest" %% "scalatest" % "2.0.M6-SNAP28" -testOptions in Test += Tests.Argument("-r", "custom.CustomReporter") \ No newline at end of file +testOptions in Test += Tests.Argument("-r", "custom.CustomReporter") diff --git a/sbt/src/sbt-test/tests/task/build.sbt b/sbt/src/sbt-test/tests/task/build.sbt index 914fa2813..c6097a06c 100644 --- a/sbt/src/sbt-test/tests/task/build.sbt +++ b/sbt/src/sbt-test/tests/task/build.sbt @@ -1,5 +1,5 @@ -scalaVersion := "2.10.1" +scalaVersion := "2.10.6" libraryDependencies += "org.scalatest" %% "scalatest" % "2.0.M6-SNAP28" -testOptions in Test += Tests.Argument("-r", "custom.CustomReporter") \ No newline at end of file +testOptions in Test += Tests.Argument("-r", "custom.CustomReporter")