Skip to content

Commit 64c416d

Browse files
juanpedromorenojuanpedromoreno
authored
Upgrades muV. Bumps scala versions (#469)
1 parent db6c7e8 commit 64c416d

File tree

18 files changed

+30
-30
lines changed

18 files changed

+30
-30
lines changed

Diff for: ‎build.sbt

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ lazy val core = project
1616
"org.typelevel" %% "cats-core" % "2.10.0",
1717
"com.julianpeeters" %% "avrohugger-core" % "2.8.3",
1818
"com.thesamet.scalapb" %% "compilerplugin" % "0.11.15",
19-
"com.thesamet.scalapb" %% "scalapb-validate-codegen" % "0.3.4",
19+
"com.thesamet.scalapb" %% "scalapb-validate-codegen" % "0.3.5",
2020
"org.scalameta" %% "scalameta" % "4.9.4",
2121
"ch.epfl.scala" %% "scalafix-core" % "0.12.1",
2222
"ch.epfl.scala" %% "scalafix-cli" % "0.12.1" cross CrossVersion.full,
@@ -38,7 +38,7 @@ lazy val core = project
3838
)
3939
)
4040

41-
val muV = "0.31.1"
41+
val muV = "0.32.0"
4242
lazy val plugin = project
4343
.dependsOn(core)
4444
.settings(moduleName := "sbt-mu-srcgen")

Diff for: ‎plugin/src/sbt-test/sbt-mu-srcgen/avroWithBadSchema/build.sbt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
version := sys.props("version")
2-
scalaVersion := "2.13.12"
2+
scalaVersion := "2.13.14"
33

44
enablePlugins(SrcGenPlugin)
55

Diff for: ‎plugin/src/sbt-test/sbt-mu-srcgen/avroWithSchema/build.sbt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
version := sys.props("version")
2-
scalaVersion := "2.13.12"
3-
crossScalaVersions := List(scalaVersion.value, "3.3.1")
2+
scalaVersion := "2.13.14"
3+
crossScalaVersions := List(scalaVersion.value, "3.4.1")
44

55
enablePlugins(SrcGenPlugin)
66

Diff for: ‎plugin/src/sbt-test/sbt-mu-srcgen/avroWithSchema/test

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@ $ exists src/main/resources/service.avdl
33
> 'set muSrcGenSerializationType := higherkindness.mu.rpc.srcgen.Model.SerializationType.Avro'
44
> +muSrcGen
55
$ exists target/scala-2.13/src_managed/main/io/higherkindness/MyService.scala
6-
$ exists target/scala-3.3.1/src_managed/main/io/higherkindness/MyService.scala
6+
$ exists target/scala-3.4.1/src_managed/main/io/higherkindness/MyService.scala
77
> +compile
88
$ delete target/scala-2.13/src_managed/main/io/higherkindness/MyService.scala
9-
$ delete target/scala-3.3.1/src_managed/main/io/higherkindness/MyService.scala
9+
$ delete target/scala-3.4.1/src_managed/main/io/higherkindness/MyService.scala
1010

1111
> 'set muSrcGenSerializationType := higherkindness.mu.rpc.srcgen.Model.SerializationType.AvroWithSchema'
1212
> +muSrcGen
1313
$ exists target/scala-2.13/src_managed/main/io/higherkindness/MyService.scala
14-
$ exists target/scala-3.3.1/src_managed/main/io/higherkindness/MyService.scala
14+
$ exists target/scala-3.4.1/src_managed/main/io/higherkindness/MyService.scala
1515
$ must-mirror target/scala-2.13/src_managed/main/io/higherkindness/MyService.scala expected/scala-2/MyService.scala.txt
16-
$ must-mirror target/scala-3.3.1/src_managed/main/io/higherkindness/MyService.scala expected/scala-3/MyService.scala.txt
16+
$ must-mirror target/scala-3.4.1/src_managed/main/io/higherkindness/MyService.scala expected/scala-3/MyService.scala.txt
1717
> +compile
1818
> +compile

Diff for: ‎plugin/src/sbt-test/sbt-mu-srcgen/avrohuggerRewrites/build.sbt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
version := sys.props("version")
2-
scalaVersion := "2.13.12"
3-
crossScalaVersions := List(scalaVersion.value, "3.3.1")
2+
scalaVersion := "2.13.14"
3+
crossScalaVersions := List(scalaVersion.value, "3.4.1")
44

55
enablePlugins(SrcGenPlugin)
66

