standardize more worker terminology

4 files changed, 32 insertions, 32 deletions

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]
 }
diff --git a/scalanativelib/src/mill/scalanativelib/ScalaNativeModule.scala b/scalanativelib/src/mill/scalanativelib/ScalaNativeModule.scala
index b636f1b4..5e4fc471 100644
--- a/scalanativelib/src/mill/scalanativelib/ScalaNativeModule.scala
+++ b/scalanativelib/src/mill/scalanativelib/ScalaNativeModule.scala
@@ -65,13 +65,13 @@ trait ScalaNativeModule extends ScalaModule { outer =>
       scalaNativeBinaryVersion()
   }
 
-  def bridge = T.task{ ScalaNativeWorkerApi.scalaNativeBridge().bridge(bridgeFullClassPath()) }
+  def scalaNativeWorker = T.task{ ScalaNativeWorkerApi.scalaNativeWorker().impl(bridgeFullClassPath()) }
 
-  def scalaNativeBridgeClasspath = T {
-    val snBridgeKey = "MILL_SCALANATIVE_WORKER_" + scalaNativeBinaryVersion().replace('.', '_').replace('-', '_')
-    val snBridgePath = sys.props(snBridgeKey)
-    if (snBridgePath != null)
-      Result.Success(Agg(snBridgePath.split(',').map(p => PathRef(Path(p), quick = true)): _*))
+  def scalaNativeWorkerClasspath = T {
+    val workerKey = "MILL_SCALANATIVE_WORKER_" + scalaNativeBinaryVersion().replace('.', '_').replace('-', '_')
+    val workerPath = sys.props(workerKey)
+    if (workerPath != null)
+      Result.Success(Agg(workerPath.split(',').map(p => PathRef(Path(p), quick = true)): _*))
     else
       Lib.resolveDependencies(
         Seq(Cache.ivy2Local, MavenRepository("https://repo1.maven.org/maven2")),
@@ -108,7 +108,7 @@ trait ScalaNativeModule extends ScalaModule { outer =>
       Seq(Cache.ivy2Local, MavenRepository("https://repo1.maven.org/maven2")),
       Lib.depToDependency(_, scalaVersion(), platformSuffix()),
       toolsIvyDeps()
-    ).map(t => (scalaNativeBridgeClasspath().toSeq ++ t.toSeq).map(_.path))
+    ).map(t => (scalaNativeWorkerClasspath().toSeq ++ t.toSeq).map(_.path))
   }
 
   override def scalacPluginIvyDeps = super.scalacPluginIvyDeps() ++
@@ -121,24 +121,24 @@ trait ScalaNativeModule extends ScalaModule { outer =>
   def nativeWorkdir = T{ T.ctx().dest }
 
   // Location of the clang compiler
-  def nativeClang = T{ bridge().discoverClang }
+  def nativeClang = T{ scalaNativeWorker().discoverClang }
 
   // Location of the clang++ compiler
-  def nativeClangPP = T{ bridge().discoverClangPP }
+  def nativeClangPP = T{ scalaNativeWorker().discoverClangPP }
 
   // GC choice, either "none", "boehm" or "immix"
   def nativeGC = T{
     Option(System.getenv.get("SCALANATIVE_GC"))
-      .getOrElse(bridge().defaultGarbageCollector)
+      .getOrElse(scalaNativeWorker().defaultGarbageCollector)
   }
 
-  def nativeTarget = T{ bridge().discoverTarget(nativeClang(), nativeWorkdir()) }
+  def nativeTarget = T{ scalaNativeWorker().discoverTarget(nativeClang(), nativeWorkdir()) }
 
   // Options that are passed to clang during compilation
-  def nativeCompileOptions = T{ bridge().discoverCompileOptions }
+  def nativeCompileOptions = T{ scalaNativeWorker().discoverCompileOptions }
 
   // Options that are passed to clang during linking
-  def nativeLinkingOptions = T{ bridge().discoverLinkingOptions }
+  def nativeLinkingOptions = T{ scalaNativeWorker().discoverLinkingOptions }
 
   // Whether to link `@stub` methods, or ignore them
   def nativeLinkStubs = T { false }
@@ -154,7 +154,7 @@ trait ScalaNativeModule extends ScalaModule { outer =>
   def nativeConfig = T.task {
     val classpath = runClasspath().map(_.path).filter(_.toIO.exists).toList
 
-    bridge().config(
+    scalaNativeWorker().config(
       nativeLibJar().path,
       finalMainClass(),
       classpath,
@@ -171,7 +171,7 @@ trait ScalaNativeModule extends ScalaModule { outer =>
   }
 
   // Generates native binary
-  def nativeLink = T{ bridge().nativeLink(nativeConfig(), (T.ctx().dest / 'out)) }
+  def nativeLink = T{ scalaNativeWorker().nativeLink(nativeConfig(), (T.ctx().dest / 'out)) }
 
   // Runs the native binary
   override def run(args: String*) = T.command{
@@ -204,7 +204,7 @@ trait TestScalaNativeModule extends ScalaNativeModule with TestModule { testOute
 
     val nativeFrameworks = (cl: ClassLoader) =>
       frameworkInstances.zipWithIndex.map { case (f, id) =>
-        bridge().newScalaNativeFrameWork(f, id, testBinary, logLevel(), envVars)
+        scalaNativeWorker().newScalaNativeFrameWork(f, id, testBinary, logLevel(), envVars)
       }
 
     val (doneMsg, results) = TestRunner.runTests(
diff --git a/scalanativelib/src/mill/scalanativelib/ScalaNativeWorkerApi.scala b/scalanativelib/src/mill/scalanativelib/ScalaNativeWorkerApi.scala
index 9489d7e4..cbbd5de6 100644
--- a/scalanativelib/src/mill/scalanativelib/ScalaNativeWorkerApi.scala
+++ b/scalanativelib/src/mill/scalanativelib/ScalaNativeWorkerApi.scala
@@ -12,7 +12,7 @@ import sbt.testing.Framework
 class ScalaNativeWorker {
   private var scalaInstanceCache = Option.empty[(Long, ScalaNativeWorkerApi)]
 
-  def bridge(toolsClasspath: Agg[Path]): ScalaNativeWorkerApi = {
+  def impl(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
@@ -23,7 +23,7 @@ class ScalaNativeWorker {
         )
         try {
           val bridge = cl
-            .loadClass("mill.scalanativelib.bridge.ScalaNativeBridge")
+            .loadClass("mill.scalanativelib.bridge.ScalaNativeWorker")
             .getDeclaredConstructor()
             .newInstance()
             .asInstanceOf[ScalaNativeWorkerApi]
@@ -72,6 +72,6 @@ trait ScalaNativeWorkerApi {
 }
 
 object ScalaNativeWorkerApi extends mill.define.ExternalModule {
-  def scalaNativeBridge: Worker[ScalaNativeWorker] = T.worker { new ScalaNativeWorker() }
+  def scalaNativeWorker: Worker[ScalaNativeWorker] = T.worker { new ScalaNativeWorker() }
   lazy val millDiscover = Discover[this.type]
 }