Update sbt, Scala, scala collection-compat and scalatest versions

.github/workflows/checks.yml

@@ -23,8 +23,8 @@ jobs:
         with:
           fetch-depth: 0
           submodules: recursive
-      - uses: coursier/cache-action@v6.3
-      - uses: olafurpg/setup-scala@v13
+      - uses: coursier/cache-action@v6
+      - uses: coursier/setup-action@v1
         with:
           java-version: ${{ matrix.java }}
       - name: Compile, test and check format, coverage

build.sbt

@@ -17,7 +17,7 @@ lazy val crossVersionSourcesSettings =
 
 val coverageSettings = Seq(
   CoverallsKeys.coverallsTokenFile := Some("./token.txt"),
-  ScoverageKeys.coverageMinimumStmtTotal := 95,
+  ScoverageKeys.coverageMinimumStmtTotal := 100,
   ScoverageKeys.coverageFailOnMinimum := true,
   ScoverageKeys.coverageHighlighting := true
 )
@@ -53,8 +53,8 @@ val publishSettings = sonatypeSettings ++ Seq(
 
 val commonSettings = Seq(
   organization := "com.daodecode",
-  scalaVersion := "2.13.7",
-  crossScalaVersions := Seq(scalaVersion.value, "2.11.12", "2.12.15"),
+  scalaVersion := "2.13.10",
+  crossScalaVersions := Seq(scalaVersion.value, "2.11.12", "2.12.17"),
   scalafmtConfig := Some(scalaj.base / "scalafmt-config/.scalafmt.conf")
 ) ++ releaseSettings ++ crossVersionSourcesSettings
 
@@ -70,7 +70,8 @@ val moduleSettings = commonSettings ++ Seq(
          "-feature",
          "-Ywarn-unused",
          "-encoding",
-         "UTF-8"
+         "UTF-8",
+         "-Wconf:origin=scala.collection.compat.*:s"
        )
      else
        Seq(
@@ -89,7 +90,7 @@ val moduleSettings = commonSettings ++ Seq(
          "UTF-8"
        )),
   libraryDependencies ++= Seq(
-    "org.scalatest" %% "scalatest" % "3.0.9" % "test"
+    "org.scalatest" %% "scalatest" % "3.2.16" % "test"
   )
 ) ++ publishSettings ++ coverageSettings
 
@@ -106,7 +107,7 @@ lazy val scalaj: Project =
 lazy val `scalaj-collection` = project.settings(
   moduleSettings ++ Seq(
     libraryDependencies ++= Seq(
-      "org.scala-lang.modules" %% "scala-collection-compat" % "2.6.0"
+      "org.scala-lang.modules" %% "scala-collection-compat" % "2.10.0"
     )
   )
 )

project/build.properties

@@ -1 +1 @@
-sbt.version=1.5.5
+sbt.version=1.8.2

project/plugins.sbt

@@ -1,8 +1,8 @@
-addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.9.2")
+addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.7")
 
 addSbtPlugin("org.scoverage" %% "sbt-coveralls" % "1.3.1")
 
-addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.10")
+addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.15")
 
 addSbtPlugin("com.github.sbt" % "sbt-release" % "1.1.0")
 

scalaj-collection/src/test/scala/com/daodecode/scalaj/collection/test/ComplexJConvertersTest.scala

@@ -1,11 +1,10 @@
 package com.daodecode.scalaj.collection.test
 
-import scala.collection.mutable.{Buffer => MBuffer, Map => MMap, Seq => MSeq, Set => MSet}
-
 import com.daodecode.scalaj.collection._
-import org.scalatest.{Matchers, WordSpec}
 
