Replaced deprecated symbols with strings (#1329)

Pull request: #1329
com-lihaoyi · May 21, 2021 · 5a62e25 · 5a62e25
1 parent bf96a10
commit 5a62e25
Show file tree

Hide file tree

Showing 49 changed files with 206 additions and 206 deletions.
diff --git a/contrib/bloop/test/src/mill/contrib/bloop/BloopTests.scala b/contrib/bloop/test/src/mill/contrib/bloop/BloopTests.scala
@@ -15,7 +15,7 @@ import bloop.config.Config.Platform.Jvm
 object BloopTests extends TestSuite {
   import BloopFormats._
 
-  val workdir = os.pwd / 'target / 'workspace / "bloop"
+  val workdir = os.pwd / "target" / "workspace" / "bloop"
   val testEvaluator = TestEvaluator.static(build)
   val testBloop = new BloopImpl(() => testEvaluator.evaluator, workdir)
 
@@ -70,7 +70,7 @@ object BloopTests extends TestSuite {
       .get
 
   def tests: Tests = Tests {
-    'genBloopTests - {
+    "genBloopTests" - {
 
       testEvaluator(testBloop.install())
       val scalaModuleConfig = readBloopConf("scalaModule.json")
@@ -80,7 +80,7 @@ object BloopTests extends TestSuite {
       // skipped on Windows
       val scalanativeModuleConfig = if(scala.util.Properties.isWin) None else Some(readBloopConf("scalanativeModule.json"))
 
-      'scalaModule - {
+      "scalaModule" - {
         val p = scalaModuleConfig.project
         val name = p.name
         val workspaceDir = p.workspaceDir
@@ -110,7 +110,7 @@ object BloopTests extends TestSuite {
         assert(artifacts.map(_.name).distinct == List("bloop-config_2.12"))
         assert(artifacts.flatMap(_.classifier).contains("sources"))
       }
-      'scalaModuleTest - {
+      "scalaModuleTest" - {
         val p = testModuleConfig.project
         val name = p.name
         val workspaceDir = p.workspaceDir
@@ -125,16 +125,16 @@ object BloopTests extends TestSuite {
         assert(dep == "scalaModule")
         assert(mainModuleClasspath.forall(p.classpath.contains))
       }
-      'configAccessTest - {
+      "configAccessTest" - {
         val (accessedConfig, _) =
           testEvaluator(build.scalaModule.bloop.config).asSuccess.get.value.right.get
         assert(accessedConfig == scalaModuleConfig)
       }
-      'noDepTest - {
+      "noDepTest" - {
         val cp = scalaModule2Config.project.classpath.map(_.toString)
         assert(cp.exists(_.contains("scala-library-2.12.8")))
       }
-      'scalajsModule - {
+      "scalajsModule" - {
         val p = scalajsModuleConfig.project
         val name = p.name
         val workspaceDir = p.workspaceDir
@@ -150,7 +150,7 @@ object BloopTests extends TestSuite {
         assert(platform.config.kind == BloopConfig.ModuleKindJS.CommonJSModule)
         assert(platform.config.mode == BloopConfig.LinkerMode.Release)
       }
-      'scalanativeModule - {
+    "scalanativeModule" - {
         scalanativeModuleConfig match {
           case None =>
             val exists = os.exists(workdir / ".bloop" / "scalanativeModule.json")
@@ -173,7 +173,7 @@ object BloopTests extends TestSuite {
             assert(platform.config.clang == clang.toNIO)
         }
       }
-      'skipped - {
+      "skipped" - {
         val exists = os.exists(workdir / ".bloop" / "skippedModule.json")
         assert(exists == false)
       }

diff --git a/contrib/buildinfo/test/src/BuildInfoTests.scala b/contrib/buildinfo/test/src/BuildInfoTests.scala
@@ -43,7 +43,7 @@ object BuildInfoTests extends TestSuite {
   }
 
   val testModuleSourcesPath
-    : Path = os.pwd / 'contrib / 'buildinfo / 'test / 'resources / "buildinfo"
+    : Path = os.pwd / "contrib" / "buildinfo" / "test" / "resources" / "buildinfo"
 
   def workspaceTest[T](m: TestUtil.BaseModule)(t: TestEvaluator => T)(
       implicit tp: TestPath): T = {
@@ -57,8 +57,8 @@ object BuildInfoTests extends TestSuite {
 
   def tests: Tests = Tests {
 
-    'buildinfo - {
-      'createSourcefile - workspaceTest(BuildInfo) { eval =>
+    "buildinfo" - {
+      "createSourcefile" - workspaceTest(BuildInfo) { eval =>
         val expected =
           s"""|
               |object BuildInfo {
@@ -70,23 +70,23 @@ object BuildInfoTests extends TestSuite {
         val Right(((result, _), evalCount)) =
           eval.apply(BuildInfo.generatedBuildInfo)
         assert(
-          result.head.path == eval.outPath / 'generatedBuildInfo / 'dest / "BuildInfo.scala" &&
+          result.head.path == eval.outPath / "generatedBuildInfo" / "dest" / "BuildInfo.scala" &&
             os.exists(result.head.path) &&
             os.read(result.head.path) == expected
         )
       }
 
-      'notCreateEmptySourcefile - workspaceTest(EmptyBuildInfo) { eval =>
+      "notCreateEmptySourcefile" - workspaceTest(EmptyBuildInfo) { eval =>
         val Right(((result, _), evalCount)) =
           eval.apply(EmptyBuildInfo.generatedBuildInfo)
         assert(
           result.isEmpty &&
             !os.exists(
-              eval.outPath / 'generatedBuildInfo / 'dest / "BuildInfo.scala")
+              eval.outPath / "generatedBuildInfo" / "dest" / "BuildInfo.scala")
         )
       }
 
-      'supportCustomSettings - workspaceTest(BuildInfoSettings) { eval =>
+      "supportCustomSettings" - workspaceTest(BuildInfoSettings) { eval =>
         val expected =
           s"""|package foo
               |
@@ -99,18 +99,18 @@ object BuildInfoTests extends TestSuite {
         val Right(((result, _), evalCount)) =
           eval.apply(BuildInfoSettings.generatedBuildInfo)
         assert(
-          result.head.path == eval.outPath / 'generatedBuildInfo / 'dest / "BuildInfo.scala" &&
+          result.head.path == eval.outPath / "generatedBuildInfo" / "dest" / "BuildInfo.scala" &&
             os.exists(result.head.path) &&
             os.read(result.head.path) == expected
         )
       }
 
-      'compile - workspaceTest(BuildInfo) { eval =>
+      "compile" - workspaceTest(BuildInfo) { eval =>
         val Right((result, evalCount)) = eval.apply(BuildInfo.compile)
         assert(true)
       }
 
-      'run - workspaceTest(BuildInfo) { eval =>
+      "run" - workspaceTest(BuildInfo) { eval =>
         val runResult = eval.outPath / "hello-mill"
         val Right((result, evalCount)) =
           eval.apply(BuildInfo.run(runResult.toString))
@@ -121,7 +121,7 @@ object BuildInfoTests extends TestSuite {
       }
 
       "generatedSources must be a folder" - workspaceTest(BuildInfo) { eval =>
-        val buildInfoGeneratedSourcesFolder = eval.outPath / 'generatedBuildInfo / 'dest
+        val buildInfoGeneratedSourcesFolder = eval.outPath / "generatedBuildInfo" / "dest"
         val Right((result, evalCount)) = eval.apply(BuildInfo.generatedSources)
         assert(
           result.size == 1,

diff --git a/contrib/flyway/test/src/BuildTest.scala b/contrib/flyway/test/src/BuildTest.scala
@@ -9,7 +9,7 @@ object BuildTest extends TestSuite {
   object Build extends TestUtil.BaseModule {
     object build extends FlywayModule {
 
-      def resources = T.sources(os.pwd / 'contrib / 'flyway / 'test / 'resources)
+      def resources = T.sources(os.pwd / "contrib" / "flyway" / "test" / "resources")
 
       def postgres = ivy"com.h2database:h2:1.4.199"
 
@@ -19,13 +19,13 @@ object BuildTest extends TestSuite {
   }
 
   def tests = Tests {
-    'clean - {
+    "clean" - {
       val eval = new TestEvaluator(Build)
       val Right((_, count)) = eval(Build.build.flywayClean())
       assert(count > 0)
     }
 
-    'migrate - {
+    "migrate" - {
       val eval = new TestEvaluator(Build)
       val Right((res, count)) = eval(Build.build.flywayMigrate())
       assert(
@@ -39,10 +39,10 @@ object BuildTest extends TestSuite {
       )
     }
 
-    'info - {
+    "info" - {
       val eval = new TestEvaluator(Build)
       val Right((_, count)) = eval(Build.build.flywayInfo())
       assert(count > 0)
     }
   }
-}
+}
diff --git a/contrib/playlib/src/mill/playlib/Layout.scala b/contrib/playlib/src/mill/playlib/Layout.scala
@@ -5,8 +5,8 @@ import mill.scalalib._
 
 private[playlib] trait Layout extends JavaModule{
 
-  def conf = T.sources{ millSourcePath / 'conf }
-  def app = T.sources{ millSourcePath / 'app }
+  def conf = T.sources{ millSourcePath / "conf" }
+  def app = T.sources{ millSourcePath / "app" }
 
   override def sources = T.sources{ app() }
   override def resources = T.sources{ conf() }

diff --git a/contrib/playlib/src/mill/playlib/RouteCompilerWorker.scala b/contrib/playlib/src/mill/playlib/RouteCompilerWorker.scala
@@ -56,7 +56,7 @@ private[playlib] class RouteCompilerWorker {
         dest.toIO
       ) match {
       case null =>
-        Result.Success(CompilationResult(T.dest / 'zinc, PathRef(T.dest)))
+        Result.Success(CompilationResult(T.dest / "zinc", PathRef(T.dest)))
       case err => Result.Failure(err)
     }
   }

diff --git a/contrib/playlib/src/mill/playlib/RouterModule.scala b/contrib/playlib/src/mill/playlib/RouterModule.scala
@@ -10,7 +10,7 @@ import mill.{Agg, T}
 
 trait RouterModule extends ScalaModule with Version {
 
-  def routes: T[Seq[PathRef]] = T.sources { millSourcePath / 'routes }
+  def routes: T[Seq[PathRef]] = T.sources { millSourcePath / "routes" }
 
   def routeFiles = T {
     val paths = routes().flatMap(file => os.walk(file.path))

diff --git a/contrib/playlib/src/mill/playlib/Static.scala b/contrib/playlib/src/mill/playlib/Static.scala
@@ -60,7 +60,7 @@ trait Static extends ScalaModule {
     * webjar resources extracted from their source jars with version from path removed
     */
   def webJarResources = T {
-    extractWebJars(webJars().toSeq, os.Path(assetsPath(), T.dest) / 'lib)
+    extractWebJars(webJars().toSeq, os.Path(assetsPath(), T.dest) / "lib")
     PathRef(T.dest)
   }
 

diff --git a/contrib/proguard/test/src/ProguardTests.scala b/contrib/proguard/test/src/ProguardTests.scala
@@ -30,7 +30,7 @@ object ProguardTests extends TestSuite {
   }
 
   val testModuleSourcesPath
-    : Path = os.pwd / 'contrib / 'proguard / 'test / 'resources / "proguard"
+    : Path = os.pwd / "contrib" / "proguard" / "test" / "resources" / "proguard"
 
   def workspaceTest[T](m: TestUtil.BaseModule)(t: TestEvaluator => T)(
       implicit tp: TestPath): T = {

diff --git a/contrib/scalapblib/src/ScalaPBModule.scala b/contrib/scalapblib/src/ScalaPBModule.scala
@@ -53,7 +53,7 @@ trait ScalaPBModule extends ScalaModule {
   def scalaPBProtocPath: T[Option[String]] = T { None }
 
   def scalaPBSources: Sources = T.sources {
-    millSourcePath / 'protobuf
+    millSourcePath / "protobuf"
   }
 
   def scalaPBOptions: T[String] = T {

diff --git a/contrib/scalapblib/test/src/TutorialTests.scala b/contrib/scalapblib/test/src/TutorialTests.scala
@@ -40,10 +40,10 @@ object TutorialTests extends TestSuite {
     }
   }
 
-  val resourcePath: os.Path = os.pwd / 'contrib / 'scalapblib / 'test / 'protobuf / 'tutorial
+  val resourcePath: os.Path = os.pwd / "contrib" / "scalapblib" / "test" / "protobuf" / "tutorial"
 
   def protobufOutPath(eval: TestEvaluator): os.Path =
-    eval.outPath / 'core / 'compileScalaPB / 'dest / 'com / 'example / 'tutorial
+    eval.outPath / "core" / "compileScalaPB" / "dest" / "com" / "example" / "tutorial"
 
   def workspaceTest[T](m: TestUtil.BaseModule)(t: TestEvaluator => T)
                       (implicit tp: TestPath): T = {
@@ -52,8 +52,8 @@ object TutorialTests extends TestSuite {
     println(m.millSourcePath)
     os.remove.all(eval.outPath)
     println(eval.outPath)
-    os.makeDir.all(m.millSourcePath / 'core / 'protobuf)
-    os.copy(resourcePath, m.millSourcePath / 'core / 'protobuf / 'tutorial)
+    os.makeDir.all(m.millSourcePath / "core" / "protobuf")
+    os.copy(resourcePath, m.millSourcePath / "core" / "protobuf" / "tutorial")
     t(eval)
   }
 
@@ -66,9 +66,9 @@ object TutorialTests extends TestSuite {
   )
 
   def tests: Tests = Tests {
-    'scalapbVersion - {
+    "scalapbVersion" - {
 
-      'fromBuild - workspaceTest(Tutorial) { eval =>
+      "fromBuild" - workspaceTest(Tutorial) { eval =>
         val Right((result, evalCount)) = eval.apply(Tutorial.core.scalaPBVersion)
 
         assert(
@@ -89,7 +89,7 @@ object TutorialTests extends TestSuite {
          val expectedSourcefiles = compiledSourcefiles.map(outPath / _)
 
          assert(
-           result.path == eval.outPath / 'core / 'compileScalaPB / 'dest,
+           result.path == eval.outPath / "core" / "compileScalaPB" / "dest",
            outputFiles.nonEmpty,
            outputFiles.forall(expectedSourcefiles.contains),
            outputFiles.size == 5,
@@ -104,7 +104,7 @@ object TutorialTests extends TestSuite {
 
 //      // This throws a NullPointerException in coursier somewhere
 //      //
-//      // 'triggeredByScalaCompile - workspaceTest(Tutorial) { eval =>
+//      // "triggeredByScalaCompile" - workspaceTest(Tutorial) { eval =>
 //      //   val Right((_, evalCount)) = eval.apply(Tutorial.core.compile)
 //
 //      //   val outPath = protobufOutPath(eval)
@@ -128,18 +128,18 @@ object TutorialTests extends TestSuite {
 //     }
      }
 
-    'useExternalProtocCompiler - {
+    "useExternalProtocCompiler" - {
       /* This ensure that the `scalaPBProtocPath` is properly used.
        * As the given path is incorrect, the compilation should fail.
        */
-      'calledWithWrongProtocFile - workspaceTest(TutorialWithProtoc) { eval =>
+      "calledWithWrongProtocFile" - workspaceTest(TutorialWithProtoc) { eval =>
         val result = eval.apply(TutorialWithProtoc.core.compileScalaPB)
         assert(result.isLeft)
       }
     }
 
-    'compilationArgs - {
-      'calledWithAdditionalArgs - workspaceTest(TutorialWithAdditionalArgs) {
+    "compilationArgs" - {
+      "calledWithAdditionalArgs" - workspaceTest(TutorialWithAdditionalArgs) {
         eval =>
           val result =
             eval.apply(TutorialWithAdditionalArgs.core.scalaPBCompileOptions)

diff --git a/contrib/scoverage/test/src/HelloWorldTests.scala b/contrib/scoverage/test/src/HelloWorldTests.scala
@@ -9,8 +9,8 @@ import utest._
 import utest.framework.TestPath
 
 object HelloWorldTests extends utest.TestSuite {
-  val resourcePath = os.pwd / 'contrib / 'scoverage / 'test / 'resources / "hello-world"
-  val sbtResourcePath = os.pwd / 'contrib / 'scoverage / 'test / 'resources / "hello-world-sbt"
+  val resourcePath = os.pwd / "contrib" / "scoverage" / "test" / "resources" / "hello-world"
+  val sbtResourcePath = os.pwd / "contrib" / "scoverage" / "test" / "resources" / "hello-world-sbt"
   val unmanagedFile = resourcePath / "unmanaged.xml"
   trait HelloBase extends TestUtil.BaseModule {
     def millSourcePath =  TestUtil.getSrcPathBase() / millOuterCtx.enclosing.split('.')
@@ -44,16 +44,16 @@ object HelloWorldTests extends utest.TestSuite {
       def scalaVersion = "2.12.9"
       def scoverageVersion = "1.4.0"
       override def sources = T.sources(
-        millSourcePath / 'src / 'main / 'scala,
-        millSourcePath / 'src / 'main / 'java
+        millSourcePath / "src" / "main" / "scala",
+        millSourcePath / "src" / "main" / "java"
       )
-      override def resources = T.sources{ millSourcePath / 'src / 'main / 'resources }
+      override def resources = T.sources{ millSourcePath / "src" / "main" / "resources" }
 
       object test extends ScoverageTests {
         override def ivyDeps = Agg(ivy"org.scalatest::scalatest:3.0.8")
         def testFrameworks = Seq("org.scalatest.tools.Framework")
         override def millSourcePath = outer.millSourcePath
-        override def intellijModulePath = outer.millSourcePath / 'src / 'test
+        override def intellijModulePath = outer.millSourcePath / "src" / "test"
       }
     }
   }

diff --git a/contrib/testng/test/src/mill/testng/TestNGTests.scala b/contrib/testng/test/src/mill/testng/TestNGTests.scala
@@ -35,7 +35,7 @@ object TestNGTests extends TestSuite {
 
   }
 
-  val resourcePath: Path = pwd / 'contrib / 'testng / 'test / 'resources / "demo"
+  val resourcePath: Path = pwd / "contrib" / "testng" / "test" / "resources" / "demo"
 
   def workspaceTest[T, M <: TestUtil.BaseModule](m: M, resourcePath: Path = resourcePath)
                                                 (t: TestEvaluator => T)
@@ -49,8 +49,8 @@ object TestNGTests extends TestSuite {
   }
 
   def tests: Tests = Tests {
-    'TestNG - {
-      'demo - workspaceTest(demo) { eval =>
+    "TestNG" - {
+      "demo" - workspaceTest(demo) { eval =>
         val Right((result, evalCount)) = eval.apply(demo.test.testFramework)
         assert(
           result == "mill.testng.TestNGFramework",

diff --git a/contrib/twirllib/src/TwirlModule.scala b/contrib/twirllib/src/TwirlModule.scala
@@ -16,7 +16,7 @@ trait TwirlModule extends mill.Module {
   def twirlVersion: T[String]
 
   def twirlSources: Sources = T.sources {
-    millSourcePath / 'views
+    millSourcePath / "views"
   }
 
   def twirlClasspath: T[Loose.Agg[PathRef]] = T {

diff --git a/contrib/twirllib/src/TwirlWorker.scala b/contrib/twirllib/src/TwirlWorker.scala
@@ -158,7 +158,7 @@ class TwirlWorker {
 
     sourceDirectories.foreach(compileTwirlDir)
 
-    val zincFile = ctx.dest / 'zinc
+    val zincFile = ctx.dest / "zinc"
     val classesDir = ctx.dest
 
     mill.api.Result.Success(CompilationResult(zincFile, PathRef(classesDir)))