diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BuildCacheRelocationIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BuildCacheRelocationIT.kt index 91b8a573b2f..db87e74587f 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BuildCacheRelocationIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BuildCacheRelocationIT.kt @@ -101,8 +101,8 @@ class BuildCacheRelocationIT : KGPBaseTest() { listOf("build"), listOf( ":compileCommonMainKotlinMetadata", - ":compileKotlinJvmWithJava", - ":compileTestKotlinJvmWithJava", + ":compileKotlinJvmWithoutJava", + ":compileTestKotlinJvmWithoutJava", ":compileKotlinJs", ":compileTestKotlinJs" ) diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/CompilerOptionsIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/CompilerOptionsIT.kt index eb9b76ac587..3630a80694f 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/CompilerOptionsIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/CompilerOptionsIT.kt @@ -136,7 +136,6 @@ internal class CompilerOptionsIT : KGPBaseTest() { val compileTasks = listOf( "compileKotlinMetadata", - "compileKotlinJvmWithJava", "compileKotlinJvmWithoutJava", "compileKotlinJs", // we do not allow modifying free args for K/N at execution time @@ -621,4 +620,4 @@ internal class CompilerOptionsIT : KGPBaseTest() { } } } -} \ No newline at end of file +} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/NewMultiplatformIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/NewMultiplatformIT.kt index 348dfc08563..fb91902177b 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/NewMultiplatformIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/NewMultiplatformIT.kt @@ -421,6 +421,7 @@ open class NewMultiplatformIT : BaseGradleIT() { } @Test + @Ignore // KT-60745 fun testJvmWithJavaEquivalence() = doTestJvmWithJava(testJavaSupportInJvmTargets = false) @Test @@ -627,31 +628,12 @@ open class NewMultiplatformIT : BaseGradleIT() { ":compileTestKotlinJs", ":compileKotlinJvmWithoutJava", ":compileTestKotlinJvmWithoutJava", - ":compileKotlinJvmWithJava", - ":compileJava", - ":compileTestKotlinJvmWithJava", - ":compileTestJava", // test tasks: ":jsTest", // does not run any actual tests for now ":jvmWithoutJavaTest", - ":test" ) val expectedKotlinOutputFiles = listOf( - *kotlinClassesDir(sourceSet = "jvmWithJava/main").let { - arrayOf( - it + "com/example/lib/JavaClassUsageKt.class", - it + "com/example/lib/CommonKt.class", - it + "META-INF/new-mpp-lib-with-tests.kotlin_module" - ) - }, - *kotlinClassesDir(sourceSet = "jvmWithJava/test").let { - arrayOf( - it + "com/example/lib/TestCommonCode.class", - it + "com/example/lib/TestWithJava.class", - it + "META-INF/new-mpp-lib-with-tests_test.kotlin_module" - ) - }, *kotlinClassesDir(sourceSet = "jvmWithoutJava/main").let { arrayOf( it + "com/example/lib/CommonKt.class", @@ -676,7 +658,6 @@ open class NewMultiplatformIT : BaseGradleIT() { assertTestResults( expectedTestResults, "jsNodeTest", - "test", // jvmTest "${targetName}Test" ) } diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/AggregatingKotlinTestReportIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/AggregatingKotlinTestReportIT.kt index 9a6cc7e86ff..9861850571e 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/AggregatingKotlinTestReportIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/AggregatingKotlinTestReportIT.kt @@ -161,4 +161,4 @@ private fun BuildResult.assertNoTestsStateFileException() { // KT-55134 assertOutputDoesNotContain("Cannot read test tasks state from") assertOutputDoesNotContain("Cannot store test tasks state into") -} \ No newline at end of file +} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-with-tests/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-with-tests/build.gradle index 5ca51a78c58..d1ff3b33681 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-with-tests/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-with-tests/build.gradle @@ -19,15 +19,11 @@ repositories { } kotlin { - targets { - fromPreset(presets.jvm, 'jvmWithoutJava') - fromPreset(presets.jvmWithJava, 'jvmWithJava') - fromPreset(presets.macosX64, 'macos64') - fromPreset(presets.macosArm64, 'macosArm64') - fromPreset(presets.linuxX64, 'linux64') - fromPreset(presets.mingwX64, 'mingw64') - } - + jvm("jvmWithoutJava") + macosX64("macos64") + macosArm64() + linuxX64("linux64") + mingwX64("mingw64") js { nodejs() } @@ -61,4 +57,4 @@ kotlin { dependsOn nativeMain } } -} \ No newline at end of file +} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-with-tests/build.gradle.kts.alternative b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-with-tests/build.gradle.kts.alternative index bf27bc5649c..fe8b2cf94d3 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-with-tests/build.gradle.kts.alternative +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-with-tests/build.gradle.kts.alternative @@ -9,7 +9,6 @@ repositories { kotlin { val jvmWithoutJava = jvm("jvmWithoutJava") - val jvmWithJava = targetFromPreset(presets["jvmWithJava"]) val js = js { nodejs() } @@ -26,18 +25,14 @@ kotlin { } } - val main by getting - val jvmWithoutJavaMain = jvmWithoutJava.compilations["main"].defaultSourceSet - configure(listOf(main, jvmWithoutJavaMain)) { + jvmWithoutJava.compilations["main"].defaultSourceSet { dependencies { implementation(kotlin("stdlib")) implementation(kotlin("script-runtime")) } } - val test by getting - val jvmWithoutJavaTest = jvmWithoutJava.compilations["test"].defaultSourceSet - configure(listOf(test, jvmWithoutJavaTest)) { + jvmWithoutJava.compilations["test"].defaultSourceSet { dependencies { implementation(kotlin("test-junit")) } @@ -54,4 +49,4 @@ kotlin { compilations["main"].defaultSourceSet.dependsOn(nativeMain) } } -} \ No newline at end of file +} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-with-tests/src/main/java/com/example/lib/JavaClass.java b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-with-tests/src/main/java/com/example/lib/JavaClass.java deleted file mode 100644 index eaf99fc6c3a..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-with-tests/src/main/java/com/example/lib/JavaClass.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.example.lib; - -public class JavaClass { - -} \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-with-tests/src/main/kotlin/JavaClassUsage.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-with-tests/src/main/kotlin/JavaClassUsage.kt deleted file mode 100644 index 82869e4a0e2..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-with-tests/src/main/kotlin/JavaClassUsage.kt +++ /dev/null @@ -1,5 +0,0 @@ -package com.example.lib - -actual fun expectedFun() { println(id(1)) } - -fun f() = JavaClass() \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-with-tests/src/test/java/com/example/lib/TestJava.java b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-with-tests/src/test/java/com/example/lib/TestJava.java deleted file mode 100644 index cd33a2589d0..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-with-tests/src/test/java/com/example/lib/TestJava.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.example.lib; - -import org.junit.Test; - -public class TestJava { - @Test - public void testJava() { - new JavaClass(); - JavaClassUsageKt.f(); - } -} \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-with-tests/src/test/kotlin/TestWithJava.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-with-tests/src/test/kotlin/TestWithJava.kt deleted file mode 100644 index e7bfd8bc67b..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-with-tests/src/test/kotlin/TestWithJava.kt +++ /dev/null @@ -1,15 +0,0 @@ -package com.example.lib - -import org.junit.Test - -class TestWithJava { - @Test - fun testJavaClass() { - JavaClass() - f() - } - - companion object { - val seesJavaTestClass = TestJava::class - } -} \ No newline at end of file