standardize naming of ScalaWorker/Api/Impl

4 files changed, 13 insertions, 13 deletions

diff --git a/scalajslib/src/mill/scalajslib/ScalaJSModule.scala b/scalajslib/src/mill/scalajslib/ScalaJSModule.scala
index 8f0e7da9..b3737da1 100644
--- a/scalajslib/src/mill/scalajslib/ScalaJSModule.scala
+++ b/scalajslib/src/mill/scalajslib/ScalaJSModule.scala
@@ -56,7 +56,7 @@ trait ScalaJSModule extends scalalib.ScalaModule { outer =>
 
   def fastOpt = T {
     link(
-      ScalaJSBridge.scalaJSBridge(),
+      ScalaJSWorkerApi.scalaJSBridge(),
       toolsClasspath(),
       runClasspath(),
       finalMainClassOpt().toOption,
@@ -67,7 +67,7 @@ trait ScalaJSModule extends scalalib.ScalaModule { outer =>
 
   def fullOpt = T {
     link(
-      ScalaJSBridge.scalaJSBridge(),
+      ScalaJSWorkerApi.scalaJSBridge(),
       toolsClasspath(),
       runClasspath(),
       finalMainClassOpt().toOption,
@@ -82,7 +82,7 @@ trait ScalaJSModule extends scalalib.ScalaModule { outer =>
     finalMainClassOpt() match{
       case Left(err) => Result.Failure(err)
       case Right(_) =>
-        ScalaJSBridge.scalaJSBridge().run(
+        ScalaJSWorkerApi.scalaJSBridge().run(
           toolsClasspath().map(_.path),
           nodeJSConfig(),
           fastOpt().path.toIO
@@ -164,7 +164,7 @@ trait TestScalaJSModule extends ScalaJSModule with TestModule {
 
   def fastOptTest = T {
     link(
-      ScalaJSBridge.scalaJSBridge(),
+      ScalaJSWorkerApi.scalaJSBridge(),
       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.ScalaJSBridge.scalaJSBridge().getFramework(
+    val (close, framework) = mill.scalajslib.ScalaJSWorkerApi.scalaJSBridge().getFramework(
         toolsClasspath().map(_.path),
         nodeJSConfig(),
         testFrameworks().head,
diff --git a/scalajslib/src/mill/scalajslib/ScalaJSBridge.scala b/scalajslib/src/mill/scalajslib/ScalaJSWorkerApi.scala
index c9947e88..e8239e8f 100644
--- a/scalajslib/src/mill/scalajslib/ScalaJSBridge.scala
+++ b/scalajslib/src/mill/scalajslib/ScalaJSWorkerApi.scala
@@ -21,7 +21,7 @@ object ModuleKind{
 }
 
 class ScalaJSWorker {
-  private var scalaInstanceCache = Option.empty[(Long, ScalaJSBridge)]
+  private var scalaInstanceCache = Option.empty[(Long, ScalaJSWorkerApi)]
 
   private def bridge(toolsClasspath: Agg[Path])
                     (implicit ctx: Ctx.Home) = {
@@ -38,7 +38,7 @@ class ScalaJSWorker {
           .loadClass("mill.scalajslib.bridge.ScalaJSBridge")
           .getDeclaredConstructor()
           .newInstance()
-          .asInstanceOf[ScalaJSBridge]
+          .asInstanceOf[ScalaJSWorkerApi]
         scalaInstanceCache = Some((classloaderSig, bridge))
         bridge
     }
@@ -77,7 +77,7 @@ class ScalaJSWorker {
 
 }
 
-trait ScalaJSBridge {
+trait ScalaJSWorkerApi {
   def link(sources: Array[File],
            libraries: Array[File],
            dest: File,
@@ -93,7 +93,7 @@ trait ScalaJSBridge {
 
 }
 
-object ScalaJSBridge extends mill.define.ExternalModule {
+object ScalaJSWorkerApi extends mill.define.ExternalModule {
 
   def scalaJSBridge = T.worker { new ScalaJSWorker() }
   lazy val millDiscover = Discover[this.type]
diff --git a/scalajslib/worker/0.6/src/mill/scalajslib/bridge/ScalaJSBridge.scala b/scalajslib/worker/0.6/src/mill/scalajslib/worker/ScalaJSWorkerImpl.scala
index 6f14db19..7c30ece9 100644
--- a/scalajslib/worker/0.6/src/mill/scalajslib/bridge/ScalaJSBridge.scala
+++ b/scalajslib/worker/0.6/src/mill/scalajslib/worker/ScalaJSWorkerImpl.scala
@@ -1,6 +1,6 @@
 package mill
 package scalajslib
-package bridge
+package worker
 
 import java.io.File
 
@@ -14,7 +14,7 @@ import org.scalajs.jsenv._
 import org.scalajs.jsenv.nodejs._
 import org.scalajs.testadapter.TestAdapter
 
-class ScalaJSBridge extends mill.scalajslib.ScalaJSBridge {
+class ScalaJSWorkerImpl extends mill.scalajslib.ScalaJSWorkerApi {
   def link(sources: Array[File],
            libraries: Array[File],
            dest: File,
diff --git a/scalajslib/worker/1.0/src/mill/scalajslib/bridge/ScalaJSBridge.scala b/scalajslib/worker/1.0/src/mill/scalajslib/worker/ScalaJSWorkerImpl.scala
index 534d45bf..45795271 100644
--- a/scalajslib/worker/1.0/src/mill/scalajslib/bridge/ScalaJSBridge.scala
+++ b/scalajslib/worker/1.0/src/mill/scalajslib/worker/ScalaJSWorkerImpl.scala
@@ -1,6 +1,6 @@
 package mill
 package scalajslib
-package bridge
+package worker
 
 import java.io.File
 
@@ -12,7 +12,7 @@ import org.scalajs.jsenv.ConsoleJSConsole
 import org.scalajs.jsenv.nodejs._
 import org.scalajs.testadapter.TestAdapter
 
-class ScalaJSBridge extends mill.scalajslib.ScalaJSBridge {
+class ScalaJSWorkerImpl extends mill.scalajslib.ScalaJSWorkerApi {
   def link(sources: Array[File],
            libraries: Array[File],
            dest: File,