From 7d7808bb13a34df14b20e3ae3a96520f57788b42 Mon Sep 17 00:00:00 2001 From: Alexey Andreev Date: Sun, 21 Feb 2016 22:36:45 +0300 Subject: [PATCH] Fix maven build --- classlib/pom.xml | 7 -- classlib/teavm-classlib.iml | 12 ++- core/teavm-core.iml | 7 ++ extras-slf4j/teavm-extras-slf4j.iml | 4 + html4j/teavm-html4j.iml | 17 +++++ jso/apis/teavm-jso-apis.iml | 2 + jso/core/teavm-jso.iml | 2 + jso/impl/teavm-jso-impl.iml | 6 ++ platform/teavm-platform.iml | 6 ++ samples/async/teavm-samples-async.iml | 7 ++ samples/benchmark/teavm-samples-benchmark.iml | 23 ++++++ samples/hello/teavm-samples-hello.iml | 8 ++ samples/kotlin/teavm-samples-kotlin.iml | 11 +++ samples/scala/teavm-samples-scala.iml | 8 ++ samples/storage/teavm-samples-storage.iml | 8 ++ samples/video/teavm-samples-video.iml | 8 ++ tests/teavm-tests.iml | 9 +++ tools/chrome-rdp/teavm-chrome-rdp.iml | 31 ++++++++ tools/cli/teavm-cli.iml | 4 + tools/core/teavm-tooling.iml | 5 ++ tools/maven/plugin/teavm-maven-plugin.iml | 75 +++++++++++++++++++ 21 files changed, 252 insertions(+), 8 deletions(-) diff --git a/classlib/pom.xml b/classlib/pom.xml index 357e463c3..07c593131 100644 --- a/classlib/pom.xml +++ b/classlib/pom.xml @@ -67,7 +67,6 @@ org.ow2.asm asm-debug-all - provided com.google.code.gson @@ -112,12 +111,6 @@ org.codehaus.mojo exec-maven-plugin 1.2.1 - - - org.ow2.asm - asm-debug-all - - generate-classlib-doc diff --git a/classlib/teavm-classlib.iml b/classlib/teavm-classlib.iml index 00b424db8..f3c0d6ffe 100644 --- a/classlib/teavm-classlib.iml +++ b/classlib/teavm-classlib.iml @@ -11,6 +11,7 @@ + @@ -41,6 +42,15 @@ + + + + + + + + + @@ -49,7 +59,7 @@ - + diff --git a/core/teavm-core.iml b/core/teavm-core.iml index 6359b3c09..d18675547 100644 --- a/core/teavm-core.iml +++ b/core/teavm-core.iml @@ -4,6 +4,7 @@ + @@ -36,5 +37,11 @@ + + + + + + \ No newline at end of file diff --git a/extras-slf4j/teavm-extras-slf4j.iml b/extras-slf4j/teavm-extras-slf4j.iml index 93666ceb8..17153eb8e 100644 --- a/extras-slf4j/teavm-extras-slf4j.iml +++ b/extras-slf4j/teavm-extras-slf4j.iml @@ -13,8 +13,12 @@ + + + + diff --git a/html4j/teavm-html4j.iml b/html4j/teavm-html4j.iml index 30e96058f..a8c758eda 100644 --- a/html4j/teavm-html4j.iml +++ b/html4j/teavm-html4j.iml @@ -35,8 +35,25 @@ + + + + + + + + + + + + + + + + + diff --git a/jso/apis/teavm-jso-apis.iml b/jso/apis/teavm-jso-apis.iml index 57fa10b32..c82942cf3 100644 --- a/jso/apis/teavm-jso-apis.iml +++ b/jso/apis/teavm-jso-apis.iml @@ -12,6 +12,8 @@ + + diff --git a/jso/core/teavm-jso.iml b/jso/core/teavm-jso.iml index 448d7266b..44dcc203d 100644 --- a/jso/core/teavm-jso.iml +++ b/jso/core/teavm-jso.iml @@ -13,5 +13,7 @@ + + \ No newline at end of file diff --git a/jso/impl/teavm-jso-impl.iml b/jso/impl/teavm-jso-impl.iml index c5519fe60..2fd4fcc1b 100644 --- a/jso/impl/teavm-jso-impl.iml +++ b/jso/impl/teavm-jso-impl.iml @@ -16,8 +16,14 @@ + + + + + + diff --git a/platform/teavm-platform.iml b/platform/teavm-platform.iml index 60707510a..47b6f49c6 100644 --- a/platform/teavm-platform.iml +++ b/platform/teavm-platform.iml @@ -4,6 +4,7 @@ + @@ -26,8 +27,13 @@ + + + + + diff --git a/samples/async/teavm-samples-async.iml b/samples/async/teavm-samples-async.iml index 92a3c435b..9d3bc6ab3 100644 --- a/samples/async/teavm-samples-async.iml +++ b/samples/async/teavm-samples-async.iml @@ -28,6 +28,12 @@ + + + + + + @@ -37,6 +43,7 @@ + diff --git a/samples/benchmark/teavm-samples-benchmark.iml b/samples/benchmark/teavm-samples-benchmark.iml index c4b61f6fd..736795dab 100644 --- a/samples/benchmark/teavm-samples-benchmark.iml +++ b/samples/benchmark/teavm-samples-benchmark.iml @@ -54,6 +54,28 @@ + + + + + + + + + + + + + + + + + + + + + + @@ -62,6 +84,7 @@ + diff --git a/samples/hello/teavm-samples-hello.iml b/samples/hello/teavm-samples-hello.iml index 36a84bd3d..4dd65253b 100644 --- a/samples/hello/teavm-samples-hello.iml +++ b/samples/hello/teavm-samples-hello.iml @@ -29,6 +29,13 @@ + + + + + + + @@ -37,6 +44,7 @@ + diff --git a/samples/kotlin/teavm-samples-kotlin.iml b/samples/kotlin/teavm-samples-kotlin.iml index 52093c0d0..f9226f334 100644 --- a/samples/kotlin/teavm-samples-kotlin.iml +++ b/samples/kotlin/teavm-samples-kotlin.iml @@ -36,6 +36,16 @@ + + + + + + + + + + @@ -44,6 +54,7 @@ + diff --git a/samples/scala/teavm-samples-scala.iml b/samples/scala/teavm-samples-scala.iml index 343186baf..42958b542 100644 --- a/samples/scala/teavm-samples-scala.iml +++ b/samples/scala/teavm-samples-scala.iml @@ -29,6 +29,13 @@ + + + + + + + @@ -37,6 +44,7 @@ + diff --git a/samples/storage/teavm-samples-storage.iml b/samples/storage/teavm-samples-storage.iml index af4b7b0ad..7b7a0d5f7 100644 --- a/samples/storage/teavm-samples-storage.iml +++ b/samples/storage/teavm-samples-storage.iml @@ -29,6 +29,13 @@ + + + + + + + @@ -37,6 +44,7 @@ + diff --git a/samples/video/teavm-samples-video.iml b/samples/video/teavm-samples-video.iml index af4b7b0ad..7b7a0d5f7 100644 --- a/samples/video/teavm-samples-video.iml +++ b/samples/video/teavm-samples-video.iml @@ -29,6 +29,13 @@ + + + + + + + @@ -37,6 +44,7 @@ + diff --git a/tests/teavm-tests.iml b/tests/teavm-tests.iml index 2d8f395c8..f82fca9c6 100644 --- a/tests/teavm-tests.iml +++ b/tests/teavm-tests.iml @@ -18,8 +18,17 @@ + + + + + + + + + diff --git a/tools/chrome-rdp/teavm-chrome-rdp.iml b/tools/chrome-rdp/teavm-chrome-rdp.iml index 26c5bdd72..36b89f4b8 100644 --- a/tools/chrome-rdp/teavm-chrome-rdp.iml +++ b/tools/chrome-rdp/teavm-chrome-rdp.iml @@ -4,6 +4,7 @@ + @@ -72,8 +73,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tools/cli/teavm-cli.iml b/tools/cli/teavm-cli.iml index c79ab883a..f84234540 100644 --- a/tools/cli/teavm-cli.iml +++ b/tools/cli/teavm-cli.iml @@ -12,9 +12,13 @@ + + + + diff --git a/tools/core/teavm-tooling.iml b/tools/core/teavm-tooling.iml index 89e564a1f..a07eab557 100644 --- a/tools/core/teavm-tooling.iml +++ b/tools/core/teavm-tooling.iml @@ -4,6 +4,7 @@ + @@ -25,8 +26,12 @@ + + + + diff --git a/tools/maven/plugin/teavm-maven-plugin.iml b/tools/maven/plugin/teavm-maven-plugin.iml index fd2c61ac6..31142ceae 100644 --- a/tools/maven/plugin/teavm-maven-plugin.iml +++ b/tools/maven/plugin/teavm-maven-plugin.iml @@ -114,8 +114,83 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +