From e7e5b795975b0c0b3407cf3bf16fec4789f3f91a Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov <654232+AlexeyTsvetkov@users.noreply.github.com> Date: Tue, 13 Apr 2021 10:18:56 +0300 Subject: [PATCH] Fix unpacking skiko on Linux and Windows (#586) --- .../compose/desktop/application/tasks/AbstractJPackageTask.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/desktop/application/tasks/AbstractJPackageTask.kt b/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/desktop/application/tasks/AbstractJPackageTask.kt index e0948fc255f..e508982a069 100644 --- a/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/desktop/application/tasks/AbstractJPackageTask.kt +++ b/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/desktop/application/tasks/AbstractJPackageTask.kt @@ -487,8 +487,8 @@ private fun isSkikoForCurrentOS(lib: File): Boolean = private fun unpackSkikoForCurrentOS(sourceJar: File, skikoDir: File, fileOperations: FileOperations): List { val entriesToUnpack = when (currentOS) { OS.MacOS -> setOf("libskiko-macos-${currentArch.id}.dylib") - OS.Linux -> setOf("skiko-windows-${currentArch.id}.dll", "icudtl.dat") - OS.Windows -> setOf("libskiko-linux-${currentArch.id}.so") + OS.Windows -> setOf("skiko-windows-${currentArch.id}.dll", "icudtl.dat") + OS.Linux -> setOf("libskiko-linux-${currentArch.id}.so") } // output files: unpacked libs, corresponding .sha256 files, and target jar