From a34f7bb80b6bdd26d13357bd52e45beeeed12138 Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Sat, 24 Mar 2018 03:16:54 +0900 Subject: [PATCH] Fixes the reflection fallback for ScalaInstance I think I've made a mistake in https://github.com/sbt/zinc/pull/505 by using NoSuchMethodError. When trying to use Zinc 1.1.2, I ran into `java.lang.NoSuchMethodException`. This is because `NoSuchMethodException` would be thrown for reflective calls, not `NoSuchMethodError`. --- .../src/main/scala/sbt/internal/inc/ScalaInstance.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/zinc-classpath/src/main/scala/sbt/internal/inc/ScalaInstance.scala b/internal/zinc-classpath/src/main/scala/sbt/internal/inc/ScalaInstance.scala index 8909e6b406..4d6806dfab 100644 --- a/internal/zinc-classpath/src/main/scala/sbt/internal/inc/ScalaInstance.scala +++ b/internal/zinc-classpath/src/main/scala/sbt/internal/inc/ScalaInstance.scala @@ -167,7 +167,7 @@ object ScalaInstance { case p: ScalaProvider2 @unchecked => Option((provider.loader, p.loaderLibraryOnly)) } } catch { - case _: NoSuchMethodError => None + case _: NoSuchMethodException => None }) getOrElse fallbackClassLoaders } new ScalaInstance(version, loader, loaderLibraryOnly, libraryJar, compilerJar, jars, None)