Skip to content

Commit bf2bd78

Browse files
committed
Unify the parameter names of external JS env constructors.
They all standardize on `executable`, `args` en `env`, which are the names used by the `Initialize` constructors in `ScalaJSPlugin`.
1 parent c1f2bfe commit bf2bd78

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

js-envs/src/main/scala/org/scalajs/jsenv/phantomjs/PhantomJSEnv.scala

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,17 +29,19 @@ import scala.concurrent.{ExecutionContext, TimeoutException, Future}
2929
import scala.concurrent.duration.Duration
3030

3131
class PhantomJSEnv(
32-
phantomjsPath: String = "phantomjs",
33-
addArgs: Seq[String] = Seq.empty,
34-
addEnv: Map[String, String] = Map.empty,
32+
@deprecatedName('phantomjsPath)
33+
protected val executable: String = "phantomjs",
34+
@deprecatedName('addArgs)
35+
args: Seq[String] = Seq.empty,
36+
@deprecatedName('addEnv)
37+
env: Map[String, String] = Map.empty,
3538
val autoExit: Boolean = true,
3639
jettyClassLoader: ClassLoader = null
37-
) extends ExternalJSEnv(addArgs, addEnv) with ComJSEnv {
40+
) extends ExternalJSEnv(args, env) with ComJSEnv {
3841

3942
import PhantomJSEnv._
4043

4144
protected def vmName: String = "PhantomJS"
42-
protected def executable: String = phantomjsPath
4345

4446
override def jsRunner(libs: Seq[ResolvedJSDependency],
4547
code: VirtualJSFile): JSRunner = {

0 commit comments

Comments
 (0)