Fix broken .travis.yml

Author: MasseGuillaume

.travis.yml

@@ -1,5 +1,12 @@
+# slower instance startup, but needed to work around https://github.com/travis-ci/travis-ci/issues/9713
+sudo: true
+
 language: scala
 
+addons:
+  apt:
+    packages:
+      - openjdk-6-jdk
 scala:
   - 2.11.12
   - 2.12.6
@@ -40,18 +47,12 @@ matrix:
     # 2.13.0-M4 is not available in Scala.js 1.0.0-M3
     - scala: 2.13.0-M4
       env: SCALAJS_VERSION=1.0.0-M3
-
-  # run migration test
   include:
-    - scala: 2.12.6
-      jdk: oraclejdk8
-      env: TEST_SCALAFIX=true
 
-    - addons:
-       apt:
-         packages:
-           - openjdk-6-jdk
-     jdk: openjdk6
+    # run migration test
+    - jdk: oraclejdk8
+      scala: 2.12.6
+      env: TEST_SCALAFIX=true
 
 # | jdk         |   scala   | scala target | scala target version | scalafix test |
 # | ----------- | --------- | ------------ | -------------------- |---------------|

build.sbt

@@ -33,8 +33,8 @@ lazy val compat = crossProject(JSPlatform, JVMPlatform)
   .jvmSettings(
     OsgiKeys.exportPackage := Seq(s"scala.collection.compat.*;version=${version.value}"),
     libraryDependencies += "com.novocode" % "junit-interface" % "0.11" % "test",
-    javaHome := {
-      val oldValue = javaHome.value
+    javaHome in Compile := {
+      val oldValue = (javaHome in Compile).value
       val isOnCi = sys.env.get("CI").isDefined
 
       if (isOnCi) {
@@ -44,12 +44,12 @@ lazy val compat = crossProject(JSPlatform, JVMPlatform)
             case "openjdk6"   => "/usr/lib/jvm/java-6-openjdk-amd64"
             case "oraclejdk8" => "/usr/lib/jvm/java-8-oracle"
           }
-
         println(s"using JAVA_HOME: $ciJavaHome")
         Some(file(ciJavaHome))
       }
       else oldValue
-    }
+    },
+    javaHome in Test := (javaHome in Compile).value
   )
   .jsSettings(
     scalacOptions += {

compat/src/test/scala/test/scala/collection/JdkVersionTest.scala

@@ -11,6 +11,10 @@ class JdkVersionTest {
     if (isOnCi) {
       val travisJdkVersion = sys.env("TRAVIS_JDK_VERSION")
       val jdkVersion = sys.props("java.specification.version")
+
+      println(s"travisJdkVersion: $travisJdkVersion")
+      println(s"jdkVersion: $jdkVersion")
+
       if (travisJdkVersion == "openjdk6") {
         assertEquals(jdkVersion, "1.8")
       } else if (travisJdkVersion == "oraclejdk8") {