Diff for: ‎plugin/src/sbt-test/sbt-mu-srcgen/avrohuggerRewrites/test

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
$ exists src/main/resources/model.avdl
22
> +muSrcGen
33
$ exists target/scala-2.13/src_managed/main/foo/model.scala
4-
$ exists target/scala-3.3.1/src_managed/main/foo/model.scala
4+
$ exists target/scala-3.4.1/src_managed/main/foo/model.scala
55
$ must-mirror target/scala-2.13/src_managed/main/foo/model.scala expected/scala-2/model.scala.txt
6-
$ must-mirror target/scala-3.3.1/src_managed/main/foo/model.scala expected/scala-3/model.scala.txt
6+
$ must-mirror target/scala-3.4.1/src_managed/main/foo/model.scala expected/scala-3/model.scala.txt
77
> +compile

Diff for: ‎plugin/src/sbt-test/sbt-mu-srcgen/basic/build.sbt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
version := sys.props("version")
2-
scalaVersion := "2.13.12"
3-
crossScalaVersions := List(scalaVersion.value, "3.3.1")
2+
scalaVersion := "2.13.14"
3+
crossScalaVersions := List(scalaVersion.value, "3.4.1")
44

55
enablePlugins(SrcGenPlugin)
66

Diff for: ‎plugin/src/sbt-test/sbt-mu-srcgen/basic/test

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
$ exists src/main/resources/model.avdl
22
> +muSrcGen
33
$ exists target/scala-2.13/src_managed/main/foo/model.scala
4-
$ exists target/scala-3.3.1/src_managed/main/foo/model.scala
4+
$ exists target/scala-3.4.1/src_managed/main/foo/model.scala
55
> +compile

Diff for: ‎plugin/src/sbt-test/sbt-mu-srcgen/gzipCompression/build.sbt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
version := sys.props("version")
2-
scalaVersion := "2.13.12"
2+
scalaVersion := "2.13.14"
33

44
enablePlugins(SrcGenPlugin)
55

Diff for: ‎plugin/src/sbt-test/sbt-mu-srcgen/idiomaticEndpoints/build.sbt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
version := sys.props("version")
2-
scalaVersion := "2.13.12"
2+
scalaVersion := "2.13.14"
33

44
enablePlugins(SrcGenPlugin)
55

