diff --git a/build.sbt b/build.sbt index a5307d0..6bff24a 100644 --- a/build.sbt +++ b/build.sbt @@ -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, @@ -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") 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 be6bb35..48487b6 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.12" +scalaVersion := "2.13.14" 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 b578116..e5b52a2 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.12" -crossScalaVersions := List(scalaVersion.value, "3.3.1") +scalaVersion := "2.13.14" +crossScalaVersions := List(scalaVersion.value, "3.4.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 2e7459e..b6d8f51 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.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 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 ebf563e..f9470c5 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.12" -crossScalaVersions := List(scalaVersion.value, "3.3.1") +scalaVersion := "2.13.14" +crossScalaVersions := List(scalaVersion.value, "3.4.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 68f4e83..d2b018b 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.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 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 ebf563e..f9470c5 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.12" -crossScalaVersions := List(scalaVersion.value, "3.3.1") +scalaVersion := "2.13.14" +crossScalaVersions := List(scalaVersion.value, "3.4.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 ecf7257..5052899 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.3.1/src_managed/main/foo/model.scala +$ exists target/scala-3.4.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 db5a80c..4f507f1 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.12" +scalaVersion := "2.13.14" 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 db5a80c..4f507f1 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.12" +scalaVersion := "2.13.14" 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 ed7a48b..444f661 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.12", + scalaVersion := "2.13.14", 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 7f3211c..4d7e85c 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.12", + scalaVersion := "2.13.14", 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.12", + scalaVersion := "2.13.14", 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 207bdc5..773ddd6 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.12", + scalaVersion := "2.13.14", 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.12", + scalaVersion := "2.13.14", 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 c724940..654541b 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.12", "3.3.1"), + crossScalaVersions := Seq("2.13.14", "3.4.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 6dfdc74..8948abd 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.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 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 e66aa25..156b0a9 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.12", + scalaVersion := "2.13.14", 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.12", + scalaVersion := "2.13.14", 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 2afcad4..a923e62 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.12", + scalaVersion := "2.13.14", 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.12", + scalaVersion := "2.13.14", 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 f17ee2c..050e44e 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.12", "3.3.1"), + crossScalaVersions := Seq("2.13.14", "3.4.1"), muSrcGenIdlType := IdlType.Proto, muSrcGenTargetDir := (Compile / sourceManaged).value / "compiled_proto", muSrcGenValidateProto := true,