Skip to content

Commit

Permalink
Bumps mu-scala to 0.31.0 (#422)
Browse files Browse the repository at this point in the history
* Bumps mu-scala to 0.31.0

* Update scripted tests
  • Loading branch information
fedefernandez authored Oct 18, 2023
1 parent 1e9d57a commit a067d09
Show file tree
Hide file tree
Showing 18 changed files with 29 additions and 29 deletions.
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
version := sys.props("version")
scalaVersion := "2.13.10"
scalaVersion := "2.13.12"

enablePlugins(SrcGenPlugin)

Expand Down
4 changes: 2 additions & 2 deletions plugin/src/sbt-test/sbt-mu-srcgen/avroWithSchema/build.sbt
Original file line number Diff line number Diff line change
@@ -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)

Expand Down
8 changes: 4 additions & 4 deletions plugin/src/sbt-test/sbt-mu-srcgen/avroWithSchema/test
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
@@ -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)

Expand Down
4 changes: 2 additions & 2 deletions plugin/src/sbt-test/sbt-mu-srcgen/avrohuggerRewrites/test
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions plugin/src/sbt-test/sbt-mu-srcgen/basic/build.sbt
Original file line number Diff line number Diff line change
@@ -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)

Expand Down
2 changes: 1 addition & 1 deletion plugin/src/sbt-test/sbt-mu-srcgen/basic/test
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
version := sys.props("version")
scalaVersion := "2.13.10"
scalaVersion := "2.13.12"

enablePlugins(SrcGenPlugin)

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
version := sys.props("version")
scalaVersion := "2.13.10"
scalaVersion := "2.13.12"

enablePlugins(SrcGenPlugin)

Expand Down
2 changes: 1 addition & 1 deletion plugin/src/sbt-test/sbt-mu-srcgen/srcGenFromDirs/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
4 changes: 2 additions & 2 deletions plugin/src/sbt-test/sbt-mu-srcgen/srcGenFromJars/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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"),
Expand Down
4 changes: 2 additions & 2 deletions plugin/src/sbt-test/sbt-mu-srcgen/srcGenFromJars2/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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"),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
2 changes: 1 addition & 1 deletion plugin/src/sbt-test/sbt-mu-srcgen/srcProtoGenFromDirs/test
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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"),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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"),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

0 comments on commit a067d09

Please sign in to comment.