diff --git a/.mergify.yml b/.mergify.yml index 88d2f945..0ea6b56e 100644 --- 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 index b182a73a..79b7dad6 100644 --- 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 index d7dd6593..cbc02382 100644 --- 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 index 40b3b8e7..52413ab7 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.9.0 +sbt.version=1.9.3 diff --git a/project/plugins.sbt b/project/plugins.sbt index 4e0b72d6..3c8cf732 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,5 +1,5 @@ addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.2") -addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.13.1") +addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.13.2") addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat" % "0.4.1")