From f19e65f2d444b7f26b64d13f41e1d3b0f83f8da7 Mon Sep 17 00:00:00 2001 From: Sergey Igushkin Date: Tue, 1 Feb 2022 01:11:40 +0400 Subject: [PATCH] Remove illegal dependsOn edges in MPP tests Those dependsOn edges were not used in any way, and not assertion checked for them. They are illegal according to KPM design, and we generally consider such a setup unsupported with the stable MPP plugin, too. --- .../new-mpp-lib-and-app/sample-external-lib/build.gradle | 1 - .../sample-lib-gradle-kotlin-dsl/build.gradle.kts | 1 - .../testProject/new-mpp-lib-and-app/sample-lib/build.gradle | 1 - 3 files changed, 3 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-external-lib/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-external-lib/build.gradle index 1724c5dde35..1137d824c3c 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-external-lib/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-external-lib/build.gradle @@ -79,7 +79,6 @@ apply plugin: 'maven-publish' afterEvaluate { kotlin { jvm('jvm6').compilations.create('benchmark') { - defaultSourceSet.dependsOn(sourceSets.jvm6Main) assemble.dependsOn compileKotlinTask } } diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-lib-gradle-kotlin-dsl/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-lib-gradle-kotlin-dsl/build.gradle.kts index d5678a22267..d9d0c77fb51 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-lib-gradle-kotlin-dsl/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-lib-gradle-kotlin-dsl/build.gradle.kts @@ -55,7 +55,6 @@ publishing { afterEvaluate { kotlin { jvm("jvm6").compilations.create("benchmark") { - defaultSourceSet.dependsOn(sourceSets["jvm6Main"]) tasks["assemble"].dependsOn(compileKotlinTask) } } diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-lib/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-lib/build.gradle index 33a49c74525..32faabf18af 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-lib/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-lib/build.gradle @@ -103,7 +103,6 @@ publishing { afterEvaluate { kotlin { jvm('jvm6').compilations.create('benchmark') { - defaultSourceSet.dependsOn(sourceSets.jvm6Main) assemble.dependsOn compileKotlinTask } }