Skip to content

Commit 23d9732

Browse files
nigredo-torimuuki88
authored andcommitted
Fix 1.5.0 regression in JLinkPLugin error handling (#1285)
* Add a test for #1284 * Update tool-launcher
1 parent 1cafa21 commit 23d9732

File tree

3 files changed

+12
-2
lines changed

3 files changed

+12
-2
lines changed

build.sbt

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ libraryDependencies ++= Seq(
2020
// for jdkpackager
2121
"org.apache.ant" % "ant" % "1.10.5",
2222
// workaround for the command line size limit
23-
"com.github.eldis" % "tool-launcher" % "0.2.1",
23+
"com.github.eldis" % "tool-launcher" % "0.2.2",
2424
"org.scalatest" %% "scalatest" % "3.0.5" % Test
2525
)
2626

src/sbt-test/jlink/test-jlink-misc/build.sbt

+9
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import scala.sys.process.Process
55
import com.typesafe.sbt.packager.Compat._
66

77
val runChecks = taskKey[Unit]("Run checks for a specific issue")
8+
val runFailingChecks = taskKey[Unit]("Run checks for a specific issue, expecting them to fail")
89

910
// Exclude Scala by default to simplify the test.
1011
autoScalaLibrary in ThisBuild := false
@@ -80,3 +81,11 @@ val issue1266 = project
8081

8182
runChecks := jlinkBuildImage.value
8283
)
84+
85+
// Should fail for invalid jlink inputs
86+
val issue1284 = project
87+
.enablePlugins(JlinkPlugin)
88+
.settings(
89+
jlinkModules := List("no-such-module"),
90+
runFailingChecks := jlinkBuildImage.value
91+
)

src/sbt-test/jlink/test-jlink-misc/test

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,5 @@
44
> issue1247BadAutoModuleName/runChecks
55
> issue1247ExternalModule/runChecks
66
> issue1247JakartaJavaModules/runChecks
7-
> issue1266/runChecks
7+
> issue1266/runChecks
8+
-> issue1284/runFailingChecks

0 commit comments

Comments
 (0)