standardize naming of ScalaWorker/Api/Impl

3 files changed, 8 insertions, 8 deletions

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),