Add Scala 3.7.4 cross-build

build.mill

@@ -15,15 +15,17 @@ import java.io.File
 object DepVersions {
   def mdoc = "2.3.6"
   def scala213 = "2.13.18"
+  def scala3 = "3.7.4"
   def scalaJs = "1.20.2"
 
-  def scala = Seq(scala213, "2.12.21")
+  def scala = Seq(scala213, "2.12.21", scala3)
 }
 
 object Deps {
   def macroParadise = mvn"org.scalamacros:::paradise:2.1.1"
   def pprint = mvn"com.lihaoyi::pprint::0.9.6"
   def utest = mvn"com.lihaoyi::utest::0.8.9"
+  def unrollAnnotation = mvn"com.lihaoyi:::unroll-annotation:0.3.0"
 }
 
 trait VersionsMima extends Mima with PublishModule {
@@ -105,19 +107,32 @@ trait Versions extends Cross.Module[String] with ScalaModule with VersionsPublis
     val scala213Opts =
       if (sv.startsWith("2.13.")) Seq("-Ymacro-annotations")
       else Nil
-    super.scalacOptions() ++ scala213Opts ++ Seq(
-      "-deprecation",
-      "--release",
-      "8"
-    )
+    val releaseOpts =
+      if (sv.startsWith("3.")) Seq("-release", "8")
+      else Seq("--release", "8")
+    super.scalacOptions() ++ scala213Opts ++ Seq("-deprecation") ++ releaseOpts
   }
   def sources = Task {
-    super.sources() ++ Seq(versions.shared.sources())
+    val sv = scalaVersion()
+    val versionSpecific =
+      if (sv.startsWith("3.")) versions.shared.sources3()
+      else versions.shared.sources2()
+    super.sources() ++ Seq(versions.shared.sources(), versionSpecific)
   }
 
-  def compileMvnDeps = Seq(
-    mvn"io.github.alexarchambault::data-class:0.2.7"
-  )
+  def compileMvnDeps = Task {
+    val sv = scalaVersion()
+    if (sv.startsWith("3.")) Seq.empty
+    else Seq(mvn"io.github.alexarchambault::data-class:0.2.7")
+  }
+
+  def mvnDeps = Task {
+    val sv = scalaVersion()
+    val unrollDeps =
+      if (sv.startsWith("3.")) Seq(Deps.unrollAnnotation)
+      else Seq.empty
+    super.mvnDeps() ++ unrollDeps
+  }
 
   def mimaBinaryIssueFilters = super.mimaBinaryIssueFilters() ++ Seq(
     // Additional abstract method on *sealed* trait
@@ -157,6 +172,8 @@ trait VersionsJs extends Versions with ScalaJSModule {
 object versions extends Module {
   object shared extends Module {
     def sources = Task.Source("src")
+    def sources2 = Task.Source("src-2")
+    def sources3 = Task.Source("src-3")
     def testSources = Task.Source("test/src")
   }
   object jvm extends Cross[VersionsJvm](DepVersions.scala)

versions/shared/src-3/coursier/version/ModuleMatcher.scala

@@ -0,0 +1,65 @@
+package coursier.version
+
+import java.util.regex.Pattern
+
+import com.lihaoyi.unroll
+import scala.annotation.tailrec
+import scala.util.matching.Regex
+
+// Adapted from https://github.com/coursier/coursier/blob/876a6604d0cd0c3783ed729f5399549f52a3a385/modules/coursier/shared/src/main/scala/coursier/util/ModuleMatcher.scala
+
+case class ModuleMatcher(
+  organizationMatcher: String,
+  nameMatcher: String,
+  @unroll attributeMatchers: Map[String, String] = Map.empty
+) {
+
+  import ModuleMatcher.blobToPattern
+
+  lazy val orgPattern = blobToPattern(organizationMatcher)
+  lazy val namePattern = blobToPattern(nameMatcher)
+  lazy val attributesPattern = attributeMatchers
+    .iterator
+    .map {
+      case (k, v) =>
+        (k, blobToPattern(v))
+    }
+    .toMap
+
+  def matches(organization: String, name: String): Boolean =
+    matches(organization, name, Map.empty)
+
+  def matches(organization: String, name: String, attributes: Map[String, String]): Boolean =
+    orgPattern.pattern.matcher(organization).matches() &&
+      namePattern.pattern.matcher(name).matches() &&
+      attributes.keySet == attributesPattern.keySet &&
+      attributesPattern.forall {
+        case (k, p) =>
+          attributes.get(k).exists(p.pattern.matcher(_).matches())
+      }
+
+}
+
+object ModuleMatcher {
+
+  def all: ModuleMatcher =
+    ModuleMatcher("*", "*")
+
+  @tailrec
+  private def blobToPattern(s: String, b: StringBuilder = new StringBuilder): Regex =
+    if (s.isEmpty)
+      b.result().r
+    else {
+      val idx = s.indexOf('*')
+      if (idx < 0) {
+        b ++= Pattern.quote(s)
+        b.result().r
+      } else {
+        if (idx > 0)
+          b ++= Pattern.quote(s.substring(0, idx))
+        b ++= ".*"
+        blobToPattern(s.substring(idx + 1), b)
+      }
+    }
+
+}

versions/shared/src-3/coursier/version/ModuleMatchers.scala

@@ -0,0 +1,38 @@
+package coursier.version
+
+import com.lihaoyi.unroll
+
+// Adapted from https://github.com/coursier/coursier/blob/f0b10fb1744e5bdf94bf17857dfb3cb19fda2e5b/modules/coursier/shared/src/main/scala/coursier/util/ModuleMatchers.scala
+
+case class ModuleMatchers(
+  exclude: Set[ModuleMatcher],
+  include: Set[ModuleMatcher] = Set(),
+  @unroll includeByDefault: Boolean = true
+) {
+
+  // If modules are included by default:
+  // Those matched by anything in exclude are excluded, but for those also matched by something in include.
+  // If modules are excluded by default:
+  // Those matched by anything in include are included, but for those also matched by something in exclude.
+
+  def matches(organization: String, name: String): Boolean =
+    matches(organization, name, Map.empty)
+
+  def matches(organization: String, name: String, attributes: Map[String, String]): Boolean =
+    if (includeByDefault)
+      !exclude.exists(_.matches(organization, name, attributes)) ||
+        include.exists(_.matches(organization, name, attributes))
+    else
+      include.exists(_.matches(organization, name, attributes)) &&
+        !exclude.exists(_.matches(organization, name, attributes))
+
+}
+
+object ModuleMatchers {
+  def all: ModuleMatchers =
+    ModuleMatchers(Set.empty, Set.empty)
+  def only(organization: String, name: String): ModuleMatchers =
+    only(organization, name, Map.empty)
+  def only(organization: String, name: String, attributes: Map[String, String]): ModuleMatchers =
+    ModuleMatchers(Set.empty, Set(ModuleMatcher(organization, name, attributes)), includeByDefault = false)
+}