Merge pull request #91 from com-lihaoyi/jo/upgrade

Upgrade mill to 1.1.x

Author: jodersky

.mill-version

@@ -1,10 +1,10 @@
+//| mill-version: 1.1.4
+//| mvnDeps: ["com.github.lolgab::mill-mima::0.2.1"]
+
 package build
 import mill._, scalalib._, scalajslib._, scalanativelib._, publish._
-import $ivy.`de.tototec::de.tobiasroeser.mill.vcs.version::0.4.0`
-import de.tobiasroeser.mill.vcs.version.VcsVersion
-import $ivy.`com.github.lolgab::mill-mima::0.1.1`
+import mill.util.VcsVersion
 import com.github.lolgab.mill.mima._
-import mill.scalalib.api.ZincWorkerUtil.isScala3
 
 val communityBuildDottyVersion = sys.props.get("dottyVersion").toList
 
@@ -41,49 +41,47 @@ object castor extends Module {
     )
 
     def artifactName = "castor"
-    def millSourcePath = super.millSourcePath / os.up
+    def moduleDir = super.moduleDir / os.up
 
-    def sources = T.sources(
-      millSourcePath / "src",
-      millSourcePath / s"src-$platformSegment"
+    def sources = Task.Sources(
+      moduleDir / "src",
+      moduleDir / s"src-$platformSegment"
     )
 
-    def ivyDeps = Agg(ivy"com.lihaoyi::sourcecode::0.4.1")
+    def mvnDeps = Seq(mvn"com.lihaoyi::sourcecode::0.4.1")
   }
   trait ActorTestModule extends ScalaModule with TestModule.Utest with PlatformModule {
-    def sources = T.sources(
-      millSourcePath / "src",
-      millSourcePath / s"src-$platformSegment"
+    def sources = Task.Sources(
+      moduleDir / "src",
+      moduleDir / s"src-$platformSegment"
     )
-    def ivyDeps = Agg(ivy"com.lihaoyi::utest::0.8.3")
+    def mvnDeps = Seq(mvn"com.lihaoyi::utest::0.8.3")
   }
 
   object js extends Cross[ActorJsModule](scalaVersions)
   trait ActorJsModule extends ActorModule with ScalaJSModule {
     def scalaJSVersion = "1.16.0"
-    override def sources = T.sources {
-      super.sources() ++ Seq(PathRef(millSourcePath / "src-js-native"))
-    }
+    def jsNativeSources = Task.Sources(moduleDir / "src-js-native")
+    override def sources = Task { super.sources() ++ jsNativeSources() }
     object test extends ScalaJSTests with ActorTestModule {
       def scalaVersion = crossScalaVersion
     }
   }
   object jvm extends Cross[ActorJvmModule](scalaVersions)
   trait ActorJvmModule extends ActorModule {
     object test extends ScalaTests with ActorTestModule{
-      def ivyDeps = super.ivyDeps() ++ Agg(
-        ivy"com.lihaoyi::os-lib:0.9.1"
+      def mvnDeps = super.mvnDeps() ++ Seq(
+        mvn"com.lihaoyi::os-lib:0.9.1"
       )
     }
   }
   object native extends Cross[ActorNativeModule](scalaVersions)
   trait ActorNativeModule extends ActorModule with ScalaNativeModule {
     def scalaNativeVersion = "0.5.4"
     // Enable after first release for Scala Native 0.5
-    def mimaPreviousArtifacts = T { Agg.empty }
-    override def sources = T.sources {
-      super.sources() ++ Seq(PathRef(millSourcePath / "src-js-native"))
-    }
+    def mimaPreviousArtifacts = Task { Seq.empty }
+    def jsNativeSources = Task.Sources(moduleDir / "src-js-native")
+    override def sources = Task { super.sources() ++ jsNativeSources() }
     object test extends ScalaNativeTests with ActorTestModule
   }
 }