From 46c516893a641a283f11a46f5c45a5cf1b4af373 Mon Sep 17 00:00:00 2001
From: Robby <robby@santoslab.org>
Date: Sat, 10 Mar 2018 19:32:42 -0600
Subject: Changes to make {clientserver,main,scalalib,scalajslib}.test work
 under Java 9 (#217)

* Append "exported rt.jar" when creating URLClassLoader.

* Disabled tests involving Scala 2.10 & 2.11 and nashorn.

* Use java.net.URLClassLoader.
---
 core/src/mill/util/ClassLoader.scala | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 core/src/mill/util/ClassLoader.scala

(limited to 'core')

diff --git a/core/src/mill/util/ClassLoader.scala b/core/src/mill/util/ClassLoader.scala
new file mode 100644
index 00000000..7f4a9836
--- /dev/null
+++ b/core/src/mill/util/ClassLoader.scala
@@ -0,0 +1,12 @@
+package mill.util
+
+import java.net.{URL, URLClassLoader}
+
+import io.github.retronym.java9rtexport.Export
+
+object ClassLoader {
+  def create(urls: Seq[URL], parent: java.lang.ClassLoader): URLClassLoader = {
+    val rtOpt = if (ammonite.util.Util.java9OrAbove) Some(Export.export().toURI.toURL) else None
+    new URLClassLoader((urls ++ rtOpt).toArray, parent)
+  }
+}
-- 
cgit v1.2.3