Skip to content

Commit 628ae98

Browse files
authored
Make -usejavacp a private setting as -Yusejavacp (#24304)
as per #24247 (comment): - the `usejavacp` setting would now be `Yusejavacp` (a fork setting, rather than root) - old API (`-usejavacp`/`--usejavacp`/`--use-java-class-path`) would be preserved as aliases
1 parent 5a2cff6 commit 628ae98

File tree

5 files changed

+8
-6
lines changed

5 files changed

+8
-6
lines changed

compiler/src/dotty/tools/dotc/config/PathResolver.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ class PathResolver(using c: Context) {
194194
*/
195195
object Calculated {
196196
def scalaHome: String = Defaults.scalaHome
197-
def useJavaClassPath: Boolean = settings.usejavacp.value || Defaults.useJavaClassPath
197+
def useJavaClassPath: Boolean = settings.Yusejavacp.value || Defaults.useJavaClassPath
198198
def javaBootClassPath: String = cmdLineOrElse("javabootclasspath", Defaults.javaBootClassPath)
199199
def javaExtDirs: String = cmdLineOrElse("javaextdirs", Defaults.javaExtDirs)
200200
def javaUserClassPath: String = if (useJavaClassPath) Defaults.javaUserClassPath else ""

compiler/src/dotty/tools/dotc/config/ScalaSettings.scala

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,10 +124,12 @@ trait CommonScalaSettings:
124124

125125
/* Other settings */
126126
val encoding: Setting[String] = StringSetting(RootSetting, "encoding", "encoding", "Specify character encoding used by source files.", Properties.sourceEncoding, aliases = List("--encoding"))
127-
val usejavacp: Setting[Boolean] = BooleanSetting(RootSetting, "usejavacp", "Utilize the java.class.path in classpath resolution.", aliases = List("--use-java-class-path"))
128127
val scalajs: Setting[Boolean] = BooleanSetting(RootSetting, "scalajs", "Compile in Scala.js mode (requires scalajs-library.jar on the classpath).", aliases = List("--scalajs"))
129128
val replInitScript: Setting[String] = StringSetting(RootSetting, "repl-init-script", "code", "The code will be run on REPL startup.", "", aliases = List("--repl-init-script"))
130129
val replQuitAfterInit: Setting[Boolean] = BooleanSetting(RootSetting, "repl-quit-after-init", "Quit REPL after evaluating the init script.", aliases = List("--repl-quit-after-init"))
130+
131+
/* YSettings shared with scaladoc */
132+
val Yusejavacp: Setting[Boolean] = BooleanSetting(ForkSetting, "Yusejavacp", "Utilize the java.class.path in classpath resolution.", aliases = List("--use-java-class-path", "-usejavacp", "--usejavacp"))
131133
end CommonScalaSettings
132134

133135
/** -P "plugin" settings. Various tools might support plugins. */

compiler/test/dotty/tools/dotc/classpath/MultiReleaseJarTest.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ class MultiReleaseJarTest extends dotty.tools.backend.jvm.DottyBytecodeTest {
3838

3939
def apiMethods(jarPath: Path, release: String): Set[String] = {
4040
given ctx: Context = initCtx.fresh
41-
ctx.settings.usejavacp.update(true)
41+
ctx.settings.Yusejavacp.update(true)
4242
ctx.settings.classpath.update(jarPath.toAbsolutePath.toString)
4343
ctx.settings.javaOutputVersion.update(release)
4444
ctx.initialize()
@@ -76,7 +76,7 @@ class MultiReleaseJarTest extends dotty.tools.backend.jvm.DottyBytecodeTest {
7676

7777
def classExists(className: String, release: String): Boolean = {
7878
given ctx: Context = initCtx.fresh
79-
ctx.settings.usejavacp.update(true)
79+
ctx.settings.Yusejavacp.update(true)
8080
ctx.settings.javaOutputVersion.update(release)
8181
ctx.initialize()
8282
val classFile = ctx.platform.classPath.findClassFile(className)

scaladoc/test/dotty/tools/scaladoc/snippets/SnippetCompilerTest.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import dotty.tools.io.{AbstractFile, VirtualDirectory}
77

88
class SnippetCompilerTest {
99
val compiler = SnippetCompiler(
10-
Seq(SnippetCompilerSetting(testContext.settings.usejavacp, true))
10+
Seq(SnippetCompilerSetting(testContext.settings.Yusejavacp, true))
1111
)
1212
def wrapFn: String => WrappedSnippet = (str: String) => WrappedSnippet(
1313
str,

scaladoc/test/dotty/tools/scaladoc/testUtils.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ def testArgs(files: Seq[File] = Nil, dest: File = new File("notUsed")) = Scalado
6060

6161
def testContext =
6262
val ctx = (new ContextBase).initialCtx.fresh.setReporter(new TestReporter)
63-
ctx.setSetting(ctx.settings.usejavacp, true)
63+
ctx.setSetting(ctx.settings.Yusejavacp, true)
6464
ctx
6565

6666
def testDocContext(files: Seq[File] = Nil) = DocContext(testArgs(files), testContext)

0 commit comments

Comments
 (0)