Rename 'jvmArgs' -> 'jvmOptions'

com-lihaoyi · Mar 11, 2024 · 655dc4a · 655dc4a
1 parent d501901
commit 655dc4a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/contrib/docker/src/mill/contrib/docker/DockerModule.scala b/contrib/docker/src/mill/contrib/docker/DockerModule.scala
@@ -18,7 +18,7 @@ trait DockerModule { outer: JavaModule =>
     def labels: T[Map[String, String]] = Map.empty[String, String]
     def baseImage: T[String] = "gcr.io/distroless/java:latest"
     def pullBaseImage: T[Boolean] = T(baseImage().endsWith(":latest"))
-    def jvmArgs: T[Seq[String]] = Seq.empty[String]
+    def jvmOptions: T[Seq[String]] = Seq.empty[String]
 
     /**
      * TCP Ports the container will listen to at runtime.
@@ -114,7 +114,7 @@ trait DockerModule { outer: JavaModule =>
         if (user().isEmpty) "" else s"USER ${user()}"
       ).filter(_.nonEmpty).mkString(sys.props("line.separator"))
 
-      val quotedEntryPointArgs = (Seq("java") ++ jvmArgs() ++ Seq("-jar", s"/$jarName"))
+      val quotedEntryPointArgs = (Seq("java") ++ jvmOptions() ++ Seq("-jar", s"/$jarName"))
         .map(arg => s"\"$arg\"").mkString(", ")
 
       s"""

diff --git a/contrib/docker/test/src/mill/contrib/docker/DockerModuleTest.scala b/contrib/docker/test/src/mill/contrib/docker/DockerModuleTest.scala
@@ -37,9 +37,9 @@ object DockerModuleTest extends TestSuite {
       override def executable = testExecutable
     }
 
-    object dockerJvmArgs extends DockerConfig {
+    object dockerJvmOptions extends DockerConfig {
       override def executable = testExecutable
-      override def jvmArgs = Seq("-Xmx1024M")
+      override def jvmOptions = Seq("-Xmx1024M")
     }
   }
 
@@ -138,9 +138,9 @@ object DockerModuleTest extends TestSuite {
         assert(dockerfileStringRefined == expected)
       }
 
-      "extra jvm args" - {
+      "extra jvm options" - {
         val eval = new TestEvaluator(Docker)
-        val Right((dockerfileString, _)) = eval(Docker.dockerJvmArgs.dockerfile)
+        val Right((dockerfileString, _)) = eval(Docker.dockerJvmOptions.dockerfile)
         val expected = multineRegex.replaceAllIn(
           """
             |FROM gcr.io/distroless/java:latest