From 7c1559e157b626a0ff760fa37e0b4da949885af9 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov <654232+AlexeyTsvetkov@users.noreply.github.com> Date: Mon, 16 Jan 2023 18:50:10 +0100 Subject: [PATCH] Use global directory to download wix toolset (#2639) * Use global directory to download wix toolset Resolves #2592 (cherry picked from commit e2aba37e625def21b9aa136592a38a3e33b4667a) --- gradle-plugins/compose/build.gradle.kts | 3 ++- .../compose/desktop/application/internal/wixToolset.kt | 7 ++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/gradle-plugins/compose/build.gradle.kts b/gradle-plugins/compose/build.gradle.kts index 5e18e1fe6a5..52a88fd13e6 100644 --- a/gradle-plugins/compose/build.gradle.kts +++ b/gradle-plugins/compose/build.gradle.kts @@ -64,7 +64,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}") @@ -79,6 +79,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") { 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")