Bumps mu to v0.29.1 (#324)

* Update build.sbt * Bumps Scala * Bumps Scala on scripted tests * Fixes test Scala path * More Scala path fixes * Update build.sbt Co-authored-by: Francisco Diaz <[email protected]> Co-authored-by: Francisco Diaz <[email protected]>
higherkindness · Oct 19, 2022 · 10c773d · 10c773d
1 parent e7d8ba6
commit 10c773d
Show file tree

Hide file tree

Showing 31 changed files with 55 additions and 55 deletions.
diff --git a/build.sbt b/build.sbt
@@ -38,7 +38,7 @@ lazy val core = project
     )
   )
 
-val muV = "0.28.0+42-bd246ae6-SNAPSHOT" // TODO update when mu-scala is released
+val muV = "0.29.1"
 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
@@ -1,9 +1,9 @@
 version      := sys.props("version")
-scalaVersion := "2.13.8"
+scalaVersion := "2.13.10"
 
 enablePlugins(SrcGenPlugin)
 
-ThisBuild / resolvers += Resolver.sonatypeRepo("snapshots")
+ThisBuild / resolvers ++= Resolver.sonatypeOssRepos("snapshots")
 libraryDependencies ++= Seq(
   "io.higherkindness" %% "mu-rpc-service" % sys.props("mu")
 )

diff --git a/plugin/src/sbt-test/sbt-mu-srcgen/avroWithBadSchema/project/plugins.sbt b/plugin/src/sbt-test/sbt-mu-srcgen/avroWithBadSchema/project/plugins.sbt
@@ -1,2 +1,2 @@
-resolvers += Resolver.sonatypeRepo("snapshots")
+resolvers ++= Resolver.sonatypeOssRepos("snapshots")
 addSbtPlugin("io.higherkindness" %% "sbt-mu-srcgen" % sys.props("version"))
diff --git a/plugin/src/sbt-test/sbt-mu-srcgen/avroWithSchema/build.sbt b/plugin/src/sbt-test/sbt-mu-srcgen/avroWithSchema/build.sbt
@@ -1,10 +1,10 @@
 version            := sys.props("version")
-scalaVersion       := "2.13.8"
-crossScalaVersions := List(scalaVersion.value, "3.1.1")
+scalaVersion       := "2.13.10"
+crossScalaVersions := List(scalaVersion.value, "3.2.0")
 
 enablePlugins(SrcGenPlugin)
 
-ThisBuild / resolvers += Resolver.sonatypeRepo("snapshots")
+ThisBuild / resolvers ++= Resolver.sonatypeOssRepos("snapshots")
 libraryDependencies ++= Seq(
   "io.higherkindness" %% "mu-rpc-service" % sys.props("mu")
 )

diff --git a/plugin/src/sbt-test/sbt-mu-srcgen/avroWithSchema/project/plugins.sbt b/plugin/src/sbt-test/sbt-mu-srcgen/avroWithSchema/project/plugins.sbt
@@ -1,2 +1,2 @@
-resolvers += Resolver.sonatypeRepo("snapshots")
+resolvers ++= Resolver.sonatypeOssRepos("snapshots")
 addSbtPlugin("io.higherkindness" %% "sbt-mu-srcgen" % sys.props("version"))
diff --git 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.1.1/src_managed/main/io/higherkindness/MyService.scala
+$ exists target/scala-3.2.0/src_managed/main/io/higherkindness/MyService.scala
 > +compile
 $ delete target/scala-2.13/src_managed/main/io/higherkindness/MyService.scala
-$ delete target/scala-3.1.1/src_managed/main/io/higherkindness/MyService.scala
+$ delete target/scala-3.2.0/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.1.1/src_managed/main/io/higherkindness/MyService.scala
+$ exists target/scala-3.2.0/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.1.1/src_managed/main/io/higherkindness/MyService.scala expected/scala-3/MyService.scala.txt
+$ must-mirror target/scala-3.2.0/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
@@ -1,10 +1,10 @@
 version            := sys.props("version")
