From 590bab82e2ec594f0969b55c1d070d608ddec653 Mon Sep 17 00:00:00 2001 From: Yahor Berdnikau Date: Wed, 10 Mar 2021 20:55:46 +0100 Subject: [PATCH] Remove not-needed test task validation. Now all test 'install' dependencies are added via centralized 'dependsOnKotlinGradlePluginInstall()' method. --- .../build.gradle.kts | 27 ------------------- 1 file changed, 27 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle.kts index bc4185e4079..118b65e0fc0 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle.kts @@ -151,29 +151,6 @@ tasks.named("check") { } } -gradle.taskGraph.whenReady { - // Validate that all dependencies "install" tasks are added to "test" dependencies - // Test dependencies are specified as paths to avoid forcing dependency resolution - // and also to avoid specifying evaluationDependsOn for each testCompile dependency. - - val notAddedTestTasks = hashSetOf() - val test = tasks.getByName("test") - val testDependencies = test.dependsOn - - for (dependency in configurations.getByName("testCompile").allDependencies) { - if (dependency !is ProjectDependency) continue - - val task = dependency.dependencyProject.tasks.findByName("install") - if (task != null && !testDependencies.contains(task.path)) { - notAddedTestTasks.add("\"${task.path}\"") - } - } - - if (!notAddedTestTasks.isEmpty()) { - throw GradleException("Add the following tasks to ${test.path} dependencies:\n ${notAddedTestTasks.joinToString(",\n ")}") - } -} - tasks.withType { kotlinOptions.jdkHome = rootProject.extra["JDK_18"] as String kotlinOptions.jvmTarget = "1.8" @@ -237,7 +214,3 @@ tasks.withType { }) } } - -java { - withSourcesJar() -} \ No newline at end of file