From 241193ff6a581c7217be9f732e21731e87c25697 Mon Sep 17 00:00:00 2001
From: Li Haoyi <haoyi.sg@gmail.com>
Date: Wed, 22 Aug 2018 21:25:36 +0800
Subject: standardize more worker terminology

---
 scalajslib/src/mill/scalajslib/ScalaJSModule.scala | 22 +++++++++++-----------
 .../src/mill/scalajslib/ScalaJSWorkerApi.scala     |  4 ++--
 2 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'scalajslib')

diff --git a/scalajslib/src/mill/scalajslib/ScalaJSModule.scala b/scalajslib/src/mill/scalajslib/ScalaJSModule.scala
index 803543c7..efa4dfe0 100644
--- a/scalajslib/src/mill/scalajslib/ScalaJSModule.scala
+++ b/scalajslib/src/mill/scalajslib/ScalaJSModule.scala
@@ -24,13 +24,13 @@ trait ScalaJSModule extends scalalib.ScalaModule { outer =>
 
   def scalaJSBinaryVersion = T { Lib.scalaBinaryVersion(scalaJSVersion()) }
 
-  def scalaJSBridgeVersion = T{ scalaJSVersion().split('.').dropRight(1).mkString(".") }
+  def scalaJSWorkerVersion = T{ scalaJSVersion().split('.').dropRight(1).mkString(".") }
 
-  def sjsBridgeClasspath = T {
-    val jsBridgeKey = "MILL_SCALAJS_WORKER_" + scalaJSBridgeVersion().replace('.', '_')
+  def scalaJSWorkerClasspath = T {
+    val workerKey = "MILL_SCALAJS_WORKER_" + scalaJSWorkerVersion().replace('.', '_')
     mill.modules.Util.millProjectModule(
-      jsBridgeKey,
-      s"mill-scalajslib-worker-${scalaJSBridgeVersion()}",
+      workerKey,
+      s"mill-scalajslib-worker-${scalaJSWorkerVersion()}",
       repositories,
       resolveFilter = _.toString.contains("mill-scalajslib-worker")
     )
@@ -52,11 +52,11 @@ trait ScalaJSModule extends scalalib.ScalaModule { outer =>
     )
   }
 
-  def toolsClasspath = T { sjsBridgeClasspath() ++ scalaJSLinkerClasspath() }
+  def toolsClasspath = T { scalaJSWorkerClasspath() ++ scalaJSLinkerClasspath() }
 
   def fastOpt = T {
     link(
-      ScalaJSWorkerApi.scalaJSBridge(),
+      ScalaJSWorkerApi.scalaJSWorker(),
       toolsClasspath(),
       runClasspath(),
       finalMainClassOpt().toOption,
@@ -67,7 +67,7 @@ trait ScalaJSModule extends scalalib.ScalaModule { outer =>
 
   def fullOpt = T {
     link(
-      ScalaJSWorkerApi.scalaJSBridge(),
+      ScalaJSWorkerApi.scalaJSWorker(),
       toolsClasspath(),
       runClasspath(),
       finalMainClassOpt().toOption,
@@ -82,7 +82,7 @@ trait ScalaJSModule extends scalalib.ScalaModule { outer =>
     finalMainClassOpt() match{
       case Left(err) => Result.Failure(err)
       case Right(_) =>
-        ScalaJSWorkerApi.scalaJSBridge().run(
+        ScalaJSWorkerApi.scalaJSWorker().run(
           toolsClasspath().map(_.path),
           nodeJSConfig(),
           fastOpt().path.toIO
@@ -164,7 +164,7 @@ trait TestScalaJSModule extends ScalaJSModule with TestModule {
 
   def fastOptTest = T {
     link(
-      ScalaJSWorkerApi.scalaJSBridge(),
+      ScalaJSWorkerApi.scalaJSWorker(),
       toolsClasspath(),
       scalaJSTestDeps() ++ runClasspath(),
       None,
@@ -176,7 +176,7 @@ trait TestScalaJSModule extends ScalaJSModule with TestModule {
   override def testLocal(args: String*) = T.command { test(args:_*) }
 
   override def test(args: String*) = T.command {
-    val (close, framework) = mill.scalajslib.ScalaJSWorkerApi.scalaJSBridge().getFramework(
+    val (close, framework) = mill.scalajslib.ScalaJSWorkerApi.scalaJSWorker().getFramework(
         toolsClasspath().map(_.path),
         nodeJSConfig(),
         testFrameworks().head,
diff --git a/scalajslib/src/mill/scalajslib/ScalaJSWorkerApi.scala b/scalajslib/src/mill/scalajslib/ScalaJSWorkerApi.scala
index e8239e8f..3f83229d 100644
--- a/scalajslib/src/mill/scalajslib/ScalaJSWorkerApi.scala
+++ b/scalajslib/src/mill/scalajslib/ScalaJSWorkerApi.scala
@@ -35,7 +35,7 @@ class ScalaJSWorker {
           getClass.getClassLoader
         )
         val bridge = cl
-          .loadClass("mill.scalajslib.bridge.ScalaJSBridge")
+          .loadClass("mill.scalajslib.bridge.ScalaJSWorker")
           .getDeclaredConstructor()
           .newInstance()
           .asInstanceOf[ScalaJSWorkerApi]
@@ -95,6 +95,6 @@ trait ScalaJSWorkerApi {
 
 object ScalaJSWorkerApi extends mill.define.ExternalModule {
 
-  def scalaJSBridge = T.worker { new ScalaJSWorker() }
+  def scalaJSWorker = T.worker { new ScalaJSWorker() }
   lazy val millDiscover = Discover[this.type]
 }
-- 
cgit v1.2.3