From 1410ebb6a0937ae28e60005de6c396fd4d7f607c Mon Sep 17 00:00:00 2001 From: Martin Bonnin Date: Wed, 31 Dec 2025 13:47:32 +0100 Subject: [PATCH] Fix relative paths --- .../nmcp/internal/task/nmcpPublishFileByFileToMavenLocal.kt | 2 +- nmcp-tasks/src/main/kotlin/nmcp/transport/transport.kt | 3 +++ .../kotlin/nmcp/internal/DefaultNmcpAggregationExtension.kt | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/nmcp-tasks/src/main/kotlin/nmcp/internal/task/nmcpPublishFileByFileToMavenLocal.kt b/nmcp-tasks/src/main/kotlin/nmcp/internal/task/nmcpPublishFileByFileToMavenLocal.kt index 5ed64f3..eaeca96 100644 --- a/nmcp-tasks/src/main/kotlin/nmcp/internal/task/nmcpPublishFileByFileToMavenLocal.kt +++ b/nmcp-tasks/src/main/kotlin/nmcp/internal/task/nmcpPublishFileByFileToMavenLocal.kt @@ -23,5 +23,5 @@ internal fun nmcpPublishFileByFileToFileSystem( logger.info("Nmcp: copying files to $m2AbsolutePath") File(m2AbsolutePath).mkdirs() - publishFileByFile(FilesystemTransport(m2AbsolutePath), inputFiles, parallelism) + publishFileByFile(FilesystemTransport(m2AbsolutePath, logger), inputFiles, parallelism) } diff --git a/nmcp-tasks/src/main/kotlin/nmcp/transport/transport.kt b/nmcp-tasks/src/main/kotlin/nmcp/transport/transport.kt index f82850d..d8a927b 100644 --- a/nmcp-tasks/src/main/kotlin/nmcp/transport/transport.kt +++ b/nmcp-tasks/src/main/kotlin/nmcp/transport/transport.kt @@ -166,8 +166,10 @@ fun Content.toRequestBody(): RequestBody { internal class FilesystemTransport( private val basePath: String, + private val logger: GLogger, ) : Transport { override fun get(path: String): BufferedSource? { + logger.info("Nmcp: read '$path'") val file = File(basePath).resolve(path) if (!file.exists()) { return null @@ -176,6 +178,7 @@ internal class FilesystemTransport( } override fun put(path: String, body: Content) { + logger.info("Nmcp: write '$path'") File(basePath).resolve(path).apply { parentFile.mkdirs() sink().buffer().use { diff --git a/nmcp/src/main/kotlin/nmcp/internal/DefaultNmcpAggregationExtension.kt b/nmcp/src/main/kotlin/nmcp/internal/DefaultNmcpAggregationExtension.kt index 9f52adb..6447d1f 100644 --- a/nmcp/src/main/kotlin/nmcp/internal/DefaultNmcpAggregationExtension.kt +++ b/nmcp/src/main/kotlin/nmcp/internal/DefaultNmcpAggregationExtension.kt @@ -60,11 +60,11 @@ internal abstract class DefaultNmcpAggregationExtension(private val project: Pro project.registerNmcpPublishFileByFileToFileSystemTask( taskName = "nmcpPublishAggregationTo${options.name.get().capitalizeFirstLetter()}Repository", inputFiles = allFiles, - m2AbsolutePath = project.provider { File(options.path.get()).absolutePath }, + m2AbsolutePath = project.provider { project.file(options.path.get()).absolutePath }, parallelism = project.provider { 1 }, ) } - + @Deprecated("Use the settings plugin or a convention plugin instead") override fun publishAllProjectsProbablyBreakingProjectIsolation() { check(project === project.rootProject) {