From 3f8505a090ed5292969cbd790e9fdee192198d7e Mon Sep 17 00:00:00 2001 From: Evgenii Mazhukin Date: Wed, 29 Nov 2023 13:28:26 +0000 Subject: [PATCH] [IC] Smoke tests for KMP IC, part 1.5 Refactorings: rework testData to better reflect usages of declarations, clean up internal test methods. Merge-request: KT-MR-13232 Merged-by: Evgenii Mazhukin --- .../kotlin/gradle/mpp/KmpIncrementalITBase.kt | 21 ++++++++--- .../smoke/BasicIncrementalCompilationIT.kt | 19 +++++----- .../BasicTestIncrementalCompilationIT.kt | 10 +++--- .../ExpectActualIncrementalCompilationIT.kt | 36 ++++++++++--------- .../kotlin/{Bar.kt => ExpectClassBar.kt} | 0 .../kotlin/{Foo.kt => ExpectFunFoo.kt} | 0 .../commonMain/kotlin/{Value.kt => Unused.kt} | 0 .../kotlin/{Bar.kt => ActualClassBar.kt} | 0 .../kotlin/{FooJs.kt => ActualFunFoo.kt} | 0 .../kotlin/{Bar.kt => ActualClassBar.kt} | 0 .../kotlin/{FooJvm.kt => ActualFunFoo.kt} | 0 .../kotlin/{Bar.kt => ActualClassBar.kt} | 0 .../kotlin/{FooNative.kt => ActualFunFoo.kt} | 0 .../app/build.gradle.kts | 8 ++--- .../app/src/commonMain/kotlin/CommonUtils.kt | 1 - .../commonMain/kotlin/DependsOnLibCommon.kt | 3 ++ .../commonMain/kotlin/ExpectDeclaration.kt | 3 ++ .../app/src/commonMain/kotlin/ExpectDetail.kt | 3 -- .../src/commonMain/kotlin/PlainPublicClass.kt | 3 -- .../app/src/commonMain/kotlin/Unused.kt | 3 ++ .../kotlin/UsedInPlatformMainAndCommonTest.kt | 1 + ...ivialTest.kt => TestDependsOnAppCommon.kt} | 4 +-- .../{ActualDetail.kt => ActualDeclaration.kt} | 2 +- .../src/jsMain/kotlin/DependsOnAppCommon.kt | 3 ++ .../src/jsMain/kotlin/DependsOnLibCommon.kt | 3 ++ .../app/src/jsMain/kotlin/DependsOnLibJs.kt | 1 + .../src/jsMain/kotlin/PlainPublicClassJs.kt | 3 -- .../app/src/jsMain/kotlin/UnusedJs.kt | 3 ++ .../src/jsMain/kotlin/useLibJsPlatformUtil.kt | 1 - .../{ActualDetail.kt => ActualDeclaration.kt} | 2 +- .../src/jvmMain/kotlin/DependsOnAppCommon.kt | 3 ++ .../src/jvmMain/kotlin/DependsOnLibCommon.kt | 3 ++ .../app/src/jvmMain/kotlin/DependsOnLibJvm.kt | 1 + .../src/jvmMain/kotlin/PlainPublicClassJvm.kt | 3 -- .../app/src/jvmMain/kotlin/UnusedJvm.kt | 3 ++ .../jvmMain/kotlin/useLibJvmPlatformUtil.kt | 1 - .../{ActualDetail.kt => ActualDeclaration.kt} | 2 +- .../nativeMain/kotlin/DependsOnAppCommon.kt | 3 ++ .../nativeMain/kotlin/DependsOnLibCommon.kt | 3 ++ .../nativeMain/kotlin/DependsOnLibNative.kt | 1 + ...inPublicClassNative.kt => UnusedNative.kt} | 2 +- .../kotlin/useLibNativePlatformUtil.kt | 1 - .../lib/build.gradle.kts | 8 ++--- .../lib/src/commonMain/kotlin/CommonUtil.kt | 3 -- .../src/commonMain/kotlin/ExpectCalcFun.kt | 2 +- .../lib/src/commonMain/kotlin/Unused.kt | 1 + .../src/commonMain/kotlin/UsedInAppCommon.kt | 1 + .../commonMain/kotlin/UsedInAppPlatform.kt | 5 +++ .../kotlin/UsedInLibPlatformTests.kt | 3 ++ .../lib/src/commonMain/kotlin/Value.kt | 1 - .../lib/src/jsMain/kotlin/ActualCalcFun.kt | 2 +- ...tformUtil.kt => UsedInAppJsAndLibTests.kt} | 0 ...TestDependsOnCommonMainAndPlatformMain.kt} | 4 +-- .../lib/src/jvmMain/kotlin/ActualCalcFun.kt | 2 +- ...formUtil.kt => UsedInAppJvmAndLibTests.kt} | 0 ...TestDependsOnCommonMainAndPlatformMain.kt} | 4 +-- .../src/nativeMain/kotlin/ActualCalcFun.kt | 2 +- ...mUtil.kt => UsedInAppNativeAndLibTests.kt} | 0 ...TestDependsOnCommonMainAndPlatformMain.kt} | 4 +-- 59 files changed, 120 insertions(+), 81 deletions(-) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/expect-actual-fun-or-class-ic/src/commonMain/kotlin/{Bar.kt => ExpectClassBar.kt} (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/expect-actual-fun-or-class-ic/src/commonMain/kotlin/{Foo.kt => ExpectFunFoo.kt} (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/expect-actual-fun-or-class-ic/src/commonMain/kotlin/{Value.kt => Unused.kt} (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/expect-actual-fun-or-class-ic/src/jsMain/kotlin/{Bar.kt => ActualClassBar.kt} (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/expect-actual-fun-or-class-ic/src/jsMain/kotlin/{FooJs.kt => ActualFunFoo.kt} (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/expect-actual-fun-or-class-ic/src/jvmMain/kotlin/{Bar.kt => ActualClassBar.kt} (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/expect-actual-fun-or-class-ic/src/jvmMain/kotlin/{FooJvm.kt => ActualFunFoo.kt} (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/expect-actual-fun-or-class-ic/src/nativeMain/kotlin/{Bar.kt => ActualClassBar.kt} (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/expect-actual-fun-or-class-ic/src/nativeMain/kotlin/{FooNative.kt => ActualFunFoo.kt} (100%) delete mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/commonMain/kotlin/CommonUtils.kt create mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/commonMain/kotlin/DependsOnLibCommon.kt create mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/commonMain/kotlin/ExpectDeclaration.kt delete mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/commonMain/kotlin/ExpectDetail.kt delete mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/commonMain/kotlin/PlainPublicClass.kt create mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/commonMain/kotlin/Unused.kt create mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/commonMain/kotlin/UsedInPlatformMainAndCommonTest.kt rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/commonTest/kotlin/{TrivialTest.kt => TestDependsOnAppCommon.kt} (51%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/jsMain/kotlin/{ActualDetail.kt => ActualDeclaration.kt} (50%) create mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/jsMain/kotlin/DependsOnAppCommon.kt create mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/jsMain/kotlin/DependsOnLibCommon.kt create mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/jsMain/kotlin/DependsOnLibJs.kt delete mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/jsMain/kotlin/PlainPublicClassJs.kt create mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/jsMain/kotlin/UnusedJs.kt delete mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/jsMain/kotlin/useLibJsPlatformUtil.kt rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/jvmMain/kotlin/{ActualDetail.kt => ActualDeclaration.kt} (51%) create mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/jvmMain/kotlin/DependsOnAppCommon.kt create mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/jvmMain/kotlin/DependsOnLibCommon.kt create mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/jvmMain/kotlin/DependsOnLibJvm.kt delete mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/jvmMain/kotlin/PlainPublicClassJvm.kt create mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/jvmMain/kotlin/UnusedJvm.kt delete mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/jvmMain/kotlin/useLibJvmPlatformUtil.kt rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/nativeMain/kotlin/{ActualDetail.kt => ActualDeclaration.kt} (60%) create mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/nativeMain/kotlin/DependsOnAppCommon.kt create mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/nativeMain/kotlin/DependsOnLibCommon.kt create mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/nativeMain/kotlin/DependsOnLibNative.kt rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/nativeMain/kotlin/{PlainPublicClassNative.kt => UnusedNative.kt} (52%) delete mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/nativeMain/kotlin/useLibNativePlatformUtil.kt delete mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/lib/src/commonMain/kotlin/CommonUtil.kt create mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/lib/src/commonMain/kotlin/Unused.kt create mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/lib/src/commonMain/kotlin/UsedInAppCommon.kt create mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/lib/src/commonMain/kotlin/UsedInAppPlatform.kt create mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/lib/src/commonMain/kotlin/UsedInLibPlatformTests.kt delete mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/lib/src/commonMain/kotlin/Value.kt rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/lib/src/jsMain/kotlin/{libJsPlatformUtil.kt => UsedInAppJsAndLibTests.kt} (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/lib/src/jsTest/kotlin/{AdvancedTest.kt => TestDependsOnCommonMainAndPlatformMain.kt} (71%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/lib/src/jvmMain/kotlin/{libJvmPlatformUtil.kt => UsedInAppJvmAndLibTests.kt} (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/lib/src/jvmTest/kotlin/{AdvancedTest.kt => TestDependsOnCommonMainAndPlatformMain.kt} (71%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/lib/src/nativeMain/kotlin/{libNativePlatformUtil.kt => UsedInAppNativeAndLibTests.kt} (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/lib/src/nativeTest/kotlin/{AdvancedTest.kt => TestDependsOnCommonMainAndPlatformMain.kt} (71%) diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/KmpIncrementalITBase.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/KmpIncrementalITBase.kt index 3839dbbb546..1acb5e1e30a 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/KmpIncrementalITBase.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/KmpIncrementalITBase.kt @@ -11,8 +11,14 @@ import org.gradle.util.GradleVersion import org.jetbrains.kotlin.gradle.testbase.* import org.jetbrains.kotlin.gradle.testbase.relativizeTo import java.nio.file.Path +import java.util.concurrent.atomic.AtomicInteger import kotlin.io.path.appendText +/** + * KmpIncrementalITBase is used as a "limited scope" for experimental test utils. + * If some of them can be reused widely, consider moving them to KGPBaseTest + * or the appropriate util package. //TODO: KT-63876 + */ abstract class KmpIncrementalITBase : KGPBaseTest() { override val defaultBuildOptions: BuildOptions @@ -38,10 +44,13 @@ abstract class KmpIncrementalITBase : KGPBaseTest() { ) } - protected open fun TestProject.touchAndGet(subproject: String, srcDir: String, name: String): Path { - val path = subProject(subproject).kotlinSourcesDir(srcDir).resolve(name) - path.appendText("private val nothingMuch = 24") - return path + protected fun TestProject.resolvePath(subproject: String, srcDir: String, name: String): Path { + return subProject(subproject).kotlinSourcesDir(srcDir).resolve(name) + } + + protected fun Path.addPrivateVal(): Path { + this@addPrivateVal.appendText("private val nothingMuch${changeCounter.incrementAndGet()} = 24") + return this@addPrivateVal } protected open fun BuildResult.assertSuccessOrUTD(allTasks: Set, executedTasks: Set) { @@ -61,4 +70,8 @@ abstract class KmpIncrementalITBase : KGPBaseTest() { assertions() } } + + companion object { + private val changeCounter = AtomicInteger(0) + } } \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/smoke/BasicIncrementalCompilationIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/smoke/BasicIncrementalCompilationIT.kt index 3c36ad435ec..69b3ca8e09b 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/smoke/BasicIncrementalCompilationIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/smoke/BasicIncrementalCompilationIT.kt @@ -10,6 +10,9 @@ import org.jetbrains.kotlin.gradle.mpp.KmpIncrementalITBase import org.jetbrains.kotlin.gradle.testbase.* import org.junit.jupiter.api.DisplayName +/** + * Basic smoke tests assert that the baseline IC is reasonable: if we do a local change, only a local rebuild is performed. + */ @DisplayName("Basic incremental scenarios with KMP - K2") @MppGradlePluginTests open class BasicIncrementalCompilationIT : KmpIncrementalITBase() { @@ -24,7 +27,7 @@ open class BasicIncrementalCompilationIT : KmpIncrementalITBase() { */ testCase( - incrementalPath = touchAndGet("app", "commonMain", "PlainPublicClass.kt"), + incrementalPath = resolvePath("app", "commonMain", "Unused.kt").addPrivateVal(), executedTasks = setOf( ":app:compileKotlinJvm", ":app:compileKotlinJs", @@ -36,7 +39,7 @@ open class BasicIncrementalCompilationIT : KmpIncrementalITBase() { * Step 2: touch app:jvm, no abi change */ - val appJvmClassKt = touchAndGet("app", "jvmMain", "PlainPublicClassJvm.kt") + val appJvmClassKt = resolvePath("app", "jvmMain", "UnusedJvm.kt").addPrivateVal() testCase( incrementalPath = null, //TODO: it just doesn't print "Incremental compilation completed", why? (KT-63476) executedTasks = setOf(":app:compileKotlinJvm") @@ -49,7 +52,7 @@ open class BasicIncrementalCompilationIT : KmpIncrementalITBase() { */ testCase( - incrementalPath = touchAndGet("app", "jsMain", "PlainPublicClassJs.kt"), + incrementalPath = resolvePath("app", "jsMain", "UnusedJs.kt").addPrivateVal(), executedTasks = setOf(":app:compileKotlinJs"), ) @@ -57,7 +60,7 @@ open class BasicIncrementalCompilationIT : KmpIncrementalITBase() { * Step 4: touch app:native, no abi change */ - touchAndGet("app", "nativeMain", "PlainPublicClassNative.kt") + resolvePath("app", "nativeMain", "UnusedNative.kt").addPrivateVal() testCase( incrementalPath = null, // no native incremental compilation - see KT-62824 executedTasks = setOf(":app:compileKotlinNative"), @@ -68,7 +71,7 @@ open class BasicIncrementalCompilationIT : KmpIncrementalITBase() { */ testCase( - incrementalPath = touchAndGet("lib", "commonMain", "CommonUtil.kt"), + incrementalPath = resolvePath("lib", "commonMain", "UsedInLibPlatformTests.kt").addPrivateVal(), executedTasks = mainCompileTasks // TODO: KT-62642 - bad compile avoidance here ) @@ -76,7 +79,7 @@ open class BasicIncrementalCompilationIT : KmpIncrementalITBase() { * Step 6: touch lib:jvm, no abi change */ - val libJvmUtilKt = touchAndGet("lib", "jvmMain", "libJvmPlatformUtil.kt") + val libJvmUtilKt = resolvePath("lib", "jvmMain", "UsedInAppJvmAndLibTests.kt").addPrivateVal() testCase( incrementalPath = null, //TODO: it just doesn't print "Incremental compilation completed", why? (KT-63476) executedTasks = setOf(":app:compileKotlinJvm", ":lib:compileKotlinJvm"), @@ -89,7 +92,7 @@ open class BasicIncrementalCompilationIT : KmpIncrementalITBase() { */ testCase( - incrementalPath = touchAndGet("lib", "jsMain", "libJsPlatformUtil.kt"), + incrementalPath = resolvePath("lib", "jsMain", "UsedInAppJsAndLibTests.kt").addPrivateVal(), executedTasks = setOf(":app:compileKotlinJs", ":lib:compileKotlinJs"), ) @@ -97,7 +100,7 @@ open class BasicIncrementalCompilationIT : KmpIncrementalITBase() { * Step 8: touch lib:native, no abi change */ - touchAndGet("lib", "nativeMain", "libNativePlatformUtil.kt") + resolvePath("lib", "nativeMain", "UsedInAppNativeAndLibTests.kt").addPrivateVal() testCase( incrementalPath = null, executedTasks = setOf(":app:compileKotlinNative", ":lib:compileKotlinNative"), diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/smoke/BasicTestIncrementalCompilationIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/smoke/BasicTestIncrementalCompilationIT.kt index 0f9a3ef3bed..e3e1dee3775 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/smoke/BasicTestIncrementalCompilationIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/smoke/BasicTestIncrementalCompilationIT.kt @@ -46,7 +46,7 @@ open class BasicTestIncrementalCompilationIT : KmpIncrementalITBase() { */ testCase( - incrementalPath = touchAndGet("lib", "commonMain", "CommonUtil.kt"), + incrementalPath = resolvePath("lib", "commonMain", "UsedInLibPlatformTests.kt").addPrivateVal(), executedTasks = mainCompileTasks, ) @@ -55,7 +55,7 @@ open class BasicTestIncrementalCompilationIT : KmpIncrementalITBase() { */ testCase( - incrementalPath = touchAndGet("app", "commonMain", "PlainPublicClass.kt"), + incrementalPath = resolvePath("app", "commonMain", "Unused.kt").addPrivateVal(), executedTasks = setOf( ":app:compileTestKotlinJvm", ":app:compileTestKotlinNative", @@ -70,7 +70,7 @@ open class BasicTestIncrementalCompilationIT : KmpIncrementalITBase() { * Step 3 - touch app/jvm, affect jvm tests in app */ - val touchedAppJvm = touchAndGet("app", "jvmMain", "PlainPublicClassJvm.kt") + val touchedAppJvm = resolvePath("app", "jvmMain", "UnusedJvm.kt").addPrivateVal() testCase( incrementalPath = null, executedTasks = setOf( @@ -86,7 +86,7 @@ open class BasicTestIncrementalCompilationIT : KmpIncrementalITBase() { */ testCase( - incrementalPath = touchAndGet("app", "jsMain", "PlainPublicClassJs.kt"), + incrementalPath = resolvePath("app", "jsMain", "UnusedJs.kt").addPrivateVal(), executedTasks = setOf( ":app:compileTestKotlinJs", ":app:jsTest", @@ -97,7 +97,7 @@ open class BasicTestIncrementalCompilationIT : KmpIncrementalITBase() { * Step 5 - touch app/native, affect native tests in app */ - touchAndGet("app", "nativeMain", "PlainPublicClassNative.kt") + resolvePath("app", "nativeMain", "UnusedNative.kt").addPrivateVal() testCase( incrementalPath = null, executedTasks = setOf( diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/smoke/ExpectActualIncrementalCompilationIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/smoke/ExpectActualIncrementalCompilationIT.kt index 723408e8c4f..85dcd2ed98a 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/smoke/ExpectActualIncrementalCompilationIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/smoke/ExpectActualIncrementalCompilationIT.kt @@ -33,9 +33,9 @@ open class ExpectActualIncrementalCompilationIT : KGPBaseTest() { build("assemble") listOf( - kotlinSourcesDir("jvmMain").resolve("FooJvm.kt"), - kotlinSourcesDir("nativeMain").resolve("FooNative.kt"), - kotlinSourcesDir("jsMain").resolve("FooJs.kt") + kotlinSourcesDir("jvmMain").resolve("ActualFunFoo.kt"), + kotlinSourcesDir("nativeMain").resolve("ActualFunFoo.kt"), + kotlinSourcesDir("jsMain").resolve("ActualFunFoo.kt") ).forEach { it.replaceFirst("\"foo", "\"bar") } @@ -44,9 +44,9 @@ open class ExpectActualIncrementalCompilationIT : KGPBaseTest() { assertTasksExecuted(":compileKotlinJvm", ":compileKotlinJs", ":compileKotlinNative") assertIncrementalCompilation( listOf( - kotlinSourcesDir("jvmMain").resolve("FooJvm.kt"), - kotlinSourcesDir("jsMain").resolve("FooJs.kt"), - kotlinSourcesDir("commonMain").resolve("Foo.kt") + kotlinSourcesDir("jvmMain").resolve("ActualFunFoo.kt"), + kotlinSourcesDir("jsMain").resolve("ActualFunFoo.kt"), + kotlinSourcesDir("commonMain").resolve("ExpectFunFoo.kt") ).relativizeTo(projectPath) ) } @@ -59,8 +59,8 @@ open class ExpectActualIncrementalCompilationIT : KGPBaseTest() { nativeProject("expect-actual-fun-or-class-ic", gradleVersion) { build("assemble") - val valueKtPath = kotlinSourcesDir("commonMain").resolve("Value.kt") - valueKtPath.replaceFirst( + val unusedKtPath = kotlinSourcesDir("commonMain").resolve("Unused.kt") + unusedKtPath.replaceFirst( "val secret = 1", "val secret = \"k2\"" ) @@ -69,10 +69,10 @@ open class ExpectActualIncrementalCompilationIT : KGPBaseTest() { assertTasksExecuted(":compileKotlinJvm", ":compileKotlinJs", ":compileKotlinNative") assertIncrementalCompilation( listOf( - kotlinSourcesDir("jvmMain").resolve("FooJvm.kt"), - kotlinSourcesDir("jsMain").resolve("FooJs.kt"), - kotlinSourcesDir("commonMain").resolve("Foo.kt"), - valueKtPath + kotlinSourcesDir("jvmMain").resolve("ActualFunFoo.kt"), + kotlinSourcesDir("jsMain").resolve("ActualFunFoo.kt"), + kotlinSourcesDir("commonMain").resolve("ExpectFunFoo.kt"), + unusedKtPath ).relativizeTo(projectPath) ) } @@ -85,13 +85,17 @@ open class ExpectActualIncrementalCompilationIT : KGPBaseTest() { nativeProject("expect-actual-fun-or-class-ic", gradleVersion) { build("assemble") - kotlinSourcesDir("commonMain").resolve("Bar.kt").appendText("val irrelevant = 2") + kotlinSourcesDir("commonMain").resolve("ExpectClassBar.kt").appendText("val irrelevant = 2") build("assemble", buildOptions = defaultBuildOptions.copy(logLevel = LogLevel.DEBUG)) { assertTasksExecuted(":compileKotlinJvm", ":compileKotlinJs", ":compileKotlinNative") - assertIncrementalCompilation(listOf("commonMain", "jvmMain", "jsMain").map { sourceSet -> - kotlinSourcesDir(sourceSet).resolve("Bar.kt") - }.relativizeTo(projectPath)) + assertIncrementalCompilation( + listOf( + kotlinSourcesDir("jvmMain").resolve("ActualClassBar.kt"), + kotlinSourcesDir("jsMain").resolve("ActualClassBar.kt"), + kotlinSourcesDir("commonMain").resolve("ExpectClassBar.kt") + ).relativizeTo(projectPath) + ) } } } diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/expect-actual-fun-or-class-ic/src/commonMain/kotlin/Bar.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/expect-actual-fun-or-class-ic/src/commonMain/kotlin/ExpectClassBar.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/expect-actual-fun-or-class-ic/src/commonMain/kotlin/Bar.kt rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/expect-actual-fun-or-class-ic/src/commonMain/kotlin/ExpectClassBar.kt diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/expect-actual-fun-or-class-ic/src/commonMain/kotlin/Foo.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/expect-actual-fun-or-class-ic/src/commonMain/kotlin/ExpectFunFoo.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/expect-actual-fun-or-class-ic/src/commonMain/kotlin/Foo.kt rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/expect-actual-fun-or-class-ic/src/commonMain/kotlin/ExpectFunFoo.kt diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/expect-actual-fun-or-class-ic/src/commonMain/kotlin/Value.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/expect-actual-fun-or-class-ic/src/commonMain/kotlin/Unused.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/expect-actual-fun-or-class-ic/src/commonMain/kotlin/Value.kt rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/expect-actual-fun-or-class-ic/src/commonMain/kotlin/Unused.kt diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/expect-actual-fun-or-class-ic/src/jsMain/kotlin/Bar.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/expect-actual-fun-or-class-ic/src/jsMain/kotlin/ActualClassBar.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/expect-actual-fun-or-class-ic/src/jsMain/kotlin/Bar.kt rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/expect-actual-fun-or-class-ic/src/jsMain/kotlin/ActualClassBar.kt diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/expect-actual-fun-or-class-ic/src/jsMain/kotlin/FooJs.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/expect-actual-fun-or-class-ic/src/jsMain/kotlin/ActualFunFoo.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/expect-actual-fun-or-class-ic/src/jsMain/kotlin/FooJs.kt rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/expect-actual-fun-or-class-ic/src/jsMain/kotlin/ActualFunFoo.kt diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/expect-actual-fun-or-class-ic/src/jvmMain/kotlin/Bar.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/expect-actual-fun-or-class-ic/src/jvmMain/kotlin/ActualClassBar.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/expect-actual-fun-or-class-ic/src/jvmMain/kotlin/Bar.kt rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/expect-actual-fun-or-class-ic/src/jvmMain/kotlin/ActualClassBar.kt diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/expect-actual-fun-or-class-ic/src/jvmMain/kotlin/FooJvm.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/expect-actual-fun-or-class-ic/src/jvmMain/kotlin/ActualFunFoo.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/expect-actual-fun-or-class-ic/src/jvmMain/kotlin/FooJvm.kt rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/expect-actual-fun-or-class-ic/src/jvmMain/kotlin/ActualFunFoo.kt diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/expect-actual-fun-or-class-ic/src/nativeMain/kotlin/Bar.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/expect-actual-fun-or-class-ic/src/nativeMain/kotlin/ActualClassBar.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/expect-actual-fun-or-class-ic/src/nativeMain/kotlin/Bar.kt rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/expect-actual-fun-or-class-ic/src/nativeMain/kotlin/ActualClassBar.kt diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/expect-actual-fun-or-class-ic/src/nativeMain/kotlin/FooNative.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/expect-actual-fun-or-class-ic/src/nativeMain/kotlin/ActualFunFoo.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/expect-actual-fun-or-class-ic/src/nativeMain/kotlin/FooNative.kt rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/expect-actual-fun-or-class-ic/src/nativeMain/kotlin/ActualFunFoo.kt diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/build.gradle.kts index daefdcf0c9a..59493a9ada8 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/build.gradle.kts @@ -4,14 +4,10 @@ plugins { kotlin { jvm() - js() - ("native") -} - -kotlin { - js { + js() { nodejs() } + ("native") sourceSets { val commonMain by getting { diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/commonMain/kotlin/CommonUtils.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/commonMain/kotlin/CommonUtils.kt deleted file mode 100644 index 36fdc23139d..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/commonMain/kotlin/CommonUtils.kt +++ /dev/null @@ -1 +0,0 @@ -fun sayYes() = "Yes" diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/commonMain/kotlin/DependsOnLibCommon.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/commonMain/kotlin/DependsOnLibCommon.kt new file mode 100644 index 00000000000..bcdf2d11e4c --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/commonMain/kotlin/DependsOnLibCommon.kt @@ -0,0 +1,3 @@ +fun appCommonFunDependingOnLibCommon() { + println("you're ${libCommonFunForAppCommon()} years old!") +} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/commonMain/kotlin/ExpectDeclaration.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/commonMain/kotlin/ExpectDeclaration.kt new file mode 100644 index 00000000000..a1817b4a16a --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/commonMain/kotlin/ExpectDeclaration.kt @@ -0,0 +1,3 @@ +expect class ExpectActualDetail { + val key: String +} \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/commonMain/kotlin/ExpectDetail.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/commonMain/kotlin/ExpectDetail.kt deleted file mode 100644 index 5809fa0d724..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/commonMain/kotlin/ExpectDetail.kt +++ /dev/null @@ -1,3 +0,0 @@ -expect class Detail { - val key: String -} \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/commonMain/kotlin/PlainPublicClass.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/commonMain/kotlin/PlainPublicClass.kt deleted file mode 100644 index 9df0e1e8db6..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/commonMain/kotlin/PlainPublicClass.kt +++ /dev/null @@ -1,3 +0,0 @@ -class PlainPublicClass { - fun bar() = 234 -} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/commonMain/kotlin/Unused.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/commonMain/kotlin/Unused.kt new file mode 100644 index 00000000000..addcd988924 --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/commonMain/kotlin/Unused.kt @@ -0,0 +1,3 @@ +class AppCommonUnusedClass { + fun bar() = 234 +} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/commonMain/kotlin/UsedInPlatformMainAndCommonTest.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/commonMain/kotlin/UsedInPlatformMainAndCommonTest.kt new file mode 100644 index 00000000000..d462842ab0f --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/commonMain/kotlin/UsedInPlatformMainAndCommonTest.kt @@ -0,0 +1 @@ +fun appCommonFunForAppPlatformAndAppCommonTest() = "Yes" diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/commonTest/kotlin/TrivialTest.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/commonTest/kotlin/TestDependsOnAppCommon.kt similarity index 51% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/commonTest/kotlin/TrivialTest.kt rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/commonTest/kotlin/TestDependsOnAppCommon.kt index f4d413ea0ed..4ee9da3f853 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/commonTest/kotlin/TrivialTest.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/commonTest/kotlin/TestDependsOnAppCommon.kt @@ -1,10 +1,10 @@ import kotlin.test.Test import kotlin.test.assertEquals -class TrivialTest { +class AppCommonTest { @Test fun sayYesSaysYes() { - assertEquals("Yes", sayYes()) + assertEquals("Yes", appCommonFunForAppPlatformAndAppCommonTest()) } } \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/jsMain/kotlin/ActualDetail.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/jsMain/kotlin/ActualDeclaration.kt similarity index 50% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/jsMain/kotlin/ActualDetail.kt rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/jsMain/kotlin/ActualDeclaration.kt index 9586e6114c0..a868fdb43cb 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/jsMain/kotlin/ActualDetail.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/jsMain/kotlin/ActualDeclaration.kt @@ -1,3 +1,3 @@ -actual class Detail { +actual class ExpectActualDetail { actual val key: String = "42" } \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/jsMain/kotlin/DependsOnAppCommon.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/jsMain/kotlin/DependsOnAppCommon.kt new file mode 100644 index 00000000000..f5d7dff2a00 --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/jsMain/kotlin/DependsOnAppCommon.kt @@ -0,0 +1,3 @@ +class AppJsUnusedClassWithDependencies { + val line = appCommonFunForAppPlatformAndAppCommonTest() +} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/jsMain/kotlin/DependsOnLibCommon.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/jsMain/kotlin/DependsOnLibCommon.kt new file mode 100644 index 00000000000..d802023d11c --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/jsMain/kotlin/DependsOnLibCommon.kt @@ -0,0 +1,3 @@ +class AppJsUnusedChildClass(length: Int, builder: String) : LibCommonClassForAppPlatform(length, builder) { + fun price() = length * builder.length * 300 +} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/jsMain/kotlin/DependsOnLibJs.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/jsMain/kotlin/DependsOnLibJs.kt new file mode 100644 index 00000000000..e76ca66be44 --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/jsMain/kotlin/DependsOnLibJs.kt @@ -0,0 +1 @@ +fun appJsUseLibJsPlatformUtil() = libJsPlatformUtil() diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/jsMain/kotlin/PlainPublicClassJs.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/jsMain/kotlin/PlainPublicClassJs.kt deleted file mode 100644 index 121fc14341b..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/jsMain/kotlin/PlainPublicClassJs.kt +++ /dev/null @@ -1,3 +0,0 @@ -class PlainPublicClassJs { - fun foo() = 234 -} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/jsMain/kotlin/UnusedJs.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/jsMain/kotlin/UnusedJs.kt new file mode 100644 index 00000000000..fa2ef0c4015 --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/jsMain/kotlin/UnusedJs.kt @@ -0,0 +1,3 @@ +class AppJsUnusedClass { + fun foo() = 234 +} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/jsMain/kotlin/useLibJsPlatformUtil.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/jsMain/kotlin/useLibJsPlatformUtil.kt deleted file mode 100644 index 987812ba493..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/jsMain/kotlin/useLibJsPlatformUtil.kt +++ /dev/null @@ -1 +0,0 @@ -fun useLibJsPlatformUtil() = libJsPlatformUtil() diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/jvmMain/kotlin/ActualDetail.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/jvmMain/kotlin/ActualDeclaration.kt similarity index 51% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/jvmMain/kotlin/ActualDetail.kt rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/jvmMain/kotlin/ActualDeclaration.kt index 9f817ee162b..a7e04a10dcc 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/jvmMain/kotlin/ActualDetail.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/jvmMain/kotlin/ActualDeclaration.kt @@ -1,3 +1,3 @@ -actual class Detail { +actual class ExpectActualDetail { actual val key: String = "422" } \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/jvmMain/kotlin/DependsOnAppCommon.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/jvmMain/kotlin/DependsOnAppCommon.kt new file mode 100644 index 00000000000..7946343bf55 --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/jvmMain/kotlin/DependsOnAppCommon.kt @@ -0,0 +1,3 @@ +class AppJvmUnusedClassWithDependencies { + val line = appCommonFunForAppPlatformAndAppCommonTest() +} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/jvmMain/kotlin/DependsOnLibCommon.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/jvmMain/kotlin/DependsOnLibCommon.kt new file mode 100644 index 00000000000..2263adb71fc --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/jvmMain/kotlin/DependsOnLibCommon.kt @@ -0,0 +1,3 @@ +class AppJvmUnusedChildClass(length: Int, builder: String) : LibCommonClassForAppPlatform(length, builder) { + fun price() = length * builder.length * 300 +} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/jvmMain/kotlin/DependsOnLibJvm.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/jvmMain/kotlin/DependsOnLibJvm.kt new file mode 100644 index 00000000000..8edac690832 --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/jvmMain/kotlin/DependsOnLibJvm.kt @@ -0,0 +1 @@ +fun appJvmUseLibJvmPlatformUtil() = libJvmPlatformUtil() diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/jvmMain/kotlin/PlainPublicClassJvm.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/jvmMain/kotlin/PlainPublicClassJvm.kt deleted file mode 100644 index 3f7446f8702..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/jvmMain/kotlin/PlainPublicClassJvm.kt +++ /dev/null @@ -1,3 +0,0 @@ -class PlainPublicClassJvm { - fun doBar() = 2 -} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/jvmMain/kotlin/UnusedJvm.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/jvmMain/kotlin/UnusedJvm.kt new file mode 100644 index 00000000000..a6e842291ad --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/jvmMain/kotlin/UnusedJvm.kt @@ -0,0 +1,3 @@ +class AppJvmUnusedClass { + fun doBar() = 2 +} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/jvmMain/kotlin/useLibJvmPlatformUtil.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/jvmMain/kotlin/useLibJvmPlatformUtil.kt deleted file mode 100644 index 0d3a313c8eb..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/jvmMain/kotlin/useLibJvmPlatformUtil.kt +++ /dev/null @@ -1 +0,0 @@ -fun useLibJvmPlatformUtil() = libJvmPlatformUtil() diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/nativeMain/kotlin/ActualDetail.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/nativeMain/kotlin/ActualDeclaration.kt similarity index 60% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/nativeMain/kotlin/ActualDetail.kt rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/nativeMain/kotlin/ActualDeclaration.kt index 65dff1401b0..88dbe408106 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/nativeMain/kotlin/ActualDetail.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/nativeMain/kotlin/ActualDeclaration.kt @@ -1,3 +1,3 @@ -actual class Detail { +actual class ExpectActualDetail { actual val key: String = "definitely not ios" } diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/nativeMain/kotlin/DependsOnAppCommon.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/nativeMain/kotlin/DependsOnAppCommon.kt new file mode 100644 index 00000000000..3bfb1778200 --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/nativeMain/kotlin/DependsOnAppCommon.kt @@ -0,0 +1,3 @@ +class AppNativeUnusedClassWithDependencies { + val line = appCommonFunForAppPlatformAndAppCommonTest() +} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/nativeMain/kotlin/DependsOnLibCommon.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/nativeMain/kotlin/DependsOnLibCommon.kt new file mode 100644 index 00000000000..2e8ca04272e --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/nativeMain/kotlin/DependsOnLibCommon.kt @@ -0,0 +1,3 @@ +class AppNativeUnusedChildClass(length: Int, builder: String) : LibCommonClassForAppPlatform(length, builder) { + fun price() = length * builder.length * 300 +} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/nativeMain/kotlin/DependsOnLibNative.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/nativeMain/kotlin/DependsOnLibNative.kt new file mode 100644 index 00000000000..e5c415d28b9 --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/nativeMain/kotlin/DependsOnLibNative.kt @@ -0,0 +1 @@ +fun appNativeUseLibNativePlatformUtil() = libNativePlatformUtil() diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/nativeMain/kotlin/PlainPublicClassNative.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/nativeMain/kotlin/UnusedNative.kt similarity index 52% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/nativeMain/kotlin/PlainPublicClassNative.kt rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/nativeMain/kotlin/UnusedNative.kt index 8c1e686f210..4b037602eb8 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/nativeMain/kotlin/PlainPublicClassNative.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/nativeMain/kotlin/UnusedNative.kt @@ -1,3 +1,3 @@ -class PlainPublicClassNative { +class AppNativeUnusedClass { fun queueSomething() = Unit } diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/nativeMain/kotlin/useLibNativePlatformUtil.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/nativeMain/kotlin/useLibNativePlatformUtil.kt deleted file mode 100644 index 7cdf211e8f5..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/app/src/nativeMain/kotlin/useLibNativePlatformUtil.kt +++ /dev/null @@ -1 +0,0 @@ -fun useLibNativePlatformUtil() = libNativePlatformUtil() diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/lib/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/lib/build.gradle.kts index 0dcf1d95705..fd89c8aa140 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/lib/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/lib/build.gradle.kts @@ -4,14 +4,10 @@ plugins { kotlin { jvm() - js() - ("native") -} - -kotlin { - js { + js() { nodejs() } + ("native") sourceSets { val commonTest by getting { diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/lib/src/commonMain/kotlin/CommonUtil.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/lib/src/commonMain/kotlin/CommonUtil.kt deleted file mode 100644 index 852680038f4..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/lib/src/commonMain/kotlin/CommonUtil.kt +++ /dev/null @@ -1,3 +0,0 @@ -fun multiplyByTwo(n: Int): Int { - return n * 2 -} \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/lib/src/commonMain/kotlin/ExpectCalcFun.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/lib/src/commonMain/kotlin/ExpectCalcFun.kt index af6ffb2e11e..97b43e7fa4d 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/lib/src/commonMain/kotlin/ExpectCalcFun.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/lib/src/commonMain/kotlin/ExpectCalcFun.kt @@ -1 +1 @@ -expect fun calc(expression: String): Double \ No newline at end of file +expect fun expectActualCalc(expression: String): Double \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/lib/src/commonMain/kotlin/Unused.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/lib/src/commonMain/kotlin/Unused.kt new file mode 100644 index 00000000000..a52e24d9b51 --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/lib/src/commonMain/kotlin/Unused.kt @@ -0,0 +1 @@ +private val libCommonUnusedVal = 12 diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/lib/src/commonMain/kotlin/UsedInAppCommon.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/lib/src/commonMain/kotlin/UsedInAppCommon.kt new file mode 100644 index 00000000000..c611a6c1e3b --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/lib/src/commonMain/kotlin/UsedInAppCommon.kt @@ -0,0 +1 @@ +fun libCommonFunForAppCommon() = Double.NaN diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/lib/src/commonMain/kotlin/UsedInAppPlatform.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/lib/src/commonMain/kotlin/UsedInAppPlatform.kt new file mode 100644 index 00000000000..d3dfea7318a --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/lib/src/commonMain/kotlin/UsedInAppPlatform.kt @@ -0,0 +1,5 @@ +open class LibCommonClassForAppPlatform( + val length: Int, + val builder: String, +) { +} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/lib/src/commonMain/kotlin/UsedInLibPlatformTests.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/lib/src/commonMain/kotlin/UsedInLibPlatformTests.kt new file mode 100644 index 00000000000..eb26a9bedc3 --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/lib/src/commonMain/kotlin/UsedInLibPlatformTests.kt @@ -0,0 +1,3 @@ +fun libCommonFunForLibPlatformTests(n: Int): Int { + return n * 2 +} \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/lib/src/commonMain/kotlin/Value.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/lib/src/commonMain/kotlin/Value.kt deleted file mode 100644 index 8ddbd759468..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/lib/src/commonMain/kotlin/Value.kt +++ /dev/null @@ -1 +0,0 @@ -private val bar = 12 diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/lib/src/jsMain/kotlin/ActualCalcFun.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/lib/src/jsMain/kotlin/ActualCalcFun.kt index 9d2d2cc97cb..f98099d6a35 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/lib/src/jsMain/kotlin/ActualCalcFun.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/lib/src/jsMain/kotlin/ActualCalcFun.kt @@ -1,3 +1,3 @@ -actual fun calc(expression: String): Double { +actual fun expectActualCalc(expression: String): Double { return Double.NaN } \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/lib/src/jsMain/kotlin/libJsPlatformUtil.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/lib/src/jsMain/kotlin/UsedInAppJsAndLibTests.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/lib/src/jsMain/kotlin/libJsPlatformUtil.kt rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/lib/src/jsMain/kotlin/UsedInAppJsAndLibTests.kt diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/lib/src/jsTest/kotlin/AdvancedTest.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/lib/src/jsTest/kotlin/TestDependsOnCommonMainAndPlatformMain.kt similarity index 71% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/lib/src/jsTest/kotlin/AdvancedTest.kt rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/lib/src/jsTest/kotlin/TestDependsOnCommonMainAndPlatformMain.kt index 0ceb2045350..622c734818a 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/lib/src/jsTest/kotlin/AdvancedTest.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/lib/src/jsTest/kotlin/TestDependsOnCommonMainAndPlatformMain.kt @@ -1,7 +1,7 @@ import kotlin.test.Test import kotlin.test.assertEquals -class AdvancedTest { +class LibJsTest { @Test fun jsUtilReturns0() { @@ -10,6 +10,6 @@ class AdvancedTest { @Test fun commonUtilTest() { - assertEquals(2, multiplyByTwo(1)) + assertEquals(2, libCommonFunForLibPlatformTests(1)) } } \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/lib/src/jvmMain/kotlin/ActualCalcFun.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/lib/src/jvmMain/kotlin/ActualCalcFun.kt index 041660fa463..53a96e94cd0 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/lib/src/jvmMain/kotlin/ActualCalcFun.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/lib/src/jvmMain/kotlin/ActualCalcFun.kt @@ -1,3 +1,3 @@ -actual fun calc(expression: String): Double { +actual fun expectActualCalc(expression: String): Double { return expression.toDoubleOrNull()?.let { it * 2 } ?: 0.0 } \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/lib/src/jvmMain/kotlin/libJvmPlatformUtil.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/lib/src/jvmMain/kotlin/UsedInAppJvmAndLibTests.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/lib/src/jvmMain/kotlin/libJvmPlatformUtil.kt rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/lib/src/jvmMain/kotlin/UsedInAppJvmAndLibTests.kt diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/lib/src/jvmTest/kotlin/AdvancedTest.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/lib/src/jvmTest/kotlin/TestDependsOnCommonMainAndPlatformMain.kt similarity index 71% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/lib/src/jvmTest/kotlin/AdvancedTest.kt rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/lib/src/jvmTest/kotlin/TestDependsOnCommonMainAndPlatformMain.kt index 91f552a8a0e..d993aaa19cd 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/lib/src/jvmTest/kotlin/AdvancedTest.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/lib/src/jvmTest/kotlin/TestDependsOnCommonMainAndPlatformMain.kt @@ -1,7 +1,7 @@ import kotlin.test.Test import kotlin.test.assertEquals -class AdvancedTest { +class LibJvmTest { @Test fun jvmUtilReturns400() { @@ -10,6 +10,6 @@ class AdvancedTest { @Test fun commonUtilTest() { - assertEquals(2, multiplyByTwo(1)) + assertEquals(2, libCommonFunForLibPlatformTests(1)) } } \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/lib/src/nativeMain/kotlin/ActualCalcFun.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/lib/src/nativeMain/kotlin/ActualCalcFun.kt index 213f7f74e99..9fe2dce0d05 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/lib/src/nativeMain/kotlin/ActualCalcFun.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/lib/src/nativeMain/kotlin/ActualCalcFun.kt @@ -1,3 +1,3 @@ -actual fun calc(expression: String): Double { +actual fun expectActualCalc(expression: String): Double { return 15.0 } \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/lib/src/nativeMain/kotlin/libNativePlatformUtil.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/lib/src/nativeMain/kotlin/UsedInAppNativeAndLibTests.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/lib/src/nativeMain/kotlin/libNativePlatformUtil.kt rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/lib/src/nativeMain/kotlin/UsedInAppNativeAndLibTests.kt diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/lib/src/nativeTest/kotlin/AdvancedTest.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/lib/src/nativeTest/kotlin/TestDependsOnCommonMainAndPlatformMain.kt similarity index 71% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/lib/src/nativeTest/kotlin/AdvancedTest.kt rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/lib/src/nativeTest/kotlin/TestDependsOnCommonMainAndPlatformMain.kt index 613b98739a6..8715257ef2f 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/lib/src/nativeTest/kotlin/AdvancedTest.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/generic-kmp-app-plus-lib-with-tests/lib/src/nativeTest/kotlin/TestDependsOnCommonMainAndPlatformMain.kt @@ -1,7 +1,7 @@ import kotlin.test.Test import kotlin.test.assertEquals -class AdvancedTest { +class LibNativeTest { @Test fun nativeUtilReturns800() { @@ -10,6 +10,6 @@ class AdvancedTest { @Test fun commonUtilTest() { - assertEquals(2, multiplyByTwo(1)) + assertEquals(2, libCommonFunForLibPlatformTests(1)) } }