Add all sources to the transformed directory (#394)

* Add all sources to the transformed directories. Fixes #388 Co-authored-by: Yahor Berdnikau <yahor.berdnikau@jetbrains.com>
Kotlin · Jan 22, 2024 · e3cb148 · e3cb148
1 parent 2ab3902
commit e3cb148
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/...icfu-gradle-plugin/src/main/kotlin/kotlinx/atomicfu/plugin/gradle/AtomicFUGradlePlugin.kt b/...icfu-gradle-plugin/src/main/kotlin/kotlinx/atomicfu/plugin/gradle/AtomicFUGradlePlugin.kt
@@ -337,8 +337,9 @@ private fun Project.configureTransformationForTarget(target: KotlinTarget) {
                 it.destinationDirectory.value(originalDestinationDirectory)
             }
         }
-        val originalClassesDirs: FileCollection =
-            project.files(classesDirs.from.toTypedArray()).filter { it.exists() }
+        val originalClassesDirs: FileCollection = project.objects.fileCollection()
+            .from(compilationTask.flatMap { it.destinationDirectory })
+            .from({ project.files(classesDirs.from).filter { it.exists() } })
         originalDirsByCompilation[compilation] = originalClassesDirs
         val transformedClassesDir = project.layout.buildDirectory
             .dir("classes/atomicfu/${target.name}/${compilation.name}")

diff --git a/integration-testing/examples/jvm-sample/build.gradle.kts b/integration-testing/examples/jvm-sample/build.gradle.kts
@@ -14,6 +14,7 @@ group = "kotlinx.atomicfu.examples"
 version = "DUMMY_VERSION"
 
 plugins {
+    application
     kotlin("jvm") version libs.versions.kotlinVersion.get()
     `maven-publish`
 }
@@ -37,6 +38,10 @@ tasks.compileKotlin {
     }
 }
 
+application {
+    mainClass.set("org.example.MainKt")
+}
+
 publishing {
     repositories {
         /**

diff --git a/integration-testing/examples/jvm-sample/src/main/java/JavaClass.java b/integration-testing/examples/jvm-sample/src/main/java/JavaClass.java
@@ -1,5 +1,3 @@
-package org.example;
-
 import java.util.concurrent.atomic.AtomicLongFieldUpdater;
 
 public class JavaClass {