Merge branch 'master' into update/sbt-1.4.6

Author: scala-steward

.github/workflows/ci.yml

@@ -24,7 +24,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        scala: [2.12.12, 2.13.3]
+        scala: [2.13.4, 2.12.13]
         java: [adopt@1.11]
     runs-on: ${{ matrix.os }}
     steps:
@@ -91,7 +91,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        scala: [2.13.3]
+        scala: [2.13.4]
         java: [adopt@1.11]
     runs-on: ${{ matrix.os }}
     steps:
@@ -117,22 +117,22 @@ jobs:
             ~/Library/Caches/Coursier/v1
           key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}
 
-      - name: Download target directories (2.12.12)
+      - name: Download target directories (2.13.4)
         uses: actions/download-artifact@v2
         with:
-          name: target-${{ matrix.os }}-2.12.12-${{ matrix.java }}
+          name: target-${{ matrix.os }}-2.13.4-${{ matrix.java }}
 
-      - name: Inflate target directories (2.12.12)
+      - name: Inflate target directories (2.13.4)
         run: |
           tar xf targets.tar
           rm targets.tar
 
-      - name: Download target directories (2.13.3)
+      - name: Download target directories (2.12.13)
         uses: actions/download-artifact@v2
         with:
-          name: target-${{ matrix.os }}-2.13.3-${{ matrix.java }}
+          name: target-${{ matrix.os }}-2.12.13-${{ matrix.java }}
 
-      - name: Inflate target directories (2.13.3)
+      - name: Inflate target directories (2.12.13)
         run: |
           tar xf targets.tar
           rm targets.tar

build.sbt

@@ -9,29 +9,31 @@ cancelable in Global := true
 val forIdeaImport = System.getProperty("idea.managed", "false").toBoolean && System.getProperty("idea.runid") == null
 
 val silencerVersion = "1.7.1"
-val collectionCompatVersion = "2.1.6"
-val guavaVersion = "23.0"
+val collectionCompatVersion = "2.3.2"
+val guavaVersion = "23.6.1-jre"
 val jsr305Version = "3.0.2"
-val scalatestVersion = "3.2.1"
+val scalatestVersion = "3.2.3"
 val scalatestplusScalacheckVersion = "3.2.2.0"
-val scalacheckVersion = "1.14.3"
-val jettyVersion = "9.4.31.v20200723"
+val scalacheckVersion = "1.15.2"
+val jettyVersion = "9.4.35.v20201120"
 val mongoVersion = "4.1.1"
 val springVersion = "4.3.26.RELEASE"
 val typesafeConfigVersion = "1.4.0"
 val commonsIoVersion = "1.3.2"
 val scalaLoggingVersion = "3.9.2"
 val akkaVersion = "2.6.8"
 val monixVersion = "3.3.0"
-val mockitoVersion = "3.5.15"
+val mockitoVersion = "3.7.0"
 val circeVersion = "0.13.0"
-val upickleVersion = "1.2.0"
+val upickleVersion = "1.2.2"
 val scalajsBenchmarkVersion = "0.8.0"
 val slf4jVersion = "1.7.30"
 
 // for binary compatibility checking
 val previousCompatibleVersions = Set("1.39.14")
 
