Merge pull request #482 from AVSystem/scala2-13

Drop Scala 2.12 support
AVSystem · Aug 31, 2023 · bf51ea8 · bf51ea8
2 parents 59ea63b + 8cd076b
commit bf51ea8
Show file tree

Hide file tree

Showing 51 changed files with 46 additions and 184 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -24,7 +24,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        scala: [2.13.11, 2.12.18]
+        scala: [2.13.11]
         java: [temurin@11, temurin@17]
     runs-on: ${{ matrix.os }}
     steps:

diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 # AVSystem Commons Library for Scala
 
 [![Build Status](https://travis-ci.org/AVSystem/scala-commons.svg?branch=master)](https://travis-ci.org/AVSystem/scala-commons)
-[![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.avsystem.commons/commons-core_2.12/badge.svg)](https://maven-badges.herokuapp.com/maven-central/com.avsystem.commons/commons-core_2.12)
+[![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.avsystem.commons/commons-core_2.12/badge.svg)](https://maven-badges.herokuapp.com/maven-central/com.avsystem.commons/commons-core_2.13)
 
 **[API reference](http://avsystem.github.io/scala-commons/api/com/avsystem/commons/index.html)**
 

diff --git a/benchmark/js/fullopt-2.12.html → benchmark/js/fullopt-2.13.html b/benchmark/js/fullopt-2.12.html → benchmark/js/fullopt-2.13.html
@@ -5,7 +5,7 @@
 </head>
 <body>
 <div id="body">Loading...</div>
-<script type="text/javascript" src="target/scala-2.12/commons-benchmark-jsdeps.min.js"></script>
-<script type="text/javascript" src="target/scala-2.12/commons-benchmark-opt.js"></script>
+<script type="text/javascript" src="target/scala-2.13/commons-benchmark-jsdeps.min.js"></script>
+<script type="text/javascript" src="target/scala-2.13/commons-benchmark-opt.js"></script>
 </body>
 </html>
diff --git a/benchmark/jvm/src/main/scala-2.11/com/avsystem/commons/benchmark/CrossRedisBenchmark.scala b/benchmark/jvm/src/main/scala-2.11/com/avsystem/commons/benchmark/CrossRedisBenchmark.scala
diff --git a/core/jvm/src/main/scala/com/avsystem/commons/jiop/ScalaJDoubleStream.scala b/core/jvm/src/main/scala/com/avsystem/commons/jiop/ScalaJDoubleStream.scala
@@ -2,8 +2,7 @@ package com.avsystem.commons
 package jiop
 
 import java.util.DoubleSummaryStatistics
-
-import scala.collection.compat._
+import scala.collection.Factory
 
 final class ScalaJDoubleStream(private val jStream: JDoubleStream) extends AnyVal {
   def asJava: JDoubleStream = jStream

diff --git a/core/jvm/src/main/scala/com/avsystem/commons/jiop/ScalaJIntStream.scala b/core/jvm/src/main/scala/com/avsystem/commons/jiop/ScalaJIntStream.scala
@@ -2,8 +2,7 @@ package com.avsystem.commons
 package jiop
 
 import java.util.IntSummaryStatistics
-
-import scala.collection.compat._
+import scala.collection.Factory
 
 final class ScalaJIntStream(private val jStream: JIntStream) extends AnyVal {
   def asJava: JIntStream = jStream

diff --git a/core/jvm/src/main/scala/com/avsystem/commons/jiop/ScalaJLongStream.scala b/core/jvm/src/main/scala/com/avsystem/commons/jiop/ScalaJLongStream.scala
@@ -2,8 +2,7 @@ package com.avsystem.commons
 package jiop
 
 import java.util.LongSummaryStatistics
-
-import scala.collection.compat._
+import scala.collection.Factory
 
 final class ScalaJLongStream(private val jStream: JLongStream) extends AnyVal {
   def asJava: JLongStream = jStream

diff --git a/core/jvm/src/main/scala/com/avsystem/commons/jiop/ScalaJStream.scala b/core/jvm/src/main/scala/com/avsystem/commons/jiop/ScalaJStream.scala
@@ -2,7 +2,7 @@ package com.avsystem.commons
 package jiop
 
 import scala.annotation.unchecked.{uncheckedVariance => uV}
-import scala.collection.compat._
+import scala.collection.Factory
 
 final class ScalaJStream[+A](private val jStream: JStream[A@uV]) extends AnyVal {
   def asJava[B >: A]: JStream[B] =

diff --git a/core/jvm/src/test/scala/com/avsystem/commons/jiop/JavaInteropTest.scala b/core/jvm/src/test/scala/com/avsystem/commons/jiop/JavaInteropTest.scala
@@ -1,13 +1,11 @@
 package com.avsystem.commons
 package jiop
 
-import java.util.stream.{Collectors, DoubleStream, IntStream, LongStream}
-
 import com.avsystem.commons.jiop.GuavaInterop._
 import com.google.common.util.concurrent.{MoreExecutors, SettableFuture}
 import org.scalatest.funsuite.AnyFunSuite
 
-import scala.collection.compat._
+import java.util.stream.{Collectors, DoubleStream, IntStream, LongStream}
 import scala.concurrent.Await
 import scala.concurrent.duration.Duration
 

diff --git a/core/src/main/scala-2.12/com/avsystem/commons/collection/crossBuilders.scala b/core/src/main/scala-2.12/com/avsystem/commons/collection/crossBuilders.scala
diff --git a/core/src/main/scala-2.12/com/avsystem/commons/jiop/CompatAsJavaScalaExtensions.scala b/core/src/main/scala-2.12/com/avsystem/commons/jiop/CompatAsJavaScalaExtensions.scala
diff --git a/core/src/main/scala-2.12/com/avsystem/commons/misc/OptBase.scala b/core/src/main/scala-2.12/com/avsystem/commons/misc/OptBase.scala
diff --git a/core/src/main/scala/com/avsystem/commons/SharedExtensions.scala b/core/src/main/scala/com/avsystem/commons/SharedExtensions.scala
@@ -2,11 +2,9 @@ package com.avsystem.commons
 
 import com.avsystem.commons.concurrent.RunNowEC
 import com.avsystem.commons.misc._
-import scala.annotation.nowarn
 
-import scala.annotation.tailrec
-import scala.collection.compat._
-import scala.collection.{AbstractIterator, mutable}
+import scala.annotation.{nowarn, tailrec}
+import scala.collection.{AbstractIterator, BuildFrom, Factory, mutable}
 
 trait SharedExtensions {
 
@@ -536,19 +534,6 @@ object SharedExtensionsUtils extends SharedExtensions {
   class IterableOnceOps[C[X] <: IterableOnce[X], A](private val coll: C[A]) extends AnyVal {
     private def it: Iterator[A] = coll.iterator
 
-    /**
-      * Provided as a Scala 2.12 "backport" of Scala 2.13 regular method.
-      * In Scala 2.13 this extension method is always be hidden by an actual method available on `IterableOnce`.
-      */
-    def knownSize: Int = coll match {
-      case c: BIterable[_] if c.isEmpty => 0
-      case is: BIndexedSeq[_] => is.size
-      case _: IListMap[_, _] => -1
-      case m: BMap[_, _] => m.size
-      case s: BSet[_] => s.size
-      case _ => -1
-    }
-
     def toSized[To](fac: Factory[A, To], sizeHint: Int): To = {
       val b = fac.newBuilder
       b.sizeHint(sizeHint)
@@ -748,9 +733,6 @@ object SharedExtensionsUtils extends SharedExtensions {
       }
 
     def distinct: Iterator[A] = distinctBy(identity)
-
-    //overloaded to avoid eager iterator consumption in 2.12
-    def flatCollect[B](f: PartialFunction[A, IterableOnce[B]]): Iterator[B] = it.collect(f).flatten
   }
 
   object IteratorCompanionOps {

diff --git a/core/src/main/scala/com/avsystem/commons/collection/CollectionAliases.scala b/core/src/main/scala/com/avsystem/commons/collection/CollectionAliases.scala
@@ -1,7 +1,6 @@
 package com.avsystem.commons
 package collection
 
-import scala.collection.compat.{immutable => scci}
 import scala.collection.{immutable => sci, mutable => scm}
 import scala.{collection => sc}
 
@@ -37,8 +36,8 @@ trait CollectionAliases {
 
   type MArraySeq[A] = scm.ArraySeq[A]
   final def MArraySeq: scm.ArraySeq.type = scm.ArraySeq
-  type IArraySeq[+A] = scci.ArraySeq[A]
-  final def IArraySeq: scci.ArraySeq.type = scci.ArraySeq
+  type IArraySeq[+A] = sci.ArraySeq[A]
+  final def IArraySeq: sci.ArraySeq.type = sci.ArraySeq
 
   type BLinearSeq[+A] = sc.LinearSeq[A]
   final def BLinearSeq: sc.LinearSeq.type = sc.LinearSeq

diff --git a/core/src/main/scala/com/avsystem/commons/collection/MutableStack.scala b/core/src/main/scala/com/avsystem/commons/collection/MutableStack.scala
@@ -1,8 +1,6 @@
 package com.avsystem.commons
 package collection
 
-import scala.collection.compat._
-
 final class MutableStack[T] {
   private[this] var ssize: Int = 0
   private[this] var stack = List.empty[T]

diff --git a/...em/commons/collection/crossBuilders.scala → ...em/commons/collection/crossBuilders.scala b/...em/commons/collection/crossBuilders.scala → ...em/commons/collection/crossBuilders.scala
diff --git a/core/src/main/scala/com/avsystem/commons/concurrent/ObservableExtensions.scala b/core/src/main/scala/com/avsystem/commons/concurrent/ObservableExtensions.scala
@@ -5,6 +5,7 @@ import com.avsystem.commons.concurrent.ObservableExtensions.ObservableOps
 import monix.eval.Task
 import monix.reactive.Observable
 
+import scala.collection.Factory
 import scala.util.Sorting
 
 trait ObservableExtensions {
@@ -14,8 +15,6 @@ trait ObservableExtensions {
 object ObservableExtensions extends ObservableExtensions {
   final class ObservableOps[T](private val obs: Observable[T]) extends AnyVal {
 
-    import scala.collection.compat._
-
     /** Creates a [[monix.eval.Task Task]] that upon execution
       * will signal the first generated element of the source observable.
       *
@@ -51,7 +50,7 @@ object ObservableExtensions extends ObservableExtensions {
         .toL(Array)
         .map { arr =>
           Sorting.stableSort(arr)
-          immutable.ArraySeq.unsafeWrapArray(arr)
+          IArraySeq.unsafeWrapArray(arr)
         }
 
     /** Given a function that returns a key for each element emitted by the source Observable,

diff --git a/...ns/jiop/CompatAsJavaScalaExtensions.scala → ...ns/jiop/CompatAsJavaScalaExtensions.scala b/...ns/jiop/CompatAsJavaScalaExtensions.scala → ...ns/jiop/CompatAsJavaScalaExtensions.scala
diff --git a/core/src/main/scala/com/avsystem/commons/jiop/JCollectionUtils.scala b/core/src/main/scala/com/avsystem/commons/jiop/JCollectionUtils.scala
@@ -2,8 +2,7 @@ package com.avsystem.commons
 package jiop
 
 import java.{lang => jl, util => ju}
-
-import scala.collection.compat._
+import scala.collection.Factory
 
 trait JCollectionUtils extends JFactories {
   type JIterator[T] = ju.Iterator[T]

diff --git a/core/src/main/scala/com/avsystem/commons/jiop/JFactory.scala b/core/src/main/scala/com/avsystem/commons/jiop/JFactory.scala
@@ -3,7 +3,6 @@ package jiop
 
 import com.avsystem.commons.collection.{CrossBuilder, CrossFactory}
 
-import scala.collection.compat._
 import scala.collection.mutable
 
 trait JFactory[-Elem, +To] extends CrossFactory[Elem, To] {

diff --git a/...3/com/avsystem/commons/misc/package.scala → ...a/com/avsystem/commons/misc/package.scala b/...3/com/avsystem/commons/misc/package.scala → ...a/com/avsystem/commons/misc/package.scala
diff --git a/core/src/main/scala/com/avsystem/commons/rpc/RpcUtils.scala b/core/src/main/scala/com/avsystem/commons/rpc/RpcUtils.scala
@@ -3,7 +3,7 @@ package rpc
 
 import com.avsystem.commons.macros.misc.MiscMacros
 
-import scala.collection.compat._
+import scala.collection.Factory
 
 class InvalidRpcCall(msg: String, cause: Throwable = null)
   extends RuntimeException(msg, cause)

diff --git a/core/src/main/scala/com/avsystem/commons/serialization/GenCodec.scala b/core/src/main/scala/com/avsystem/commons/serialization/GenCodec.scala
@@ -9,7 +9,7 @@ import com.avsystem.commons.misc.{Bytes, Timestamp}
 
 import java.util.UUID
 import scala.annotation.{implicitNotFound, tailrec}
-import scala.collection.compat._
+import scala.collection.Factory
 
 /**
   * Type class for types that can be serialized to [[Output]] (format-agnostic "output stream") and deserialized
@@ -511,7 +511,6 @@ object GenCodec extends RecursiveAutoCodecs with TupleGenCodecs {
 
   // these are covered by the generic `seqCodec` and `setCodec` but making them explicit may be easier
   // for the compiler and also make IntelliJ less confused
-  // https://github.com/scala/bug/issues/11027 - only for Scala 2.12
   implicit def bseqCodec[T: GenCodec]: GenCodec[BSeq[T]] = seqCodec[BSeq, T](GenCodec[T], implicitly[Factory[T, List[T]]])
   implicit def iseqCodec[T: GenCodec]: GenCodec[ISeq[T]] = seqCodec[ISeq, T](GenCodec[T], implicitly[Factory[T, List[T]]])
   implicit def mseqCodec[T: GenCodec]: GenCodec[MSeq[T]] = seqCodec[MSeq, T]

diff --git a/core/src/main/scala/com/avsystem/commons/serialization/cbor/CborOptimizedCodecs.scala b/core/src/main/scala/com/avsystem/commons/serialization/cbor/CborOptimizedCodecs.scala
@@ -5,7 +5,7 @@ import com.avsystem.commons.jiop.JFactory
 import com.avsystem.commons.serialization.GenCodec.OOOFieldsObjectCodec
 import com.avsystem.commons.serialization._
 
-import scala.collection.compat._
+import scala.collection.Factory
 
 trait CborOptimizedCodecs {
   /**

diff --git a/core/src/test/scala-2.12/com/avsystem/commons/concurrent/package.scala b/core/src/test/scala-2.12/com/avsystem/commons/concurrent/package.scala
diff --git a/core/src/test/scala-2.12/com/avsystem/commons/serialization/OverloadedApplyCodecTest.scala b/core/src/test/scala-2.12/com/avsystem/commons/serialization/OverloadedApplyCodecTest.scala
diff --git a/core/src/test/scala-2.12/com/avsystem/commons/serialization/SealedBaseThatHasGenCodec.scala b/core/src/test/scala-2.12/com/avsystem/commons/serialization/SealedBaseThatHasGenCodec.scala
diff --git a/core/src/test/scala/com/avsystem/commons/concurrent/ObservableExtensionsTest.scala b/core/src/test/scala/com/avsystem/commons/concurrent/ObservableExtensionsTest.scala
@@ -9,7 +9,7 @@ import org.scalatest.funsuite.AnyFunSuite
 import org.scalatest.matchers.should.Matchers
 import org.scalatestplus.scalacheck.ScalaCheckDrivenPropertyChecks
 
-import scala.collection.compat._
+import scala.collection.Factory
 
 class ObservableExtensionsTest extends AnyFunSuite with Matchers
   with ScalaCheckDrivenPropertyChecks with ObservableExtensions with ScalaFutures {
@@ -56,7 +56,7 @@ class ObservableExtensionsTest extends AnyFunSuite with Matchers
       testFactory(Seq)
       testFactory(Vector)
       testFactory(Iterable)
-      testFactory(immutable.LazyList)
+      testFactory(LazyList)
       testFactory(IHashMap)
       testFactory(IListMap)
       testFactory(ITreeMap)

diff --git a/macros/src/main/scala-2.12/com/avsystem/commons/macros/CompatMacroCommons.scala b/macros/src/main/scala-2.12/com/avsystem/commons/macros/CompatMacroCommons.scala
diff --git a/...m/commons/macros/CompatMacroCommons.scala → ...m/commons/macros/CompatMacroCommons.scala b/...m/commons/macros/CompatMacroCommons.scala → ...m/commons/macros/CompatMacroCommons.scala
diff --git a/macros/src/main/scala/com/avsystem/commons/macros/meta/MacroSymbols.scala b/macros/src/main/scala/com/avsystem/commons/macros/meta/MacroSymbols.scala
@@ -17,7 +17,7 @@ private[commons] trait MacroSymbols extends MacroCommons {
   final def RpcUtils = q"$RpcPackage.RpcUtils"
   final def OptionLikeCls = tq"$MetaPackage.OptionLike"
   final def AutoOptionalParamCls = tq"$MetaPackage.AutoOptionalParam"
-  final def FactoryCls = tq"$CollectionPkg.compat.Factory"
+  final def FactoryCls = tq"$CollectionPkg.Factory"
   final lazy val RpcArityAT: Type = staticType(tq"$MetaPackage.SymbolArity")
   final lazy val SingleArityAT: Type = staticType(tq"$MetaPackage.single")
   final lazy val OptionalArityAT: Type = staticType(tq"$MetaPackage.optional")

diff --git a/macros/src/main/scala/com/avsystem/commons/macros/misc/MiscMacros.scala b/macros/src/main/scala/com/avsystem/commons/macros/misc/MiscMacros.scala
@@ -520,7 +520,7 @@ final class MiscMacros(ctx: blackbox.Context) extends AbstractMacroCommons(ctx)
           val elems = au.params.indices.map(i => q"$resName.${TermName(s"_${i + 1}")}")
           q"""
              val $resName = $unapplyRes.get
-             $CollectionPkg.compat.immutable.ArraySeq.unsafeWrapArray($ArrayObj[$ScalaPkg.Any](..$elems))
+             $CollectionPkg.immutable.ArraySeq.unsafeWrapArray($ArrayObj[$ScalaPkg.Any](..$elems))
            """
       }
     }

diff --git a/mongo/jvm/src/main/scala-2.12/com/avsystem/commons/mongo/typed/MongoPolyDataCompanion.scala b/mongo/jvm/src/main/scala-2.12/com/avsystem/commons/mongo/typed/MongoPolyDataCompanion.scala
diff --git a/mongo/jvm/src/main/scala/com/avsystem/commons/mongo/BsonCodec.scala b/mongo/jvm/src/main/scala/com/avsystem/commons/mongo/BsonCodec.scala
@@ -1,12 +1,11 @@
 package com.avsystem.commons
 package mongo
 
-import java.time.Instant
-
 import org.bson.types.ObjectId
-import org.bson.{BsonArray, BsonBinary, BsonBoolean, BsonDateTime, BsonDocument, BsonDouble, BsonInt32, BsonInt64, BsonObjectId, BsonString, BsonValue}
+import org.bson._
 
-import _root_.scala.collection.compat._
+import java.time.Instant
+import _root_.scala.collection.Factory
 import _root_.scala.language.higherKinds
 
 /**

diff --git a/mongo/jvm/src/main/scala/com/avsystem/commons/mongo/Filter.scala b/mongo/jvm/src/main/scala/com/avsystem/commons/mongo/Filter.scala
@@ -3,9 +3,9 @@ package mongo
 
 import com.mongodb.client.model.{Filters => F}
 import org.bson.conversions.Bson
-import org.bson.{BsonArray, BsonDateTime, BsonDouble, BsonInt32, BsonInt64, BsonString, BsonValue}
+import org.bson._
 
-import _root_.scala.collection.compat._
+import _root_.scala.collection.Factory
 
 /**
   * @author MKej

diff --git a/.../mongo/typed/MongoPolyDataCompanion.scala → .../mongo/typed/MongoPolyDataCompanion.scala b/.../mongo/typed/MongoPolyDataCompanion.scala → .../mongo/typed/MongoPolyDataCompanion.scala