Merge branch 'develop' into watch-alias

.travis.yml

@@ -11,44 +11,23 @@ env:
     - secure: d3bu2KNwsVHwfhbGgO+gmRfDKBJhfICdCJFGWKf2w3Gv86AJZX9nuTYRxz0KtdvEHO5Xw8WTBZLPb2thSJqhw9OCm4J8TBAVqCP0ruUj4+aqBUFy4bVexQ6WKE6nWHs4JPzPk8c6uC1LG3hMuzlC8RGETXtL/n81Ef1u7NjyXjs=
   matrix:
     - SBT_CMD=";mimaReportBinaryIssues ;scalafmtCheckAll ;headerCheck ;test:headerCheck ;whitesourceOnPush ;test:compile; publishLocal ;mainSettingsProj/test ;safeUnitTests ;otherUnitTests; doc"
-    - SBT_CMD="scripted actions/*"
-    - SBT_CMD="scripted apiinfo/* compiler-project/* ivy-deps-management/*"
-    - SBT_CMD="scripted dependency-management/*1of4"
-    - SBT_CMD="scripted dependency-management/*2of4"
-    - SBT_CMD="scripted dependency-management/*3of4"
-    - SBT_CMD="scripted dependency-management/*4of4"
-    - SBT_CMD="scripted plugins/*"
-    - SBT_CMD="scripted package/* reporter/* run/* project-load/*"
-    - SBT_CMD="scripted project/*1of2"
-    - SBT_CMD="scripted project/*2of2"
-    - SBT_CMD="scripted source-dependencies/*1of3"
-    - SBT_CMD="scripted source-dependencies/*2of3"
-    - SBT_CMD="scripted source-dependencies/*3of3"
-    - SBT_CMD="scripted tests/* watch/* classloader-cache/*"
-    - SBT_CMD="repoOverrideTest:scripted dependency-management/*"
+    - SBT_CMD="scripted actions/* apiinfo/* compiler-project/* ivy-deps-management/* reporter/* tests/* watch/* classloader-cache/* package/*"
+    - SBT_CMD="scripted dependency-management/* plugins/* project-load/* java/* run/*"
+    - SBT_CMD="repoOverrideTest:scripted dependency-management/*; scripted source-dependencies/* project/*"
 
 matrix:
   fast_finish: true
   include:
-    - env:
-        - SBT_CMD="scripted java/*"
-      install:
-        - /home/travis/.jabba/bin/jabba install openjdk@1.10
     - env:
         - TRAVIS_JDK=adopt@1.8.192-12
-        - SBT_CMD="scripted actions/*"
-    - env:
-        - TRAVIS_JDK=adopt@1.8.192-12
-        - SBT_CMD="scripted source-dependencies/*1of3"
-    - env:
-        - TRAVIS_JDK=adopt@1.8.192-12
-        - SBT_CMD="scripted dependency-management/*1of4"
+        - SBT_CMD="scripted actions/* source-dependencies/*1of3 dependency-management/*1of4 java/*"
 
 before_install:
   - curl -sL https://raw.githubusercontent.com/shyiko/jabba/0.11.0/install.sh | bash && . ~/.jabba/jabba.sh
 
 install:
   - $JABBA_HOME/bin/jabba install $TRAVIS_JDK
+  - $JABBA_HOME/bin/jabba install openjdk@1.10
   - unset _JAVA_OPTIONS
   - export JAVA_HOME="$JABBA_HOME/jdk/$TRAVIS_JDK" && export PATH="$JAVA_HOME/bin:$PATH" && java -Xmx32m -version
 

main/src/main/scala/sbt/Defaults.scala

@@ -3426,7 +3426,7 @@ object Classpaths {
 
   def unmanagedScalaLibrary: Initialize[Task[Seq[File]]] = Def.taskDyn {
     if (autoScalaLibrary.value && scalaHome.value.isDefined)
-      Def.task { scalaInstance.value.libraryJar :: Nil } else
+      Def.task { scalaInstance.value.libraryJars } else
       Def.task { Nil }
   }
 

sbt/src/sbt-test/dependency-management/artifact/build.sbt

@@ -15,7 +15,7 @@ lazy val root = (project in file("."))
     artifact in (Compile, packageBin) := mainArtifact,
     libraryDependencies ++= (if (baseDirectory.value / "retrieve" exists) publishedID :: Nil else Nil),
       // needed to add a jar with a different type to the managed classpath
-    unmanagedClasspath in Compile += scalaInstance.map(_.libraryJar).value,
+    unmanagedClasspath in Compile ++= scalaInstance.value.libraryJars.toSeq,
     classpathTypes := Set(tpe),
     check := checkTask(dependencyClasspath).value,
     checkFull := checkTask(fullClasspath).value

sbt/src/sbt-test/package/manifest/build.sbt

@@ -12,7 +12,7 @@ mainClass := Some("jartest.Main")
 packageOptions in (Compile, packageBin) := {
   def manifestExtra = {
     val mf = new Manifest
-    mf.getMainAttributes.put(Attributes.Name.CLASS_PATH, makeString(scalaInstance.value.libraryJar :: Nil))
+    mf.getMainAttributes.put(Attributes.Name.CLASS_PATH, makeString(scalaInstance.value.libraryJars))
     mf
   }
   (packageOptions in (Compile, packageBin)).value :+ Package.JarManifest(manifestExtra)

sbt/src/sbt-test/package/resources/build.sbt

@@ -1,3 +1,5 @@
+import Path.makeString
+
 name := "Main Resources Test"
 
 version := "0.1"
@@ -8,7 +10,7 @@ packageOptions := {
   def manifestExtra = {
     import java.util.jar._
     val mf = new Manifest
-    mf.getMainAttributes.put(Attributes.Name.CLASS_PATH, scalaInstance.value.libraryJar.getAbsolutePath)
+    mf.getMainAttributes.put(Attributes.Name.CLASS_PATH, makeString(scalaInstance.value.libraryJars))
     mf
   }
   Package.JarManifest(manifestExtra) +: packageOptions.value