From d0ba472e0acf96ceb9a79c7c005b1db360ef8289 Mon Sep 17 00:00:00 2001 From: Scala Steward <2517319+scala-steward-bot@users.noreply.github.com> Date: Wed, 21 Feb 2024 23:02:06 +0000 Subject: [PATCH] Update scala-library to 2.13.13 --- build.sbt | 4 ++-- .../main/scala/org/parboiled/examples/json/JsonParser0.scala | 2 +- .../main/scala/org/parboiled/examples/json/JsonParser1.scala | 2 +- .../main/scala/org/parboiled/examples/json/JsonParser2.scala | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build.sbt b/build.sbt index 8981e461..c2057d22 100644 --- a/build.sbt +++ b/build.sbt @@ -3,7 +3,7 @@ import Dependencies._ val basicSettings = Seq( shellPrompt := { s => Project.extract(s).currentProject.id + " > " }, version := "1.4.1", - scalaVersion := "2.13.12", + scalaVersion := "2.13.13", homepage := Some(url("http://parboiled.org")), organization := "org.parboiled", organizationHomepage := Some(url("http://parboiled.org")), @@ -43,7 +43,7 @@ val basicSettings = Seq( (doc / scalacOptions) ++= Seq("-doc-title", name.value, "-doc-version", version.value), // publishing - crossScalaVersions := Seq("2.12.19", "2.13.12", "3.3.2"), + crossScalaVersions := Seq("2.12.19", "2.13.13", "3.3.2"), scalaBinaryVersion := { if (CrossVersion.isScalaApiCompatible(scalaVersion.value)) CrossVersion.binaryScalaVersion(scalaVersion.value) else scalaVersion.value diff --git a/examples-scala/src/main/scala/org/parboiled/examples/json/JsonParser0.scala b/examples-scala/src/main/scala/org/parboiled/examples/json/JsonParser0.scala index ac07cec6..043fe952 100644 --- a/examples-scala/src/main/scala/org/parboiled/examples/json/JsonParser0.scala +++ b/examples-scala/src/main/scala/org/parboiled/examples/json/JsonParser0.scala @@ -65,7 +65,7 @@ class JsonParser0 extends Parser { * We redefine the default string-to-rule conversion to also match trailing whitespace if the string ends with * a blank, this keeps the rules free from most whitespace matching clutter */ - override implicit def toRule(string: String) = + override implicit def toRule(string: String): Rule0 = if (string.endsWith(" ")) str(string.trim) ~ WhiteSpace else diff --git a/examples-scala/src/main/scala/org/parboiled/examples/json/JsonParser1.scala b/examples-scala/src/main/scala/org/parboiled/examples/json/JsonParser1.scala index 5a021a75..f59ff946 100644 --- a/examples-scala/src/main/scala/org/parboiled/examples/json/JsonParser1.scala +++ b/examples-scala/src/main/scala/org/parboiled/examples/json/JsonParser1.scala @@ -98,7 +98,7 @@ class JsonParser1 extends Parser { * We redefine the default string-to-rule conversion to also match trailing whitespace if the string ends with * a blank, this keeps the rules free from most whitespace matching clutter */ - override implicit def toRule(string: String) = + override implicit def toRule(string: String): Rule0 = if (string.endsWith(" ")) str(string.trim) ~ WhiteSpace else diff --git a/examples-scala/src/main/scala/org/parboiled/examples/json/JsonParser2.scala b/examples-scala/src/main/scala/org/parboiled/examples/json/JsonParser2.scala index d59e6214..f19d63e3 100644 --- a/examples-scala/src/main/scala/org/parboiled/examples/json/JsonParser2.scala +++ b/examples-scala/src/main/scala/org/parboiled/examples/json/JsonParser2.scala @@ -102,7 +102,7 @@ class JsonParser2 extends Parser { * We redefine the default string-to-rule conversion to also match trailing whitespace if the string ends with * a blank, this keeps the rules free from most whitespace matching clutter */ - override implicit def toRule(string: String) = + override implicit def toRule(string: String): Rule0 = if (string.endsWith(" ")) str(string.trim) ~ WhiteSpace else