From a067d09474b9bcd5522a235e0caf628799cae0f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fede=20Fern=C3=A1ndez?= <720923+fedefernandez@users.noreply.github.com> Date: Wed, 18 Oct 2023 11:57:07 +0200 Subject: [PATCH] Bumps mu-scala to 0.31.0 (#422) * Bumps mu-scala to 0.31.0 * Update scripted tests --- build.sbt | 2 +- .../sbt-test/sbt-mu-srcgen/avroWithBadSchema/build.sbt | 2 +- .../src/sbt-test/sbt-mu-srcgen/avroWithSchema/build.sbt | 4 ++-- plugin/src/sbt-test/sbt-mu-srcgen/avroWithSchema/test | 8 ++++---- .../sbt-test/sbt-mu-srcgen/avrohuggerRewrites/build.sbt | 4 ++-- plugin/src/sbt-test/sbt-mu-srcgen/avrohuggerRewrites/test | 4 ++-- plugin/src/sbt-test/sbt-mu-srcgen/basic/build.sbt | 4 ++-- plugin/src/sbt-test/sbt-mu-srcgen/basic/test | 2 +- .../src/sbt-test/sbt-mu-srcgen/gzipCompression/build.sbt | 2 +- .../sbt-test/sbt-mu-srcgen/idiomaticEndpoints/build.sbt | 2 +- .../src/sbt-test/sbt-mu-srcgen/srcGenFromDirs/build.sbt | 2 +- .../src/sbt-test/sbt-mu-srcgen/srcGenFromJars/build.sbt | 4 ++-- .../src/sbt-test/sbt-mu-srcgen/srcGenFromJars2/build.sbt | 4 ++-- .../sbt-test/sbt-mu-srcgen/srcProtoGenFromDirs/build.sbt | 2 +- .../src/sbt-test/sbt-mu-srcgen/srcProtoGenFromDirs/test | 2 +- .../sbt-test/sbt-mu-srcgen/srcProtoGenFromJars/build.sbt | 4 ++-- .../sbt-test/sbt-mu-srcgen/srcProtoGenFromJars2/build.sbt | 4 ++-- .../sbt-test/sbt-mu-srcgen/srcProtoGenValidate/build.sbt | 2 +- 18 files changed, 29 insertions(+), 29 deletions(-) diff --git a/build.sbt b/build.sbt index 50c9692..1838526 100644 --- a/build.sbt +++ b/build.sbt @@ -38,7 +38,7 @@ lazy val core = project ) ) -val muV = "0.30.3" +val muV = "0.31.0" lazy val plugin = project .dependsOn(core) .settings(moduleName := "sbt-mu-srcgen") diff --git a/plugin/src/sbt-test/sbt-mu-srcgen/avroWithBadSchema/build.sbt b/plugin/src/sbt-test/sbt-mu-srcgen/avroWithBadSchema/build.sbt index aeedfd8..be6bb35 100644 --- a/plugin/src/sbt-test/sbt-mu-srcgen/avroWithBadSchema/build.sbt +++ b/plugin/src/sbt-test/sbt-mu-srcgen/avroWithBadSchema/build.sbt @@ -1,5 +1,5 @@ version := sys.props("version") -scalaVersion := "2.13.10" +scalaVersion := "2.13.12" enablePlugins(SrcGenPlugin) diff --git a/plugin/src/sbt-test/sbt-mu-srcgen/avroWithSchema/build.sbt b/plugin/src/sbt-test/sbt-mu-srcgen/avroWithSchema/build.sbt index c1505e7..b578116 100644 --- a/plugin/src/sbt-test/sbt-mu-srcgen/avroWithSchema/build.sbt +++ b/plugin/src/sbt-test/sbt-mu-srcgen/avroWithSchema/build.sbt @@ -1,6 +1,6 @@ version := sys.props("version") -scalaVersion := "2.13.10" -crossScalaVersions := List(scalaVersion.value, "3.2.0") +scalaVersion := "2.13.12" +crossScalaVersions := List(scalaVersion.value, "3.3.1") enablePlugins(SrcGenPlugin) diff --git a/plugin/src/sbt-test/sbt-mu-srcgen/avroWithSchema/test b/plugin/src/sbt-test/sbt-mu-srcgen/avroWithSchema/test index 9c0990a..2e7459e 100644 --- a/plugin/src/sbt-test/sbt-mu-srcgen/avroWithSchema/test +++ b/plugin/src/sbt-test/sbt-mu-srcgen/avroWithSchema/test @@ -3,16 +3,16 @@ $ exists src/main/resources/service.avdl > 'set muSrcGenSerializationType := higherkindness.mu.rpc.srcgen.Model.SerializationType.Avro' > +muSrcGen $ exists target/scala-2.13/src_managed/main/io/higherkindness/MyService.scala -$ exists target/scala-3.2.0/src_managed/main/io/higherkindness/MyService.scala +$ exists target/scala-3.3.1/src_managed/main/io/higherkindness/MyService.scala > +compile $ delete target/scala-2.13/src_managed/main/io/higherkindness/MyService.scala -$ delete target/scala-3.2.0/src_managed/main/io/higherkindness/MyService.scala +$ delete target/scala-3.3.1/src_managed/main/io/higherkindness/MyService.scala > 'set muSrcGenSerializationType := higherkindness.mu.rpc.srcgen.Model.SerializationType.AvroWithSchema' > +muSrcGen $ exists target/scala-2.13/src_managed/main/io/higherkindness/MyService.scala -$ exists target/scala-3.2.0/src_managed/main/io/higherkindness/MyService.scala +$ exists target/scala-3.3.1/src_managed/main/io/higherkindness/MyService.scala $ must-mirror target/scala-2.13/src_managed/main/io/higherkindness/MyService.scala expected/scala-2/MyService.scala.txt -$ must-mirror target/scala-3.2.0/src_managed/main/io/higherkindness/MyService.scala expected/scala-3/MyService.scala.txt +$ must-mirror target/scala-3.3.1/src_managed/main/io/higherkindness/MyService.scala expected/scala-3/MyService.scala.txt > +compile > +compile diff --git a/plugin/src/sbt-test/sbt-mu-srcgen/avrohuggerRewrites/build.sbt b/plugin/src/sbt-test/sbt-mu-srcgen/avrohuggerRewrites/build.sbt index e7ed5d8..ebf563e 100644 --- a/plugin/src/sbt-test/sbt-mu-srcgen/avrohuggerRewrites/build.sbt +++ b/plugin/src/sbt-test/sbt-mu-srcgen/avrohuggerRewrites/build.sbt @@ -1,6 +1,6 @@ version := sys.props("version") -scalaVersion := "2.13.10" -crossScalaVersions := List(scalaVersion.value, "3.2.0") +scalaVersion := "2.13.12" +crossScalaVersions := List(scalaVersion.value, "3.3.1") enablePlugins(SrcGenPlugin) diff --git a/plugin/src/sbt-test/sbt-mu-srcgen/avrohuggerRewrites/test b/plugin/src/sbt-test/sbt-mu-srcgen/avrohuggerRewrites/test index c40fd0d..68f4e83 100644 --- a/plugin/src/sbt-test/sbt-mu-srcgen/avrohuggerRewrites/test +++ b/plugin/src/sbt-test/sbt-mu-srcgen/avrohuggerRewrites/test @@ -1,7 +1,7 @@ $ exists src/main/resources/model.avdl > +muSrcGen $ exists target/scala-2.13/src_managed/main/foo/model.scala -$ exists target/scala-3.2.0/src_managed/main/foo/model.scala +$ exists target/scala-3.3.1/src_managed/main/foo/model.scala $ must-mirror target/scala-2.13/src_managed/main/foo/model.scala expected/scala-2/model.scala.txt -$ must-mirror target/scala-3.2.0/src_managed/main/foo/model.scala expected/scala-3/model.scala.txt +$ must-mirror target/scala-3.3.1/src_managed/main/foo/model.scala expected/scala-3/model.scala.txt > +compile diff --git a/plugin/src/sbt-test/sbt-mu-srcgen/basic/build.sbt b/plugin/src/sbt-test/sbt-mu-srcgen/basic/build.sbt index e7ed5d8..ebf563e 100644 --- a/plugin/src/sbt-test/sbt-mu-srcgen/basic/build.sbt +++ b/plugin/src/sbt-test/sbt-mu-srcgen/basic/build.sbt @@ -1,6 +1,6 @@ version := sys.props("version") -scalaVersion := "2.13.10" -crossScalaVersions := List(scalaVersion.value, "3.2.0") +scalaVersion := "2.13.12" +crossScalaVersions := List(scalaVersion.value, "3.3.1") enablePlugins(SrcGenPlugin) diff --git a/plugin/src/sbt-test/sbt-mu-srcgen/basic/test b/plugin/src/sbt-test/sbt-mu-srcgen/basic/test index 34b2641..ecf7257 100644 --- a/plugin/src/sbt-test/sbt-mu-srcgen/basic/test +++ b/plugin/src/sbt-test/sbt-mu-srcgen/basic/test @@ -1,5 +1,5 @@ $ exists src/main/resources/model.avdl > +muSrcGen $ exists target/scala-2.13/src_managed/main/foo/model.scala -$ exists target/scala-3.2.0/src_managed/main/foo/model.scala +$ exists target/scala-3.3.1/src_managed/main/foo/model.scala > +compile diff --git a/plugin/src/sbt-test/sbt-mu-srcgen/gzipCompression/build.sbt b/plugin/src/sbt-test/sbt-mu-srcgen/gzipCompression/build.sbt index f4a266d..db5a80c 100644 --- a/plugin/src/sbt-test/sbt-mu-srcgen/gzipCompression/build.sbt +++ b/plugin/src/sbt-test/sbt-mu-srcgen/gzipCompression/build.sbt @@ -1,5 +1,5 @@ version := sys.props("version") -scalaVersion := "2.13.10" +scalaVersion := "2.13.12" enablePlugins(SrcGenPlugin) diff --git a/plugin/src/sbt-test/sbt-mu-srcgen/idiomaticEndpoints/build.sbt b/plugin/src/sbt-test/sbt-mu-srcgen/idiomaticEndpoints/build.sbt index f4a266d..db5a80c 100644 --- a/plugin/src/sbt-test/sbt-mu-srcgen/idiomaticEndpoints/build.sbt +++ b/plugin/src/sbt-test/sbt-mu-srcgen/idiomaticEndpoints/build.sbt @@ -1,5 +1,5 @@ version := sys.props("version") -scalaVersion := "2.13.10" +scalaVersion := "2.13.12" enablePlugins(SrcGenPlugin) diff --git a/plugin/src/sbt-test/sbt-mu-srcgen/srcGenFromDirs/build.sbt b/plugin/src/sbt-test/sbt-mu-srcgen/srcGenFromDirs/build.sbt index f0f78f6..ed7a48b 100644 --- a/plugin/src/sbt-test/sbt-mu-srcgen/srcGenFromDirs/build.sbt +++ b/plugin/src/sbt-test/sbt-mu-srcgen/srcGenFromDirs/build.sbt @@ -8,7 +8,7 @@ lazy val root = project .settings( name := "root", version := "1.0.0", - scalaVersion := "2.13.10", + scalaVersion := "2.13.12", muSrcGenIdlType := IdlType.Avro, muSrcGenSourceDirs := Seq( (Compile / resourceDirectory).value / "domain", diff --git a/plugin/src/sbt-test/sbt-mu-srcgen/srcGenFromJars/build.sbt b/plugin/src/sbt-test/sbt-mu-srcgen/srcGenFromJars/build.sbt index fce6ae2..7f3211c 100644 --- a/plugin/src/sbt-test/sbt-mu-srcgen/srcGenFromJars/build.sbt +++ b/plugin/src/sbt-test/sbt-mu-srcgen/srcGenFromJars/build.sbt @@ -8,7 +8,7 @@ lazy val domain = project .settings( organization := "foo.bar.srcgenfromjars", name := "domain", - scalaVersion := "2.13.10", + scalaVersion := "2.13.12", version := "1.0.0-SNAPSHOT", Compile / packageBin / mappings ~= { _.filter(!_._1.getName.endsWith(".class")) }, muSrcGenIdlType := IdlType.Avro, @@ -24,7 +24,7 @@ lazy val root = project .enablePlugins(SrcGenPlugin) .settings( name := "root", - scalaVersion := "2.13.10", + scalaVersion := "2.13.12", version := sys.props("version"), muSrcGenIdlType := IdlType.Avro, muSrcGenJarNames := Seq("domain"), diff --git a/plugin/src/sbt-test/sbt-mu-srcgen/srcGenFromJars2/build.sbt b/plugin/src/sbt-test/sbt-mu-srcgen/srcGenFromJars2/build.sbt index fac479c..207bdc5 100644 --- a/plugin/src/sbt-test/sbt-mu-srcgen/srcGenFromJars2/build.sbt +++ b/plugin/src/sbt-test/sbt-mu-srcgen/srcGenFromJars2/build.sbt @@ -8,7 +8,7 @@ lazy val domain = project .settings( organization := "foo.bar.srcgenfromjars2", name := "domain", - scalaVersion := "2.13.10", + scalaVersion := "2.13.12", version := "1.0.0-SNAPSHOT", Compile / packageBin / mappings ~= { _.filter(!_._1.getName.endsWith(".class")) }, muSrcGenIdlType := IdlType.Avro, @@ -24,7 +24,7 @@ lazy val root = project .enablePlugins(SrcGenPlugin) .settings( name := "root", - scalaVersion := "2.13.10", + scalaVersion := "2.13.12", version := sys.props("version"), muSrcGenIdlType := IdlType.Avro, muSrcGenJarNames := Seq("domain"), diff --git a/plugin/src/sbt-test/sbt-mu-srcgen/srcProtoGenFromDirs/build.sbt b/plugin/src/sbt-test/sbt-mu-srcgen/srcProtoGenFromDirs/build.sbt index a4b4497..c724940 100644 --- a/plugin/src/sbt-test/sbt-mu-srcgen/srcProtoGenFromDirs/build.sbt +++ b/plugin/src/sbt-test/sbt-mu-srcgen/srcProtoGenFromDirs/build.sbt @@ -6,7 +6,7 @@ lazy val root = project .in(file(".")) .enablePlugins(SrcGenPlugin) .settings( - crossScalaVersions := Seq("2.13.10", "3.2.0"), + crossScalaVersions := Seq("2.13.12", "3.3.1"), muSrcGenIdlType := IdlType.Proto, muSrcGenTargetDir := (Compile / sourceManaged).value / "compiled_proto", libraryDependencies ++= Seq( diff --git a/plugin/src/sbt-test/sbt-mu-srcgen/srcProtoGenFromDirs/test b/plugin/src/sbt-test/sbt-mu-srcgen/srcProtoGenFromDirs/test index 02749b3..6dfdc74 100644 --- a/plugin/src/sbt-test/sbt-mu-srcgen/srcProtoGenFromDirs/test +++ b/plugin/src/sbt-test/sbt-mu-srcgen/srcProtoGenFromDirs/test @@ -4,4 +4,4 @@ $ exists target/scala-2.13/src_managed/main/compiled_proto/com/proto/book/Book.s $ exists target/scala-2.13/src_managed/main/compiled_proto/com/proto/book/GetBookRequest.scala $ exists target/scala-2.13/src_managed/main/compiled_proto/com/proto/book/BookService.scala $ must-mirror target/scala-2.13/src_managed/main/compiled_proto/com/proto/book/BookService.scala expected/scala-2/BookService.scala.txt -$ must-mirror target/scala-3.2.0/src_managed/main/compiled_proto/com/proto/book/BookService.scala expected/scala-3/BookService.scala.txt +$ must-mirror target/scala-3.3.1/src_managed/main/compiled_proto/com/proto/book/BookService.scala expected/scala-3/BookService.scala.txt diff --git a/plugin/src/sbt-test/sbt-mu-srcgen/srcProtoGenFromJars/build.sbt b/plugin/src/sbt-test/sbt-mu-srcgen/srcProtoGenFromJars/build.sbt index 36c54a7..e66aa25 100644 --- a/plugin/src/sbt-test/sbt-mu-srcgen/srcProtoGenFromJars/build.sbt +++ b/plugin/src/sbt-test/sbt-mu-srcgen/srcProtoGenFromJars/build.sbt @@ -8,7 +8,7 @@ lazy val domain = project .settings( organization := "foo.bar.srcprotogenfromjars", name := "domain", - scalaVersion := "2.13.10", + scalaVersion := "2.13.12", version := "1.0.0-SNAPSHOT", Compile / packageBin / mappings ~= { _.filter(!_._1.getName.endsWith(".class")) }, muSrcGenIdlType := IdlType.Proto, @@ -26,7 +26,7 @@ lazy val root = project .enablePlugins(SrcGenPlugin) .settings( name := "root", - scalaVersion := "2.13.10", + scalaVersion := "2.13.12", version := sys.props("version"), muSrcGenIdlType := IdlType.Proto, muSrcGenJarNames := Seq("domain"), diff --git a/plugin/src/sbt-test/sbt-mu-srcgen/srcProtoGenFromJars2/build.sbt b/plugin/src/sbt-test/sbt-mu-srcgen/srcProtoGenFromJars2/build.sbt index 3cf4b7a..2afcad4 100644 --- a/plugin/src/sbt-test/sbt-mu-srcgen/srcProtoGenFromJars2/build.sbt +++ b/plugin/src/sbt-test/sbt-mu-srcgen/srcProtoGenFromJars2/build.sbt @@ -8,7 +8,7 @@ lazy val domain = project .settings( organization := "foo.bar.srcprotogenfromjars2", name := "domain", - scalaVersion := "2.13.10", + scalaVersion := "2.13.12", version := "1.0.0-SNAPSHOT", Compile / packageBin / mappings ~= { _.filter(!_._1.getName.endsWith(".class")) }, muSrcGenIdlType := IdlType.Proto, @@ -26,7 +26,7 @@ lazy val root = project .enablePlugins(SrcGenPlugin) .settings( name := "root", - scalaVersion := "2.13.10", + scalaVersion := "2.13.12", version := sys.props("version"), muSrcGenIdlType := IdlType.Proto, muSrcGenJarNames := Seq("domain"), diff --git a/plugin/src/sbt-test/sbt-mu-srcgen/srcProtoGenValidate/build.sbt b/plugin/src/sbt-test/sbt-mu-srcgen/srcProtoGenValidate/build.sbt index f21a746..f17ee2c 100644 --- a/plugin/src/sbt-test/sbt-mu-srcgen/srcProtoGenValidate/build.sbt +++ b/plugin/src/sbt-test/sbt-mu-srcgen/srcProtoGenValidate/build.sbt @@ -6,7 +6,7 @@ lazy val root = project .in(file(".")) .enablePlugins(SrcGenPlugin) .settings( - crossScalaVersions := Seq("2.13.10", "3.2.0"), + crossScalaVersions := Seq("2.13.12", "3.3.1"), muSrcGenIdlType := IdlType.Proto, muSrcGenTargetDir := (Compile / sourceManaged).value / "compiled_proto", muSrcGenValidateProto := true,