From 07cd13fa129ea6d86524d199198659c5d37eaeff Mon Sep 17 00:00:00 2001 From: nikolaev-nikita <97604641+nikolaev-nikita@users.noreply.github.com> Date: Wed, 12 Jan 2022 16:29:32 +0300 Subject: [PATCH] Update Scala, sbt and dependencies (#143) --- .github/workflows/scala.yml | 2 +- build.sbt | 14 +++++++------- project/build.properties | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/scala.yml b/.github/workflows/scala.yml index bf70e8f2..f7a9c6dc 100644 --- a/.github/workflows/scala.yml +++ b/.github/workflows/scala.yml @@ -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 diff --git a/build.sbt b/build.sbt index 5e3ef52d..6417bb92 100644 --- a/build.sbt +++ b/build.sbt @@ -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)) @@ -43,7 +43,7 @@ lazy val commonSettings = Seq( else sonatypePublishToBundle.value }, - publishArtifact in Test := false + Test / publishArtifact := false ) lazy val testSettings = Seq( @@ -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") @@ -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) @@ -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) diff --git a/project/build.properties b/project/build.properties index 7a7e80d6..dd4ff436 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version = 1.5.5 +sbt.version = 1.6.1