standardize naming of ScalaWorker/Api/Impl

8 files changed, 23 insertions, 23 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,
diff --git a/scalalib/worker/src/mill/scalalib/worker/ScalaWorker.scala b/scalalib/worker/src/mill/scalalib/worker/ScalaWorkerImpl.scala
index 98b40889..ebeb9561 100644
--- a/scalalib/worker/src/mill/scalalib/worker/ScalaWorker.scala
+++ b/scalalib/worker/src/mill/scalalib/worker/ScalaWorkerImpl.scala
@@ -24,8 +24,8 @@ case class MockedLookup(am: File => Optional[CompileAnalysis]) extends PerClassp
     Locate.definesClass(classpathEntry)
 }
 
-class ScalaWorker(ctx0: mill.util.Ctx,
-                  compilerBridgeClasspath: Array[String]) extends mill.scalalib.ScalaWorkerApi{
+class ScalaWorkerImpl(ctx0: mill.util.Ctx,
+                      compilerBridgeClasspath: Array[String]) extends mill.scalalib.ScalaWorkerApi{
   @volatile var compilersCache = Option.empty[(Long, Compilers)]
 
   /** Compile the bridge if it doesn't exist yet and return the output directory.
diff --git a/scalanativelib/src/mill/scalanativelib/ScalaNativeModule.scala b/scalanativelib/src/mill/scalanativelib/ScalaNativeModule.scala
index 2ede1e4c..b275e6e3 100644
--- a/scalanativelib/src/mill/scalanativelib/ScalaNativeModule.scala
+++ b/scalanativelib/src/mill/scalanativelib/ScalaNativeModule.scala
@@ -65,7 +65,7 @@ trait ScalaNativeModule extends ScalaModule { outer =>
       scalaNativeBinaryVersion()
   }
 
-  def bridge = T.task{ ScalaNativeBridge.scalaNativeBridge().bridge(bridgeFullClassPath()) }
+  def bridge = T.task{ ScalaNativeWorkerApi.scalaNativeBridge().bridge(bridgeFullClassPath()) }
 
   def scalaNativeBridgeClasspath = T {
     val snBridgeKey = "MILL_SCALANATIVE_BRIDGE_" + scalaNativeBinaryVersion().replace('.', '_').replace('-', '_')
diff --git a/scalanativelib/src/mill/scalanativelib/ScalaNativeBridge.scala b/scalanativelib/src/mill/scalanativelib/ScalaNativeWorkerApi.scala
index a7777fad..9489d7e4 100644
--- a/scalanativelib/src/mill/scalanativelib/ScalaNativeBridge.scala
+++ b/scalanativelib/src/mill/scalanativelib/ScalaNativeWorkerApi.scala
@@ -10,9 +10,9 @@ import sbt.testing.Framework
 
 
 class ScalaNativeWorker {
-  private var scalaInstanceCache = Option.empty[(Long, ScalaNativeBridge)]
+  private var scalaInstanceCache = Option.empty[(Long, ScalaNativeWorkerApi)]
 
-  def bridge(toolsClasspath: Agg[Path]): ScalaNativeBridge = {
+  def bridge(toolsClasspath: Agg[Path]): ScalaNativeWorkerApi = {
     val classloaderSig = toolsClasspath.map(p => p.toString().hashCode + p.mtime.toMillis).sum
     scalaInstanceCache match {
       case Some((sig, bridge)) if sig == classloaderSig => bridge
@@ -26,7 +26,7 @@ class ScalaNativeWorker {
             .loadClass("mill.scalanativelib.bridge.ScalaNativeBridge")
             .getDeclaredConstructor()
             .newInstance()
-            .asInstanceOf[ScalaNativeBridge]
+            .asInstanceOf[ScalaNativeWorkerApi]
           scalaInstanceCache = Some((classloaderSig, bridge))
           bridge
         }
@@ -43,7 +43,7 @@ class ScalaNativeWorker {
 // result wrapper to preserve some type safety
 case class NativeConfig(config: Any)
 
-trait ScalaNativeBridge {
+trait ScalaNativeWorkerApi {
   def discoverClang: Path
   def discoverClangPP: Path
   def discoverTarget(clang: Path, workDir: Path): String
@@ -71,7 +71,7 @@ trait ScalaNativeBridge {
                               logLevel: NativeLogLevel, envVars: Map[String, String]): Framework
 }
 
-object ScalaNativeBridge extends mill.define.ExternalModule {
+object ScalaNativeWorkerApi extends mill.define.ExternalModule {
   def scalaNativeBridge: Worker[ScalaNativeWorker] = T.worker { new ScalaNativeWorker() }
   lazy val millDiscover = Discover[this.type]
 }
diff --git a/scalanativelib/worker/0.3/src/mill/scalanativelib/bridge/ScalaNativeBridge.scala b/scalanativelib/worker/0.3/src/mill/scalanativelib/worker/ScalaNativeWorkerImpl.scala
index 268e18ac..7e93fbd4 100644
--- a/scalanativelib/worker/0.3/src/mill/scalanativelib/bridge/ScalaNativeBridge.scala
+++ b/scalanativelib/worker/0.3/src/mill/scalanativelib/worker/ScalaNativeWorkerImpl.scala
@@ -1,4 +1,4 @@
-package mill.scalanativelib.bridge
+package mill.scalanativelib.worker
 
 import java.io.File
 import java.lang.System.{err, out}
@@ -11,7 +11,7 @@ import sbt.testing.Framework
 import scala.scalanative.testinterface.ScalaNativeFramework
 
 
-class ScalaNativeBridge extends mill.scalanativelib.ScalaNativeBridge {
+class ScalaNativeWorkerImpl extends mill.scalanativelib.ScalaNativeWorkerApi {
   def logger(level: NativeLogLevel) =
     Logger(
       debugFn = msg => if (level >= NativeLogLevel.Debug) out.println(msg),