Skip to content

Add directive packaging.graalvmJvmId #4223

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Gedochao merged 2 commits into from
Apr 13, 2026
+26 −0
Merged

Add directive packaging.graalvmJvmId #4223

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
06b7e07
Add 'packaging.graalvmJvmId' directive
zrhmn Apr 11, 2026
e9327cf
Merge branch 'main' into main
zrhmn Apr 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions modules/build/src/test/scala/scala/build/tests/PackagingUsingDirectiveTests.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,23 @@ class PackagingUsingDirectiveTests extends TestUtil.ScalaCliBuildSuite {
}
}

test("graalvm packaging") {
val inputs = TestInputs(
os.rel / "p.sc" ->
"""//> using packaging.packageType graalvm
|//> using packaging.graalvmJvmId graalvm-community:23.0.2
|//> using packaging.graalvmArgs --no-fallback
|
|def foo() = println("hello foo")
|""".stripMargin
)
inputs.withLoadedBuild(buildOptions, buildThreads, bloopConfig) { (_, _, maybeBuild) =>
val nativeImageOpt = maybeBuild.options.notForBloopOptions.packageOptions.nativeImageOptions
expect(nativeImageOpt.jvmId == "graalvm-community:23.0.2")
expect(nativeImageOpt.graalvmArgs.exists(_.value == "--no-fallback"))
}
}

test("output") {
val output = "foo"
val inputs = TestInputs(
Expand Down
5 changes: 5 additions & 0 deletions modules/directives/src/main/scala/scala/build/preprocessing/directives/Packaging.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import scala.util.Try
@DirectiveExamples("//> using packaging.output foo")
@DirectiveExamples("//> using packaging.provided org.apache.spark::spark-sql")
@DirectiveExamples("//> using packaging.graalvmArgs --no-fallback")
@DirectiveExamples("//> using packaging.graalvmJvmId graalvm-community:23.0.2")
@DirectiveExamples("//> using packaging.dockerFrom openjdk:11")
@DirectiveExamples("//> using packaging.dockerImageTag 1.0.0")
@DirectiveExamples("//> using packaging.dockerImageRegistry virtuslab")
Expand Down Expand Up @@ -54,6 +55,8 @@ import scala.util.Try
|
|`//> using packaging.graalvmArgs` _args_
|
|`//> using packaging.graalvmJvmId` _graalvm-jvm-id_
|
|`//> using packaging.dockerFrom` _base-docker-image_
|
|`//> using packaging.dockerImageTag` _image-tag_
Expand All @@ -76,6 +79,7 @@ final case class Packaging(
output: Option[String] = None,
provided: List[Positioned[String]] = Nil,
graalvmArgs: List[Positioned[String]] = Nil,
graalvmJvmId: Option[String] = None,
dockerFrom: Option[String] = None,
dockerImageTag: Option[String] = None,
dockerImageRegistry: Option[String] = None,
Expand Down Expand Up @@ -158,6 +162,7 @@ final case class Packaging(
extraDirectories = extraDirectories
),
nativeImageOptions = NativeImageOptions(
graalvmJvmId = graalvmJvmId,
graalvmArgs = graalvmArgs
)
)
Expand Down
4 changes: 4 additions & 0 deletions website/docs/reference/directives.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,6 +290,8 @@ Set parameters for packaging

`//> using packaging.graalvmArgs` _args_

`//> using packaging.graalvmJvmId` _graalvm-jvm-id_

`//> using packaging.dockerFrom` _base-docker-image_

`//> using packaging.dockerImageTag` _image-tag_
Expand All @@ -314,6 +316,8 @@ Set parameters for packaging

`//> using packaging.graalvmArgs --no-fallback`

`//> using packaging.graalvmJvmId graalvm-community:23.0.2`

`//> using packaging.dockerFrom openjdk:11`

`//> using packaging.dockerImageTag 1.0.0`
Expand Down
Loading