Mill 1 Support (#191)

Pull request: #191

Author: lefou

build.sc

@@ -12,17 +12,15 @@ import java.nio.file.attribute.PosixFilePermission
 import de.tobiasroeser.mill.integrationtest._
 import de.tobiasroeser.mill.vcs.version._
 
-import mill.{Agg, PathRef, T}
+import mill._
 import mill.contrib.scoverage.ScoverageModule
-import mill.define.{Cross, Module, Sources, Target}
-import mill.util.Util
 import mill.scalalib._
-import mill.scalalib.api.ZincWorkerUtil
+import mill.scalalib.api.JvmWorkerUtil
 import mill.scalalib.publish._
 
 import os.Path
 
-private def baseDir = build.millSourcePath
+private def baseDir = build.moduleDir
 
 trait Deps {
   // The mill API version used in the project/sources/dependencies, also default for integration tests
@@ -32,17 +30,25 @@ trait Deps {
   def millTestVersions: Seq[String]
   val scoverageVersion = "2.4.1"
 
-  val bndlib = ivy"biz.aQute.bnd:biz.aQute.bndlib:6.4.1"
-  val logbackClassic = ivy"ch.qos.logback:logback-classic:1.1.3"
-  def millMain = ivy"com.lihaoyi::mill-main:${millVersion}"
-  def millScalalib = ivy"com.lihaoyi::mill-scalalib:${millVersion}"
-  val scalaTest = ivy"org.scalatest::scalatest:3.2.19"
-  def scalaLibrary = ivy"org.scala-lang:scala-library:${scalaVersion}"
-  val scoveragePlugin = ivy"org.scoverage:::scalac-scoverage-plugin:${scoverageVersion}"
-  val scoverageRuntime = ivy"org.scoverage::scalac-scoverage-runtime:${scoverageVersion}"
-  val slf4j = ivy"org.slf4j:slf4j-api:1.7.36"
+  val bndlib = mvn"biz.aQute.bnd:biz.aQute.bndlib:6.4.1"
+  val logbackClassic = mvn"ch.qos.logback:logback-classic:1.1.3"
+  def millMain = mvn"com.lihaoyi::mill-main:${millVersion}"
+  def millScalalib = mvn"com.lihaoyi::mill-scalalib:${millVersion}"
+  val scalaTest = mvn"org.scalatest::scalatest:3.2.19"
+  def scalaLibrary = mvn"org.scala-lang:scala-library:${scalaVersion}"
+  val scoveragePlugin = mvn"org.scoverage:::scalac-scoverage-plugin:${scoverageVersion}"
+  val scoverageRuntime = mvn"org.scoverage::scalac-scoverage-runtime:${scoverageVersion}"
+  val slf4j = mvn"org.slf4j:slf4j-api:1.7.36"
 }
 
+object Deps_1 extends Deps {
+  override val millVersion = "1.0.0" // scala-steward:off
+  override def millPlatform = "1"
+  // keep in sync with .github/workflows/build.yml
+  override val millTestVersions = Seq("1.1.0-RC1", millVersion)
+  override def millScalalib: Dep = mvn"com.lihaoyi::mill-libs:${millVersion}"
+  override def scalaVersion = "3.7.4"
+}
 object Deps_0_11 extends Deps {
   override val millVersion = "0.11.0" // scala-steward:off
   override def millPlatform = "0.11"
@@ -57,7 +63,7 @@ object Deps_0_10 extends Deps {
 }
 
 /** Cross build versions */
-val millPlatforms = Seq(Deps_0_11, Deps_0_10).map(x => x.millPlatform -> x)
+val millPlatforms = Seq(Deps_1, Deps_0_11, Deps_0_10).map(x => x.millPlatform -> x)
 
 trait MyScoverageModule extends ScoverageModule {
   override lazy val scoverage: ScoverageData = new MyScoverageData {}
@@ -69,21 +75,26 @@ trait MyScoverageModule extends ScoverageModule {
 trait MillOsgiModule extends ScalaModule with PublishModule with Cross.Module[String] {
   def millPlatform: String = crossValue
   def deps: Deps = millPlatforms.toMap.apply(millPlatform)
-  override def scalaVersion = T { deps.scalaVersion }
-  override def ivyDeps = Agg(deps.scalaLibrary)
-  override def artifactSuffix = s"_mill${deps.millPlatform}_${artifactScalaVersion()}"
+  override def scalaVersion = Task { deps.scalaVersion }
+//  override def ivyDeps = Agg(deps.scalaLibrary)
+//  override def artifactSuffix = s"_mill${deps.millPlatform}_${artifactScalaVersion()}"
+  override def platformSuffix = s"_mill${millPlatform}"
   def publishVersion = VcsVersion.vcsState().format()
   override def javacOptions = Seq("-source", "1.8", "-target", "1.8", "-encoding", "UTF-8")
-  override def scalacOptions = T {
+  override def scalacOptions = Task {
     val jvmSpecific =
       if (scala.util.Properties.isJavaAtLeast(11))
         Seq("-release", "8")
       else
         Seq("-target:jvm-1.8")
 
-    jvmSpecific ++ Seq("-encoding", "UTF-8", "-deprecation", "-Xsource:3")
+    val svSpecific =
+      if (scalaVersion().startsWith("3")) Seq("-Ydebug-unpickling")
+      else Seq("-Xsource:3")
+
+    jvmSpecific ++ svSpecific ++ Seq("-encoding", "UTF-8", "-deprecation")
   }
-  override def pomSettings = T {
+  override def pomSettings = Task {
     PomSettings(
       description = "Mill module adding OSGi bundle support",
       organization = "de.tototec",
@@ -93,13 +104,16 @@ trait MillOsgiModule extends ScalaModule with PublishModule with Cross.Module[St
       developers = Seq(Developer("lefou", "Tobias Roeser", "https.//github.com/lefou"))
     )
   }
-  override def sources = T.sources {
-    super.sources() ++
-      (
-        ZincWorkerUtil.matchingVersions(deps.millPlatform) ++
-          ZincWorkerUtil.versionRanges(deps.millPlatform, millPlatforms.map(_._1))
-      )
-        .map(p => PathRef(millSourcePath / s"src-${p}"))
+  def sources0 = Task.Sources {
+    (
+      JvmWorkerUtil.matchingVersions(deps.millPlatform) ++
+        JvmWorkerUtil.versionRanges(deps.millPlatform, millPlatforms.map(_._1))
+    )
+      .map(p => PathRef(moduleDir / s"src-${p}"))
+  }
+  override def sources = Task {
+    super.sources() ++ sources0()
+
   }
 }
 
@@ -110,13 +124,17 @@ trait Core extends MillOsgiModule with MyScoverageModule {
     deps.bndlib,
     deps.slf4j
   )
-  override def compileIvyDeps = Agg(
-    deps.millMain,
-    deps.millScalalib
-  )
+  override def compileIvyDeps =
+    if (deps.millPlatform == "1") Agg(
+      deps.millScalalib
+    )
+    else Agg(
+      deps.millMain,
+      deps.millScalalib
+    )
 
-  override def generatedSources: Target[Seq[PathRef]] = T {
-    val dest = T.dest
+  override def generatedSources: T[Seq[PathRef]] = T {
+    val dest = Task.dest
     val infoClass =
       s"""// Generated with mill from build.sc
          |package de.tobiasroeser.mill.osgi.internal
@@ -132,7 +150,7 @@ trait Core extends MillOsgiModule with MyScoverageModule {
 
   override def scoverageVersion = deps.scoverageVersion
 
-//  override def skipIdea: Boolean = millPlatforms.head._1 != millPlatform
+  override def skipIdea: Boolean = millPlatforms.head._1 != millPlatform
 
   object test extends ScoverageTests with TestModule.ScalaTest {
     override def ivyDeps = Agg(
@@ -144,7 +162,10 @@ trait Core extends MillOsgiModule with MyScoverageModule {
 
 object testsupport extends Cross[TestSupport](millPlatforms.map(_._1))
 trait TestSupport extends MillOsgiModule {
-  override def compileIvyDeps = Agg(
+  override def compileIvyDeps = if (deps.millPlatform == "1") Agg(
+    deps.millScalalib
+  )
+  else Agg(
     deps.millMain,
     deps.millScalalib
   )
@@ -161,33 +182,33 @@ trait ItestCross extends MillIntegrationTestModule with Cross.Module[String] {
   override def millTestVersion = T { millVersion }
   override def pluginsUnderTest = Seq(core(deps.millPlatform), testsupport(deps.millPlatform))
   override def prefetchIvyDeps = Agg(
-    ivy"com.typesafe.akka:akka-http-core_2.12:10.1.11"
+    mvn"com.typesafe.akka:akka-http-core_2.12:10.1.11"
   )
-  override def sources = T.sources {
+  override def sources = Task.Sources {
     super.sources() ++
-      ZincWorkerUtil.versionRanges(deps.millPlatform, millPlatforms.map(_._1))
-        .map(p => PathRef(millSourcePath / s"src-${p}"))
+      JvmWorkerUtil.versionRanges(deps.millPlatform, millPlatforms.map(_._1))
+        .map(p => PathRef(moduleDir / s"src-${p}"))
   }
 
   override def pluginUnderTestDetails: Task[Seq[(PathRef, (PathRef, (PathRef, (PathRef, (PathRef, Artifact)))))]] =
-    T.traverse(pluginsUnderTest) { p =>
+    Task.traverse(pluginsUnderTest) { p =>
       val jar = p match {
         case p: ScoverageModule => p.scoverage.jar
         case p => p.jar
       }
       jar zip (p.sourceJar zip (p.docJar zip (p.pom zip (p.ivy zip p.artifactMetadata))))
     }
-  override def perTestResources = T.sources { Seq(generatedSharedSrc()) }
-  def generatedSharedSrc = T {
-    val scov = deps.scoverageRuntime.dep
+  override def perTestResources = Task { Seq(generatedSharedSrc()) }
+  def generatedSharedSrc = Task {
+    val scov = deps.scoverageRuntime
     os.write(
-      T.dest / "shared.sc",
+      Task.dest / "shared.sc",
       s"""// Load the plugin under test
          |import $$file.plugins
          |// Load scoverage runtime to get coverage results
-         |import $$ivy.`${scov.module.organization.value}::${scov.module.name.value}:${scov.version}`
+         |import $$ivy.`${scov.organization}::${scov.name}:${scov.version}`
          |""".stripMargin
     )
-    PathRef(T.dest)
+    PathRef(Task.dest)
   }
 }

…sroeser/mill/osgi/OsgiBundleModule.scala …sroeser/mill/osgi/OsgiBundleModule.scalacore/src/de/tobiasroeser/mill/osgi/OsgiBundleModule.scala renamed to core/src-0.11-/de/tobiasroeser/mill/osgi/OsgiBundleModule.scala core/src/de/tobiasroeser/mill/osgi/OsgiBundleModule.scala renamed to core/src-0.11-/de/tobiasroeser/mill/osgi/OsgiBundleModule.scala

@@ -7,9 +7,10 @@ import scala.util.Try
 
 import aQute.bnd.osgi.{Builder, Constants, Jar}
 import de.tobiasroeser.mill.osgi.internal.{BuildInfo, copy => icopy, unpack => iunpack}
+import de.tobiasroeser.mill.osgi.{OsgiBundleModulePlatform, OsgiHeaders}
 import mill._
-import mill.define.{Sources, Task}
 import mill.api.PathRef
+import mill.define.{Sources, Task}
 import mill.modules.Jvm
 import mill.scalalib.{JavaModule, PublishModule}
 import os.Path
@@ -363,57 +364,7 @@ trait OsgiBundleModule extends OsgiBundleModulePlatform {
 
 }
 
-object OsgiBundleModule {
-
-  def calcBundleSymbolicName(group: String, artifact: String): String = {
-    val groupParts = group.split("[.]")
-    val nameParts = artifact.split("[.]").flatMap(_.split("[-]"))
-
-    val parts =
-      if (nameParts.startsWith(groupParts)) nameParts
-      else (groupParts.lastOption, nameParts.headOption) match {
-        case (Some(last), Some(head)) if last == head => groupParts ++ nameParts.tail
-        case (Some(last), Some(head)) if head.startsWith(last) => groupParts.take(groupParts.size - 1) ++ nameParts
-        case _ => groupParts ++ nameParts
-      }
-
-    parts.mkString(".")
-  }
-
-  def mergeSeqProps(builder: Builder, key: String, value: Seq[String]): Unit = {
-    val existing = builder.getProperty(key) match {
-      case null => Seq()
-      case p => Seq(p)
-    }
-    builder.setProperty(key, (existing ++ value).mkString(","))
-  }
-
-  protected[osgi] def checkMillVersion(millVersion: Option[String]): Boolean =
-    checkMillVersion(BuildInfo.millVersion, millVersion)
-
-  protected[osgi] def checkMillVersion(buildVersion: String, millVersion: Option[String]): Boolean = millVersion match {
-    case Some(v) =>
-      /** Extract the major, minor and micro version parts of the given version string. */
-      def parseVersion(version: String): Try[Array[Int]] = Try {
-        version
-          .split("[-]", 2)(0)
-          .split("[.]", 4)
-          .take(3)
-          .map(_.toInt)
-      }
-
-      val buildMillVersion = parseVersion(buildVersion).getOrElse(Array(0, 0, 0))
-      val runMillVersion = parseVersion(v).getOrElse(Array(999, 999, 999))
-
-      (runMillVersion(0) > buildMillVersion(0)) ||
-      (runMillVersion(0) == buildMillVersion(0) && runMillVersion(1) > buildMillVersion(1)) ||
-      (runMillVersion(0) == buildMillVersion(0) && runMillVersion(1) == buildMillVersion(1) &&
-        runMillVersion(2) >= buildMillVersion(2))
-
-    case _ =>
-      // ignore
-      true
-  }
+object OsgiBundleModule extends OsgiBundleModuleSupport {
 
   sealed trait BuildMode
   object BuildMode {