Merge pull request #15103 from philwalk/fix-for-13760

bishabosha · web-flow · commit 139060947163 · 2022-05-19T23:44:06.000+02:00
fix for #13760 - running script compiled jar no longer restricted to java.base module
diff --git a/compiler/src/dotty/tools/runner/ScalaClassLoader.scala b/compiler/src/dotty/tools/runner/ScalaClassLoader.scala
@@ -67,7 +67,7 @@ object ScalaClassLoader {
   @sharable private[this] val bootClassLoader: ClassLoader =
     if scala.util.Properties.isJavaAtLeast("9") then
       try
-        MethodHandles.lookup().findStatic(classOf[ClassLoader], "getPlatformClassLoader", MethodType.methodType(classOf[ClassLoader])).invoke().asInstanceOf[ClassLoader]
+        ClassLoader.getSystemClassLoader.getParent 
       catch case _: Throwable => null
     else null
 
diff --git a/compiler/test-resources/scripting/sqlDateError.sc b/compiler/test-resources/scripting/sqlDateError.sc
@@ -1,4 +1,4 @@
-#!bin/scala -nosave
+#!bin/scala
 
 def main(args: Array[String]): Unit = {
   println(new java.sql.Date(100L))

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#!bin/scala -nosave`
	`1`	`+#!bin/scala`
`2`	`2`
`3`	`3`	`def main(args: Array[String]): Unit = {`
`4`	`4`	`println(new java.sql.Date(100L))`