fix beryx#244 secondary launcher fails in kotlin DSL

xzel23 · Feb 6, 2024 · 87ba248 · 87ba248
1 parent e1c7255
commit 87ba248
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 31 deletions.
diff --git a/src/main/groovy/org/beryx/jlink/data/JlinkPluginExtension.groovy b/src/main/groovy/org/beryx/jlink/data/JlinkPluginExtension.groovy
@@ -174,7 +174,7 @@ class JlinkPluginExtension {
  action.execute(launcherData.get())
  }
 
- void secondaryLauncher(Action<LauncherData> action) {
+ void secondaryLauncher(Action<SecondaryLauncherData> action) {
  def ld = new SecondaryLauncherData(null)
  ld.moduleName = moduleName.get()
  Util.addToListProperty(secondaryLaunchers, ld)

diff --git a/src/test/resources/multi-launch-kotlin-dsl/build.gradle b/src/test/resources/multi-launch-kotlin-dsl/build.gradle
diff --git a/src/test/resources/multi-launch-kotlin-dsl/build.gradle.kts b/src/test/resources/multi-launch-kotlin-dsl/build.gradle.kts
@@ -0,0 +1,35 @@
+plugins {
+ id("org.javamodularity.moduleplugin") version "1.8.12"
+ id("org.beryx.jlink")
+}
+
+repositories {
+ mavenCentral()
+}
+
+extra["moduleName"] = "org.example.multi"
+
+application {
+ mainClass.set("org.example.multi.Hello")
+}
+
+jlink {
+ launcher {
+ name = "hello"
+ noConsole = false
+ jvmArgs = listOf(
+ "-Xms512m",
+ "-Xmx4g",
+ "-XX:+UseShenandoahGC"
+ )
+ }
+ secondaryLauncher {
+ name = "helloAgain"
+ mainClass = "org.example.multi.HelloAgain"
+ }
+ secondaryLauncher {
+ name = "howdy"
+ moduleName= "org.example.multi"
+ mainClass = "org.example.multi.Howdy"
+ }
+}
diff --git a/src/test/resources/multi-launch-kotlin-dsl/settings.gradle b/src/test/resources/multi-launch-kotlin-dsl/settings.gradle
diff --git a/src/test/resources/multi-launch-kotlin-dsl/settings.gradle.kts b/src/test/resources/multi-launch-kotlin-dsl/settings.gradle.kts
@@ -0,0 +1 @@
+rootProject.name = "multi-launch-kotlin-dsl"