From 6e7a169907d8db0f20eed3c8052db9bc7ecfcfae Mon Sep 17 00:00:00 2001 From: Gia Bao Date: Wed, 27 Apr 2016 13:42:26 +0700 Subject: [PATCH 1/5] cross compile for scala 2.12.0-M4. Also remove `-target:jvm-1.6` scalacOptions --- project/Common.scala | 3 +-- project/Dependencies.scala | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/project/Common.scala b/project/Common.scala index 1466efc7..cc7dfaef 100644 --- a/project/Common.scala +++ b/project/Common.scala @@ -16,12 +16,11 @@ object Common { // Core settings organization := "com.typesafe.scala-logging", scalaVersion := Version.scala, - crossScalaVersions := List(scalaVersion.value), + crossScalaVersions := Version.crossScala, scalacOptions ++= List( "-unchecked", "-deprecation", "-language:_", - "-target:jvm-1.6", "-encoding", "UTF-8" ), unmanagedSourceDirectories in Compile := List((scalaSource in Compile).value), diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 4040c11a..01eeb977 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -4,6 +4,7 @@ object Version { val logback = "1.1.7" val mockito = "1.9.5" val scala = "2.11.8" + val crossScala = List(scala, "2.12.0-M4") val scalaTest = "2.2.6" val slf4j = "1.7.21" } From 42603ec300c60c69d35ce28cfe245f55b74166a5 Mon Sep 17 00:00:00 2001 From: Gia Bao Date: Wed, 27 Apr 2016 13:45:03 +0700 Subject: [PATCH 2/5] .travis.yml: build matrix for (scala 2.11, 2.12) x (oraclejdk, openjdk) x (jdk 7, 8) --- .travis.yml | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index a3bfc8aa..10585546 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,20 @@ +sudo: required +dist: trusty language: scala scala: - 2.11.8 -jdk: - - oraclejdk8 - - oraclejdk7 \ No newline at end of file + - 2.12.0-M4 +env: +- JDK=oraclejdk8 +- JDK=openjdk8 +- JDK=oraclejdk7 +- JDK=openjdk7 +before_script: +- jdk_switcher use $JDK +matrix: + # scala 2.12 require java 8 + exclude: + - scala: 2.12.0-M4 + env: JDK=oraclejdk7 + - scala: 2.12.0-M4 + env: JDK=openjdk7 From 1a17cc898339fa33c270d25303d1af1598bb3a92 Mon Sep 17 00:00:00 2001 From: Gia Bao Date: Wed, 27 Apr 2016 13:46:59 +0700 Subject: [PATCH 3/5] update mockito 1.10.19 --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 01eeb977..9ddec540 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -2,7 +2,7 @@ import sbt._ object Version { val logback = "1.1.7" - val mockito = "1.9.5" + val mockito = "1.10.19" val scala = "2.11.8" val crossScala = List(scala, "2.12.0-M4") val scalaTest = "2.2.6" From e7de3afc14197ade0eff274b7d1b44e5cca9ecb7 Mon Sep 17 00:00:00 2001 From: Gia Bao Date: Wed, 27 Apr 2016 13:52:21 +0700 Subject: [PATCH 4/5] fix error when test in openjdk7 https://github.com/travis-ci/travis-ci/issues/5227#issuecomment-165131913 --- .travis.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 10585546..b85fb4f7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,12 @@ env: - JDK=oraclejdk7 - JDK=openjdk7 before_script: -- jdk_switcher use $JDK + - jdk_switcher use $JDK + #https://github.com/travis-ci/travis-ci/issues/5227#issuecomment-165131913 + - cat /etc/hosts # optionally check the content *before* + - sudo hostname "$(hostname | cut -c1-63)" + - sed -e "s/^\\(127\\.0\\.0\\.1.*\\)/\\1 $(hostname | cut -c1-63)/" /etc/hosts | sudo tee /etc/hosts + - cat /etc/hosts # optionally check the content *after* matrix: # scala 2.12 require java 8 exclude: From a6e2c35059633d1b3b6979199f13d11cee34b4ca Mon Sep 17 00:00:00 2001 From: Gia Bao Date: Wed, 27 Apr 2016 13:53:54 +0700 Subject: [PATCH 5/5] update sbt-release 0.8.5 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index c7f590fa..4831faea 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -2,7 +2,7 @@ addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.0.0") addSbtPlugin("com.typesafe.sbt" % "sbt-scalariform" % "1.3.0") -addSbtPlugin("com.github.gseitz" % "sbt-release" % "0.8.3") +addSbtPlugin("com.github.gseitz" % "sbt-release" % "0.8.5") addSbtPlugin("com.typesafe.sbt" % "sbt-osgi" % "0.7.0")