Merge branch 'master' into update/sbt-scalajs-1.13.2

cornerman · Aug 6, 2023 · 133e7f0 · 133e7f0
2 parents 532419c + 3fcb74a
commit 133e7f0
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/.mergify.yml b/.mergify.yml
@@ -2,7 +2,7 @@ queue_rules:
   - name: default
     conditions:
       # Conditions to get out of the queue (= merged)
-      - check-success~=build \(2.12.\d+\)
+      - check-success~=build \(3.3.\d+\)
       - check-success~=build \(2.13.\d+\)
 
 pull_request_rules:
@@ -16,7 +16,7 @@ pull_request_rules:
     conditions:
       - base=master
       - author=scala-steward
-      - check-success~=build \(2.12.\d+\)
+      - check-success~=build \(3.3.\d+\)
       - check-success~=build \(2.13.\d+\)
     actions:
       queue:

diff --git a/build.sbt b/build.sbt
@@ -46,7 +46,7 @@ lazy val types = crossProject(JSPlatform, JVMPlatform)
   .crossType(CrossType.Pure)
   .settings(commonSettings)
   .settings(
-    crossScalaVersions := Seq("2.12.17", "2.13.10", "3.3.0"),
+    crossScalaVersions := Seq("2.12.18", "2.13.10", "3.3.0"),
     name := "sloth-types",
     libraryDependencies ++=
       Deps.cats.value ::

diff --git a/project/Deps.scala b/project/Deps.scala
@@ -9,7 +9,7 @@ object Deps {
 
   val scalaReflect = dep("org.scala-lang" % "scala-reflect")
   val cats = dep("org.typelevel" %%% "cats-core" % "2.9.0")
-  val chameleon = dep("com.github.cornerman" %%% "chameleon" % "0.3.5")
+  val chameleon = dep("com.github.cornerman" %%% "chameleon" % "0.3.6")
 
   val circe = new {
     private val version = "0.14.1"

diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.9.0
+sbt.version=1.9.3