Skip to content

Commit

Permalink
Merge pull request #545 from scala-steward/update/scala-library-2.13.10
Browse files Browse the repository at this point in the history
Update scala-library, scala-reflect to 2.13.10
  • Loading branch information
mergify[bot] authored Nov 1, 2022
2 parents 4e1c24a + 9c7f2ea commit 283685e
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 13 deletions.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
lazy val root = (project in file("."))
.enablePlugins(Smithy4sCodegenPlugin)
.settings(
scalaVersion := "2.13.8",
scalaVersion := "2.13.10",
libraryDependencies ++= Seq(
"com.disneystreaming.smithy4s" %% "smithy4s-core" % smithy4sVersion.value,
"com.disneystreaming.smithy4s" %% "smithy4s-dynamic" % smithy4sVersion.value,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ThisBuild / scalaVersion := "2.13.8"
ThisBuild / scalaVersion := "2.13.10"

lazy val foo = (project in file("foo"))

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ThisBuild / scalaVersion := "2.13.8"
ThisBuild / scalaVersion := "2.13.10"
ThisBuild / version := "0.0.1-SNAPSHOT"
ThisBuild / organization := "foobar"

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ThisBuild / scalaVersion := "2.13.8"
ThisBuild / scalaVersion := "2.13.10"

lazy val foo = (project in file("foo"))
.enablePlugins(Smithy4sCodegenPlugin)
Expand Down
2 changes: 1 addition & 1 deletion modules/codegen/src/smithy4s/codegen/Renderer.scala
Original file line number Diff line number Diff line change
Expand Up @@ -931,7 +931,7 @@ private[codegen] class Renderer(compilationUnit: CompilationUnit) { self =>
.map { case (k, v) => k.runDefault + line" -> " + v.runDefault }
.intercalate(Line.comma)})".writeCollection
case PrimitiveTN(prim, value) =>
renderPrimitive(prim)(value).write
renderPrimitive[prim.T](prim)(value).write
}

private def renderPrimitive[T](prim: Primitive.Aux[T]): T => Line =
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ class Smithy4sModuleSpec extends munit.FunSuite {

test("basic codegen runs") {
object foo extends testKit.BaseModule with Smithy4sModule {
override def scalaVersion = "2.13.8"
override def scalaVersion = "2.13.10"
override def ivyDeps = Agg(coreDep)
override def millSourcePath = resourcePath / "basic"
}
Expand All @@ -61,7 +61,7 @@ class Smithy4sModuleSpec extends munit.FunSuite {

test("codegen with dependencies") {
object foo extends testKit.BaseModule with Smithy4sModule {
override def scalaVersion = "2.13.8"
override def scalaVersion = "2.13.10"
override def ivyDeps = Agg(coreDep)
override def millSourcePath = resourcePath / "basic"
override def smithy4sAllowedNamespaces = T(Some(Set("aws.iam")))
Expand All @@ -82,14 +82,14 @@ class Smithy4sModuleSpec extends munit.FunSuite {
test("multi-module codegen works") {

object foo extends testKit.BaseModule with Smithy4sModule {
override def scalaVersion = "2.13.8"
override def scalaVersion = "2.13.10"
override def ivyDeps = Agg(coreDep)
override def millSourcePath = resourcePath / "multi-module" / "foo"
}

object bar extends testKit.BaseModule with Smithy4sModule {
override def moduleDeps = Seq(foo)
override def scalaVersion = "2.13.8"
override def scalaVersion = "2.13.10"
override def ivyDeps = Agg(coreDep)
override def millSourcePath = resourcePath / "multi-module" / "bar"
}
Expand Down Expand Up @@ -142,14 +142,14 @@ class Smithy4sModuleSpec extends munit.FunSuite {
) {

object foo extends testKit.BaseModule with ScalaModule {
override def scalaVersion = "2.13.8"
override def scalaVersion = "2.13.10"
override def millSourcePath =
resourcePath / "multi-module-no-compile" / "foo"
}

object bar extends testKit.BaseModule with Smithy4sModule {
override def moduleDeps = Seq(foo)
override def scalaVersion = "2.13.8"
override def scalaVersion = "2.13.10"
override def ivyDeps = Agg(coreDep)
override def millSourcePath =
resourcePath / "multi-module-no-compile" / "bar"
Expand Down
4 changes: 2 additions & 2 deletions project/Smithy4sPlugin.scala
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ object Smithy4sPlugin extends AutoPlugin {
val CatsEffect2Axis = CatsEffectAxis("_CE2", "ce2")

val Scala212 = "2.12.17"
val Scala213 = "2.13.8"
val Scala213 = "2.13.10"
val Scala3 = "3.2.0"

implicit class ProjectMatrixOps(val pm: ProjectMatrix) extends AnyVal {
Expand Down Expand Up @@ -170,7 +170,7 @@ object Smithy4sPlugin extends AutoPlugin {

def targetScalacOptions(scalaVersion: String) =
if (scalaVersion.startsWith("2.12")) Seq("-target:jvm-1.8", "-release", "8")
else if (scalaVersion.startsWith("2.13")) Seq("-target:8", "-release", "8")
else if (scalaVersion.startsWith("2.13")) Seq("-release", "8")
else if (scalaVersion.startsWith("3.")) Seq("-release", "8")
else Seq.empty // when we get Scala 4...

Expand Down

0 comments on commit 283685e

Please sign in to comment.