-scalaVersion       := "2.13.8"
-crossScalaVersions := List(scalaVersion.value, "3.1.1")
+scalaVersion       := "2.13.10"
+crossScalaVersions := List(scalaVersion.value, "3.2.0")
 
 enablePlugins(SrcGenPlugin)
 
-ThisBuild / resolvers += Resolver.sonatypeRepo("snapshots")
+ThisBuild / resolvers ++= Resolver.sonatypeOssRepos("snapshots")
 libraryDependencies ++= Seq(
   "io.higherkindness" %% "mu-rpc-server" % sys.props("mu")
 )

diff --git a/plugin/src/sbt-test/sbt-mu-srcgen/avrohuggerRewrites/project/plugins.sbt b/plugin/src/sbt-test/sbt-mu-srcgen/avrohuggerRewrites/project/plugins.sbt
@@ -1,2 +1,2 @@
-resolvers += Resolver.sonatypeRepo("snapshots")
+resolvers ++= Resolver.sonatypeOssRepos("snapshots")
 addSbtPlugin("io.higherkindness" %% "sbt-mu-srcgen" % sys.props("version"))
diff --git 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.1.1/src_managed/main/foo/model.scala
+$ exists target/scala-3.2.0/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.1.1/src_managed/main/foo/model.scala expected/scala-3/model.scala.txt
+$ must-mirror target/scala-3.2.0/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
@@ -1,10 +1,10 @@
 version            := sys.props("version")
-scalaVersion       := "2.13.8"
-crossScalaVersions := List(scalaVersion.value, "3.1.1")
+scalaVersion       := "2.13.10"
+crossScalaVersions := List(scalaVersion.value, "3.2.0")
 
 enablePlugins(SrcGenPlugin)
 
-ThisBuild / resolvers += Resolver.sonatypeRepo("snapshots")
+ThisBuild / resolvers ++= Resolver.sonatypeOssRepos("snapshots")
 libraryDependencies ++= Seq(
   "io.higherkindness" %% "mu-rpc-server" % sys.props("mu")
 )

diff --git a/plugin/src/sbt-test/sbt-mu-srcgen/basic/project/plugins.sbt b/plugin/src/sbt-test/sbt-mu-srcgen/basic/project/plugins.sbt
@@ -1,2 +1,2 @@
-resolvers += Resolver.sonatypeRepo("snapshots")
+resolvers ++= Resolver.sonatypeOssRepos("snapshots")
 addSbtPlugin("io.higherkindness" %% "sbt-mu-srcgen" % sys.props("version"))
diff --git 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.1.1/src_managed/main/foo/model.scala
+$ exists target/scala-3.2.0/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
@@ -1,9 +1,9 @@
 version      := sys.props("version")
-scalaVersion := "2.13.8"
+scalaVersion := "2.13.10"
 
 enablePlugins(SrcGenPlugin)
 
-ThisBuild / resolvers += Resolver.sonatypeRepo("snapshots")
+ThisBuild / resolvers ++= Resolver.sonatypeOssRepos("snapshots")
 libraryDependencies ++= Seq(
   "io.higherkindness" %% "mu-rpc-service" % sys.props("mu")
 )

diff --git a/plugin/src/sbt-test/sbt-mu-srcgen/gzipCompression/project/plugins.sbt b/plugin/src/sbt-test/sbt-mu-srcgen/gzipCompression/project/plugins.sbt
@@ -1,2 +1,2 @@
-resolvers += Resolver.sonatypeRepo("snapshots")
+resolvers ++= Resolver.sonatypeOssRepos("snapshots")
 addSbtPlugin("io.higherkindness" %% "sbt-mu-srcgen" % sys.props("version"))
diff --git a/plugin/src/sbt-test/sbt-mu-srcgen/idiomaticEndpoints/build.sbt b/plugin/src/sbt-test/sbt-mu-srcgen/idiomaticEndpoints/build.sbt
@@ -1,9 +1,9 @@
 version      := sys.props("version")
