From 62d9dcdd3f98222d671b2b858feb21d69a950508 Mon Sep 17 00:00:00 2001 From: Oleksandr Karpovich Date: Thu, 16 Nov 2023 16:16:38 +0100 Subject: [PATCH] Fix wix toolset download duplication (#3882) Fixes #3876 --- .../desktop/application/internal/wixToolset.kt | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) 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 a2d48bba4c..f5f1739d80 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 @@ -39,12 +39,18 @@ internal fun JvmApplicationContext.configureWix() { val fileName = "wix311" val zipFile = wixDir.resolve("$fileName.zip") val unzipDir = root.layout.buildDirectory.dir(fileName) - val download = root.tasks.maybeCreate(DOWNLOAD_WIX_TOOLSET_TASK_NAME, Download::class.java).apply { + val download = root.tasks.findByName(DOWNLOAD_WIX_TOOLSET_TASK_NAME) ?: 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") dest(zipFile) } - val unzip = root.tasks.maybeCreate(UNZIP_WIX_TOOLSET_TASK_NAME, Copy::class.java).apply { + val unzip = root.tasks.findByName(UNZIP_WIX_TOOLSET_TASK_NAME) ?: root.tasks.maybeCreate( + UNZIP_WIX_TOOLSET_TASK_NAME, + Copy::class.java + ).apply { dependsOn(download) from(project.zipTree(zipFile)) destinationDir = unzipDir.ioFile @@ -61,4 +67,4 @@ private fun Project.eachWindowsPackageTask(fn: AbstractJPackageTask.() -> Unit) packageTask.fn() } } -} \ No newline at end of file +}