Bump openjdk6 to openjdk7

We cannot use openjdk6 since maven central wont serve TLS1.0

Server access Error: Received fatal alert: protocol_version url=https://repo1.maven.org/maven2/org/scala-sbt/compiler-interface/0.13.17/compiler-interface-0.13.17.jar

see https://stackoverflow.com/a/50824799/449071

Author: MasseGuillaume

.travis.yml

@@ -1,18 +1,11 @@
-# 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
   - 2.13.0-M4
 jdk:
-  - openjdk6
+  - openjdk7
   - oraclejdk8
 env:
   global:
@@ -23,29 +16,47 @@ env:
     # SONA_PASS
     - secure: "m0Fw/eH7RXJJoBTfqV6CMd7kaIN2pRPnQPNXJGb546UjqYAlYTkfjvVrWpsgpisRBptI1FEHn24yGbgAHjIes/4un/O62K66I0BffL8PbdeHeNcDjSrTesKEqage2mQfGOiqccVsmkgiKeXNYL8tPZRmPQQ3XZ97mS1SXWlqAJSMW6HfNnvqW14Gdb/snR6I8lQ2o5tRnLerWPnI96pp+xjZca2lD4XDvH2wLJXXLmYY61e23ZYzZMepxBxhGa7js3YTYzCWNrOfBLjFJ5nwRxbjR0WMuz5z5Gdy715WtguKS4Fffd/GJHycLROBU9LCAQDMTxMFvqzFqVFpfq0BuTmmkXFXj+a7dO+ABG0RfoDfoMjn7pHwyHNCZyMMuR1HCjMkbGFwC+Zme2UAYNivtcsuWWeMuypwjyqjfFfNns4FHJ0SXFtC/6+OJkAuUdbEJKReYWKWEsP5SnCH/8PLlc+uUl3tjQkFLc1sOAyx9cTWyBErwuJXhgTrjT9AWvO+fvhcm8z/p5+aaF/U9GIrzPqziX4hGjzc/WC+rsFJSiBDlFQl7br+m8WWs7/wuXqPGXmhf0BNQViDi7fZndDHcY3p3T0An05d/IMKjCUrgLDlJi6VYs9XN7S8ay6MH+XTwIsJGSxtGjfEO4rHGIjtR2GRr8TqdNfnpsI3ucbia1Y="
   matrix:
-    - SCALAJS_VERSION=
-    - SCALAJS_VERSION=0.6.23
-    - SCALAJS_VERSION=1.0.0-M3
+    - SCALA_TARGET=jvm
+    - SCALA_TARGET=js SCALAJS_VERSION=0.6.23
+    - SCALA_TARGET=js SCALAJS_VERSION=1.0.0-M3
 
 matrix:
   exclude:
-    - jdk: openjdk6
+    # > 2.12 requires jdk8
+    - jdk: openjdk7
       scala: 2.12.6
-    - jdk: openjdk6
+
+    - jdk: openjdk7
       scala: 2.13.0-M4
+
+    # ?
     - jdk: oraclejdk8
       scala: 2.11.12
+
+    # 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
+      env: SCALAJS_VERSION=1.0.0-M3 SCALA_TARGET=js
+
+  # run migration test
   include:
     - scala: 2.12.6
       jdk: oraclejdk8
       env: TEST_SCALAFIX=true
 
+# | jdk         |   scala   | scala target | scala target version | scalafix test |
+# | ----------- | --------- | ------------ | -------------------- |---------------|
+# |    openjdk7 | 2.11.12   | jvm          |                      |               |
+# |    openjdk7 | 2.11.12   | js           | 0.6.23               |               |
+# |    openjdk7 | 2.11.12   | js           | 1.0.0-M3             |               |
+# |  oraclejdk8 | 2.12.6    | jvm          |                      |               |
+# |  oraclejdk8 | 2.12.6    | js           | 0.6.23               |               |
+# |  oraclejdk8 | 2.12.6    | js           | 1.0.0-M3             |               |
+# |  oraclejdk8 | 2.13.0-M4 | jvm          |                      |               |
+# |  oraclejdk8 | 2.13.0-M4 | js           | 0.6.23               |               |
+# |  oraclejdk8 | 2.12.6    | jvm          |                      |   true        |
+ 
 before_script: ./checkCLA.sh
 script:
-  # work around https://github.com/travis-ci/travis-ci/issues/9713
-  - if [[ $JAVA_HOME = *java-6* ]]; then jdk_switcher use openjdk6; fi
   - java -version
   - admin/build.sh
 

admin/build.sh

@@ -23,11 +23,21 @@ if [[ "$TEST_SCALAFIX" == "true" ]]; then
   exit 0
 fi
 
-if [ "$SCALAJS_VERSION" = "" ]; then
-  projectPrefix="scala-collection-compat"
-else
-  projectPrefix="scala-collection-compatJS"
-fi
+case "$SCALA_TARGET" in
+  jvm)
+      targetSuffix=""
+      ;;
+   
+  js)
+      targetSuffix="JS"
+      ;;
+
+  *)
+      echo $"SCALA_TARGET: $SCALA_TARGET {jvm|js}"
+      exit 1
+esac
+
+projectPrefix="scala-collection-compat$targetSuffix"
 
 verPat="[0-9]+\.[0-9]+\.[0-9]+(-[A-Za-z0-9-]+)?"
 tagPat="^v$verPat(#.*)?$"
@@ -52,4 +62,4 @@ if [[ "$TRAVIS_TAG" =~ $tagPat ]]; then
   fi
 fi
 
-sbt "++$TRAVIS_SCALA_VERSION" "$publishVersion" "$projectPrefix/clean" "$projectPrefix/test" "$projectPrefix/publishLocal" "$publishTask"
+sbt -Dhttps.protocols=TLSv1.2 "++$TRAVIS_SCALA_VERSION" "$publishVersion" "$projectPrefix/clean" "$projectPrefix/test" "$projectPrefix/publishLocal" "$publishTask"