diff --git a/libraries/tools/kotlin-maven-plugin-test/pom.xml b/libraries/tools/kotlin-maven-plugin-test/pom.xml index d36178ebd37..ae25ae60157 100644 --- a/libraries/tools/kotlin-maven-plugin-test/pom.xml +++ b/libraries/tools/kotlin-maven-plugin-test/pom.xml @@ -211,13 +211,7 @@ test-enable-extensions/pom.xml test-kapt-allopen/pom.xml test-lombok-with-kapt/pom.xml - - test-js-moduleKind/pom.xml - test-js-accessToInternal/pom.xml - test-js-suppressWarnings/pom.xml - test-js-sourceMap/pom.xml - test-js-extraArguments/pom.xml - test-js-sourceMapEmbedSources/pom.xml + test-multiplatform/pom.xml test-helloworld-kts/pom.xml diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-js-accessToInternal/check.js b/libraries/tools/kotlin-maven-plugin-test/src/it/test-js-accessToInternal/check.js deleted file mode 100644 index 88136541efb..00000000000 --- a/libraries/tools/kotlin-maven-plugin-test/src/it/test-js-accessToInternal/check.js +++ /dev/null @@ -1 +0,0 @@ -this['test-js-accessToInternal-tests'].org.jetbrains.test(); diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-js-accessToInternal/pom.xml b/libraries/tools/kotlin-maven-plugin-test/src/it/test-js-accessToInternal/pom.xml deleted file mode 100644 index 47a8b6e72f7..00000000000 --- a/libraries/tools/kotlin-maven-plugin-test/src/it/test-js-accessToInternal/pom.xml +++ /dev/null @@ -1,83 +0,0 @@ - - - 4.0.0 - - org.jetbrains.kotlin - test-js-accessToInternal - 1.0-SNAPSHOT - - - - org.jetbrains.kotlin - kotlin-stdlib-js - ${kotlin.version} - - - - - ${project.basedir}/src/main/kotlin - ${project.basedir}/src/test/kotlin - - - kotlin-maven-plugin - org.jetbrains.kotlin - ${kotlin.version} - - - compile - - js - - - ${project.basedir}/customOutput/ - - -Xforce-deprecated-legacy-compiler-usage - - - - - test-compile - - test-js - - - - -Xforce-deprecated-legacy-compiler-usage - - - - - - - org.apache.maven.plugins - maven-dependency-plugin - 2.10 - - - unpack - package - - unpack - - - - - org.jetbrains.kotlin - kotlin-stdlib-js - ${kotlin.version} - jar - false - ${project.build.directory}/js/ - **/*.js - - - - - - - - - - diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-js-accessToInternal/src/main/kotlin/org/jetbrains/HelloWorld.kt b/libraries/tools/kotlin-maven-plugin-test/src/it/test-js-accessToInternal/src/main/kotlin/org/jetbrains/HelloWorld.kt deleted file mode 100644 index 54dbe960f70..00000000000 --- a/libraries/tools/kotlin-maven-plugin-test/src/it/test-js-accessToInternal/src/main/kotlin/org/jetbrains/HelloWorld.kt +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright 2010-2017 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.jetbrains - -internal val CONST = "CONST" - -open class PublicClass { - internal fun foo(): String = "foo" - internal val bar: String = "bar" - open internal fun baz(): String = "PublicClass.baz()" -} - -internal data class InternalDataClass(val x: Int, val y: Int) - -internal fun box(): String { - return "OK" -} \ No newline at end of file diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-js-accessToInternal/src/test/kotlin/org/jetbrains/HelloWorldTest.kt b/libraries/tools/kotlin-maven-plugin-test/src/it/test-js-accessToInternal/src/test/kotlin/org/jetbrains/HelloWorldTest.kt deleted file mode 100644 index 473f312d88e..00000000000 --- a/libraries/tools/kotlin-maven-plugin-test/src/it/test-js-accessToInternal/src/test/kotlin/org/jetbrains/HelloWorldTest.kt +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright 2010-2015 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.jetbrains - -class PublicClassHeir : PublicClass() { - override internal fun baz(): String = "PublicClassHeir.baz()" -} - -fun assertEquals(e: T, a: T) { - if (e != a) throw Exception("Expected: $e, actual: $a") -} - -fun test() { - assertEquals("CONST", CONST) - - assertEquals("foo", PublicClass().foo()) - assertEquals("bar", PublicClass().bar) - assertEquals("PublicClass.baz()", PublicClass().baz()) - - assertEquals("foo", PublicClassHeir().foo()) - assertEquals("bar", PublicClassHeir().bar) - assertEquals("PublicClassHeir.baz()", PublicClassHeir().baz()) - - val data = InternalDataClass(10, 20) - assertEquals(10, data.x) - assertEquals(20, data.y) -} diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-js-accessToInternal/verify.bsh b/libraries/tools/kotlin-maven-plugin-test/src/it/test-js-accessToInternal/verify.bsh deleted file mode 100644 index c5c23b24059..00000000000 --- a/libraries/tools/kotlin-maven-plugin-test/src/it/test-js-accessToInternal/verify.bsh +++ /dev/null @@ -1,21 +0,0 @@ -import java.io.*; -import javax.script.*; -import jdk.nashorn.api.scripting.NashornScriptEngineFactory; - -File file = new File(basedir, "target/js/test-js-accessToInternal.js"); -if (!file.exists() || !file.isFile()) { - throw new FileNotFoundException("Could not find generated JS : " + file); -} - -File testFile = new File(basedir, "target/test-js/test-js-accessToInternal-tests.js"); -if (!testFile.exists() || !testFile.isFile()) { - throw new FileNotFoundException("Could not find generated JS : " + testFile); -} - -String basePath = basedir.getPath(); -ScriptEngine engine = new NashornScriptEngineFactory().getScriptEngine(); - -engine.eval(new FileReader(basePath + "/target/js/kotlin.js")); -engine.eval(new FileReader(basePath + "/target/js/test-js-accessToInternal.js")); -engine.eval(new FileReader(basePath + "/target/test-js/test-js-accessToInternal-tests.js")); -engine.eval(new FileReader(basePath + "/check.js")); \ No newline at end of file diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-js-extraArguments/pom.xml b/libraries/tools/kotlin-maven-plugin-test/src/it/test-js-extraArguments/pom.xml deleted file mode 100644 index 85562223010..00000000000 --- a/libraries/tools/kotlin-maven-plugin-test/src/it/test-js-extraArguments/pom.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - 4.0.0 - - org.jetbrains.kotlin - test-js-extraArguments - 1.0-SNAPSHOT - - - - org.jetbrains.kotlin - kotlin-stdlib-js - ${kotlin.version} - - - - - ${project.basedir}/src/main/kotlin - - - kotlin-maven-plugin - org.jetbrains.kotlin - ${kotlin.version} - - - compile - - js - - - - - - -Xno-inline - -Xforce-deprecated-legacy-compiler-usage - - - - - - - diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-js-extraArguments/src/main/kotlin/org/jetbrains/HelloWorld.kt b/libraries/tools/kotlin-maven-plugin-test/src/it/test-js-extraArguments/src/main/kotlin/org/jetbrains/HelloWorld.kt deleted file mode 100644 index 44d4071d9e3..00000000000 --- a/libraries/tools/kotlin-maven-plugin-test/src/it/test-js-extraArguments/src/main/kotlin/org/jetbrains/HelloWorld.kt +++ /dev/null @@ -1,9 +0,0 @@ -package org.jetbrains - -fun main(args : Array) { - println(getGreeting()) -} - -fun getGreeting() : String { - return "Hello, World!" -} diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-js-extraArguments/verify.bsh b/libraries/tools/kotlin-maven-plugin-test/src/it/test-js-extraArguments/verify.bsh deleted file mode 100644 index b5da31475d7..00000000000 --- a/libraries/tools/kotlin-maven-plugin-test/src/it/test-js-extraArguments/verify.bsh +++ /dev/null @@ -1,6 +0,0 @@ -import java.io.*; - -File file = new File(basedir, "target/js/test-js-extraArguments.js"); -if (!file.exists() || !file.isFile()) { - throw new FileNotFoundException("Could not find generated JS : " + file); -} diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-js-moduleKind/amd.js b/libraries/tools/kotlin-maven-plugin-test/src/it/test-js-moduleKind/amd.js deleted file mode 100644 index b611d41b0c6..00000000000 --- a/libraries/tools/kotlin-maven-plugin-test/src/it/test-js-moduleKind/amd.js +++ /dev/null @@ -1,23 +0,0 @@ -var amdModules = {}; -// Hard-code expected dependency order since we are unable to refer to modules by filename here. -var moduleNames = ["kotlin", "test-js-moduleKind", "check"]; -function define(moduleName, dependencies, body) { - if (Array.isArray(moduleName)) { - body = dependencies; - dependencies = moduleName; - moduleName = moduleNames.shift(); - } - else { - if (moduleName !== moduleNames.shift()) throw new Error("Unexpected dependency") - } - var resolvedDependencies = []; - var currentModule = {}; - amdModules[moduleName] = currentModule; - for (var i = 0; i < dependencies.length; ++i) { - var dependencyName = dependencies[i]; - var dependency = dependencyName === 'exports' ? currentModule : amdModules[dependencyName]; - resolvedDependencies.push(dependency); - } - body.apply(body, resolvedDependencies); -} -define.amd = {}; \ No newline at end of file diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-js-moduleKind/check.js b/libraries/tools/kotlin-maven-plugin-test/src/it/test-js-moduleKind/check.js deleted file mode 100644 index decc2977b35..00000000000 --- a/libraries/tools/kotlin-maven-plugin-test/src/it/test-js-moduleKind/check.js +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright 2010-2016 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -define("check", ["test-js-moduleKind"], function(app) { - if (app.foo.bar() != "OK") { - throw new Error("Unexpected result"); - } -}); \ No newline at end of file diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-js-moduleKind/pom.xml b/libraries/tools/kotlin-maven-plugin-test/src/it/test-js-moduleKind/pom.xml deleted file mode 100644 index c79ae04002e..00000000000 --- a/libraries/tools/kotlin-maven-plugin-test/src/it/test-js-moduleKind/pom.xml +++ /dev/null @@ -1,71 +0,0 @@ - - - 4.0.0 - - org.jetbrains.kotlin - test-js-moduleKind - 1.0-SNAPSHOT - - - - org.jetbrains.kotlin - kotlin-stdlib-js - ${kotlin.version} - - - - - ${project.basedir}/src/main/kotlin - - - kotlin-maven-plugin - org.jetbrains.kotlin - ${kotlin.version} - - - compile - - js - - - - - umd - - -Xforce-deprecated-legacy-compiler-usage - - - - - org.apache.maven.plugins - maven-dependency-plugin - 2.10 - - - unpack - package - - unpack - - - - - org.jetbrains.kotlin - kotlin-stdlib-js - ${kotlin.version} - jar - false - ${project.build.directory}/js/ - **/*.js - - - - - - - - - - diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-js-moduleKind/src/main/kotlin/org/jetbrains/HelloWorld.kt b/libraries/tools/kotlin-maven-plugin-test/src/it/test-js-moduleKind/src/main/kotlin/org/jetbrains/HelloWorld.kt deleted file mode 100644 index ec5efeeb1e2..00000000000 --- a/libraries/tools/kotlin-maven-plugin-test/src/it/test-js-moduleKind/src/main/kotlin/org/jetbrains/HelloWorld.kt +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright 2010-2016 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package foo - -fun bar() = "OK" diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-js-moduleKind/verify.bsh b/libraries/tools/kotlin-maven-plugin-test/src/it/test-js-moduleKind/verify.bsh deleted file mode 100644 index 34cf7eed4e9..00000000000 --- a/libraries/tools/kotlin-maven-plugin-test/src/it/test-js-moduleKind/verify.bsh +++ /dev/null @@ -1,16 +0,0 @@ -import java.io.*; -import javax.script.*; -import jdk.nashorn.api.scripting.NashornScriptEngineFactory; - -File file = new File(basedir, "target/js/test-js-moduleKind.js"); -if (!file.exists() || !file.isFile()) { - throw new FileNotFoundException("Could not find generated JS : " + file); -} - -String basePath = basedir.getPath(); -ScriptEngine engine = new NashornScriptEngineFactory().getScriptEngine(); - -engine.eval(new FileReader(basePath + "/amd.js")); -engine.eval(new FileReader(basePath + "/target/js/kotlin.js")); -engine.eval(new FileReader(basePath + "/target/js/test-js-moduleKind.js")); -engine.eval(new FileReader(basePath + "/check.js")); \ No newline at end of file diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-js-sourceMap/pom.xml b/libraries/tools/kotlin-maven-plugin-test/src/it/test-js-sourceMap/pom.xml deleted file mode 100644 index 23e4d73f179..00000000000 --- a/libraries/tools/kotlin-maven-plugin-test/src/it/test-js-sourceMap/pom.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - 4.0.0 - - org.jetbrains.kotlin - test-js-sourceMap - 1.0-SNAPSHOT - - - - org.jetbrains.kotlin - kotlin-stdlib-js - ${kotlin.version} - - - - - ${project.basedir}/src/main/kotlin - - - kotlin-maven-plugin - org.jetbrains.kotlin - ${kotlin.version} - - - compile - - js - - - - - true - prefixprefix/ - - -Xforce-deprecated-legacy-compiler-usage - - - - - - - diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-js-sourceMap/src/main/kotlin/org/jetbrains/HelloWorld.kt b/libraries/tools/kotlin-maven-plugin-test/src/it/test-js-sourceMap/src/main/kotlin/org/jetbrains/HelloWorld.kt deleted file mode 100644 index 0b757bce4cd..00000000000 --- a/libraries/tools/kotlin-maven-plugin-test/src/it/test-js-sourceMap/src/main/kotlin/org/jetbrains/HelloWorld.kt +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright 2010-2017 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.jetbrains - -fun bar() = "OK" diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-js-sourceMap/verify.bsh b/libraries/tools/kotlin-maven-plugin-test/src/it/test-js-sourceMap/verify.bsh deleted file mode 100644 index bec94d704f9..00000000000 --- a/libraries/tools/kotlin-maven-plugin-test/src/it/test-js-sourceMap/verify.bsh +++ /dev/null @@ -1,3 +0,0 @@ -source(new File(basedir, "../../../verify-common.bsh").getAbsolutePath()); - -assertFileContains("target/js/test-js-sourceMap.js.map", "\"prefixprefix/org/jetbrains/HelloWorld.kt\"") diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-js-sourceMapEmbedSources/pom.xml b/libraries/tools/kotlin-maven-plugin-test/src/it/test-js-sourceMapEmbedSources/pom.xml deleted file mode 100644 index 15bf3bee558..00000000000 --- a/libraries/tools/kotlin-maven-plugin-test/src/it/test-js-sourceMapEmbedSources/pom.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - 4.0.0 - - org.jetbrains.kotlin - test-js-sourceMapEmbedSources - 1.0-SNAPSHOT - - - - org.jetbrains.kotlin - kotlin-stdlib-js - ${kotlin.version} - - - - - ${project.basedir}/src/main/kotlin - - - kotlin-maven-plugin - org.jetbrains.kotlin - ${kotlin.version} - - - compile - - js - - - - - true - always - - -Xforce-deprecated-legacy-compiler-usage - - - - - - - diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-js-sourceMapEmbedSources/src/main/kotlin/org/jetbrains/HelloWorld.kt b/libraries/tools/kotlin-maven-plugin-test/src/it/test-js-sourceMapEmbedSources/src/main/kotlin/org/jetbrains/HelloWorld.kt deleted file mode 100644 index 82b141634f1..00000000000 --- a/libraries/tools/kotlin-maven-plugin-test/src/it/test-js-sourceMapEmbedSources/src/main/kotlin/org/jetbrains/HelloWorld.kt +++ /dev/null @@ -1,3 +0,0 @@ -package org.jetbrains - -fun bar() = "OK" diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-js-sourceMapEmbedSources/verify.bsh b/libraries/tools/kotlin-maven-plugin-test/src/it/test-js-sourceMapEmbedSources/verify.bsh deleted file mode 100644 index 2e8d9bd3d2e..00000000000 --- a/libraries/tools/kotlin-maven-plugin-test/src/it/test-js-sourceMapEmbedSources/verify.bsh +++ /dev/null @@ -1,5 +0,0 @@ -source(new File(basedir, "../../../verify-common.bsh").getAbsolutePath()); - -assertFileContains("target/js/test-js-sourceMapEmbedSources.js.map", "\"org/jetbrains/HelloWorld.kt\""); -assertFileContains("target/js/test-js-sourceMapEmbedSources.js.map", "\"package org.jetbrains"); -assertFileContains("target/js/test-js-sourceMapEmbedSources.js.map", "fun bar() = \\\"OK\\\"") diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-js-suppressWarnings/pom.xml b/libraries/tools/kotlin-maven-plugin-test/src/it/test-js-suppressWarnings/pom.xml deleted file mode 100644 index f1a87f0e274..00000000000 --- a/libraries/tools/kotlin-maven-plugin-test/src/it/test-js-suppressWarnings/pom.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - 4.0.0 - - org.jetbrains.kotlin - test-js-suppressWarningsAndVersion - 1.0-SNAPSHOT - - - - org.jetbrains.kotlin - kotlin-stdlib-js - ${kotlin.version} - - - - - ${project.basedir}/src/main/kotlin - - - kotlin-maven-plugin - org.jetbrains.kotlin - ${kotlin.version} - - - compile - - js - - - - - true - - -Xforce-deprecated-legacy-compiler-usage - - - - - - - diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-js-suppressWarnings/src/main/kotlin/org/jetbrains/HelloWorld.kt b/libraries/tools/kotlin-maven-plugin-test/src/it/test-js-suppressWarnings/src/main/kotlin/org/jetbrains/HelloWorld.kt deleted file mode 100644 index 4cdba9e2047..00000000000 --- a/libraries/tools/kotlin-maven-plugin-test/src/it/test-js-suppressWarnings/src/main/kotlin/org/jetbrains/HelloWorld.kt +++ /dev/null @@ -1,19 +0,0 @@ -package org.jetbrains - -import kotlin.Any - -fun foo(p: Int??) { - -} - -interface T { - abstract fun foo() -} - -fun main(args : Array) { - println(getGreeting()) -} - -fun getGreeting() : String { - return "Hello, World!" -} diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-js-suppressWarnings/verify.bsh b/libraries/tools/kotlin-maven-plugin-test/src/it/test-js-suppressWarnings/verify.bsh deleted file mode 100644 index 582689710af..00000000000 --- a/libraries/tools/kotlin-maven-plugin-test/src/it/test-js-suppressWarnings/verify.bsh +++ /dev/null @@ -1,6 +0,0 @@ -import java.io.*; - -File file = new File(basedir, "target/js/test-js-suppressWarningsAndVersion.js"); -if (!file.exists() || !file.isFile()) { - throw new FileNotFoundException("Could not find generated JS : " + file); -} diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-multiplatform/js/pom.xml b/libraries/tools/kotlin-maven-plugin-test/src/it/test-multiplatform/js/pom.xml deleted file mode 100644 index 9c3e0069789..00000000000 --- a/libraries/tools/kotlin-maven-plugin-test/src/it/test-multiplatform/js/pom.xml +++ /dev/null @@ -1,78 +0,0 @@ - - - 4.0.0 - - - org.jetbrains.kotlin - test-multimodule-root - 1.0-SNAPSHOT - ../pom.xml - - - test-multimodule-js - - - - org.jetbrains.kotlin - kotlin-stdlib-js - ${kotlin.version} - - - org.jetbrains.kotlin - kotlin-test-js - ${kotlin.version} - test - - - org.jetbrains.kotlin - test-multimodule-shared - ${project.version} - - - - - ${project.basedir}/src/main/kotlin - ${project.basedir}/src/test/kotlin - - - - kotlin-maven-plugin - org.jetbrains.kotlin - ${kotlin.version} - - - compile - compile - - js - - - - true - - -Xforce-deprecated-legacy-compiler-usage - - - - - compile-test - test-compile - - test-js - - - - true - - -Xforce-deprecated-legacy-compiler-usage - - - - - - - - - diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-multiplatform/js/src/main/kotlin/org/jetbrains/HelloWorld.kt b/libraries/tools/kotlin-maven-plugin-test/src/it/test-multiplatform/js/src/main/kotlin/org/jetbrains/HelloWorld.kt deleted file mode 100644 index 5e777d6dbb4..00000000000 --- a/libraries/tools/kotlin-maven-plugin-test/src/it/test-multiplatform/js/src/main/kotlin/org/jetbrains/HelloWorld.kt +++ /dev/null @@ -1,9 +0,0 @@ -package org.jetbrains - -fun main(args: Array) { - doMain() -} - -actual fun doMain() { - console.info(getGreeting()) -} diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-multiplatform/js/src/test/kotlin/org/jetbrains/JSSpecificTest.kt b/libraries/tools/kotlin-maven-plugin-test/src/it/test-multiplatform/js/src/test/kotlin/org/jetbrains/JSSpecificTest.kt deleted file mode 100644 index 840d8242a8a..00000000000 --- a/libraries/tools/kotlin-maven-plugin-test/src/it/test-multiplatform/js/src/test/kotlin/org/jetbrains/JSSpecificTest.kt +++ /dev/null @@ -1,10 +0,0 @@ -package org.jetbrains - -import kotlin.test.* - -class JSSpecificTest { - @Test - fun test1() { - assertEquals(1, 1) - } -} diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-multiplatform/pom.xml b/libraries/tools/kotlin-maven-plugin-test/src/it/test-multiplatform/pom.xml index 7a6fcb8f4ff..9f483785859 100644 --- a/libraries/tools/kotlin-maven-plugin-test/src/it/test-multiplatform/pom.xml +++ b/libraries/tools/kotlin-maven-plugin-test/src/it/test-multiplatform/pom.xml @@ -11,7 +11,6 @@ shared - js jvm diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-multiplatform/verify.bsh b/libraries/tools/kotlin-maven-plugin-test/src/it/test-multiplatform/verify.bsh index 7d3350db213..730875e27d2 100644 --- a/libraries/tools/kotlin-maven-plugin-test/src/it/test-multiplatform/verify.bsh +++ b/libraries/tools/kotlin-maven-plugin-test/src/it/test-multiplatform/verify.bsh @@ -12,11 +12,6 @@ if (!classFile.exists()) { throw new FileNotFoundException("Could not find generated class file: " + classFile); } -File scriptFile = new File(basedir, "js/target/js/test-multimodule-js.js"); -if (!scriptFile.exists()) { - throw new FileNotFoundException("Could not find generated JavaScript file: " + scriptFile); -} - File metaFile = new File(basedir, "shared/target/classes/org/jetbrains/ApiKt.kotlin_metadata"); if (!metaFile.exists()) { throw new FileNotFoundException("Could not find generated common metadata file: " + metaFile);