Merge pull request #2081 from ccellado/ergo-core-213

Compile ergo-core and avldb to 2.13 and 2.11

Author: kushti

.github/workflows/ci.yml

@@ -21,7 +21,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        scala: [2.13.8, 2.12.10, 2.11.12]
+        scala: [2.13.12, 2.12.18, 2.11.12]
         java: [adopt@1.8]
     runs-on: ${{ matrix.os }}
     steps:
@@ -62,7 +62,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        scala: [2.12.10]
+        scala: [2.12.18]
         java: [adopt@1.8]
     runs-on: ${{ matrix.os }}
     steps:

avldb/build.sbt

@@ -1,24 +1,33 @@
 import sbt.Keys.testFrameworks
 
+val scala211 = "2.11.12"
+val scala212 = "2.12.18"
+val scala213 = "2.13.12"
+
 name := "avldb"
 
+val Versions = new {
+
+  val spire = (scalaVersion: String) =>
+    if (scalaVersion == scala213) "0.17.0"
+    else "0.14.1"
+
+  val scalameter = (scalaVersion: String) =>
+    if (scalaVersion == scala213) "0.19"
+    else "0.9"
+}
+
 libraryDependencies ++= Seq(
   "javax.xml.bind" % "jaxb-api" % "2.4.0-b180830.0359",
   "ch.qos.logback" % "logback-classic" % "1.2.3",
   "com.google.guava" % "guava" % "23.0",
-  "org.scorexfoundation" %% "scrypto" % "2.3.0"
-)
-
-libraryDependencies ++= Seq(
+  "org.scorexfoundation" %% "scrypto" % "2.3.0",
   "org.scalatest" %% "scalatest" % "3.1.1" % "test",
   "org.scalacheck" %% "scalacheck" % "1.14.3" % "test",
   "org.scalatestplus" %% "scalatestplus-scalacheck" % "3.1.0.0-RC2" % Test,
-  "com.storm-enroute" %% "scalameter" % "0.9" % "test"
-)
-
-libraryDependencies ++= Seq(
+  "com.storm-enroute" %% "scalameter" % Versions.scalameter(scalaVersion.value) % "test",
   "org.ethereum" % "leveldbjni-all"     % "1.18.3",
-  "org.typelevel" %% "spire" % "0.14.1"
+  "org.typelevel" %% "spire" % Versions.spire(scalaVersion.value)
 )
 
 testOptions in Test := Seq(Tests.Filter(t => !t.matches(".*Benchmark$")))
