From 5706012d0ee5fff5b533a325f1c783cfba2d5e45 Mon Sep 17 00:00:00 2001 From: Alexey Andreev Date: Fri, 19 Feb 2016 22:17:57 +0300 Subject: [PATCH] Ignore IDEA files --- .gitignore | 2 + .../Maven__aopalliance_aopalliance_1_0.xml | 1 + .idea/libraries/teavm_all.xml | 5 +- .idea/uiDesigner.xml | 124 ------------------ classlib/teavm-classlib.iml | 9 ++ core/teavm-core.iml | 6 + extras-slf4j/teavm-extras-slf4j.iml | 3 + html4j/teavm-html4j.iml | 16 +++ jso/apis/teavm-jso-apis.iml | 2 + jso/core/teavm-jso.iml | 2 + jso/impl/teavm-jso-impl.iml | 5 + platform/teavm-platform.iml | 4 + samples/async/teavm-samples-async.iml | 6 + samples/benchmark/teavm-samples-benchmark.iml | 22 ++++ samples/hello/teavm-samples-hello.iml | 7 + samples/kotlin/teavm-samples-kotlin.iml | 10 ++ samples/scala/teavm-samples-scala.iml | 7 + samples/storage/teavm-samples-storage.iml | 7 + samples/video/teavm-samples-video.iml | 7 + tests/teavm-tests.iml | 8 ++ tools/chrome-rdp/teavm-chrome-rdp.iml | 29 ++++ tools/cli/teavm-cli.iml | 3 + tools/core/teavm-tooling.iml | 3 + tools/idea/jps-plugin/teavm-jps-plugin.iml | 1 + tools/maven/plugin/teavm-maven-plugin.iml | 74 +++++++++++ 25 files changed, 235 insertions(+), 128 deletions(-) delete mode 100644 .idea/uiDesigner.xml diff --git a/.gitignore b/.gitignore index e319a93d8..ae251110b 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,5 @@ .checkstyle .cache-main target +.idea/libraries/Maven__* +.idea/uiDesigner.xml \ No newline at end of file diff --git a/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml index 30ff5cb79..0e47fce26 100644 --- a/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml +++ b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml @@ -2,6 +2,7 @@ + diff --git a/.idea/libraries/teavm_all.xml b/.idea/libraries/teavm_all.xml index 55f1409ea..1a7362281 100644 --- a/.idea/libraries/teavm_all.xml +++ b/.idea/libraries/teavm_all.xml @@ -4,9 +4,6 @@ - - - - + \ No newline at end of file diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml deleted file mode 100644 index e96534fb2..000000000 --- a/.idea/uiDesigner.xml +++ /dev/null @@ -1,124 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/classlib/teavm-classlib.iml b/classlib/teavm-classlib.iml index d479eb805..00b424db8 100644 --- a/classlib/teavm-classlib.iml +++ b/classlib/teavm-classlib.iml @@ -32,6 +32,15 @@ + + + + + + + + + diff --git a/core/teavm-core.iml b/core/teavm-core.iml index f41b2faab..6359b3c09 100644 --- a/core/teavm-core.iml +++ b/core/teavm-core.iml @@ -30,5 +30,11 @@ + + + + + + \ No newline at end of file diff --git a/extras-slf4j/teavm-extras-slf4j.iml b/extras-slf4j/teavm-extras-slf4j.iml index 46a294f62..93666ceb8 100644 --- a/extras-slf4j/teavm-extras-slf4j.iml +++ b/extras-slf4j/teavm-extras-slf4j.iml @@ -10,6 +10,9 @@ + + + diff --git a/html4j/teavm-html4j.iml b/html4j/teavm-html4j.iml index 5bd4bc0d3..30e96058f 100644 --- a/html4j/teavm-html4j.iml +++ b/html4j/teavm-html4j.iml @@ -19,6 +19,22 @@ + + + + + + + + + + + + + + + + diff --git a/jso/apis/teavm-jso-apis.iml b/jso/apis/teavm-jso-apis.iml index 62b52a573..57fa10b32 100644 --- a/jso/apis/teavm-jso-apis.iml +++ b/jso/apis/teavm-jso-apis.iml @@ -10,6 +10,8 @@ + + diff --git a/jso/core/teavm-jso.iml b/jso/core/teavm-jso.iml index c68f06c77..448d7266b 100644 --- a/jso/core/teavm-jso.iml +++ b/jso/core/teavm-jso.iml @@ -11,5 +11,7 @@ + + \ No newline at end of file diff --git a/jso/impl/teavm-jso-impl.iml b/jso/impl/teavm-jso-impl.iml index e2750eeef..c5519fe60 100644 --- a/jso/impl/teavm-jso-impl.iml +++ b/jso/impl/teavm-jso-impl.iml @@ -11,6 +11,11 @@ + + + + + diff --git a/platform/teavm-platform.iml b/platform/teavm-platform.iml index 7b5b4d479..60707510a 100644 --- a/platform/teavm-platform.iml +++ b/platform/teavm-platform.iml @@ -22,6 +22,10 @@ + + + + diff --git a/samples/async/teavm-samples-async.iml b/samples/async/teavm-samples-async.iml index 47f1da0da..92a3c435b 100644 --- a/samples/async/teavm-samples-async.iml +++ b/samples/async/teavm-samples-async.iml @@ -22,6 +22,12 @@ + + + + + + diff --git a/samples/benchmark/teavm-samples-benchmark.iml b/samples/benchmark/teavm-samples-benchmark.iml index 8a6400fda..c4b61f6fd 100644 --- a/samples/benchmark/teavm-samples-benchmark.iml +++ b/samples/benchmark/teavm-samples-benchmark.iml @@ -32,6 +32,28 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/samples/hello/teavm-samples-hello.iml b/samples/hello/teavm-samples-hello.iml index 4d3248624..36a84bd3d 100644 --- a/samples/hello/teavm-samples-hello.iml +++ b/samples/hello/teavm-samples-hello.iml @@ -22,6 +22,13 @@ + + + + + + + diff --git a/samples/kotlin/teavm-samples-kotlin.iml b/samples/kotlin/teavm-samples-kotlin.iml index 8a3e243ee..52093c0d0 100644 --- a/samples/kotlin/teavm-samples-kotlin.iml +++ b/samples/kotlin/teavm-samples-kotlin.iml @@ -26,6 +26,16 @@ + + + + + + + + + + diff --git a/samples/scala/teavm-samples-scala.iml b/samples/scala/teavm-samples-scala.iml index 06ee848e1..343186baf 100644 --- a/samples/scala/teavm-samples-scala.iml +++ b/samples/scala/teavm-samples-scala.iml @@ -22,6 +22,13 @@ + + + + + + + diff --git a/samples/storage/teavm-samples-storage.iml b/samples/storage/teavm-samples-storage.iml index eec4082b0..af4b7b0ad 100644 --- a/samples/storage/teavm-samples-storage.iml +++ b/samples/storage/teavm-samples-storage.iml @@ -22,6 +22,13 @@ + + + + + + + diff --git a/samples/video/teavm-samples-video.iml b/samples/video/teavm-samples-video.iml index eec4082b0..af4b7b0ad 100644 --- a/samples/video/teavm-samples-video.iml +++ b/samples/video/teavm-samples-video.iml @@ -22,6 +22,13 @@ + + + + + + + diff --git a/tests/teavm-tests.iml b/tests/teavm-tests.iml index 0fa8e3b14..2d8f395c8 100644 --- a/tests/teavm-tests.iml +++ b/tests/teavm-tests.iml @@ -10,6 +10,14 @@ + + + + + + + + diff --git a/tools/chrome-rdp/teavm-chrome-rdp.iml b/tools/chrome-rdp/teavm-chrome-rdp.iml index bafebaf52..26c5bdd72 100644 --- a/tools/chrome-rdp/teavm-chrome-rdp.iml +++ b/tools/chrome-rdp/teavm-chrome-rdp.iml @@ -43,6 +43,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tools/cli/teavm-cli.iml b/tools/cli/teavm-cli.iml index f1cd28fdb..c79ab883a 100644 --- a/tools/cli/teavm-cli.iml +++ b/tools/cli/teavm-cli.iml @@ -9,6 +9,9 @@ + + + diff --git a/tools/core/teavm-tooling.iml b/tools/core/teavm-tooling.iml index 298bb6085..89e564a1f 100644 --- a/tools/core/teavm-tooling.iml +++ b/tools/core/teavm-tooling.iml @@ -22,6 +22,9 @@ + + + diff --git a/tools/idea/jps-plugin/teavm-jps-plugin.iml b/tools/idea/jps-plugin/teavm-jps-plugin.iml index dec22f577..4aa591fa7 100644 --- a/tools/idea/jps-plugin/teavm-jps-plugin.iml +++ b/tools/idea/jps-plugin/teavm-jps-plugin.iml @@ -13,5 +13,6 @@ + \ No newline at end of file diff --git a/tools/maven/plugin/teavm-maven-plugin.iml b/tools/maven/plugin/teavm-maven-plugin.iml index 8171792fa..fd2c61ac6 100644 --- a/tools/maven/plugin/teavm-maven-plugin.iml +++ b/tools/maven/plugin/teavm-maven-plugin.iml @@ -40,6 +40,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +