luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix 

Have IsolatedClassLoader get preserved by proguard (1.0.0-M10 regression)
This commit is contained in:
Alexandre Archambault 2016-04-17 20:43:52 +02:00
parent 15d2afb264
commit b5b7f7714f
No known key found for this signature in database
GPG Key ID: 14640A6839C263A9
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cli/src/main/scala-2.11/coursier/cli/Launch.scala
View File

@ -33,11 +33,13 @@ object Launch {
mainClassLoader(cl.getParent) mainClassLoader(cl.getParent)
} }
class IsolatedClassLoader( }
class IsolatedClassLoader(
urls: Array[URL], urls: Array[URL],
parent: ClassLoader, parent: ClassLoader,
isolationTargets: Array[String] isolationTargets: Array[String]
) extends URLClassLoader(urls, parent) { ) extends URLClassLoader(urls, parent) {
/** /**
* Applications wanting to access an isolated `ClassLoader` should inspect the hierarchy of * Applications wanting to access an isolated `ClassLoader` should inspect the hierarchy of
@ -47,8 +49,6 @@ object Launch {
*/ */
def getIsolationTargets: Array[String] = isolationTargets def getIsolationTargets: Array[String] = isolationTargets
}
} }
case class Launch( case class Launch(
@ -113,7 +113,7 @@ case class Launch(
Console.err.println(s" $f") Console.err.println(s" $f")
} }
val isolatedLoader = new Launch.IsolatedClassLoader( val isolatedLoader = new IsolatedClassLoader(
isolatedFiles.map(_.toURI.toURL).toArray, isolatedFiles.map(_.toURI.toURL).toArray,
parent, parent,
Array(target) Array(target)