Skip to content

Commit

Permalink
Merge branch 'master' into update/sbt-scalajs-crossproject-1.3.2
Browse files Browse the repository at this point in the history
  • Loading branch information
cornerman authored Aug 7, 2023
2 parents e68f598 + 42bbe42 commit 868c669
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions .mergify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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 ::
Expand Down
2 changes: 1 addition & 1 deletion project/Deps.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.9.0
sbt.version=1.9.3
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -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")

Expand Down

0 comments on commit 868c669

Please sign in to comment.