@@ -38,13 +47,13 @@ publishTo := {
 
 pomIncludeRepository := { _ => false }
 
-scalacOptions ++= Seq("-Xfatal-warnings", "-feature", "-deprecation")
+scalacOptions ++= Seq("-feature", "-deprecation")
 
 // set bytecode version to 8 to fix NoSuchMethodError for various ByteBuffer methods
 // see https://github.com/eclipse/jetty.project/issues/3244
 // these options applied only in "compile" task since scalac crashes on scaladoc compilation with "-release 8"
 // see https://github.com/scala/community-builds/issues/796#issuecomment-423395500
-scalacOptions in(Compile, compile) ++= Seq("-release", "8")
-scalacOptions --= Seq("-Ywarn-numeric-widen", "-Ywarn-value-discard")
+scalacOptions in(Compile, compile) ++= (if (scalaBinaryVersion.value == "2.11") Seq() else Seq("-release", "8"))
+scalacOptions --= Seq("-Ywarn-numeric-widen", "-Ywarn-value-discard", "-Ywarn-unused:params", "-Xfatal-warnings")
 
 enablePlugins(ReproducibleBuildsPlugin)

avldb/src/main/scala/scorex/crypto/authds/avltree/batch/VersionedLDBAVLStorage.scala

@@ -114,7 +114,7 @@ class VersionedLDBAVLStorage(store: LDBVersionedStore)
       }
 
       def dumpSubtree(sid: DigestType): Try[Unit] = {
-        val builder = mutable.ArrayBuilder.make[Byte]()
+        val builder = new mutable.ArrayBuilder.ofByte
         builder.sizeHint(200000)
         subtreeLoop(sid, builder)
         dumpStorage.insert(sid, builder.result())
@@ -141,7 +141,7 @@ class VersionedLDBAVLStorage(store: LDBVersionedStore)
 
       require(rootNodeLabel.sameElements(expectedRootHash), "Root node hash changed")
 
-      val manifestBuilder = mutable.ArrayBuilder.make[Byte]()
+      val manifestBuilder = new mutable.ArrayBuilder.ofByte
       manifestBuilder.sizeHint(200000)
       manifestBuilder += rootNodeHeight
       manifestBuilder += manifestDepth

avldb/src/main/scala/scorex/db/ByteArrayUtils.scala

@@ -5,11 +5,13 @@ object ByteArrayUtils {
   import java.util.Comparator
 
   // Java comparator
-  val BYTE_ARRAY_COMPARATOR: Comparator[Array[Byte]] = (o1: Array[Byte], o2: Array[Byte]) => compare(o1, o2)
-
+  object BYTE_ARRAY_COMPARATOR extends Ordering[Array[Byte]] {
+    def compare(o1: Array[Byte], o2: Array[Byte]) = compare(o1, o2)
+  }
   // Scala comparator
-  implicit val ByteArrayOrdering: Ordering[Array[Byte]] =
-    (o1: Array[Byte], o2: Array[Byte]) => ByteArrayUtils.compare(o1, o2)
+  implicit object ByteArrayOrdering extends Ordering[Array[Byte]] {
+    def compare(o1: Array[Byte], o2: Array[Byte]) = ByteArrayUtils.compare(o1, o2)
+  }
 
   def compare(o1: Array[Byte], o2: Array[Byte]): Int = {
     val len = Math.min(o1.length, o2.length)

avldb/src/main/scala/scorex/db/LDBKVStore.scala

@@ -82,7 +82,7 @@ class LDBKVStore(protected val db: DB) extends KVStoreReader with ScorexLogging
     breakable {
       while (i.hasNext) {
         val key = i.next().getKey
-        if (ByteArrayUtils.compare(key, last) <= 0) res = Some(key) else break
+        if (ByteArrayUtils.compare(key, last) <= 0) res = Some(key) else break()
       }
     }
     res

avldb/src/test/scala/scorex/db/ByteArrayUtilsSpec.scala

@@ -6,17 +6,21 @@ import org.scalatest.matchers.should.Matchers
 import org.scalatest.propspec.AnyPropSpec
 import org.scalatestplus.scalacheck.ScalaCheckPropertyChecks
 
+import scala.collection.mutable
+import scala.math.Ordering.Implicits._
+
 class ByteArrayUtilsSpec extends AnyPropSpec with ScalaCheckPropertyChecks with Matchers {
 
   lazy val nonEmptyBytesGen: Gen[Array[Byte]] = Gen.nonEmptyListOf(Arbitrary.arbitrary[Byte])
     .map(_.toArray).suchThat(_.length > 0)
 
   property("compare works properly") {
 
-    //Simple and inefficient way to order byte arrays, based on
-    // https://stackoverflow.com/questions/7109943/how-to-define-orderingarraybyte
-    // but we compare unsigned bytes
-    val ordering: Ordering[Array[Byte]] = Ordering.by((_: Array[Byte]).toIterable.map(_ & 0xFF))
+    val ordering: Ordering[Array[Byte]] =
+      new Ordering[Array[Byte]] {
+        override def compare(o1: Array[Byte], o2: Array[Byte]): Int =
+          implicitly[Ordering[Seq[Int]]].compare(o1.toSeq.map(_ & 0xFF), o2.toSeq.map(_ & 0xFF))
+      }
 
     forAll(nonEmptyBytesGen, nonEmptyBytesGen) { case (bs1, bs2) =>
       val efficientOrdering = Seq(bs1, bs2).sorted(ByteArrayUtils.ByteArrayOrdering)

build.sbt

@@ -5,8 +5,8 @@ logLevel := Level.Debug
 
 // this values should be in sync with ergo-wallet/build.sbt
 val scala211 = "2.11.12"
-val scala212 = "2.12.10"
-val scala213 = "2.13.8"
+val scala212 = "2.12.18"
+val scala213 = "2.13.12"
 
 lazy val commonSettings = Seq(
   organization := "org.ergoplatform",
@@ -44,16 +44,10 @@ val ficusVersion = "1.4.7"
 val effectiveSigmaStateVersion = Option(System.getenv().get("SIGMASTATE_VERSION")).getOrElse(sigmaStateVersion)
 val effectiveSigma = "org.scorexfoundation" %% "sigma-state" % effectiveSigmaStateVersion
 
-
 libraryDependencies ++= Seq(
   effectiveSigma.force()
     .exclude("ch.qos.logback", "logback-classic")
     .exclude("org.scorexfoundation", "scrypto"),
-  
-  // api dependencies 
-  "io.circe" %% "circe-core" % circeVersion,
-  "io.circe" %% "circe-generic" % circeVersion,
-  "io.circe" %% "circe-parser" % circeVersion,
 
   "ch.qos.logback" % "logback-classic" % "1.3.5",
 
@@ -208,14 +202,17 @@ scapegoatDisabledInspections := Seq("FinalModifierOnCaseClass")
 Test / testOptions := Seq(Tests.Filter(s => !s.endsWith("Bench")))
 
 lazy val avldb = (project in file("avldb"))
+  .disablePlugins(ScapegoatSbtPlugin) // not compatible with crossScalaVersions
   .settings(
+    crossScalaVersions := Seq(scala213, scalaVersion.value, scala211),
     commonSettings,
     name := "avldb",
     // set bytecode version to 8 to fix NoSuchMethodError for various ByteBuffer methods
     // see https://github.com/eclipse/jetty.project/issues/3244
     // these options applied only in "compile" task since scalac crashes on scaladoc compilation with "-release 8"
     // see https://github.com/scala/community-builds/issues/796#issuecomment-423395500
-    scalacOptions in(Compile, compile) ++= Seq("-release", "8"),
+    scalacOptions in(Compile, compile) ++= (if (scalaBinaryVersion.value == "2.11") Seq() else Seq("-release", "8")),
+    scalacOptions in(Compile, compile) --= scalacOpts,
     javacOptions in(Compile, compile) ++= javacReleaseOption,
     libraryDependencies ++= Seq(
       // database dependencies
@@ -244,17 +241,19 @@ lazy val avldb_benchmarks = (project in file("avldb/benchmarks"))
   .enablePlugins(JmhPlugin)
 
 lazy val ergoCore = (project in file("ergo-core"))
+  .disablePlugins(ScapegoatSbtPlugin) // not compatible with crossScalaVersions
   .dependsOn(avldb % "test->test;compile->compile")
   .dependsOn(ergoWallet % "test->test;compile->compile")
   .settings(
+    crossScalaVersions := Seq(scala213, scalaVersion.value, scala211),
     commonSettings,
     name := "ergo-core",
     libraryDependencies ++= Seq(
       "com.iheart" %% "ficus" % ficusVersion,
       effectiveSigma,
       (effectiveSigma % Test).classifier("tests")
     ),
-    scalacOptions in(Compile, compile) ++= Seq("-release", "8"),
+    scalacOptions in(Compile, compile) ++= (if (scalaBinaryVersion.value == "2.11") Seq() else Seq("-release", "8")),
     scalacOptions in(Compile, compile) --= scalacOpts,
   )
 
@@ -293,6 +292,10 @@ lazy val ergo = (project in file("."))
     scalacOptions in(Compile, compile) ++= Seq("-release", "8"),
     javacOptions in(Compile, compile) ++= javacReleaseOption,
     libraryDependencies ++= Seq(
+      // api dependencies
+      "io.circe" %% "circe-core" % circeVersion,
+      "io.circe" %% "circe-generic" % circeVersion,
+      "io.circe" %% "circe-parser" % circeVersion,
       // network dependencies
       "com.typesafe.akka" %% "akka-stream" % akkaVersion, // required for akka-http to compile
       "com.typesafe.akka" %% "akka-actor" % akkaVersion, // required for akka-http to compile

ergo-core/build.sbt

@@ -1,4 +1,19 @@
 // this values should be in sync with root (i.e. ../build.sbt)
 val scala211 = "2.11.12"
-val scala212 = "2.12.10"
-val scala213 = "2.13.8"
+val scala212 = "2.12.18"
+val scala213 = "2.13.12"
+
+val deps211 = Seq(
+  "io.circe" %% "circe-core" % "0.10.0",
+  "io.circe" %% "circe-generic" % "0.10.0",
+  "io.circe" %% "circe-parser" % "0.10.0")
+val deps212 = Seq(
+  "io.circe" %% "circe-core" % "0.13.0",
+  "io.circe" %% "circe-generic" % "0.13.0",
+  "io.circe" %% "circe-parser" % "0.13.0")
+
+libraryDependencies ++= Seq() ++
+  (if (scalaVersion.value == scala211) deps211 else deps212)
+
+scalacOptions ++= (if (scalaBinaryVersion.value == scala211) Seq("-language:implicitConversions") else Seq())
+scalacOptions --= Seq("-Ywarn-numeric-widen", "-Ywarn-value-discard", "-Ywarn-unused:params", "-Xfatal-warnings")