Skip to content

Commit

Permalink
Update scala-library, scala-reflect to 2.13.14 (#3736)
Browse files Browse the repository at this point in the history
Co-authored-by: scala-steward <scala-steward>
  • Loading branch information
softwaremill-ci authored May 7, 2024
1 parent b9cd2a5 commit 20357c7
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 8 deletions.
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import scala.concurrent.duration.DurationInt
import scala.sys.process.Process

val scala2_12 = "2.12.19"
val scala2_13 = "2.13.13"
val scala2_13 = "2.13.14"
val scala3 = "3.3.3"

// The `idea.managed` property is set automatically by IntelliJ when it runs sbt for build or import
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
lazy val root = (project in file("."))
.enablePlugins(OpenapiCodegenPlugin)
.settings(
scalaVersion := "2.13.13",
scalaVersion := "2.13.14",
version := "0.1"
)

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
lazy val root = (project in file("."))
.enablePlugins(OpenapiCodegenPlugin)
.settings(
scalaVersion := "2.13.13",
scalaVersion := "2.13.14",
version := "0.1"
)

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
lazy val root = (project in file("."))
.enablePlugins(OpenapiCodegenPlugin)
.settings(
scalaVersion := "2.13.13",
scalaVersion := "2.13.14",
version := "0.1"
)

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
lazy val root = (project in file("."))
.enablePlugins(OpenapiCodegenPlugin)
.settings(
scalaVersion := "2.13.13",
scalaVersion := "2.13.14",
version := "0.1",
openapiJsonSerdeLib := "jsoniter"
)
Expand All @@ -25,7 +25,8 @@ TaskKey[Unit]("check") := {
val generatedCode =
Source.fromFile("target/scala-2.13/src_managed/main/sbt-openapi-codegen/TapirGeneratedEndpoints.scala").getLines.mkString("\n")
val expected = Source.fromFile("Expected.scala.txt").getLines.mkString("\n")
val generatedTrimmed = generatedCode.linesIterator.zipWithIndex.filterNot(_._1.forall(_.isWhitespace)).map{ case (a, i) => a.trim -> i }.toSeq
val generatedTrimmed =
generatedCode.linesIterator.zipWithIndex.filterNot(_._1.forall(_.isWhitespace)).map { case (a, i) => a.trim -> i }.toSeq
val expectedTrimmed = expected.linesIterator.filterNot(_.forall(_.isWhitespace)).map(_.trim).toSeq
if (generatedTrimmed.size != expectedTrimmed.size)
sys.error(s"expected ${expectedTrimmed.size} non-empty lines, found ${generatedTrimmed.size}")
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
lazy val root = (project in file("."))
.enablePlugins(OpenapiCodegenPlugin)
.settings(
scalaVersion := "2.13.13",
scalaVersion := "2.13.14",
version := "0.1",
openapiPackage := "com.example.generated.apis",
openapiObject := "MyExampleEndpoints",
Expand All @@ -18,7 +18,9 @@ TaskKey[Unit]("check") := {
val reference = Source.fromFile("example_swagger.yaml").getLines.mkString("\n")
val out = Source.fromFile("target/swagger.yaml").getLines.mkString("\n")
if (out != reference) {
sys.error("unexpected output:\n" + out + "\n== Out diff ref ==\n" + (out diff reference) + "\n== Ref diff out ==\n" + (reference diff out))
sys.error(
"unexpected output:\n" + out + "\n== Out diff ref ==\n" + (out diff reference) + "\n== Ref diff out ==\n" + (reference diff out)
)
}
()
}

0 comments on commit 20357c7

Please sign in to comment.