mirror of https://github.com/sbt/sbt.git
[2.0.x] fix: Remove will-be-ignored warning (#9144)
**Problem** run warns about jvm option not being applied, but it is applied for client-side run. **Solution** Remove the warning.
This commit is contained in:
parent
cecf8bd6c2
commit
ec497c38ca
|
|
@ -2006,20 +2006,6 @@ object Defaults extends BuildCommon {
|
||||||
s.log.debug(s"javaOptions: $options")
|
s.log.debug(s"javaOptions: $options")
|
||||||
new ForkRun(opts)
|
new ForkRun(opts)
|
||||||
} else {
|
} else {
|
||||||
if (options.nonEmpty) {
|
|
||||||
val mask = ScopeMask(project = false)
|
|
||||||
val showJavaOptions = Scope.displayMasked(
|
|
||||||
(resolvedScope / javaOptions).scopedKey.scope,
|
|
||||||
(resolvedScope / javaOptions).key.label,
|
|
||||||
mask
|
|
||||||
)
|
|
||||||
val showFork = Scope.displayMasked(
|
|
||||||
(resolvedScope / fork).scopedKey.scope,
|
|
||||||
(resolvedScope / fork).key.label,
|
|
||||||
mask
|
|
||||||
)
|
|
||||||
s.log.warn(s"$showJavaOptions will be ignored, $showFork is set to false")
|
|
||||||
}
|
|
||||||
new Run(si, trap, tmp)
|
new Run(si, trap, tmp)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -95,21 +95,6 @@ private[sbt] object ClassLoaders {
|
||||||
val s = streams.value
|
val s = streams.value
|
||||||
val opts = forkOptions.value
|
val opts = forkOptions.value
|
||||||
val options = javaOptions.value
|
val options = javaOptions.value
|
||||||
|
|
||||||
if options.nonEmpty then
|
|
||||||
val mask = ScopeMask(project = false)
|
|
||||||
val showJavaOptions = Scope.displayMasked(
|
|
||||||
(resolvedScope / javaOptions).scopedKey.scope,
|
|
||||||
(resolvedScope / javaOptions).key.label,
|
|
||||||
mask
|
|
||||||
)
|
|
||||||
val showFork = Scope.displayMasked(
|
|
||||||
(resolvedScope / fork).scopedKey.scope,
|
|
||||||
(resolvedScope / fork).key.label,
|
|
||||||
mask
|
|
||||||
)
|
|
||||||
s.log.warn(s"$showJavaOptions will be ignored, $showFork is set to false")
|
|
||||||
|
|
||||||
val exclude = dependencyJars(exportedProducts).value
|
val exclude = dependencyJars(exportedProducts).value
|
||||||
.map(converter.toPath)
|
.map(converter.toPath)
|
||||||
.map(_.toFile)
|
.map(_.toFile)
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue