diff options
| author | mvicsokolova <82594708+mvicsokolova@users.noreply.github.com> | 2024-01-22 14:49:12 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-22 14:49:12 +0100 |
| commit | e3cb1483dfd62754ef06d80918e823be30012fef (patch) | |
| tree | d5bb5476f7f6aba5b49f691b9b63321e1a17d892 | |
| parent | 2ab3902260a664585690f6324d2d101db7458bb3 (diff) | |
| download | kotlinx.atomicfu-e3cb1483dfd62754ef06d80918e823be30012fef.tar.gz | |
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>
3 files changed, 8 insertions, 4 deletions
diff --git a/atomicfu-gradle-plugin/src/main/kotlin/kotlinx/atomicfu/plugin/gradle/AtomicFUGradlePlugin.kt b/atomicfu-gradle-plugin/src/main/kotlin/kotlinx/atomicfu/plugin/gradle/AtomicFUGradlePlugin.kt index eb4d858..dcc74be 100644 --- a/atomicfu-gradle-plugin/src/main/kotlin/kotlinx/atomicfu/plugin/gradle/AtomicFUGradlePlugin.kt +++ b/atomicfu-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 index 2b3f2d5..26cf262 100644 --- 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 index 5c6c713..a5ea52f 100644 --- 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 { |