diff --git a/gradle-plugins/compose/build.gradle.kts b/gradle-plugins/compose/build.gradle.kts index 3c9085dc650..abc4467d3a2 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}") @@ -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") { 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")