Skip to content

Upgrades mu-scala and bumps scala versions in Tests #469

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 15, 2024
Merged

Upgrades mu-scala and bumps scala versions in Tests #469

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ lazy val core = project
"org.typelevel" %% "cats-core" % "2.10.0",
"com.julianpeeters" %% "avrohugger-core" % "2.8.3",
"com.thesamet.scalapb" %% "compilerplugin" % "0.11.15",
"com.thesamet.scalapb" %% "scalapb-validate-codegen" % "0.3.4",
"com.thesamet.scalapb" %% "scalapb-validate-codegen" % "0.3.5",
"org.scalameta" %% "scalameta" % "4.9.4",
"ch.epfl.scala" %% "scalafix-core" % "0.12.1",
"ch.epfl.scala" %% "scalafix-cli" % "0.12.1" cross CrossVersion.full,
Expand All @@ -38,7 +38,7 @@ lazy val core = project
)
)

val muV = "0.31.1"
val muV = "0.32.0"
lazy val plugin = project
.dependsOn(core)
.settings(moduleName := "sbt-mu-srcgen")
Expand Down
2 changes: 1 addition & 1 deletion plugin/src/sbt-test/sbt-mu-srcgen/avroWithBadSchema/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
version := sys.props("version")
scalaVersion := "2.13.12"
scalaVersion := "2.13.14"

enablePlugins(SrcGenPlugin)

Expand Down
4 changes: 2 additions & 2 deletions plugin/src/sbt-test/sbt-mu-srcgen/avroWithSchema/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
version := sys.props("version")
scalaVersion := "2.13.12"
crossScalaVersions := List(scalaVersion.value, "3.3.1")
scalaVersion := "2.13.14"
crossScalaVersions := List(scalaVersion.value, "3.4.1")

enablePlugins(SrcGenPlugin)

Expand Down
8 changes: 4 additions & 4 deletions plugin/src/sbt-test/sbt-mu-srcgen/avroWithSchema/test
View file
Open in desktop
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.3.1/src_managed/main/io/higherkindness/MyService.scala
$ exists target/scala-3.4.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.3.1/src_managed/main/io/higherkindness/MyService.scala
$ delete target/scala-3.4.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.3.1/src_managed/main/io/higherkindness/MyService.scala
$ exists target/scala-3.4.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.3.1/src_managed/main/io/higherkindness/MyService.scala expected/scala-3/MyService.scala.txt
$ must-mirror target/scala-3.4.1/src_managed/main/io/higherkindness/MyService.scala expected/scala-3/MyService.scala.txt
> +compile
> +compile
4 changes: 2 additions & 2 deletions plugin/src/sbt-test/sbt-mu-srcgen/avrohuggerRewrites/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
version := sys.props("version")
scalaVersion := "2.13.12"
crossScalaVersions := List(scalaVersion.value, "3.3.1")
scalaVersion := "2.13.14"
crossScalaVersions := List(scalaVersion.value, "3.4.1")

enablePlugins(SrcGenPlugin)

Expand Down
4 changes: 2 additions & 2 deletions plugin/src/sbt-test/sbt-mu-srcgen/avrohuggerRewrites/test
View file
Open in desktop
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.3.1/src_managed/main/foo/model.scala
$ exists target/scala-3.4.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.3.1/src_managed/main/foo/model.scala expected/scala-3/model.scala.txt
$ must-mirror target/scala-3.4.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
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
version := sys.props("version")
scalaVersion := "2.13.12"
crossScalaVersions := List(scalaVersion.value, "3.3.1")
scalaVersion := "2.13.14"
crossScalaVersions := List(scalaVersion.value, "3.4.1")

enablePlugins(SrcGenPlugin)

Expand Down
2 changes: 1 addition & 1 deletion plugin/src/sbt-test/sbt-mu-srcgen/basic/test
View file
Open in desktop
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.3.1/src_managed/main/foo/model.scala
$ exists target/scala-3.4.1/src_managed/main/foo/model.scala
> +compile
2 changes: 1 addition & 1 deletion plugin/src/sbt-test/sbt-mu-srcgen/gzipCompression/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
version := sys.props("version")
scalaVersion := "2.13.12"
scalaVersion := "2.13.14"

enablePlugins(SrcGenPlugin)

Expand Down
2 changes: 1 addition & 1 deletion plugin/src/sbt-test/sbt-mu-srcgen/idiomaticEndpoints/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
version := sys.props("version")
scalaVersion := "2.13.12"
scalaVersion := "2.13.14"

enablePlugins(SrcGenPlugin)

Expand Down
2 changes: 1 addition & 1 deletion plugin/src/sbt-test/sbt-mu-srcgen/srcGenFromDirs/build.sbt
View file
Open in desktop
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.12",
scalaVersion := "2.13.14",
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
View file
Open in desktop
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.12",
scalaVersion := "2.13.14",
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.12",
scalaVersion := "2.13.14",
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
View file
Open in desktop
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.12",
scalaVersion := "2.13.14",
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.12",
scalaVersion := "2.13.14",
version := sys.props("version"),
muSrcGenIdlType := IdlType.Avro,
muSrcGenJarNames := Seq("domain"),
Expand Down
2 changes: 1 addition & 1 deletion plugin/src/sbt-test/sbt-mu-srcgen/srcProtoGenFromDirs/build.sbt
View file
Open in desktop
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.12", "3.3.1"),
crossScalaVersions := Seq("2.13.14", "3.4.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
View file
Open in desktop
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.3.1/src_managed/main/compiled_proto/com/proto/book/BookService.scala expected/scala-3/BookService.scala.txt
$ must-mirror target/scala-3.4.1/src_managed/main/compiled_proto/com/proto/book/BookService.scala expected/scala-3/BookService.scala.txt
4 changes: 2 additions & 2 deletions plugin/src/sbt-test/sbt-mu-srcgen/srcProtoGenFromJars/build.sbt
View file
Open in desktop
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.12",
scalaVersion := "2.13.14",
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.12",
scalaVersion := "2.13.14",
version := sys.props("version"),
muSrcGenIdlType := IdlType.Proto,
muSrcGenJarNames := Seq("domain"),
Expand Down
4 changes: 2 additions & 2 deletions plugin/src/sbt-test/sbt-mu-srcgen/srcProtoGenFromJars2/build.sbt
View file
Open in desktop
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.12",
scalaVersion := "2.13.14",
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.12",
scalaVersion := "2.13.14",
version := sys.props("version"),
muSrcGenIdlType := IdlType.Proto,
muSrcGenJarNames := Seq("domain"),
Expand Down
2 changes: 1 addition & 1 deletion plugin/src/sbt-test/sbt-mu-srcgen/srcProtoGenValidate/build.sbt
View file
Open in desktop
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.12", "3.3.1"),
crossScalaVersions := Seq("2.13.14", "3.4.1"),
muSrcGenIdlType := IdlType.Proto,
muSrcGenTargetDir := (Compile / sourceManaged).value / "compiled_proto",
muSrcGenValidateProto := true,
Expand Down