Merge pull request #240 from cquiroz/next-dotty

Support dotty M3

Author: cquiroz

.github/workflows/ci.yml

@@ -23,7 +23,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        scala: [2.11.12, 2.12.12, 2.13.3, 3.0.0-M2]
+        scala: [2.11.12, 2.12.12, 2.13.3, 3.0.0-M2, 3.0.0-M3]
         java: [[email protected]]
     runs-on: ${{ matrix.os }}
     steps:
@@ -137,6 +137,16 @@ jobs:
           tar xf targets.tar
           rm targets.tar
 
+      - name: Download target directories (3.0.0-M3)
+        uses: actions/download-artifact@v2
+        with:
+          name: target-${{ matrix.os }}-3.0.0-M3-${{ matrix.java }}
+
+      - name: Inflate target directories (3.0.0-M3)
+        run: |
+          tar xf targets.tar
+          rm targets.tar
+
       - uses: olafurpg/setup-gpg@v3
 
       - env:

build.sbt

@@ -2,14 +2,14 @@ import sbtcrossproject.CrossPlugin.autoImport.{ CrossType, crossProject }
 import sbt.Keys._
 import locales._
 
-val cldrDbVersion = settingKey[String]("The version of CLDR used.")
+lazy val cldrApiVersion = "2.0.1"
 
 Global / onChangedBuildSource := ReloadOnSourceChanges
 
 resolvers in Global += Resolver.sonatypeRepo("public")
 
 ThisBuild / scalaVersion := "2.13.3"
-ThisBuild / crossScalaVersions := Seq("2.11.12", "2.12.12", "2.13.3", "3.0.0-M2")
+ThisBuild / crossScalaVersions := Seq("2.11.12", "2.12.12", "2.13.3", "3.0.0-M2", "3.0.0-M3")
 
 ThisBuild / githubWorkflowTargetTags ++= Seq("v*")
 ThisBuild / githubWorkflowPublishTargetBranches +=
@@ -121,8 +121,7 @@ lazy val core = crossProject(JVMPlatform, JSPlatform)
   .settings(
     name := "scala-java-locales",
     libraryDependencies ++= Seq(
-      "io.github.cquiroz"      %%% "cldr-api"                % "1.1.0",
-      "org.scala-lang.modules" %%% "scala-collection-compat" % "2.3.1"
+      "io.github.cquiroz"      %%% "cldr-api"                % cldrApiVersion
     ),
     scalacOptions ~= (_.filterNot(
       Set(
@@ -152,15 +151,16 @@ lazy val core = crossProject(JVMPlatform, JSPlatform)
   }
 )
 
+lazy val cldrDbVersion = "36.0"
+
 lazy val localesFullCurrenciesDb = project
   .in(file("localesFullCurrenciesDb"))
   .settings(commonSettings: _*)
   .configure(_.enablePlugins(LocalesPlugin))
   .configure(_.enablePlugins(ScalaJSPlugin))
   .settings(
-    cldrDbVersion := "36",
     name := "locales-full-currencies-db",
-    cldrVersion := CLDRVersion.Version(cldrDbVersion.value),
+    cldrVersion := CLDRVersion.Version(cldrDbVersion),
     localesFilter := LocalesFilter.All,
     nsFilter := NumberingSystemFilter.All,
     calendarFilter := CalendarFilter.All,
@@ -178,9 +178,8 @@ lazy val localesFullDb = project
   .configure(_.enablePlugins(LocalesPlugin))
   .configure(_.enablePlugins(ScalaJSPlugin))
   .settings(
-    cldrDbVersion := "36",
     name := "locales-full-db",
-    cldrVersion := CLDRVersion.Version(cldrDbVersion.value),
+    cldrVersion := CLDRVersion.Version(cldrDbVersion),
     localesFilter := LocalesFilter.All,
     nsFilter := NumberingSystemFilter.All,
     calendarFilter := CalendarFilter.All,
@@ -198,9 +197,8 @@ lazy val localesMinimalEnDb = project
   .configure(_.enablePlugins(LocalesPlugin))
   .configure(_.enablePlugins(ScalaJSPlugin))
   .settings(
-    cldrDbVersion := "36",
     name := "locales-minimal-en-db",
-    cldrVersion := CLDRVersion.Version(cldrDbVersion.value),
+    cldrVersion := CLDRVersion.Version(cldrDbVersion),
     localesFilter := LocalesFilter.Minimal,
     nsFilter := NumberingSystemFilter.Minimal,
     calendarFilter := CalendarFilter.Minimal,
@@ -246,7 +244,7 @@ lazy val testSuite = crossProject(JVMPlatform, JSPlatform)
       "-Dfile.encoding=UTF8"
     ),
     name := "scala-java-locales testSuite on JVM",
-    libraryDependencies += "io.github.cquiroz" %%% "cldr-api" % "1.1.0"
+    libraryDependencies += "io.github.cquiroz" %%% "cldr-api" % cldrApiVersion
   )
   .jvmConfigure(_.dependsOn(macroUtils))
 

core/shared/src/main/scala-2.11/scala/collection/compat/CompatImpl.scala

@@ -0,0 +1,73 @@
+/*
+ * Scala (https://www.scala-lang.org)
+ *
+ * Copyright EPFL and Lightbend, Inc.
+ *
+ * Licensed under Apache License 2.0
+ * (http://www.apache.org/licenses/LICENSE-2.0).
+ *
+ * See the NOTICE file distributed with this work for
+ * additional information regarding copyright ownership.
+ */
+
+package scala.collection.compat
+
+import scala.reflect.ClassTag
+import scala.collection.generic.CanBuildFrom
+import scala.collection.{immutable => i, mutable => m}
+
+/* builder optimized for a single ++= call, which returns identity on result if possible
+ * and defers to the underlying builder if not.
+ */
+private final class IdentityPreservingBuilder[A, CC[X] <: TraversableOnce[X]](
+    that: m.Builder[A, CC[A]])(implicit ct: ClassTag[CC[A]])
+    extends m.Builder[A, CC[A]] {
+
+  //invariant: ruined => (collection == null)
+  var collection: CC[A] = null.asInstanceOf[CC[A]]
+  var ruined            = false
+
+  private[this] def ruin(): Unit = {
+    if (collection != null) that ++= collection
+    collection = null.asInstanceOf[CC[A]]
+    ruined = true
+  }
+
+  override def ++=(elems: TraversableOnce[A]): this.type =
+    elems match {
+      case ct(ca) if collection == null && !ruined => {
+        collection = ca
+        this
+      }
+      case _ => {
+        ruin()
+        that ++= elems
+        this
+      }
+    }
+
+  def +=(elem: A): this.type = {
+    ruin()
+    that += elem
+    this
+  }
+
+  def clear(): Unit = {
+    collection = null.asInstanceOf[CC[A]]
+    if (ruined) that.clear()
+    ruined = false
+  }
+
+  def result(): CC[A] = if (collection == null) that.result() else collection
+}
+
+private[compat] object CompatImpl {
+  def simpleCBF[A, C](f: => m.Builder[A, C]): CanBuildFrom[Any, A, C] =
+    new CanBuildFrom[Any, A, C] {
+      def apply(from: Any): m.Builder[A, C] = apply()
+      def apply(): m.Builder[A, C]          = f
+    }
+
+  type ImmutableBitSetCC[X] = ({ type L[_] = i.BitSet })#L[X]
+  type MutableBitSetCC[X]   = ({ type L[_] = m.BitSet })#L[X]
+}