diff --git a/build.sbt b/build.sbt index 8cf6c7d182..9f549175c5 100644 --- a/build.sbt +++ b/build.sbt @@ -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 diff --git a/openapi-codegen/sbt-plugin/src/sbt-test/sbt-openapi-codegen/caching/build.sbt b/openapi-codegen/sbt-plugin/src/sbt-test/sbt-openapi-codegen/caching/build.sbt index a9afdc7a65..7e556918c4 100644 --- a/openapi-codegen/sbt-plugin/src/sbt-test/sbt-openapi-codegen/caching/build.sbt +++ b/openapi-codegen/sbt-plugin/src/sbt-test/sbt-openapi-codegen/caching/build.sbt @@ -1,7 +1,7 @@ lazy val root = (project in file(".")) .enablePlugins(OpenapiCodegenPlugin) .settings( - scalaVersion := "2.13.13", + scalaVersion := "2.13.14", version := "0.1" ) diff --git a/openapi-codegen/sbt-plugin/src/sbt-test/sbt-openapi-codegen/minimal/build.sbt b/openapi-codegen/sbt-plugin/src/sbt-test/sbt-openapi-codegen/minimal/build.sbt index a9afdc7a65..7e556918c4 100644 --- a/openapi-codegen/sbt-plugin/src/sbt-test/sbt-openapi-codegen/minimal/build.sbt +++ b/openapi-codegen/sbt-plugin/src/sbt-test/sbt-openapi-codegen/minimal/build.sbt @@ -1,7 +1,7 @@ lazy val root = (project in file(".")) .enablePlugins(OpenapiCodegenPlugin) .settings( - scalaVersion := "2.13.13", + scalaVersion := "2.13.14", version := "0.1" ) diff --git a/openapi-codegen/sbt-plugin/src/sbt-test/sbt-openapi-codegen/oneOf-json-roundtrip/build.sbt b/openapi-codegen/sbt-plugin/src/sbt-test/sbt-openapi-codegen/oneOf-json-roundtrip/build.sbt index 953265c708..3c397cd94e 100644 --- a/openapi-codegen/sbt-plugin/src/sbt-test/sbt-openapi-codegen/oneOf-json-roundtrip/build.sbt +++ b/openapi-codegen/sbt-plugin/src/sbt-test/sbt-openapi-codegen/oneOf-json-roundtrip/build.sbt @@ -1,7 +1,7 @@ lazy val root = (project in file(".")) .enablePlugins(OpenapiCodegenPlugin) .settings( - scalaVersion := "2.13.13", + scalaVersion := "2.13.14", version := "0.1" ) diff --git a/openapi-codegen/sbt-plugin/src/sbt-test/sbt-openapi-codegen/oneOf-json-roundtrip_jsoniter/build.sbt b/openapi-codegen/sbt-plugin/src/sbt-test/sbt-openapi-codegen/oneOf-json-roundtrip_jsoniter/build.sbt index 1c855800b7..de97ea0264 100644 --- a/openapi-codegen/sbt-plugin/src/sbt-test/sbt-openapi-codegen/oneOf-json-roundtrip_jsoniter/build.sbt +++ b/openapi-codegen/sbt-plugin/src/sbt-test/sbt-openapi-codegen/oneOf-json-roundtrip_jsoniter/build.sbt @@ -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" ) @@ -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}") diff --git a/openapi-codegen/sbt-plugin/src/sbt-test/sbt-openapi-codegen/option-overrides/build.sbt b/openapi-codegen/sbt-plugin/src/sbt-test/sbt-openapi-codegen/option-overrides/build.sbt index 9d217581bf..97e53a4568 100644 --- a/openapi-codegen/sbt-plugin/src/sbt-test/sbt-openapi-codegen/option-overrides/build.sbt +++ b/openapi-codegen/sbt-plugin/src/sbt-test/sbt-openapi-codegen/option-overrides/build.sbt @@ -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", @@ -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) + ) } () }