-class ComplexJConvertersTest extends WordSpec with Matchers {
+import scala.collection.mutable.{Buffer => MBuffer, Map => MMap, Seq => MSeq, Set => MSet}
+
+class ComplexJConvertersTest extends ScalaJSpec {
 
   "AsJava collection converters" should {
 

scalaj-collection/src/test/scala/com/daodecode/scalaj/collection/test/ComplexSConvertersTest.scala

@@ -1,12 +1,11 @@
 package com.daodecode.scalaj.collection.test
 
+import com.daodecode.scalaj.collection._
+
 import scala.collection.immutable.{Seq => ImSeq}
 import scala.collection.mutable.{Buffer => MBuffer, Map => MMap, Set => MSet}
 
-import com.daodecode.scalaj.collection._
-import org.scalatest.{Matchers, WordSpec}
-
-class ComplexSConvertersTest extends WordSpec with Matchers with JListBuilder with JSetBuilder with JMapBuilder {
+class ComplexSConvertersTest extends ScalaJSpec with JListBuilder with JSetBuilder with JMapBuilder {
 
   "AsScala collection converters" should {
 

scalaj-collection/src/test/scala/com/daodecode/scalaj/collection/test/ScalaJSpec.scala

@@ -0,0 +1,6 @@
+package com.daodecode.scalaj.collection.test
+
+import org.scalatest.matchers.should.Matchers
+import org.scalatest.wordspec.AnyWordSpec
+
+trait ScalaJSpec extends AnyWordSpec with Matchers

scalaj-collection/src/test/scala_2.13+/com/daodecode/scalaj/collection/test/SimpleJConvertersTest.scala

@@ -1,11 +1,10 @@
 package com.daodecode.scalaj.collection.test
 
-import scala.collection.{immutable, _}
-
 import com.daodecode.scalaj.collection._
-import org.scalatest.{Matchers, WordSpec}
 
-class SimpleJConvertersTest extends WordSpec with Matchers {
+import scala.collection.{immutable, _}
+
+class SimpleJConvertersTest extends ScalaJSpec {
 
   "SeqConverters" should {
 

scalaj-collection/src/test/scala_2.13+/com/daodecode/scalaj/collection/test/SimpleSConvertersTest.scala

@@ -1,16 +1,14 @@
 package com.daodecode.scalaj.collection.test
 
+import com.daodecode.scalaj.collection._
+
 import java.util
 import java.util.Arrays.asList
-
 import scala.collection.immutable.{Seq => ImSeq}
 import scala.collection.mutable.{Buffer => MBuffer, Map => MMap, Set => MSet}
 import scala.reflect.ClassTag
 
-import com.daodecode.scalaj.collection._
-import org.scalatest.{Matchers, WordSpec}
-
-class SimpleSConvertersTest extends WordSpec with Matchers with JListBuilder with JSetBuilder with JMapBuilder {
+class SimpleSConvertersTest extends ScalaJSpec with JListBuilder with JSetBuilder with JMapBuilder {
 
   "JListConverters" should {
 

scalaj-collection/src/test/scala_2.13-/com/daodecode/scalaj/collection/test/SimpleJConvertersTest.scala

@@ -4,9 +4,8 @@ import scala.collection.generic.CanBuildFrom
 import scala.collection.{immutable, mutable}
 
 import com.daodecode.scalaj.collection._
-import org.scalatest.{Matchers, WordSpec}
 
-class SimpleJConvertersTest extends WordSpec with Matchers {
+class SimpleJConvertersTest extends ScalaJSpec {
 
   "SeqConverters" should {
 

scalaj-collection/src/test/scala_2.13-/com/daodecode/scalaj/collection/test/SimpleSConvertersTest.scala

@@ -8,9 +8,8 @@ import scala.collection.mutable.{Buffer => MBuffer, Map => MMap, Set => MSet}
 import scala.reflect.ClassTag
 
 import com.daodecode.scalaj.collection._
-import org.scalatest.{Matchers, WordSpec}
 
-class SimpleSConvertersTest extends WordSpec with Matchers with JListBuilder with JSetBuilder with JMapBuilder {
+class SimpleSConvertersTest extends ScalaJSpec with JListBuilder with JSetBuilder with JMapBuilder {
 
   "JListConverters" should {
 

scalaj-google-optional/src/test/scala/com/daodecode/scalaj/googleoptional/test/GOptionConvertersTest.scala

@@ -4,11 +4,10 @@ import com.daodecode.scalaj.JavaAliases._
 import com.daodecode.scalaj.collection.test.{JMapBuilder, JSetBuilder}
 import com.daodecode.scalaj.googleoptional._
 import com.google.common.base.{Optional => GOption}
-import org.scalatest.{Matchers, WordSpec}
 
 import scala.collection.mutable.{Map => MMap, Set => MSet}
 
-class GOptionConvertersTest extends WordSpec with Matchers with JSetBuilder with JMapBuilder {
+class GOptionConvertersTest extends ScalaJSpec with JSetBuilder with JMapBuilder {
 
   def jb(b: Byte): JByte = b
 

scalaj-google-optional/src/test/scala/com/daodecode/scalaj/googleoptional/test/ScalaJSpec.scala

@@ -0,0 +1,6 @@
+package com.daodecode.scalaj.googleoptional.test
+
+import org.scalatest.matchers.should.Matchers
+import org.scalatest.wordspec.AnyWordSpec
+
+trait ScalaJSpec extends AnyWordSpec with Matchers