From 73e89ff0cfecc644462fa3d14f262cbda9b83b98 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Tue, 4 Jul 2023 22:41:06 +0000 Subject: [PATCH] Update scala-compiler, scala-library to 2.13.11 --- .github/workflows/scala.yml | 2 +- build.sbt | 70 ++++++++++++++++++++++++++----------- 2 files changed, 51 insertions(+), 21 deletions(-) diff --git a/.github/workflows/scala.yml b/.github/workflows/scala.yml index a4acdc02..89bd2f78 100644 --- a/.github/workflows/scala.yml +++ b/.github/workflows/scala.yml @@ -14,7 +14,7 @@ jobs: matrix: os: [ubuntu-latest] # FIXME Use stable scala version - scala: [2.13.10, 3.3.1-RC1-bin-20230318-7226ba6-NIGHTLY] + scala: [2.13.11, 3.3.1-RC1-bin-20230318-7226ba6-NIGHTLY] steps: - uses: actions/checkout@v3 diff --git a/build.sbt b/build.sbt index 1cd48670..d2324490 100644 --- a/build.sbt +++ b/build.sbt @@ -1,4 +1,4 @@ -lazy val scala213 = "2.13.10" +lazy val scala213 = "2.13.11" /* FIXME Return to use a stable version when 'scala.quoted.Quotes.reflectModuleSymbol.newClass' and 'scala.quoted.Quotes.reflectModule.ClassDef.apply' are no longer experimental methods @@ -10,7 +10,9 @@ ThisBuild / scalaVersion := scala3 lazy val commonSettings = Seq( version := "0.28.0", organization := "com.tethys-json", - licenses := Seq("Apache-2.0" -> url("https://www.apache.org/licenses/LICENSE-2.0")), + licenses := Seq( + "Apache-2.0" -> url("https://www.apache.org/licenses/LICENSE-2.0") + ), homepage := Some(url("https://github.com/tethys-json/tethys")), scmInfo := Some( ScmInfo( @@ -38,7 +40,9 @@ lazy val commonSettings = Seq( url = url("https://github.com/MrIrre") ) ), - credentials ++= Option(Path.userHome / ".config" / "sbt" / ".tethys-credentials") + credentials ++= Option( + Path.userHome / ".config" / "sbt" / ".tethys-credentials" + ) .filter(_.exists()) .map(Credentials(_)), publishMavenStyle := true, @@ -54,7 +58,8 @@ lazy val commonSettings = Seq( def crossScalaSettings = { def addDirsByScalaVersion(path: String): Def.Initialize[Seq[sbt.File]] = scalaVersion.zip(baseDirectory) { case (v, base) => - def extraDirs(versionSpecificFolder: String): Seq[sbt.File] = Seq(base / path / versionSpecificFolder) + def extraDirs(versionSpecificFolder: String): Seq[sbt.File] = + Seq(base / path / versionSpecificFolder) CrossVersion.partialVersion(v) match { case Some((2, y)) if y >= 13 => @@ -67,8 +72,12 @@ def crossScalaSettings = { Seq( crossScalaVersions := Seq(scala213, scala3), - Compile / unmanagedSourceDirectories ++= addDirsByScalaVersion("src/main").value, - Test / unmanagedSourceDirectories ++= addDirsByScalaVersion("src/test").value + Compile / unmanagedSourceDirectories ++= addDirsByScalaVersion( + "src/main" + ).value, + Test / unmanagedSourceDirectories ++= addDirsByScalaVersion( + "src/test" + ).value ) } @@ -79,13 +88,24 @@ lazy val testSettings = Seq( ) ) -lazy val tethys = project.in(file(".")) +lazy val tethys = project + .in(file(".")) .settings( publishTo := None, crossScalaVersions := Seq.empty, commonSettings ) - .aggregate(core, `macro-derivation`, `jackson-211`, `jackson-212`, `jackson-213`, json4s, circe, refined, enumeratum) + .aggregate( + core, + `macro-derivation`, + `jackson-211`, + `jackson-212`, + `jackson-213`, + json4s, + circe, + refined, + enumeratum + ) lazy val modules = file("modules") @@ -98,7 +118,8 @@ def addScalaCompiler(scalaVersion: String): Seq[ModuleID] = case _ => Seq.empty } -lazy val core = project.in(modules / "core") +lazy val core = project + .in(modules / "core") .settings(crossScalaSettings) .settings(commonSettings) .settings(testSettings) @@ -107,7 +128,8 @@ lazy val core = project.in(modules / "core") libraryDependencies ++= addScalaCompiler(scalaVersion.value) ) -lazy val `macro-derivation` = project.in(modules / "macro-derivation") +lazy val `macro-derivation` = project + .in(modules / "macro-derivation") .settings(crossScalaSettings) .settings(commonSettings) .settings(testSettings) @@ -123,7 +145,8 @@ lazy val jacksonSettings = Seq( Test / unmanagedResourceDirectories += modules / "jackson-backend" / "src" / "test" / "resources" ) -lazy val `jackson-211` = project.in(modules / "jackson-211") +lazy val `jackson-211` = project + .in(modules / "jackson-211") .settings(crossScalaSettings) .settings(commonSettings) .settings(jacksonSettings) @@ -136,7 +159,8 @@ lazy val `jackson-211` = project.in(modules / "jackson-211") ) .dependsOn(core) -lazy val `jackson-212` = project.in(modules / "jackson-212") +lazy val `jackson-212` = project + .in(modules / "jackson-212") .settings(crossScalaSettings) .settings(commonSettings) .settings(jacksonSettings) @@ -149,7 +173,8 @@ lazy val `jackson-212` = project.in(modules / "jackson-212") ) .dependsOn(core) -lazy val `jackson-213` = project.in(modules / "jackson-213") +lazy val `jackson-213` = project + .in(modules / "jackson-213") .settings(crossScalaSettings) .settings(commonSettings) .settings(jacksonSettings) @@ -162,7 +187,8 @@ lazy val `jackson-213` = project.in(modules / "jackson-213") ) .dependsOn(core) -lazy val circe = project.in(modules / "circe") +lazy val circe = project + .in(modules / "circe") .settings(crossScalaSettings) .settings(commonSettings) .settings(testSettings) @@ -174,7 +200,8 @@ lazy val circe = project.in(modules / "circe") ) .dependsOn(core, `jackson-212` % Test) -lazy val json4s = project.in(modules / "json4s") +lazy val json4s = project + .in(modules / "json4s") .settings(crossScalaSettings) .settings(commonSettings) .settings(testSettings) @@ -186,7 +213,8 @@ lazy val json4s = project.in(modules / "json4s") ) .dependsOn(core) -lazy val enumeratum = project.in(modules / "enumeratum") +lazy val enumeratum = project + .in(modules / "enumeratum") .settings(crossScalaSettings) .settings(commonSettings) .settings(testSettings) @@ -203,7 +231,8 @@ lazy val enumeratum = project.in(modules / "enumeratum") ) .dependsOn(core) -lazy val refined = project.in(modules / "refined") +lazy val refined = project + .in(modules / "refined") .settings(crossScalaSettings) .settings(commonSettings) .settings(testSettings) @@ -215,7 +244,8 @@ lazy val refined = project.in(modules / "refined") ) .dependsOn(core) -lazy val benchmarks = project.in(modules / "benchmarks") +lazy val benchmarks = project + .in(modules / "benchmarks") .settings(crossScalaSettings) .settings(commonSettings) .settings( @@ -229,12 +259,12 @@ lazy val benchmarks = project.in(modules / "benchmarks") "io.circe" %% "circe-jawn" % "0.14.3", "io.circe" %% "circe-jackson210" % "0.14.0", "com.typesafe.play" %% "play-json" % "2.10.0-RC7", - "org.knowm.xchart" % "xchart" % "3.8.2" exclude("de.erichseifert.vectorgraphics2d", "VectorGraphics2D") withSources() + "org.knowm.xchart" % "xchart" % "3.8.2" exclude ("de.erichseifert.vectorgraphics2d", "VectorGraphics2D") withSources () ), scalacOptions ++= { CrossVersion.partialVersion(scalaVersion.value) match { case Some((2, 13)) => Seq("-Ymacro-annotations") - case _ => Seq.empty + case _ => Seq.empty } } )