From cdba2dbc53fe385ee8246a0d5e20f61ce9d1e485 Mon Sep 17 00:00:00 2001
From: Eugene Yokota <eed3si9n@gmail.com>
Date: Mon, 6 Jan 2020 21:25:57 -0500
Subject: [PATCH 1/2] Remove "merged artifact" error message

Fixes https://github.com/sbt/sbt/issues/4520

It seems to display "Detected merged artifact" whenever the download fails, which is confusing.
---
 .../ivyint/ParallelResolveEngine.scala                | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/ivy/src/main/scala/sbt/internal/librarymanagement/ivyint/ParallelResolveEngine.scala b/ivy/src/main/scala/sbt/internal/librarymanagement/ivyint/ParallelResolveEngine.scala
index cac26e395..9af7ef6cb 100644
--- a/ivy/src/main/scala/sbt/internal/librarymanagement/ivyint/ParallelResolveEngine.scala
+++ b/ivy/src/main/scala/sbt/internal/librarymanagement/ivyint/ParallelResolveEngine.scala
@@ -8,7 +8,6 @@ import org.apache.ivy.core.module.descriptor.Artifact
 import org.apache.ivy.core.report._
 import org.apache.ivy.core.resolve._
 import org.apache.ivy.core.sort.SortEngine
-import org.apache.ivy.util.Message
 import org.apache.ivy.util.filter.Filter
 
 import scala.concurrent.duration.Duration
@@ -103,16 +102,6 @@ private[sbt] class ParallelResolveEngine(
       artifactReport.getDownloadStatus match {
         case DownloadStatus.SUCCESSFUL =>
           size + artifactReport.getSize
-        case DownloadStatus.FAILED =>
-          val artifact = artifactReport.getArtifact
-          val mergedAttribute = artifact.getExtraAttribute("ivy:merged")
-          if (mergedAttribute != null) {
-            Message.warn(s"\tMissing merged artifact: $artifact, required by $mergedAttribute.")
-          } else {
-            Message.warn(s"\tDetected merged artifact: $artifactReport.")
-            resolver.reportFailure(artifactReport.getArtifact)
-          }
-          size
         case _ => size
       }
     }

From a9405ff0431aabc6f6baaa1e20f2e56108902754 Mon Sep 17 00:00:00 2001
From: Eugene Yokota <eed3si9n@gmail.com>
Date: Mon, 6 Jan 2020 21:34:11 -0500
Subject: [PATCH 2/2] Fix Travis CI setup with SDKMAN

---
 .travis.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 0b066459c..d06d8f6c1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,17 +22,18 @@ before_install:
   - "[[ -d $HOME/.sdkman/bin/ ]] || rm -rf $HOME/.sdkman/"
   - curl -sL https://get.sdkman.io | bash
   - echo sdkman_auto_answer=true > $HOME/.sdkman/etc/config
+  - echo sdkman_auto_selfupdate=true >> $HOME/.sdkman/etc/config
   - source "$HOME/.sdkman/bin/sdkman-init.sh"
 
 install:
-  - sdk install java $(sdk list java | grep -o "$ADOPTOPENJDK\.[0-9\.]*hs-adpt" | head -1)
+  - sdk install java $(sdk list java | grep -o "$ADOPTOPENJDK\.[0-9\.]*hs-adpt" | head -1) || true
   - bin/fixpreloaded.sh
   - unset JAVA_HOME
   - java -Xmx32m -version
   # detect sbt version from project/build.properties
   - export TRAVIS_SBT=$(grep sbt.version= project/build.properties | sed -e 's/sbt.version=//g' ) && echo "sbt $TRAVIS_SBT"
   # - export TRAVIS_SBT=1.3.3
-  - sdk install sbt $TRAVIS_SBT
+  - sdk install sbt $TRAVIS_SBT || true
   # override Travis CI's SBT_OPTS
   - unset SBT_OPTS
   - export JAVA_OPTS="-Xms2048M -Xmx2048M -Xss6M -XX:ReservedCodeCacheSize=256M"