Merge b8db03b70b into b5ca5d4dc1

gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/desktop/application/dsl/PlatformSettings.kt

@@ -6,6 +6,7 @@
 package org.jetbrains.compose.desktop.application.dsl
 
 import org.gradle.api.Action
+import org.gradle.api.file.DirectoryProperty
 import org.gradle.api.file.RegularFileProperty
 import org.gradle.api.model.ObjectFactory
 import javax.inject.Inject
@@ -17,6 +18,7 @@ abstract class AbstractPlatformSettings {
     val iconFile: RegularFileProperty = objects.fileProperty()
     var packageVersion: String? = null
     var installationPath: String? = null
+    val jpackageResourceDir: DirectoryProperty = objects.directoryProperty()
 }
 
 abstract class AbstractMacOSPlatformSettings : AbstractPlatformSettings() {

gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/desktop/application/internal/configureJvmApplication.kt

@@ -375,6 +375,7 @@ internal fun JvmApplicationContext.configurePlatformSettings(
                 packageTask.linuxRpmLicenseType.set(provider { linux.rpmLicenseType })
                 packageTask.iconFile.set(linux.iconFile.orElse(defaultResources.get { linuxIcon }))
                 packageTask.installationPath.set(linux.installationPath)
+                packageTask.jpackageResourcesDir.set(linux.jpackageResourceDir)
             }
         }
         OS.Windows -> {
@@ -388,6 +389,7 @@ internal fun JvmApplicationContext.configurePlatformSettings(
                 packageTask.winUpgradeUuid.set(provider { win.upgradeUuid })
                 packageTask.iconFile.set(win.iconFile.orElse(defaultResources.get { windowsIcon }))
                 packageTask.installationPath.set(win.installationPath)
+                packageTask.jpackageResourcesDir.set(win.jpackageResourceDir)
             }
         }
         OS.MacOS -> {
@@ -414,6 +416,7 @@ internal fun JvmApplicationContext.configurePlatformSettings(
                 packageTask.nonValidatedMacSigningSettings = app.nativeDistributions.macOS.signing
                 packageTask.iconFile.set(mac.iconFile.orElse(defaultResources.get { macIcon }))
                 packageTask.installationPath.set(mac.installationPath)
+                packageTask.jpackageResourcesDir.set(mac.jpackageResourceDir)
             }
         }
     }

gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/desktop/application/tasks/AbstractJPackageTask.kt

@@ -286,6 +286,9 @@ abstract class AbstractJPackageTask @Inject constructor(
     @get:Internal
     val appResourcesDir: DirectoryProperty = objects.directoryProperty()
 
+    @get:Internal
+    val jpackageResourcesDir: DirectoryProperty = objects.directoryProperty()
+
     /**
      * Gradle runtime verification fails,
      * if InputDirectory is not null, but a directory does not exist.
@@ -523,6 +526,8 @@ abstract class AbstractJPackageTask @Inject constructor(
                     .writeToFile(jpackageResources.ioFile.resolve("product-def.plist"))
             }
         }
+
+        jpackageResourcesDir.ioFileOrNull?.copyRecursively(jpackageResources.ioFile, overwrite = true)
     }
 
     override fun jvmToolEnvironment(): MutableMap<String, String> =