Update to Scala 3.2.1 and Cats 2.9.0

geirolz · Nov 23, 2022 · 6b7fa6e · 6b7fa6e
1 parent 5fb403f
commit 6b7fa6e
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 11 deletions.
diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml
@@ -31,8 +31,8 @@ jobs:
           - scala: 2.13.8
             name: Scala2
             test-tasks: coverage test coverageReport generate-docs
-          - scala: 3.1.3
-            name: Scala3
+          - scala: 3.2.1
+            name: Scala32
             test-tasks: test # scoverage doesn’t support Scala 3
 
     steps:

diff --git a/.mergify.yml b/.mergify.yml
@@ -5,7 +5,7 @@ pull_request_rules:
       - check-success=codecov/patch
       - check-success=codecov/project
       - check-success=build (Scala2)
-      - check-success=build (Scala3)
+      - check-success=build (Scala32)
       - base=main
       - label!=work-in-progress
     actions:
@@ -16,7 +16,7 @@ pull_request_rules:
     conditions:
       - author=scala-steward
       - check-success=build (Scala2)
-      - check-success=build (Scala3)
+      - check-success=build (Scala32)
       - base=main
     actions:
       merge:
@@ -26,7 +26,7 @@ pull_request_rules:
     conditions:
       - author=dependabot[bot]
       - check-success=build (Scala2)
-      - check-success=build (Scala3)
+      - check-success=build (Scala32)
       - base=main
     actions:
       merge:

diff --git a/build.sbt b/build.sbt
@@ -4,8 +4,8 @@ import ModuleMdocPlugin.autoImport.mdocScalacOptions
 val prjName                     = "scope"
 val org                         = "com.github.geirolz"
 lazy val scala213               = "2.13.8"
-lazy val scala31                = "3.1.3"
-lazy val supportedScalaVersions = List(scala213, scala31)
+lazy val scala32                = "3.2.1"
+lazy val supportedScalaVersions = List(scala213, scala32)
 
 //## global project to no publish ##
 val copyReadMe = taskKey[Unit]("Copy generated README to main folder.")

diff --git a/core/src/test/scala-3/scope/ModelMapperKTest.scala b/core/src/test/scala-3/scope/ModelMapperKTest.scala
@@ -35,7 +35,7 @@ class ModelMapperKTest extends munit.FunSuite:
           1.scoped.as[String]                       
      """),
       expected = """
-           |error: no given instance of type scope.ScopeContext was found for parameter ctx of method scoped in class ModelScopeMapperSyntaxOps
+           |error: No given instance of type scope.ScopeContext was found for parameter ctx of method scoped in class ModelScopeMapperSyntaxOps
            |          1.scoped.as[String]
            |                 ^
            |""".stripMargin

diff --git a/core/src/test/scala-3/scope/ModelMapperTest.scala b/core/src/test/scala-3/scope/ModelMapperTest.scala
@@ -106,7 +106,7 @@ class ModelMapperTest extends munit.FunSuite {
           1.scoped.as[String]                       
      """),
       expected = """
-           |error: no given instance of type scope.ScopeContext was found for parameter ctx of method scoped in class ModelScopeMapperSyntaxOps
+           |error: No given instance of type scope.ScopeContext was found for parameter ctx of method scoped in class ModelScopeMapperSyntaxOps
            |          1.scoped.as[String]
            |                 ^
            |""".stripMargin

diff --git a/core/src/test/scala-3/scope/ScopeContextTest.scala b/core/src/test/scala-3/scope/ScopeContextTest.scala
@@ -35,7 +35,7 @@ class ScopeContextTest extends munit.FunSuite {
          summon[ScopeContext]
      """),
       expected = """
-           |error: ambiguous given instances: both given instance given_TypedScopeContext_Endpoint and given instance given_TypedScopeContext_Domain match type scope.ScopeContext of parameter x of method summon in object Predef
+           |error: Ambiguous given instances: both given instance given_TypedScopeContext_Endpoint and given instance given_TypedScopeContext_Domain match type scope.ScopeContext of parameter x of method summon in object Predef
            |         summon[ScopeContext]
            |                            ^
            |""".stripMargin

diff --git a/project/ProjectDependencies.scala b/project/ProjectDependencies.scala
@@ -2,7 +2,7 @@ import sbt._
 
 object ProjectDependencies {
 
-  private val catsVersion  = "2.8.0"
+  private val catsVersion  = "2.9.0"
   private val munitVersion = "0.7.29"
 
   lazy val common: Seq[ModuleID] = Seq(