Use JVM11 in the native packager

VirtusLab · Nov 25, 2021 · 4284c72 · 4284c72
1 parent 7af0c14
commit 4284c72
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/modules/cli/src/main/scala/scala/cli/commands/Package.scala b/modules/cli/src/main/scala/scala/cli/commands/Package.scala
@@ -352,7 +352,7 @@ object Package extends ScalaCommand[PackageOptions] {
     }
     val from = build.options.packageOptions.dockerOptions.from.getOrElse {
       build.options.platform match {
-        case Platform.JVM    => "openjdk:8-jre-slim"
+        case Platform.JVM    => "openjdk:11-jre-slim"
         case Platform.JS     => "node"
         case Platform.Native => "debian:stable-slim"
       }

diff --git a/modules/integration/src/test/scala/scala/cli/integration/NativePackagerTests.scala b/modules/integration/src/test/scala/scala/cli/integration/NativePackagerTests.scala
@@ -214,7 +214,7 @@ class NativePackagerTests extends munit.FunSuite {
       // format: off
       val cmd = Seq[os.Shellable](
         TestUtil.cli,
-        "package", "--jvm", "8", helloWorldFileName,
+        "package", helloWorldFileName,
         "--docker",
         "--docker-image-repository", imageRepository,
         "--docker-image-tag", imageTag

diff --git a/website/docs/commands/package.md b/website/docs/commands/package.md
@@ -35,7 +35,7 @@ scala-cli package Hello.scala -o hello
 # Hello
 ```
 
-<!-- Expected
+<!-- Expected 
 Hello
 -->
 
@@ -114,7 +114,7 @@ The docker image name parameter `--docker-image-repository` is mandatory.
 The following command generates a `hello-docker` image with the `latest` tag:
 
 ```bash
-scala-cli package --jvm 8 --docker HelloDocker.scala --docker-image-repository hello-docker
+scala-cli package --docker HelloDocker.scala --docker-image-repository hello-docker
 ```
 
 <!-- Expected:
@@ -280,7 +280,7 @@ scala-cli package --rpm --output 'path.rpm' Hello.scala
 ### macOS (PKG)
 
 PKG is the software package format for macOs.
-To build a PKG you will need to have [`pkgbuild`](https://www.unix.com/man-page/osx/1/pkgbuild/) installed.
+To build a PKG you will need to have [`pkgbuild`](https://www.unix.com/man-page/osx/1/pkgbuild/) installed. 
 
 Example: