Update sbt-assembly to 2.0.0

.github/workflows/ci.yml

@@ -6,13 +6,26 @@ on:
       - main
   pull_request:
 jobs:
+  compile:
+    name: Compile
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+          submodules: true
+      - uses: olafurpg/setup-scala@v12
+        with:
+          java-version: "[email protected]"
+      - run: sbt +test:compile # ensuring metabrowse compiles for all Scala versions
+
   unit:
     name: Tests
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
-        scala: [2.12.10]
+        scala: [2.12.17, 2.13.10]
         os: [ubuntu-latest]
         java: [11, 8]
     steps:

build.sbt

@@ -3,9 +3,32 @@ import scalajsbundler.util.JSON._
 import sbtcrossproject.{crossProject, CrossType}
 
 lazy val Version = new {
-  def scala213 = "2.13.6"
-  def scala212 = "2.12.14"
-  def scalameta = "4.4.24"
+  val scala213Versions = Seq(
+    "2.13.1",
+    "2.13.2",
+    "2.13.3",
+    "2.13.4",
+    "2.13.5",
+    "2.13.6",
+    "2.13.7",
+    "2.13.8",
+    "2.13.9",
+    "2.13.10"
+  )
+  val scala212Versions = Seq(
+    "2.12.9",
+    "2.12.10",
+    "2.12.11",
+    "2.12.12",
+    "2.12.13",
+    "2.12.14",
+    "2.12.15",
+    "2.12.16",
+    "2.12.17"
+  )
+  def scala213 = scala213Versions.last
+  def scala212 = scala212Versions.last
+  def scalameta = "4.6.0"
 }
 
 inThisBuild(
@@ -51,6 +74,11 @@ inThisBuild(
 (publish / skip) := true
 crossScalaVersions := Nil
 
+lazy val fullCrossVersionSettings = Def.settings(
+  crossVersion := CrossVersion.full,
+  crossScalaVersions := Version.scala213Versions ++ Version.scala212Versions
+)
+
 def addPaigesLikeSourceDirs(config: Configuration, srcName: String) =
   Def.settings(
     config / unmanagedSourceDirectories ++= {
@@ -84,7 +112,7 @@ lazy val example = project
     ),
     libraryDependencies ++= List(
       "org.scalatest" %% "scalatest" % "3.1.4" % Test,
-      "org.scalacheck" %% "scalacheck" % "1.14.0" % Test,
+      "org.scalacheck" %% "scalacheck" % "1.17.0" % Test,
       "org.scalatestplus" %% "scalacheck-1-14" % "3.2.2.0" % Test
     ),
     test := {} // no need to run paiges tests.
@@ -94,14 +122,15 @@ lazy val server = project
   .in(file("metabrowse-server"))
   .settings(
     moduleName := "metabrowse-server",
+    fullCrossVersionSettings,
     resolvers += Resolver.sonatypeRepo("releases"),
     resolvers += Resolver.sonatypeRepo("snapshots"),
     libraryDependencies ++= List(
       "io.undertow" % "undertow-core" % "2.0.30.Final",
-      "org.slf4j" % "slf4j-api" % "1.8.0-beta4",
+      "org.slf4j" % "slf4j-api" % "2.0.3",
       "org.jboss.xnio" % "xnio-nio" % "3.8.0.Final",
       "org.scalameta" % "semanticdb-scalac-core" % Version.scalameta cross CrossVersion.full,
-      ("org.scalameta" %% "mtags" % "0.10.5").cross(CrossVersion.full)
+      ("org.scalameta" %% "mtags" % "0.11.9").cross(CrossVersion.full)
     ),
     (Compile / packageBin) := {
       import java.io.FileOutputStream
@@ -110,7 +139,8 @@ lazy val server = project
       import java.util.zip._
       import scala.collection.JavaConverters._
       val base = (Compile / packageBin).value
-      val updated = base.getParentFile / s"${base.getName.stripSuffix(".jar")}-with-resources.jar"
+      val updated =
+        base.getParentFile / s"${base.getName.stripSuffix(".jar")}-with-resources.jar"
 
       val fos = new FileOutputStream(updated)
       val zos = new ZipOutputStream(fos)
@@ -173,6 +203,7 @@ lazy val cli = project
   .in(file("metabrowse-cli"))
   .settings(
     moduleName := "metabrowse-cli",
+    fullCrossVersionSettings,
     (assembly / mainClass) := Some("metabrowse.cli.MetabrowseCli"),
     (assembly / assemblyJarName) := "metabrowse.jar",
     scalacOptions ++= {
@@ -184,15 +215,15 @@ lazy val cli = project
       }
     },
     libraryDependencies ++= List(
-      "com.thesamet.scalapb" %% "scalapb-json4s" % "0.11.1",
-      "com.github.alexarchambault" %% "case-app" % "2.0.0-M9",
+      "com.thesamet.scalapb" %% "scalapb-json4s" % "0.12.0",
+      "com.github.alexarchambault" %% "case-app" % "2.0.6",
       "com.github.pathikrit" %% "better-files" % "3.9.1"
     ),
     libraryDependencies ++= {
       CrossVersion.partialVersion(scalaVersion.value) match {
         case Some((2, major)) if major >= 13 =>
           Seq(
-            "org.scala-lang.modules" %% "scala-parallel-collections" % "1.0.3"
+            "org.scala-lang.modules" %% "scala-parallel-collections" % "1.0.4"
           )
         case _ =>
           Seq()
@@ -317,6 +348,7 @@ lazy val tests = project
   .in(file("metabrowse-tests"))
   .configs(IntegrationTest)
   .settings(
+    fullCrossVersionSettings,
     (publish / skip) := true,
     Defaults.itSettings,
     run / baseDirectory := (ThisBuild / baseDirectory).value,
@@ -332,9 +364,9 @@ lazy val tests = project
       "org.scalameta" %% "testkit" % Version.scalameta,
       "org.scalameta" % "semanticdb-scalac-core" % Version.scalameta cross CrossVersion.full,
       "org.scalatest" %% "scalatest" % "3.1.4",
-      "org.scalacheck" %% "scalacheck" % "1.14.0",
-      "org.seleniumhq.selenium" % "selenium-java" % "3.141.59" % IntegrationTest,
-      "org.slf4j" % "slf4j-simple" % "1.8.0-beta4"
+      "org.scalacheck" %% "scalacheck" % "1.17.0",
+      "org.seleniumhq.selenium" % "selenium-java" % "4.5.0" % IntegrationTest,
+      "org.slf4j" % "slf4j-simple" % "2.0.3"
     ),
     (IntegrationTest / compile) := {
       _root_.io.github.bonigarcia.wdm.WebDriverManager.chromedriver.setup()

metabrowse-cli/src/main/scala/metabrowse/cli/MetabrowseCli.scala

@@ -384,7 +384,7 @@ object MetabrowseCli extends CaseApp[MetabrowseOptions] {
   override val messages: caseapp.core.help.Help[MetabrowseOptions] =
     caseapp.core.help
       .Help[MetabrowseOptions]
-      .copy(optionsDesc = "[options] classpath")
+      .withOptionsDesc("[options] classpath")
 
   def run(options: MetabrowseOptions, remainingArgs: RemainingArgs): Unit = {
 

metabrowse-tests/src/test/scala/metabrowse/tests/MetabrowseCliSuite.scala

@@ -51,12 +51,18 @@ class MetabrowseCliSuite extends BaseMetabrowseCliSuite {
       }
       .sorted
       .mkString("\n")
-    val extra =
+    val extraLazyListStuff =
       if (is212)
         """org/typelevel/paiges/ScalaVersionCompat.LazyList#
           |org/typelevel/paiges/ScalaVersionCompat.LazyList.
           |""".stripMargin
       else ""
+    val extraPi213Stuff =
+      if (is212) ""
+      else
+        """org/typelevel/paiges/ColorTest#TwoPi.
+          |org/typelevel/paiges/ColorTest#TwoThirdsPi.
+          |""".stripMargin
     val expected =
       s"""|org/typelevel/paiges/Chunk.
           |org/typelevel/paiges/Chunk.best().
@@ -66,7 +72,7 @@ class MetabrowseCliSuite extends BaseMetabrowseCliSuite {
           |org/typelevel/paiges/Chunk.makeIndentStr().
           |org/typelevel/paiges/ColorTest#
           |org/typelevel/paiges/ColorTest#Quote.
-          |org/typelevel/paiges/ColorTest#`<init>`().
+          |${extraPi213Stuff}org/typelevel/paiges/ColorTest#`<init>`().
           |org/typelevel/paiges/ColorTest#bg().
           |org/typelevel/paiges/ColorTest#fg().
           |org/typelevel/paiges/ColorTest#fromAngle().
@@ -317,7 +323,7 @@ class MetabrowseCliSuite extends BaseMetabrowseCliSuite {
           |org/typelevel/paiges/PaigesTest.slowRenderTrim().
           |org/typelevel/paiges/PaigesTest.twoRightAssociated().
           |org/typelevel/paiges/ScalaVersionCompat.
-          |${extra}org/typelevel/paiges/ScalaVersionCompat.lazyListFromIterator().
+          |${extraLazyListStuff}org/typelevel/paiges/ScalaVersionCompat.lazyListFromIterator().
           |org/typelevel/paiges/Style#
           |org/typelevel/paiges/Style#`++`().
           |org/typelevel/paiges/Style#`<init>`().

project/plugins.sbt

@@ -1,13 +1,13 @@
 addSbtPlugin("ch.epfl.scala" % "sbt-scalajs-bundler" % "0.20.0")
-addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.9")
-addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.10.0")
-addSbtPlugin("com.thesamet" % "sbt-protoc" % "1.0.4")
-addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.5.1")
-addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.1.0")
-addSbtPlugin("com.geirsson" % "sbt-ci-release" % "1.5.3")
+addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.0.0")
+addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.11.0")
+addSbtPlugin("com.thesamet" % "sbt-protoc" % "1.0.6")
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.10.0")
+addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.2.0")
+addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.10")
 
 libraryDependencies ++= List(
-  "io.github.bonigarcia" % "webdrivermanager" % "3.6.1",
-  "com.thesamet.scalapb" %% "compilerplugin" % "0.11.3",
+  "io.github.bonigarcia" % "webdrivermanager" % "5.3.0",
+  "com.thesamet.scalapb" %% "compilerplugin" % "0.11.11",
   "org.scala-sbt" %% "scripted-plugin" % sbtVersion.value
 )