From d4dad77369a0e8ef9bcd5dad36aa6b9ed962b58b Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Mon, 16 Jan 2023 14:51:41 +0100 Subject: [PATCH 1/2] Use global directory to download wix toolset Resolves #2592 --- gradle-plugins/compose/build.gradle.kts | 2 +- .../compose/desktop/application/internal/wixToolset.kt | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/gradle-plugins/compose/build.gradle.kts b/gradle-plugins/compose/build.gradle.kts index 3c9085dc650..798f63a7be3 100644 --- a/gradle-plugins/compose/build.gradle.kts +++ b/gradle-plugins/compose/build.gradle.kts @@ -62,7 +62,7 @@ dependencies { testImplementation(kotlin("gradle-plugin-api")) // include relocated download task to avoid potential runtime conflicts - embedded("de.undercouch:gradle-download-task:4.1.1") + embedded("de.undercouch:gradle-download-task:5.3.0") embedded("org.jetbrains.kotlinx:kotlinx-serialization-json:${BuildProperties.serializationVersion}") embedded("org.jetbrains.kotlinx:kotlinx-serialization-core:${BuildProperties.serializationVersion}") diff --git a/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/desktop/application/internal/wixToolset.kt b/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/desktop/application/internal/wixToolset.kt index f952ec5b1b3..5180646cb58 100644 --- a/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/desktop/application/internal/wixToolset.kt +++ b/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/desktop/application/internal/wixToolset.kt @@ -34,9 +34,10 @@ internal fun JvmApplicationContext.configureWix() { if (project.findProperty(DOWNLOAD_WIX_PROPERTY) == "false") return val root = project.rootProject - val wixDir = root.buildDir.resolve("wixToolset") - val zipFile = wixDir.resolve("wix311.zip") - val unzipDir = wixDir.resolve("unpacked") + val wixDir = project.gradle.gradleUserHomeDir.resolve("compose-jb") + val fileName = "wix311" + val zipFile = wixDir.resolve("$fileName.zip") + val unzipDir = root.projectDir.resolve(fileName) val download = root.tasks.maybeCreate(DOWNLOAD_WIX_TOOLSET_TASK_NAME, Download::class.java).apply { onlyIf { !zipFile.isFile } src("https://github.com/wixtoolset/wix3/releases/download/wix3112rtm/wix311-binaries.zip") From 3b5a43b202dafdb1dd2bfbac39a9be16f34395c8 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Mon, 16 Jan 2023 16:50:56 +0100 Subject: [PATCH 2/2] Fix jar checks --- gradle-plugins/compose/build.gradle.kts | 1 + 1 file changed, 1 insertion(+) diff --git a/gradle-plugins/compose/build.gradle.kts b/gradle-plugins/compose/build.gradle.kts index 798f63a7be3..abc4467d3a2 100644 --- a/gradle-plugins/compose/build.gradle.kts +++ b/gradle-plugins/compose/build.gradle.kts @@ -77,6 +77,7 @@ val shadow = tasks.named("shadowJar") { archiveClassifier.set("shadow") configurations = listOf(embeddedDependencies) exclude("META-INF/gradle-plugins/de.undercouch.download.properties") + exclude("META-INF/versions/**") } val jar = tasks.named("jar") {