Skip to content

Commit

Permalink
Update scala-compiler, scala-library to 2.13.12
Browse files Browse the repository at this point in the history
  • Loading branch information
scala-steward committed Sep 14, 2023
1 parent 3059341 commit 966362b
Show file tree
Hide file tree
Showing 2 changed files with 51 additions and 21 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/scala.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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.12, 3.3.1-RC1-bin-20230318-7226ba6-NIGHTLY]

steps:
- uses: actions/checkout@v3
Expand Down
70 changes: 50 additions & 20 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
lazy val scala213 = "2.13.10"
lazy val scala213 = "2.13.12"
/* 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
Expand All @@ -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(
Expand Down Expand Up @@ -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,
Expand All @@ -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 =>
Expand All @@ -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
)
}

Expand All @@ -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")

Expand All @@ -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)
Expand All @@ -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)
Expand All @@ -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)
Expand All @@ -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)
Expand All @@ -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)
Expand All @@ -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)
Expand All @@ -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)
Expand All @@ -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)
Expand All @@ -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)
Expand All @@ -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(
Expand All @@ -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
}
}
)
Expand Down

0 comments on commit 966362b

Please sign in to comment.