diff --git a/compiler/testData/integration/ant/jvm/stdlibJre78AndStdlibJdk78/build.log.expected b/compiler/testData/integration/ant/jvm/stdlibJre78AndStdlibJdk78/build.log.expected deleted file mode 100644 index bb97331e287..00000000000 --- a/compiler/testData/integration/ant/jvm/stdlibJre78AndStdlibJdk78/build.log.expected +++ /dev/null @@ -1,12 +0,0 @@ -OUT: -Buildfile: [TestData]/build.xml - -build: - [kotlinc] Compiling [[TestData]/main.kt] => [[Temp]/test.jar] - [kotlinc] [KotlinProjectHome]/dist/kotlin-stdlib-jre7.jar: warning: kotlin-stdlib-jre7 is deprecated. Please use kotlin-stdlib-jdk7 instead - [kotlinc] [KotlinProjectHome]/dist/kotlin-stdlib-jre8.jar: warning: kotlin-stdlib-jre8 is deprecated. Please use kotlin-stdlib-jdk8 instead - -BUILD SUCCESSFUL -Total time: [time] - -Return code: 0 diff --git a/compiler/testData/integration/ant/jvm/stdlibJre78AndStdlibJdk78/build.xml b/compiler/testData/integration/ant/jvm/stdlibJre78AndStdlibJdk78/build.xml deleted file mode 100644 index 4f774169ae6..00000000000 --- a/compiler/testData/integration/ant/jvm/stdlibJre78AndStdlibJdk78/build.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/compiler/testData/integration/ant/jvm/stdlibJre78AndStdlibJdk78/main.kt b/compiler/testData/integration/ant/jvm/stdlibJre78AndStdlibJdk78/main.kt deleted file mode 100644 index 67acb61dcb3..00000000000 --- a/compiler/testData/integration/ant/jvm/stdlibJre78AndStdlibJdk78/main.kt +++ /dev/null @@ -1,15 +0,0 @@ -import java.util.stream.Stream -import kotlin.streams.* - -// kotlin-stdlib-jdk7 - -fun testUse(c: AutoCloseable) = c.use {} - -// kotlin-stdlib-jdk8 - -fun testGet(c: MatchGroupCollection) = c.get("") - -fun testGetOrDefault(c: Map) = c.getOrDefault(42, "") -fun testRemove(c: MutableMap) = c.remove(42, "") - -fun testAsSequence(c: Stream) = c.asSequence() diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/integration/AbstractAntTaskTest.java b/compiler/tests-common/tests/org/jetbrains/kotlin/integration/AbstractAntTaskTest.java index cff8fd83d4b..59b8f8a2675 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/integration/AbstractAntTaskTest.java +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/integration/AbstractAntTaskTest.java @@ -42,10 +42,6 @@ public abstract class AbstractAntTaskTest extends KotlinIntegrationTestBase { "-Dkotlin.lib=" + KotlinIntegrationTestBase.getCompilerLib(), "-Dkotlin.runtime.jar=" + ForTestCompileRuntime.runtimeJarForTests().getAbsolutePath(), "-Dkotlin.reflect.jar=" + ForTestCompileRuntime.reflectJarForTests().getAbsolutePath(), - "-Dkotlin.stdlib.jre7.jar=" + new File("dist/kotlin-stdlib-jre7.jar").getAbsolutePath(), - "-Dkotlin.stdlib.jre8.jar=" + new File("dist/kotlin-stdlib-jre8.jar").getAbsolutePath(), - "-Dkotlin.stdlib.jdk7.jar=" + new File("dist/kotlinc/lib/kotlin-stdlib-jdk7.jar").getAbsolutePath(), - "-Dkotlin.stdlib.jdk8.jar=" + new File("dist/kotlinc/lib/kotlin-stdlib-jdk8.jar").getAbsolutePath(), "-Dtest.data=" + testDataDir, "-Dtemp=" + tmpdir, "-cp", antClasspath, diff --git a/compiler/tests/org/jetbrains/kotlin/integration/AntTaskTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/integration/AntTaskTestGenerated.java index d7bbbaf1bde..fba03027d3b 100644 --- a/compiler/tests/org/jetbrains/kotlin/integration/AntTaskTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/integration/AntTaskTestGenerated.java @@ -109,11 +109,6 @@ public class AntTaskTestGenerated extends AbstractAntTaskTest { runTest("compiler/testData/integration/ant/jvm/stdlibForJavacWithNoKotlin/"); } - @TestMetadata("stdlibJre78AndStdlibJdk78") - public void testStdlibJre78AndStdlibJdk78() throws Exception { - runTest("compiler/testData/integration/ant/jvm/stdlibJre78AndStdlibJdk78/"); - } - @TestMetadata("suppressWarnings") public void testSuppressWarnings() throws Exception { runTest("compiler/testData/integration/ant/jvm/suppressWarnings/");