Diff for: ‎plugin/src/sbt-test/sbt-mu-srcgen/srcGenFromDirs/build.sbt

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ lazy val root = project
88
.settings(
99
name := "root",
1010
version := "1.0.0",
11-
scalaVersion := "2.13.12",
11+
scalaVersion := "2.13.14",
1212
muSrcGenIdlType := IdlType.Avro,
1313
muSrcGenSourceDirs := Seq(
1414
(Compile / resourceDirectory).value / "domain",

Diff for: ‎plugin/src/sbt-test/sbt-mu-srcgen/srcGenFromJars/build.sbt

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ lazy val domain = project
88
.settings(
99
organization := "foo.bar.srcgenfromjars",
1010
name := "domain",
11-
scalaVersion := "2.13.12",
11+
scalaVersion := "2.13.14",
1212
version := "1.0.0-SNAPSHOT",
1313
Compile / packageBin / mappings ~= { _.filter(!_._1.getName.endsWith(".class")) },
1414
muSrcGenIdlType := IdlType.Avro,
@@ -24,7 +24,7 @@ lazy val root = project
2424
.enablePlugins(SrcGenPlugin)
2525
.settings(
2626
name := "root",
27-
scalaVersion := "2.13.12",
27+
scalaVersion := "2.13.14",
2828
version := sys.props("version"),
2929
muSrcGenIdlType := IdlType.Avro,
3030
muSrcGenJarNames := Seq("domain"),

Diff for: ‎plugin/src/sbt-test/sbt-mu-srcgen/srcGenFromJars2/build.sbt

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ lazy val domain = project
88
.settings(
99
organization := "foo.bar.srcgenfromjars2",
1010
name := "domain",
11-
scalaVersion := "2.13.12",
11+
scalaVersion := "2.13.14",
1212
version := "1.0.0-SNAPSHOT",
1313
Compile / packageBin / mappings ~= { _.filter(!_._1.getName.endsWith(".class")) },
1414
muSrcGenIdlType := IdlType.Avro,
@@ -24,7 +24,7 @@ lazy val root = project
2424
.enablePlugins(SrcGenPlugin)
2525
.settings(
2626
name := "root",
27-
scalaVersion := "2.13.12",
27+
scalaVersion := "2.13.14",
2828
version := sys.props("version"),
2929
muSrcGenIdlType := IdlType.Avro,
3030
muSrcGenJarNames := Seq("domain"),

Diff for: ‎plugin/src/sbt-test/sbt-mu-srcgen/srcProtoGenFromDirs/build.sbt

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ lazy val root = project
66
.in(file("."))
77
.enablePlugins(SrcGenPlugin)
88
.settings(
9-
crossScalaVersions := Seq("2.13.12", "3.3.1"),
9+
crossScalaVersions := Seq("2.13.14", "3.4.1"),
1010
muSrcGenIdlType := IdlType.Proto,
1111
muSrcGenTargetDir := (Compile / sourceManaged).value / "compiled_proto",
1212
libraryDependencies ++= Seq(

Diff for: ‎plugin/src/sbt-test/sbt-mu-srcgen/srcProtoGenFromDirs/test

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ $ exists target/scala-2.13/src_managed/main/compiled_proto/com/proto/book/Book.s
44
$ exists target/scala-2.13/src_managed/main/compiled_proto/com/proto/book/GetBookRequest.scala
55
$ exists target/scala-2.13/src_managed/main/compiled_proto/com/proto/book/BookService.scala
66
$ must-mirror target/scala-2.13/src_managed/main/compiled_proto/com/proto/book/BookService.scala expected/scala-2/BookService.scala.txt
7-
$ must-mirror target/scala-3.3.1/src_managed/main/compiled_proto/com/proto/book/BookService.scala expected/scala-3/BookService.scala.txt
7+
$ must-mirror target/scala-3.4.1/src_managed/main/compiled_proto/com/proto/book/BookService.scala expected/scala-3/BookService.scala.txt

Diff for: ‎plugin/src/sbt-test/sbt-mu-srcgen/srcProtoGenFromJars/build.sbt

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ lazy val domain = project
88
.settings(
99
organization := "foo.bar.srcprotogenfromjars",
1010
name := "domain",
11-
scalaVersion := "2.13.12",
11+
scalaVersion := "2.13.14",
1212
version := "1.0.0-SNAPSHOT",
1313
Compile / packageBin / mappings ~= { _.filter(!_._1.getName.endsWith(".class")) },
1414
muSrcGenIdlType := IdlType.Proto,
@@ -26,7 +26,7 @@ lazy val root = project
2626
.enablePlugins(SrcGenPlugin)
2727
.settings(
2828
name := "root",
29-
scalaVersion := "2.13.12",
29+
scalaVersion := "2.13.14",
3030
version := sys.props("version"),
3131
muSrcGenIdlType := IdlType.Proto,
3232
muSrcGenJarNames := Seq("domain"),

Diff for: ‎plugin/src/sbt-test/sbt-mu-srcgen/srcProtoGenFromJars2/build.sbt

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ lazy val domain = project
88
.settings(
99
organization := "foo.bar.srcprotogenfromjars2",
1010
name := "domain",
11-
scalaVersion := "2.13.12",
11+
scalaVersion := "2.13.14",
1212
version := "1.0.0-SNAPSHOT",
1313
Compile / packageBin / mappings ~= { _.filter(!_._1.getName.endsWith(".class")) },
1414
muSrcGenIdlType := IdlType.Proto,
@@ -26,7 +26,7 @@ lazy val root = project
2626
.enablePlugins(SrcGenPlugin)
2727
.settings(
2828
name := "root",
29-
scalaVersion := "2.13.12",
29+
scalaVersion := "2.13.14",
3030
version := sys.props("version"),
3131
muSrcGenIdlType := IdlType.Proto,
3232
muSrcGenJarNames := Seq("domain"),

Diff for: ‎plugin/src/sbt-test/sbt-mu-srcgen/srcProtoGenValidate/build.sbt

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ lazy val root = project
66
.in(file("."))
77
.enablePlugins(SrcGenPlugin)
88
.settings(
9-
crossScalaVersions := Seq("2.13.12", "3.3.1"),
9+
crossScalaVersions := Seq("2.13.14", "3.4.1"),
1010
muSrcGenIdlType := IdlType.Proto,
1111
muSrcGenTargetDir := (Compile / sourceManaged).value / "compiled_proto",
1212
muSrcGenValidateProto := true,

0 commit comments

Comments
 (0)