-scalaVersion := "2.13.8"
+scalaVersion := "2.13.10"
 
 enablePlugins(SrcGenPlugin)
 
-ThisBuild / resolvers += Resolver.sonatypeRepo("snapshots")
+ThisBuild / resolvers ++= Resolver.sonatypeOssRepos("snapshots")
 libraryDependencies ++= Seq(
   "io.higherkindness" %% "mu-rpc-service" % sys.props("mu")
 )

diff --git a/plugin/src/sbt-test/sbt-mu-srcgen/idiomaticEndpoints/project/plugins.sbt b/plugin/src/sbt-test/sbt-mu-srcgen/idiomaticEndpoints/project/plugins.sbt
@@ -1,2 +1,2 @@
-resolvers += Resolver.sonatypeRepo("snapshots")
+resolvers ++= Resolver.sonatypeOssRepos("snapshots")
 addSbtPlugin("io.higherkindness" %% "sbt-mu-srcgen" % sys.props("version"))
diff --git a/plugin/src/sbt-test/sbt-mu-srcgen/srcGenFromDirs/build.sbt b/plugin/src/sbt-test/sbt-mu-srcgen/srcGenFromDirs/build.sbt
@@ -1,14 +1,14 @@
 import higherkindness.mu.rpc.srcgen.Model.IdlType
 
