Skip to content

Commit

Permalink
Update Scala, sbt and dependencies (#143)
Browse files Browse the repository at this point in the history
  • Loading branch information
nikolaev-nikita authored Jan 12, 2022
1 parent ec0a0af commit 07cd13f
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/scala.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest]
scala: [2.12.15, 2.13.6]
scala: [2.12.15, 2.13.7]

steps:
- uses: actions/checkout@v2
Expand Down
14 changes: 7 additions & 7 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ lazy val commonSettings = Seq(
version := "0.25.0",
organization := "com.tethys-json",
scalaVersion := "2.12.15",
crossScalaVersions := Seq("2.12.15", "2.13.6"),
crossScalaVersions := Seq("2.12.15", "2.13.7"),
Compile / unmanagedSourceDirectories ++= {
def extraDirs(suffix: String) = Seq(file(sourceDirectory.value.getPath + "/main/scala" + suffix))

Expand Down Expand Up @@ -43,7 +43,7 @@ lazy val commonSettings = Seq(
else
sonatypePublishToBundle.value
},
publishArtifact in Test := false
Test / publishArtifact := false
)

lazy val testSettings = Seq(
Expand Down Expand Up @@ -90,9 +90,9 @@ lazy val `macro-derivation` = project.in(modules / "macro-derivation")
.dependsOn(core)

lazy val jacksonSettings = Seq(
unmanagedSourceDirectories in Compile += modules / "jackson-backend" / "src" / "main",
unmanagedSourceDirectories in Test += modules / "jackson-backend" / "src" / "test",
unmanagedResourceDirectories in Test += modules / "jackson-backend" / "src" / "test" / "resources"
Compile / unmanagedSourceDirectories += modules / "jackson-backend" / "src" / "main",
Test / unmanagedSourceDirectories += modules / "jackson-backend" / "src" / "test",
Test / unmanagedResourceDirectories += modules / "jackson-backend" / "src" / "test" / "resources"
)

lazy val `jackson-211` = project.in(modules / "jackson-211")
Expand All @@ -114,7 +114,7 @@ lazy val `jackson-212` = project.in(modules / "jackson-212")
.settings(
name := "tethys-jackson212",
libraryDependencies ++= Seq(
"com.fasterxml.jackson.core" % "jackson-core" % "2.12.5"
"com.fasterxml.jackson.core" % "jackson-core" % "2.12.6"
)
)
.dependsOn(core)
Expand Down Expand Up @@ -158,7 +158,7 @@ lazy val refined = project.in(modules / "refined")
.settings(
name := "tethys-refined",
libraryDependencies ++= Seq(
"eu.timepit" %% "refined" % "0.9.27"
"eu.timepit" %% "refined" % "0.9.28"
)
)
.dependsOn(core)
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version = 1.5.5
sbt.version = 1.6.1

0 comments on commit 07cd13f

Please sign in to comment.