From 43adf056c39cc4e49b2f2542f5bf794454915261 Mon Sep 17 00:00:00 2001 From: Browsit <80560008+Browsit@users.noreply.github.com> Date: Wed, 20 Jul 2022 22:27:22 -0400 Subject: [PATCH 1/2] Fix type mismatch Just pulled the master branch and got the error: `C:\Users\{owner}\IdeaProjects\Terra\buildSrc\src\main\kotlin\DistributionConfig.kt: (49, 39): Type mismatch: inferred type is Path! but URI! was expected` --- buildSrc/src/main/kotlin/DistributionConfig.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildSrc/src/main/kotlin/DistributionConfig.kt b/buildSrc/src/main/kotlin/DistributionConfig.kt index 6c743e9e8..2cc7cab02 100644 --- a/buildSrc/src/main/kotlin/DistributionConfig.kt +++ b/buildSrc/src/main/kotlin/DistributionConfig.kt @@ -44,7 +44,7 @@ fun Project.configureDistribution() { doLast { // https://github.com/johnrengelman/shadow/issues/111 - val dest = tasks.named("shadowJar").get().archiveFile.get().asFile.toPath() + val dest = tasks.named("shadowJar").get().archiveFile.get().asFile.toURI() FileSystems.newFileSystem(dest, mapOf("create" to "false"), null).use { fs -> forSubProjects(":common:addons") { From 829696ccc82dabf7e4da33c47c844af089ed4852 Mon Sep 17 00:00:00 2001 From: Browsit <80560008+Browsit@users.noreply.github.com> Date: Thu, 21 Jul 2022 02:35:38 -0400 Subject: [PATCH 2/2] Use jar URI prefix Fixes `Path component should be '/'` on Windows --- buildSrc/src/main/kotlin/DistributionConfig.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/buildSrc/src/main/kotlin/DistributionConfig.kt b/buildSrc/src/main/kotlin/DistributionConfig.kt index 2cc7cab02..24750233f 100644 --- a/buildSrc/src/main/kotlin/DistributionConfig.kt +++ b/buildSrc/src/main/kotlin/DistributionConfig.kt @@ -1,6 +1,7 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar import java.io.File import java.io.FileWriter +import java.net.URI import java.net.URL import java.nio.file.FileSystems import java.nio.file.Files @@ -44,7 +45,7 @@ fun Project.configureDistribution() { doLast { // https://github.com/johnrengelman/shadow/issues/111 - val dest = tasks.named("shadowJar").get().archiveFile.get().asFile.toURI() + val dest = URI.create("jar:" + tasks.named("shadowJar").get().archiveFile.get().asFile.toURI()) FileSystems.newFileSystem(dest, mapOf("create" to "false"), null).use { fs -> forSubProjects(":common:addons") {