-ThisBuild / resolvers += Resolver.sonatypeRepo("snapshots")
+ThisBuild / resolvers ++= Resolver.sonatypeOssRepos("snapshots")
 
 lazy val root = project
   .in(file("."))
   .enablePlugins(SrcGenPlugin)
   .settings(
     name            := "root",
     version         := "1.0.0",
-    scalaVersion    := "2.13.8",
+    scalaVersion    := "2.13.10",
     muSrcGenIdlType := IdlType.Avro,
     muSrcGenSourceDirs := Seq(
       (Compile / resourceDirectory).value / "domain",

diff --git a/plugin/src/sbt-test/sbt-mu-srcgen/srcGenFromDirs/project/plugins.sbt b/plugin/src/sbt-test/sbt-mu-srcgen/srcGenFromDirs/project/plugins.sbt
@@ -1,2 +1,2 @@
-resolvers += Resolver.sonatypeRepo("snapshots")
+resolvers ++= Resolver.sonatypeOssRepos("snapshots")
 addSbtPlugin("io.higherkindness" %% "sbt-mu-srcgen" % sys.props("version"))
diff --git a/plugin/src/sbt-test/sbt-mu-srcgen/srcGenFromJars/build.sbt b/plugin/src/sbt-test/sbt-mu-srcgen/srcGenFromJars/build.sbt
@@ -1,14 +1,14 @@
 import higherkindness.mu.rpc.srcgen.Model.IdlType
 
-ThisBuild / resolvers += Resolver.sonatypeRepo("snapshots")
+ThisBuild / resolvers ++= Resolver.sonatypeOssRepos("snapshots")
 
 lazy val domain = project
   .in(file("domain"))
   .enablePlugins(SrcGenPlugin)
   .settings(
     organization := "foo.bar.srcgenfromjars",
     name         := "domain",
-    scalaVersion := "2.13.8",
+    scalaVersion := "2.13.10",
     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.8",
+    scalaVersion         := "2.13.10",
     version              := sys.props("version"),
     muSrcGenIdlType      := IdlType.Avro,
     muSrcGenJarNames     := Seq("domain"),

diff --git a/plugin/src/sbt-test/sbt-mu-srcgen/srcGenFromJars/project/plugins.sbt b/plugin/src/sbt-test/sbt-mu-srcgen/srcGenFromJars/project/plugins.sbt
@@ -1,2 +1,2 @@
-resolvers += Resolver.sonatypeRepo("snapshots")
+resolvers ++= Resolver.sonatypeOssRepos("snapshots")
 addSbtPlugin("io.higherkindness" %% "sbt-mu-srcgen" % sys.props("version"))
diff --git a/plugin/src/sbt-test/sbt-mu-srcgen/srcGenFromJars2/build.sbt b/plugin/src/sbt-test/sbt-mu-srcgen/srcGenFromJars2/build.sbt
@@ -1,14 +1,14 @@
 import higherkindness.mu.rpc.srcgen.Model.IdlType
 
-ThisBuild / resolvers += Resolver.sonatypeRepo("snapshots")
+ThisBuild / resolvers ++= Resolver.sonatypeOssRepos("snapshots")
 
 lazy val domain = project
   .in(file("domain"))
   .enablePlugins(SrcGenPlugin)
   .settings(
     organization := "foo.bar.srcgenfromjars2",
     name         := "domain",
-    scalaVersion := "2.13.8",
+    scalaVersion := "2.13.10",
     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.8",
+    scalaVersion         := "2.13.10",
     version              := sys.props("version"),
     muSrcGenIdlType      := IdlType.Avro,
     muSrcGenJarNames     := Seq("domain"),

diff --git a/plugin/src/sbt-test/sbt-mu-srcgen/srcGenFromJars2/project/plugins.sbt b/plugin/src/sbt-test/sbt-mu-srcgen/srcGenFromJars2/project/plugins.sbt
@@ -1,2 +1,2 @@
-resolvers += Resolver.sonatypeRepo("snapshots")
+resolvers ++= Resolver.sonatypeOssRepos("snapshots")
 addSbtPlugin("io.higherkindness" %% "sbt-mu-srcgen" % sys.props("version"))
diff --git a/plugin/src/sbt-test/sbt-mu-srcgen/srcProtoGenFromDirs/build.sbt b/plugin/src/sbt-test/sbt-mu-srcgen/srcProtoGenFromDirs/build.sbt
@@ -1,12 +1,12 @@
 import higherkindness.mu.rpc.srcgen.Model.IdlType
 
-ThisBuild / resolvers += Resolver.sonatypeRepo("snapshots")
+ThisBuild / resolvers ++= Resolver.sonatypeOssRepos("snapshots")
 
 lazy val root = project
   .in(file("."))
   .enablePlugins(SrcGenPlugin)
   .settings(
-    crossScalaVersions := Seq("2.13.8", "3.1.1"),
+    crossScalaVersions := Seq("2.13.10", "3.2.0"),
     muSrcGenIdlType    := IdlType.Proto,
     muSrcGenTargetDir  := (Compile / sourceManaged).value / "compiled_proto",
     libraryDependencies ++= Seq(

diff --git a/plugin/src/sbt-test/sbt-mu-srcgen/srcProtoGenFromDirs/project/plugins.sbt b/plugin/src/sbt-test/sbt-mu-srcgen/srcProtoGenFromDirs/project/plugins.sbt
@@ -1,2 +1,2 @@
-resolvers += Resolver.sonatypeRepo("snapshots")
+resolvers ++= Resolver.sonatypeOssRepos("snapshots")
 addSbtPlugin("io.higherkindness" %% "sbt-mu-srcgen" % sys.props("version"))
diff --git 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.1.1/src_managed/main/compiled_proto/com/proto/book/BookService.scala expected/scala-3/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
diff --git a/plugin/src/sbt-test/sbt-mu-srcgen/srcProtoGenFromJars/build.sbt b/plugin/src/sbt-test/sbt-mu-srcgen/srcProtoGenFromJars/build.sbt
@@ -1,14 +1,14 @@
 import higherkindness.mu.rpc.srcgen.Model.IdlType
 
-ThisBuild / resolvers += Resolver.sonatypeRepo("snapshots")
+ThisBuild / resolvers ++= Resolver.sonatypeOssRepos("snapshots")
 
 lazy val domain = project
   .in(file("domain"))
   .enablePlugins(SrcGenPlugin)
   .settings(
     organization := "foo.bar.srcprotogenfromjars",
     name         := "domain",
-    scalaVersion := "2.13.8",
+    scalaVersion := "2.13.10",
     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.8",
+    scalaVersion         := "2.13.10",
     version              := sys.props("version"),
     muSrcGenIdlType      := IdlType.Proto,
     muSrcGenJarNames     := Seq("domain"),

diff --git a/plugin/src/sbt-test/sbt-mu-srcgen/srcProtoGenFromJars/project/plugins.sbt b/plugin/src/sbt-test/sbt-mu-srcgen/srcProtoGenFromJars/project/plugins.sbt
@@ -1,2 +1,2 @@
-resolvers += Resolver.sonatypeRepo("snapshots")
+resolvers ++= Resolver.sonatypeOssRepos("snapshots")
 addSbtPlugin("io.higherkindness" %% "sbt-mu-srcgen" % sys.props("version"))
diff --git a/plugin/src/sbt-test/sbt-mu-srcgen/srcProtoGenFromJars2/build.sbt b/plugin/src/sbt-test/sbt-mu-srcgen/srcProtoGenFromJars2/build.sbt
@@ -1,14 +1,14 @@
 import higherkindness.mu.rpc.srcgen.Model.IdlType
 
-ThisBuild / resolvers += Resolver.sonatypeRepo("snapshots")
+ThisBuild / resolvers ++= Resolver.sonatypeOssRepos("snapshots")
 
 lazy val domain = project
   .in(file("domain"))
   .enablePlugins(SrcGenPlugin)
   .settings(
     organization := "foo.bar.srcprotogenfromjars2",
     name         := "domain",
-    scalaVersion := "2.13.8",
+    scalaVersion := "2.13.10",
     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.8",
+    scalaVersion         := "2.13.10",
     version              := sys.props("version"),
     muSrcGenIdlType      := IdlType.Proto,
     muSrcGenJarNames     := Seq("domain"),

diff --git a/plugin/src/sbt-test/sbt-mu-srcgen/srcProtoGenFromJars2/project/plugins.sbt b/plugin/src/sbt-test/sbt-mu-srcgen/srcProtoGenFromJars2/project/plugins.sbt
@@ -1,2 +1,2 @@
-resolvers += Resolver.sonatypeRepo("snapshots")
+resolvers ++= Resolver.sonatypeOssRepos("snapshots")
 addSbtPlugin("io.higherkindness" %% "sbt-mu-srcgen" % sys.props("version"))
diff --git a/plugin/src/sbt-test/sbt-mu-srcgen/srcProtoGenValidate/build.sbt b/plugin/src/sbt-test/sbt-mu-srcgen/srcProtoGenValidate/build.sbt
@@ -1,12 +1,12 @@
 import higherkindness.mu.rpc.srcgen.Model.IdlType
 
-ThisBuild / resolvers += Resolver.sonatypeRepo("snapshots")
+ThisBuild / resolvers ++= Resolver.sonatypeOssRepos("snapshots")
 
 lazy val root = project
   .in(file("."))
   .enablePlugins(SrcGenPlugin)
   .settings(
-    crossScalaVersions    := Seq("2.13.8", "3.1.1"),
+    crossScalaVersions    := Seq("2.13.10", "3.2.0"),
     muSrcGenIdlType       := IdlType.Proto,
     muSrcGenTargetDir     := (Compile / sourceManaged).value / "compiled_proto",
     muSrcGenValidateProto := true,

diff --git a/plugin/src/sbt-test/sbt-mu-srcgen/srcProtoGenValidate/project/plugins.sbt b/plugin/src/sbt-test/sbt-mu-srcgen/srcProtoGenValidate/project/plugins.sbt
@@ -1,2 +1,2 @@
-resolvers += Resolver.sonatypeRepo("snapshots")
+resolvers ++= Resolver.sonatypeOssRepos("snapshots")
 addSbtPlugin("io.higherkindness" %% "sbt-mu-srcgen" % sys.props("version"))