From 8bca34a8e51a5b9593597efd3baa5f453ece5356 Mon Sep 17 00:00:00 2001
From: Eugene Yokota <eed3si9n@gmail.com>
Date: Thu, 25 Jun 2020 23:24:43 -0400
Subject: [PATCH 1/2] support UNC path

Fixes https://github.com/sbt/sbt/issues/5596
---
 .../main/scala/sbt/librarymanagement/ResolverExtra.scala  | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/core/src/main/scala/sbt/librarymanagement/ResolverExtra.scala b/core/src/main/scala/sbt/librarymanagement/ResolverExtra.scala
index 33944a26..ac21bb13 100644
--- a/core/src/main/scala/sbt/librarymanagement/ResolverExtra.scala
+++ b/core/src/main/scala/sbt/librarymanagement/ResolverExtra.scala
@@ -4,7 +4,7 @@
 package sbt.librarymanagement
 
 import java.io.{ IOException, File }
-import java.net.URL
+import java.net.{ URI, URL }
 import scala.xml.XML
 import org.xml.sax.SAXParseException
 import sbt.util.Logger
@@ -304,9 +304,13 @@ private[librarymanagement] abstract class ResolverFunctions {
 
     /** Constructs a file resolver with the given name and base directory. */
     def apply(name: String, baseDirectory: File)(implicit basePatterns: Patterns): FileRepository =
-      baseRepository(new File(baseDirectory.toURI.normalize).getAbsolutePath)(
+      baseRepository(
+        new File(toUri(baseDirectory).normalize.getSchemeSpecificPart).getAbsolutePath
+      )(
         FileRepository(name, defaultFileConfiguration, _)
       )
+
+    private def toUri(dir: File): URI = dir.toPath.toUri
   }
   object url {
 

From 427e8fc72fcb5cbb8d7a0a95bcb36a79b8f71a5b Mon Sep 17 00:00:00 2001
From: Eugene Yokota <eed3si9n@gmail.com>
Date: Fri, 26 Jun 2020 01:36:25 -0400
Subject: [PATCH 2/2] SDKMAN updates

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

diff --git a/.travis.yml b/.travis.yml
index 0b066459..cfbfb4fe 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,14 +25,14 @@ before_install:
   - 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"