Merge pull request #426 from AVSystem/deps-update

Update Jetty, Mongo driver
AVSystem · Nov 16, 2022 · 023490c · 023490c
2 parents 984e2ce + 950c0d8
commit 023490c
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 20 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.8, 2.12.15]
+        scala: [2.13.10, 2.12.17]
         java: [graalvm-ce-java11@21.1.0]
     runs-on: ${{ matrix.os }}
     steps:
@@ -92,7 +92,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        scala: [2.13.8]
+        scala: [2.13.10]
         java: [graalvm-ce-java11@21.1.0]
     runs-on: ${{ matrix.os }}
     steps:
@@ -118,22 +118,22 @@ jobs:
             ~/Library/Caches/Coursier/v1
           key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}
 
-      - name: Download target directories (2.13.8)
+      - name: Download target directories (2.13.10)
         uses: actions/download-artifact@v2
         with:
-          name: target-${{ matrix.os }}-2.13.8-${{ matrix.java }}
+          name: target-${{ matrix.os }}-2.13.10-${{ matrix.java }}
 
-      - name: Inflate target directories (2.13.8)
+      - name: Inflate target directories (2.13.10)
         run: |
           tar xf targets.tar
           rm targets.tar
 
-      - name: Download target directories (2.12.15)
+      - name: Download target directories (2.12.17)
         uses: actions/download-artifact@v2
         with:
-          name: target-${{ matrix.os }}-2.12.15-${{ matrix.java }}
+          name: target-${{ matrix.os }}-2.12.17-${{ matrix.java }}
 
-      - name: Inflate target directories (2.12.15)
+      - name: Inflate target directories (2.12.17)
         run: |
           tar xf targets.tar
           rm targets.tar

diff --git a/commons-core/src/main/scala/com/avsystem/commons/misc/AnnotationOf.scala b/commons-core/src/main/scala/com/avsystem/commons/misc/AnnotationOf.scala
@@ -44,7 +44,7 @@ object AnnotationsOf {
 final class HasAnnotation[A, T] private()
 object HasAnnotation {
   private[this] val reusable = new HasAnnotation
-  def create[A, T]: HasAnnotation[A, T] = reusable.asInstanceOf
+  def create[A, T]: HasAnnotation[A, T] = reusable.asInstanceOf[HasAnnotation[A, T]]
 
   implicit def materialize[A, T]: HasAnnotation[A, T] = macro macros.misc.MiscMacros.hasAnnotation[A, T]
 }

diff --git a/commons-core/src/test/scala/com/avsystem/commons/misc/OptRefTest.scala b/commons-core/src/test/scala/com/avsystem/commons/misc/OptRefTest.scala
@@ -31,8 +31,8 @@ class OptRefTest extends AnyFunSuite {
   }
 
   test("zip") {
-    assert(OptRef(3).zip(OptRef(2)) == OptRef((3, 2)))
-    assert(OptRef.Empty.zip(OptRef(2)) == OptRef.Empty)
-    assert(OptRef(3).zip(OptRef.Empty) == OptRef.Empty)
+    assert(OptRef[JInteger](3).zip(OptRef[JInteger](2)) == OptRef((3, 2)))
+    assert(OptRef.Empty.zip(OptRef[JInteger](2)) == OptRef.Empty)
+    assert(OptRef[JInteger](3).zip(OptRef.Empty) == OptRef.Empty)
   }
 }
diff --git a/commons-mongo/jvm/src/test/scala/com/avsystem/commons/mongo/core/ops/SortingTest.scala b/commons-mongo/jvm/src/test/scala/com/avsystem/commons/mongo/core/ops/SortingTest.scala
@@ -28,8 +28,8 @@ class SortingTest extends AnyFunSuite {
   }
 
   test("bsonRef tests") {
-    val someRef = BsonRef(someKey, GenCodec.StringCodec, null)
-    val otherRef = BsonRef(otherKey, GenCodec.IntCodec, null)
+    val someRef = BsonRef[Any, String](someKey, GenCodec.StringCodec, null)
+    val otherRef = BsonRef[Any, Int](otherKey, GenCodec.IntCodec, null)
 
     assert(someRef.ascending === Sorts.ascending(someKey))
     assert(someRef.descending === Sorts.descending(someKey))

diff --git a/commons-redis/src/main/scala/com/avsystem/commons/redis/Hash.scala b/commons-redis/src/main/scala/com/avsystem/commons/redis/Hash.scala
@@ -46,9 +46,9 @@ object Hash {
   )
 
   def slot(key: ByteString): Int = {
-    val tagStart = key.indexOf('{')
+    val tagStart = key.indexOf('{'.toByte) // .toByte to make both Scala 2.12 and 2.13 compiler happy
     val bytes = if (tagStart >= 0) {
-      val tagEnd = key.indexOf('}', tagStart + 1)
+      val tagEnd = key.indexOf('}'.toByte, tagStart + 1)
       if (tagEnd > tagStart + 1)
         key.iterator.slice(tagStart + 1, tagEnd)
       else key.iterator

diff --git a/project/Build.scala b/project/Build.scala
@@ -41,12 +41,12 @@ object Build extends BuildDef {
   val scalatestVersion = "3.2.12"
   val scalatestplusScalacheckVersion = "3.2.12.0"
   val scalacheckVersion = "1.16.0"
-  val jettyVersion = "9.4.48.v20220622"
-  val mongoVersion = "4.6.1"
+  val jettyVersion = "9.4.49.v20220914"
+  val mongoVersion = "4.7.2"
   val springVersion = "4.3.26.RELEASE"
   val typesafeConfigVersion = "1.4.2"
   val commonsIoVersion = "1.3.2" // test only
-  val scalaLoggingVersion = "3.9.4"
+  val scalaLoggingVersion = "3.9.5"
   val akkaVersion = "2.6.19"
   val monixVersion = "3.4.1"
   val monixBioVersion = "1.2.0"
@@ -83,7 +83,7 @@ object Build extends BuildDef {
       Developer("ghik", "Roman Janusz", "r.janusz@avsystem.com", url("https://github.com/ghik")),
     ),
 
-    crossScalaVersions := Seq("2.13.8", "2.12.15"),
+    crossScalaVersions := Seq("2.13.10", "2.12.17"),
     scalaVersion := crossScalaVersions.value.head,
     compileOrder := CompileOrder.Mixed,