Merge pull request #578 from http4s/backport

Backport changes from main
http4s · Aug 3, 2021 · a2fa075 · a2fa075
2 parents b64a96e + 0783f22
commit a2fa075
Show file tree

Hide file tree

Showing 53 changed files with 5,038 additions and 4,490 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -12,7 +12,7 @@ jobs:
     strategy:
       matrix:
         java: [1.8, 1.11, 1.14]
-        scala: [2.12.13, 2.13.4]
+        scala: [2.12.14, 2.13.6]
     steps:
     - uses: actions/checkout@v2
     - name: Set up JDK ${{ matrix.java }}

diff --git a/.github/workflows/mima.yml b/.github/workflows/mima.yml
@@ -12,7 +12,7 @@ jobs:
     strategy:
       matrix:
         java: [1.14]
-        scala: [2.12.13, 2.13.4]
+        scala: [2.12.14, 2.13.6]
     steps:
     - uses: actions/checkout@v2
       with:

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -15,7 +15,7 @@ jobs:
     strategy:
       matrix:
         java: [1.14]
-        scala: [2.12.13, 2.13.4]
+        scala: [2.12.14, 2.13.6]
     steps:
     - uses: actions/checkout@v2
       with:

diff --git a/.gitignore b/.gitignore
@@ -7,6 +7,7 @@ target/
 /.ensime
 /.idea/
 /.idea_modules/
+/.bsp
 
 .cache
 .classpath

diff --git a/build.sbt b/build.sbt
@@ -4,8 +4,6 @@ import spray.revolver.RevolverPlugin._
 
 import com.typesafe.sbt.SbtGit.git
 
-import scala.util.Properties.envOrNone
-
 import Dependencies._, RhoPlugin._
 
 lazy val rho = project
@@ -29,7 +27,7 @@ lazy val `rho-core` = project
         case _ => Nil
       }
     },
-    libraryDependencies ++= Seq("org.scala-lang.modules" %% "scala-collection-compat" % "2.4.4")
+    libraryDependencies ++= Seq("org.scala-lang.modules" %% "scala-collection-compat" % "2.5.0")
   )
 
 lazy val `rho-swagger` = project
@@ -133,7 +131,7 @@ lazy val buildSettings = publishing ++
                                  `scala-reflect` % scalaVersion.value
                                )
                              else Seq.empty),
-    libraryDependencies ++= specs2
+    libraryDependencies ++= Seq(munit, munitCatsEffect, scalacheckMunit)
   )
 
 // to keep REPL usable
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,6 +7,7 @@ target/ @@
     /.ensime
     /.idea/
     /.idea_modules/
+    /.bsp
     .cache
     .classpath
@@ Expand Down @@