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

Merge pull request #3016 from xuwei-k/Class-newInstance 

s/newInstance/getDeclaredConstructor().newInstance()
This commit is contained in:
Dale Wijnand 2017-03-15 10:25:01 +01:00 committed by GitHub
parent c6b593df95 5b00e7326b
commit cb756f5443
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
main/src/main/scala/sbt/TemplateCommand.scala
View File

@ -69,7 +69,7 @@ private[sbt] object TemplateCommandUtil {
private def call(interfaceClassName: String, methodName: String, loader: ClassLoader)(argTypes: Class[_]*)(args: AnyRef*): AnyRef =
{
val interfaceClass = getInterfaceClass(interfaceClassName, loader)
val interface = interfaceClass.newInstance.asInstanceOf[AnyRef]
val interface = interfaceClass.getDeclaredConstructor().newInstance().asInstanceOf[AnyRef]
val method = interfaceClass.getMethod(methodName, argTypes: _*)
try { method.invoke(interface, args: _*) }
catch {

2
project/Scripted.scala
View File

@ -93,7 +93,7 @@ object Scripted {
val noJLine = new classpath.FilteredLoader(scriptedSbtInstance.loader, "jline." :: Nil)
val loader = classpath.ClasspathUtilities.toLoader(scriptedSbtClasspath.files, noJLine)
val bridgeClass = Class.forName("sbt.test.ScriptedRunner", true, loader)
val bridge = bridgeClass.newInstance.asInstanceOf[SbtScriptedRunner]
val bridge = bridgeClass.getDeclaredConstructor().newInstance().asInstanceOf[SbtScriptedRunner]
try {
// Using java.util.List to encode File => Unit.
val callback = new java.util.AbstractList[File] {

2
testing/agent/src/main/java/sbt/ForkMain.java
View File

@ -227,7 +227,7 @@ final public class ForkMain {
Framework framework = null;
for (final String implClassName : implClassNames) {
try {
final Object rawFramework = Class.forName(implClassName).newInstance();
final Object rawFramework = Class.forName(implClassName).getDeclaredConstructor().newInstance();
if (rawFramework instanceof Framework)
framework = (Framework) rawFramework;
else

2
testing/src/main/scala/sbt/TestFramework.scala
View File

@ -31,7 +31,7 @@ case class TestFramework(implClassNames: String*) {
frameworkClassNames match {
case head :: tail =>
try {
Some(Class.forName(head, true, loader).newInstance match {
Some(Class.forName(head, true, loader).getDeclaredConstructor().newInstance() match {
case newFramework: Framework => newFramework
case oldFramework: OldFramework => new FrameworkWrapper(oldFramework)
})