azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Gradle] Do not try snapshotting non-existent classpath entries

Browse Source 
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
This commit is contained in:
Alexander.Likhachev
2024-01-30 12:33:40 +01:00
committed by Space Team
parent c5138b781f
commit de04c62df5
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/GeneralClasspathSnapshotIT.kt
-2
View File
@@ -7,7 +7,6 @@ package org.jetbrains.kotlin.gradle
import org.gradle.util.GradleVersion import org.gradle.util.GradleVersion
import org.jetbrains.kotlin.gradle.testbase.* import org.jetbrains.kotlin.gradle.testbase.*
import org.junit.jupiter.api.Disabled
import org.junit.jupiter.api.DisplayName import org.junit.jupiter.api.DisplayName
@JvmGradlePluginTests @JvmGradlePluginTests
@@ -15,7 +14,6 @@ import org.junit.jupiter.api.DisplayName
class GeneralClasspathSnapshotIT : KGPBaseTest() { class GeneralClasspathSnapshotIT : KGPBaseTest() {
override val defaultBuildOptions = super.defaultBuildOptions.copy(useGradleClasspathSnapshot = true) // ensure classpath snapshotting is enabled override val defaultBuildOptions = super.defaultBuildOptions.copy(useGradleClasspathSnapshot = true) // ensure classpath snapshotting is enabled
@Disabled
@DisplayName("Non-existent dependency files do not fail the build") @DisplayName("Non-existent dependency files do not fail the build")
@GradleTest @GradleTest
fun nonExistentDependency(gradleVersion: GradleVersion) { fun nonExistentDependency(gradleVersion: GradleVersion) {
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/internal/transforms/BuildToolsApiClasspathEntrySnapshotTransform.kt
+2
View File
@@ -71,6 +71,8 @@ abstract class BuildToolsApiClasspathEntrySnapshotTransform : TransformAction<Bu
checkVersionConsistency() checkVersionConsistency()
} }
val classpathEntryInputDirOrJar = inputArtifact.get().asFile val classpathEntryInputDirOrJar = inputArtifact.get().asFile
if (!classpathEntryInputDirOrJar.exists()) return
val snapshotOutputFile = outputs.file(classpathEntryInputDirOrJar.name.replace('.', '_') + "-snapshot.bin") val snapshotOutputFile = outputs.file(classpathEntryInputDirOrJar.name.replace('.', '_') + "-snapshot.bin")
val granularity = getClassSnapshotGranularity(classpathEntryInputDirOrJar, parameters.gradleUserHomeDir.get().asFile) val granularity = getClassSnapshotGranularity(classpathEntryInputDirOrJar, parameters.gradleUserHomeDir.get().asFile)