From ac52e04bd89ccf417e7e15f4613b81e6fdfc4435 Mon Sep 17 00:00:00 2001 From: Robinson Date: Tue, 10 Jan 2023 00:40:07 +0100 Subject: [PATCH] Fixed issue with path location (for source file jars) in mixed java/kotlin projects. --- src/dorkbox/gradlePublish/PublishPlugin.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/dorkbox/gradlePublish/PublishPlugin.kt b/src/dorkbox/gradlePublish/PublishPlugin.kt index 8b9b9d3..8287456 100644 --- a/src/dorkbox/gradlePublish/PublishPlugin.kt +++ b/src/dorkbox/gradlePublish/PublishPlugin.kt @@ -31,7 +31,6 @@ import org.gradle.api.tasks.util.PatternFilterable import org.gradle.jvm.tasks.Jar import org.gradle.plugins.signing.SigningExtension import org.gradle.plugins.signing.signatory.internal.pgp.InMemoryPgpSignatoryProvider -import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet import java.io.File import java.time.Duration import java.time.Instant @@ -294,7 +293,8 @@ class PublishPlugin : Plugin { val path = project.buildDir.relativeTo(it) path.path.isNotEmpty() } - file.relativeTo(base).path + // there can be leading "../" (since it's relative. WE DO NOT WANT THAT! + file.relativeTo(base).path.replace("../", "") } it.setExcludes(javaFiles)