diff --git a/classlib/teavm-classlib.iml b/classlib/teavm-classlib.iml index d96f6ab5c..18bfc21dc 100644 --- a/classlib/teavm-classlib.iml +++ b/classlib/teavm-classlib.iml @@ -7,7 +7,7 @@ - + @@ -28,15 +28,14 @@ - - - + + diff --git a/core/pom.xml b/core/pom.xml index cdf0155b0..d1ff22f4e 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -62,16 +62,6 @@ jackson-annotations true - - org.objenesis - objenesis - 2.4 - - - org.jetbrains.kotlin - kotlin-stdlib - ${kotlin.version} - diff --git a/core/src/main/java/org/teavm/model/Interpreter.java b/core/src/main/java/org/teavm/model/Interpreter.java index ec658c9f5..4e24fb022 100644 --- a/core/src/main/java/org/teavm/model/Interpreter.java +++ b/core/src/main/java/org/teavm/model/Interpreter.java @@ -22,8 +22,6 @@ import java.lang.reflect.Method; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import org.objenesis.Objenesis; -import org.objenesis.ObjenesisStd; import org.teavm.model.instructions.ArrayElementType; import org.teavm.model.instructions.BinaryBranchingCondition; import org.teavm.model.instructions.BinaryOperation; @@ -118,8 +116,6 @@ public class Interpreter { } private InstructionReader reader = new InstructionReader() { - private Objenesis objenesis = new ObjenesisStd(); - @Override public void location(TextLocation location) { } @@ -623,7 +619,7 @@ public class Interpreter { } catch (ClassNotFoundException e) { throw new RuntimeException("Class not found: " + type); } - variables[receiver.getIndex()] = objenesis.newInstance(cls); + variables[receiver.getIndex()] = null; } @Override diff --git a/core/teavm-core.iml b/core/teavm-core.iml index cc3c1e04c..eff03ae6b 100644 --- a/core/teavm-core.iml +++ b/core/teavm-core.iml @@ -32,6 +32,5 @@ - \ No newline at end of file diff --git a/extras-slf4j/teavm-extras-slf4j.iml b/extras-slf4j/teavm-extras-slf4j.iml index 733231715..3adb918ae 100644 --- a/extras-slf4j/teavm-extras-slf4j.iml +++ b/extras-slf4j/teavm-extras-slf4j.iml @@ -15,7 +15,6 @@ - diff --git a/html4j/teavm-html4j.iml b/html4j/teavm-html4j.iml index 185f9cac5..f17b3c4e5 100644 --- a/html4j/teavm-html4j.iml +++ b/html4j/teavm-html4j.iml @@ -21,11 +21,10 @@ - - + @@ -36,10 +35,10 @@ - + \ No newline at end of file diff --git a/jso/impl/teavm-jso-impl.iml b/jso/impl/teavm-jso-impl.iml index 47994facf..b1585f2b4 100644 --- a/jso/impl/teavm-jso-impl.iml +++ b/jso/impl/teavm-jso-impl.iml @@ -16,7 +16,6 @@ - diff --git a/metaprogramming/impl/teavm-metaprogramming-impl.iml b/metaprogramming/impl/teavm-metaprogramming-impl.iml index ba0901220..217dceac6 100644 --- a/metaprogramming/impl/teavm-metaprogramming-impl.iml +++ b/metaprogramming/impl/teavm-metaprogramming-impl.iml @@ -28,7 +28,6 @@ - diff --git a/platform/teavm-platform.iml b/platform/teavm-platform.iml index d2b600946..a1b7c7553 100644 --- a/platform/teavm-platform.iml +++ b/platform/teavm-platform.iml @@ -28,7 +28,6 @@ - diff --git a/samples/async/teavm-samples-async.iml b/samples/async/teavm-samples-async.iml index ee3fb7cbf..17a2512d0 100644 --- a/samples/async/teavm-samples-async.iml +++ b/samples/async/teavm-samples-async.iml @@ -25,15 +25,14 @@ - - - + + diff --git a/samples/benchmark/teavm-samples-benchmark.iml b/samples/benchmark/teavm-samples-benchmark.iml index d347eb8c6..5d8ce2346 100644 --- a/samples/benchmark/teavm-samples-benchmark.iml +++ b/samples/benchmark/teavm-samples-benchmark.iml @@ -8,6 +8,7 @@ + @@ -35,20 +36,17 @@ - - - - - - + + + @@ -57,12 +55,12 @@ - - + + \ No newline at end of file diff --git a/samples/hello/teavm-samples-hello.iml b/samples/hello/teavm-samples-hello.iml index 6070666aa..1c5f8a8cf 100644 --- a/samples/hello/teavm-samples-hello.iml +++ b/samples/hello/teavm-samples-hello.iml @@ -10,9 +10,6 @@ - - - @@ -29,18 +26,17 @@ - - - - + + + \ No newline at end of file diff --git a/samples/kotlin/teavm-samples-kotlin.iml b/samples/kotlin/teavm-samples-kotlin.iml index ca051d2d5..61b1bca01 100644 --- a/samples/kotlin/teavm-samples-kotlin.iml +++ b/samples/kotlin/teavm-samples-kotlin.iml @@ -29,17 +29,16 @@ - - - + + \ No newline at end of file diff --git a/samples/scala/teavm-samples-scala.iml b/samples/scala/teavm-samples-scala.iml index e4c68b885..8dbd24070 100644 --- a/samples/scala/teavm-samples-scala.iml +++ b/samples/scala/teavm-samples-scala.iml @@ -25,18 +25,17 @@ - - - - + + + \ No newline at end of file diff --git a/samples/storage/teavm-samples-storage.iml b/samples/storage/teavm-samples-storage.iml index fa88bfc84..2b60c620e 100644 --- a/samples/storage/teavm-samples-storage.iml +++ b/samples/storage/teavm-samples-storage.iml @@ -25,18 +25,17 @@ - - - + + \ No newline at end of file diff --git a/samples/video/teavm-samples-video.iml b/samples/video/teavm-samples-video.iml index fa88bfc84..2b60c620e 100644 --- a/samples/video/teavm-samples-video.iml +++ b/samples/video/teavm-samples-video.iml @@ -25,18 +25,17 @@ - - - + + \ No newline at end of file diff --git a/tests/teavm-tests.iml b/tests/teavm-tests.iml index 857d16271..c10937c99 100644 --- a/tests/teavm-tests.iml +++ b/tests/teavm-tests.iml @@ -15,16 +15,15 @@ - - - + + @@ -34,40 +33,40 @@ - - - - - - - + + - + - - + + + + + - + + + diff --git a/tools/chrome-rdp/teavm-chrome-rdp.iml b/tools/chrome-rdp/teavm-chrome-rdp.iml index 278403112..b9968738e 100644 --- a/tools/chrome-rdp/teavm-chrome-rdp.iml +++ b/tools/chrome-rdp/teavm-chrome-rdp.iml @@ -29,29 +29,28 @@ - + - - - + + - + diff --git a/tools/cli/teavm-cli.iml b/tools/cli/teavm-cli.iml index 9449af91d..65dc9d565 100644 --- a/tools/cli/teavm-cli.iml +++ b/tools/cli/teavm-cli.iml @@ -15,7 +15,6 @@ - \ No newline at end of file diff --git a/tools/core/teavm-tooling.iml b/tools/core/teavm-tooling.iml index 1c5cc5cb7..5ecfa1dbf 100644 --- a/tools/core/teavm-tooling.iml +++ b/tools/core/teavm-tooling.iml @@ -7,7 +7,7 @@ - + @@ -28,7 +28,6 @@ - \ No newline at end of file diff --git a/tools/junit/teavm-junit.iml b/tools/junit/teavm-junit.iml index 27f92f31d..4af276c5a 100644 --- a/tools/junit/teavm-junit.iml +++ b/tools/junit/teavm-junit.iml @@ -15,47 +15,46 @@ - - - - - - - - - + + - + - - + + + + + - + + + + diff --git a/tools/maven/plugin/teavm-maven-plugin.iml b/tools/maven/plugin/teavm-maven-plugin.iml index 5e3cc1337..c2727ff8e 100644 --- a/tools/maven/plugin/teavm-maven-plugin.iml +++ b/tools/maven/plugin/teavm-maven-plugin.iml @@ -13,76 +13,75 @@ - - - - - - - - - - + + + + + + + + + - - + - - - - - - - + + + - - + + + + + - + + +