Skip to content

Fix deleting stale files in Gradle transform task #550

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 9, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,8 @@ private fun Project.checkCompatibility(afuPluginVersion: String) {
)
}
if (!kotlinVersion.atLeast(1, 9, 0)) {
// Since Kotlin 1.9.0 the logic of the Gradle plugin from the Kotlin repo (AtomicfuKotlinGradleSubplugin)
// may be moved to the Gradle plugin in the library. The sources of the compiler plugin
// Since Kotlin 1.9.0 the logic of the Gradle plugin from the Kotlin repo (AtomicfuKotlinGradleSubplugin)
// may be moved to the Gradle plugin in the library. The sources of the compiler plugin
// are published as `kotlin-atomicfu-compiler-plugin-embeddable` since Kotlin 1.9.0 and may be accessed out of the Kotlin repo.
error(
"You are applying `kotlinx-atomicfu` plugin of version $afuPluginVersion. " +
Expand Down Expand Up @@ -487,6 +487,7 @@ abstract class AtomicFUTransformTask : ConventionTask() {

@TaskAction
fun transform() {
destinationDirectory.get().asFile.deleteRecursively()
val cp = classPath.files.map { it.absolutePath }
inputFiles.files.forEach { inputDir ->
AtomicFUTransformer(cp, inputDir, destinationDirectory.get().asFile).let { t ->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,50 @@ class JvmProjectTest {
jvmSample.checkConsumableDependencies(false)
jvmSample.buildAndCheckBytecode()
}

// This test checks that jar is packed without duplicates, see #303
@Test
fun testJar() {
assertTrue(jvmSample.cleanAndJar().isSuccessful)
}

@Test
fun testFilesDeleted() {

val buildClassesAtomicfuDir = jvmSample.targetDir.resolve("build/classes/atomicfu")

/** Get all that Atomicfu generates in `build/classes/atomicfu/` */
fun buildClassesAtomicFuDirFiles(): String =
buildClassesAtomicfuDir.walk()
.filter { it.isFile }
.map { it.relativeTo(jvmSample.targetDir).invariantSeparatorsPath }
.sorted()
.joinToString("\n")

jvmSample.build().apply {
assertTrue { buildClassesAtomicfuDir.exists() }
assertEquals(
"""
build/classes/atomicfu/main/IntArithmetic.class
build/classes/atomicfu/main/META-INF/jvm-sample.kotlin_module
build/classes/atomicfu/main/MainKt.class
build/classes/atomicfu/test/ArithmeticTest.class
build/classes/atomicfu/test/META-INF/jvm-sample_test.kotlin_module
""".trimIndent(),
buildClassesAtomicFuDirFiles()
)
}

val projectSrcDir = jvmSample.targetDir.resolve("src")
projectSrcDir.deleteRecursively()
assertFalse { projectSrcDir.exists() }

jvmSample.build().apply {
assertTrue { buildClassesAtomicfuDir.exists() }
assertEquals(
"",
buildClassesAtomicFuDirFiles(),
)
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ package kotlinx.atomicfu.gradle.plugin.test.framework.runner
import java.io.File
import java.nio.file.Files

/**
* @param[targetDir] The root Gradle project directory.
*/
internal class GradleBuild(val projectName: String, val targetDir: File) {
var enableJvmIrTransformation = false
var enableJsIrTransformation = false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,20 @@ package kotlinx.atomicfu.gradle.plugin.test.framework.runner

import kotlinx.atomicfu.gradle.plugin.test.framework.checker.getProjectClasspath

internal fun GradleBuild.build(): BuildResult =
runGradle(listOf("build")).also {
require(it.isSuccessful) { "${this.projectName}:build task FAILED: ${it.output} " }
}

internal fun GradleBuild.cleanAndBuild(): BuildResult =
runGradle(listOf("clean", "build")).also {
require(it.isSuccessful) { "${this.projectName}:build task FAILED: ${it.output} " }
}

internal fun GradleBuild.cleanAndJar(): BuildResult = runGradle(listOf("clean", "jar"))

internal fun GradleBuild.dependencies(): BuildResult =
runGradle(listOf("dependencies")).also {
internal fun GradleBuild.dependencies(): BuildResult =
runGradle(listOf("dependencies")).also {
require(it.isSuccessful) { "${this.projectName}:dependencies task FAILED: ${it.output} " }
}

Expand Down