Skip to content

Commit

Permalink
Merge branch 'main' into oscar/20250123_add_align
Browse files Browse the repository at this point in the history
  • Loading branch information
johnynek authored Jan 24, 2025
2 parents 9e6174a + a969b65 commit 6c85cb2
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 6 deletions.
3 changes: 3 additions & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
# Scala Steward: Reformat with scalafmt 3.7.5
f09f531b864e0dec446f423247b63ecda0235f0a

# Scala Steward: Reformat with scalafmt 3.8.6
608a97a3081b4d2b4b71addf68bd56506d13ce01
2 changes: 1 addition & 1 deletion .scalafmt.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version = "3.8.3"
version = "3.8.6"

runner.dialect = scala213

Expand Down
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import com.typesafe.tools.mima.core._
import Dependencies._
val scala212 = "2.12.20"
val scala213 = "2.13.15"
val scala213 = "2.13.16"
val scala3 = "3.3.4"

GlobalScope / tlCommandAliases ++= Map(
Expand Down
2 changes: 0 additions & 2 deletions core/shared/src/main/scala/cats/parse/Parser.scala
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,8 @@ import scala.collection.immutable.NumericRange
*
* - Success: The parser consumes zero-or-more characters of input and successfully extracts a
* value. The input offset will be moved forward by the number of characters consumed.
*
* - Epsilon failure: The parser fails to extract a value without consuming any characters of
* input. The input offset will not be changed.
*
* - Arresting failure: The parser fails to extract a value but does consume one-or-more
* characters of input. The input offset will be moved forward by the number of characters
* consumed and all parsing will stop (unless a higher-level parser backtracks).
Expand Down
2 changes: 1 addition & 1 deletion project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import sbt._
import org.portablescala.sbtplatformdeps.PlatformDepsPlugin.autoImport._

object Dependencies {
lazy val cats = Def.setting("org.typelevel" %%% "cats-core" % "2.12.0")
lazy val cats = Def.setting("org.typelevel" %%% "cats-core" % "2.13.0")
lazy val munit = Def.setting("org.scalameta" %%% "munit" % "1.0.4")
lazy val munitScalacheck = Def.setting("org.scalameta" %%% "munit-scalacheck" % "1.0.0")
lazy val fastParse = "com.lihaoyi" %% "fastparse" % "3.1.1"
Expand Down
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.2")
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.6")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.17.0")
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.2.2")
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.3.0")
addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.7")
addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.7.7")
addSbtPlugin("org.typelevel" % "sbt-typelevel-site" % "0.7.7")

0 comments on commit 6c85cb2

Please sign in to comment.