+Global / excludeLintKeys ++= Set(ideExcludedDirectories, ideOutputDirectory, ideBasePackages, ideSkipProject)
+
 inThisBuild(Seq(
   organization := "com.avsystem.commons",
   homepage := Some(url("https://github.com/AVSystem/scala-commons")),
@@ -51,30 +53,9 @@ inThisBuild(Seq(
     Developer("ghik", "Roman Janusz", "r.janusz@avsystem.com", url("https://github.com/ghik")),
   ),
 
-  crossScalaVersions := Seq("2.12.12", "2.13.3"),
-  scalaVersion := crossScalaVersions.value.last,
+  crossScalaVersions := Seq("2.13.4", "2.12.13"),
+  scalaVersion := crossScalaVersions.value.head,
   compileOrder := CompileOrder.Mixed,
-  scalacOptions ++= Seq(
-    "-encoding", "utf-8",
-    "-Yrangepos",
-    "-explaintypes",
-    "-feature",
-    "-deprecation",
-    "-unchecked",
-    "-language:implicitConversions",
-    "-language:existentials",
-    "-language:dynamics",
-    "-language:experimental.macros",
-    "-language:higherKinds",
-    "-Xfatal-warnings",
-    "-Xlint:-missing-interpolator,-adapted-args,-unused,_",
-  ),
-  scalacOptions ++= {
-    if (scalaBinaryVersion.value == "2.12") Seq(
-      "-Ycache-plugin-class-loader:last-modified",
-      "-Ycache-macro-class-loader:last-modified",
-    ) else Seq.empty
-  },
 
   githubWorkflowTargetTags ++= Seq("v*"),
 
@@ -121,6 +102,33 @@ inThisBuild(Seq(
 ))
 
 val commonSettings = Seq(
+  Compile / scalacOptions ++= Seq(
+    "-encoding", "utf-8",
+    "-Yrangepos",
+    "-explaintypes",
+    "-feature",
+    "-deprecation",
+    "-unchecked",
+    "-language:implicitConversions",
+    "-language:existentials",
+    "-language:dynamics",
+    "-language:experimental.macros",
+    "-language:higherKinds",
+    "-Xfatal-warnings",
+    "-Xlint:-missing-interpolator,-adapted-args,-unused,_",
+    "-Ycache-plugin-class-loader:last-modified",
+    "-Ycache-macro-class-loader:last-modified",
+  ),
+
+  Compile / scalacOptions ++= {
+    if (scalaBinaryVersion.value == "2.13") Seq(
+      "-Xnon-strict-patmat-analysis",
+      "-Xlint:-strict-unsealed-patmat"
+    ) else Seq.empty
+  },
+
+  Test / scalacOptions := (Compile / scalacOptions).value,
+
   sources in(Compile, doc) := Seq.empty, // relying on unidoc
   apiURL := Some(url("http://avsystem.github.io/scala-commons/api")),
   autoAPIMappings := true,

commons-core/jvm/src/main/scala/com/avsystem/commons/concurrent/ObservableBlockingIterator.scala

@@ -2,7 +2,6 @@ package com.avsystem.commons
 package concurrent
 
 import java.util.concurrent.ArrayBlockingQueue
-
 import com.avsystem.commons.collection.CloseableIterator
 import com.github.ghik.silencer.silent
 import monix.execution.{Ack, Scheduler}

commons-core/src/main/scala/com/avsystem/commons/SharedExtensions.scala

@@ -2,7 +2,7 @@ package com.avsystem.commons
 
 import com.avsystem.commons.concurrent.RunNowEC
 import com.avsystem.commons.misc._
-import com.github.ghik.silencer.silent
+import scala.annotation.nowarn
 
 import scala.annotation.tailrec
 import scala.collection.compat._
@@ -77,7 +77,7 @@ object SharedExtensionsUtils extends SharedExtensions {
       * Explicit syntax to discard the value of a side-effecting expression.
       * Useful when `-Ywarn-value-discard` compiler option is enabled.
       */
-    @silent
+    @nowarn
     def discard: Unit = ()
 
     def thenReturn[T](value: T): T = value

commons-core/src/main/scala/com/avsystem/commons/collection/CloseableIterator.scala

@@ -1,10 +1,9 @@
 package com.avsystem.commons
 package collection
 
-import java.util.function.Function
-
 import com.github.ghik.silencer.silent
 
+import java.util.function.Function
 import scala.annotation.unchecked.uncheckedVariance
 
 /**

commons-core/src/test/scala/com/avsystem/commons/rpc/TestRPC.scala

@@ -3,7 +3,7 @@ package rpc
 
 import com.avsystem.commons.rpc.DummyRPC._
 import com.avsystem.commons.serialization.{HasGenCodec, optionalParam, transientDefault, whenAbsent}
-import com.github.ghik.silencer.silent
+import scala.annotation.nowarn
 
 class prepend(prefix: String) extends EncodingInterceptor[String, String] with DecodingInterceptor[String, String] {
   def toOriginalRaw(newRaw: String): String = prefix + newRaw
@@ -27,7 +27,7 @@ object InnerRPC extends RPCCompanion[InnerRPC]
 trait TestRPC {
   def defaultNum: Int = 42
 
-  @silent("side-effecting nullary methods")
+  @nowarn("msg=side-effecting nullary methods")
   def handle: Unit
 
   def handleMore(): Unit
@@ -55,7 +55,7 @@ trait TestRPC {
   def generallyDoStuff[T](list: List[T])(implicit @encodingDependency tag: Tag[T]): Future[Option[T]]
 }
 
-@silent("side-effecting nullary methods")
+@nowarn("msg=side-effecting nullary methods")
 object TestRPC extends RPCCompanion[TestRPC] {
 
   //  AsRaw.materialize[DummyRPC.RawRPC, TestRPC].showAst

commons-core/src/test/scala/com/avsystem/commons/serialization/SimpleGenCodecTest.scala

@@ -2,7 +2,7 @@ package com.avsystem.commons
 package serialization
 
 import com.avsystem.commons.misc.TypedMap
-import com.github.ghik.silencer.silent
+import scala.annotation.nowarn
 
 import scala.collection.immutable.ListMap
 
@@ -20,7 +20,7 @@ trait SimpleIOCodecTest extends AbstractCodecTest {
 
 class SimpleGenCodecRoundtripTest extends GenCodecRoundtripTest with SimpleIOCodecTest
 
-@silent
+@nowarn
 class SimpleGenCodecTest extends SimpleIOCodecTest {
 
   import CodecTestData._

commons-macros/src/main/scala/com/avsystem/commons/macros/rpc/RpcMappings.scala

@@ -333,7 +333,7 @@ private[commons] trait RpcMappings { this: RpcMacroCommons with RpcSymbols =>
         case Nil => (Nil, rawType)
         case head :: tail =>
           val (filteredTail, tailNewRawType) = filter(tail)
-          val List(newRawType, oldRawType) = head.tpe.baseType(baseIcSym).typeArgs
+          val List(newRawType, oldRawType) = head.tpe.baseType(baseIcSym).typeArgs: @unchecked
           if (oldRawType =:= tailNewRawType)
             (head :: filteredTail, newRawType)
           else

commons-redis/src/main/scala/com/avsystem/commons/redis/commands/scripting.scala

@@ -9,7 +9,7 @@ import com.avsystem.commons.redis._
 import com.avsystem.commons.redis.commands.ReplyDecoders._
 import com.avsystem.commons.redis.exception.ErrorReplyException
 import com.avsystem.commons.redis.protocol.ValidRedisMsg
-import com.github.ghik.silencer.silent
+import scala.annotation.nowarn
 import com.google.common.hash.Hashing
 
 trait KeyedScriptingApi extends ApiSubset {
@@ -124,7 +124,7 @@ case class Sha1(raw: String) extends AnyVal {
   override def toString: String = raw
 }
 object Sha1 {
-  @silent
+  @nowarn
   def hashString(input: CharSequence): Sha1 =
     Sha1(Hashing.sha1.hashString(input, StandardCharsets.UTF_8).toString)
 

commons-redis/src/test/scala/com/avsystem/commons/redis/ApiTypecheckingTest.scala

@@ -2,7 +2,7 @@ package com.avsystem.commons
 package redis
 
 import com.avsystem.commons.redis.commands.Encoding
-import com.github.ghik.silencer.silent
+import scala.annotation.nowarn
 
 object ApiTypecheckingTest {