From de04c62df5c9d99028b3196867e767779969b80b Mon Sep 17 00:00:00 2001 From: "Alexander.Likhachev" Date: Tue, 30 Jan 2024 12:33:40 +0100 Subject: [PATCH] [Gradle] Do not try snapshotting non-existent classpath entries The fix changes only Gradle's side of the transformation to be consistent with general Gradle behaviour for non-existent dependencies in classpath ^KT-62101 In Progress --- .../org/jetbrains/kotlin/gradle/GeneralClasspathSnapshotIT.kt | 2 -- .../transforms/BuildToolsApiClasspathEntrySnapshotTransform.kt | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/GeneralClasspathSnapshotIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/GeneralClasspathSnapshotIT.kt index 3954e84d9ff..01e543e433a 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/GeneralClasspathSnapshotIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/GeneralClasspathSnapshotIT.kt @@ -7,7 +7,6 @@ package org.jetbrains.kotlin.gradle import org.gradle.util.GradleVersion import org.jetbrains.kotlin.gradle.testbase.* -import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.DisplayName @JvmGradlePluginTests @@ -15,7 +14,6 @@ import org.junit.jupiter.api.DisplayName class GeneralClasspathSnapshotIT : KGPBaseTest() { override val defaultBuildOptions = super.defaultBuildOptions.copy(useGradleClasspathSnapshot = true) // ensure classpath snapshotting is enabled - @Disabled @DisplayName("Non-existent dependency files do not fail the build") @GradleTest fun nonExistentDependency(gradleVersion: GradleVersion) { diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/internal/transforms/BuildToolsApiClasspathEntrySnapshotTransform.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/internal/transforms/BuildToolsApiClasspathEntrySnapshotTransform.kt index 68c2f7ca6c5..42fe3117259 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/internal/transforms/BuildToolsApiClasspathEntrySnapshotTransform.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/internal/transforms/BuildToolsApiClasspathEntrySnapshotTransform.kt @@ -71,6 +71,8 @@ abstract class BuildToolsApiClasspathEntrySnapshotTransform : TransformAction