Merge pull request #10654 from rtyley/allow-java-output-version-flag

Allow `-java-output-version` flag, matching Scala 3
scala · Jan 13, 2024 · 4deab53 · 4deab53
2 parents 288bc58 + 23ba51b
commit 4deab53
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/compiler/scala/tools/nsc/settings/StandardScalaSettings.scala b/src/compiler/scala/tools/nsc/settings/StandardScalaSettings.scala
@@ -78,7 +78,7 @@ trait StandardScalaSettings { _: MutableSettings =>
         //target.value = setting.value  // this would trigger deprecation
       }
       .withAbbreviation("--release")
-      // .withAbbreviation("-java-output-version")
+      .withAbbreviation("-java-output-version")
   def releaseValue: Option[String] = release.valueSetByUser
   val target =
     ChoiceSetting("-target", "target", "Target platform for object files.", AllTargetVersions, "8")
@@ -89,7 +89,7 @@ trait StandardScalaSettings { _: MutableSettings =>
       .withAbbreviation("--target")
       // .withAbbreviation("--Xtarget")
       // .withAbbreviation("-Xtarget")
-      // .withAbbreviation("-Xunchecked-java-output-version")
+      .withAbbreviation("-Xunchecked-java-output-version")
       .withDeprecationMessage("Use -release instead to compile against the correct platform API.")
   def targetValue: String = target.valueSetByUser.orElse(releaseValue).getOrElse(target.value)
   val unchecked =      BooleanSetting ("-unchecked", "Enable additional warnings where generated code depends on assumptions. See also -Wconf.") withAbbreviation "--unchecked" withPostSetHook { s =>