Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ name := "facia-api-client"

description := "Scala client for The Guardian's Facia JSON API"

ThisBuild / scalaVersion := "2.13.15"
ThisBuild / scalaVersion := "2.13.16"

val sonatypeReleaseSettings = Seq(
releaseVersion := fromAggregatedAssessedCompatibilityWithLatestRelease().value,
Expand All @@ -27,7 +27,7 @@ def artifactProducingSettings(supportScala3: Boolean) = Seq(
organization := "com.gu",
licenses := Seq(License.Apache2),
resolvers ++= Resolver.sonatypeOssRepos("releases"),
crossScalaVersions := Seq(scalaVersion.value) ++ (if (supportScala3) Seq("3.3.3") else Seq.empty),
crossScalaVersions := Seq(scalaVersion.value) ++ (if (supportScala3) Seq("3.3.6") else Seq.empty),
scalacOptions := Seq(
"-release:8",
"-feature",
Expand Down Expand Up @@ -68,7 +68,7 @@ def faciaJson(playJsonVersion: PlayJsonVersion) = playJsonSpecificProject("facia
awsS3SdkV1, // ideally, this would be pushed out to a separate FAPI artifact, or just not used directly at all
commonsIo,
playJsonVersion.lib,
"org.scala-lang.modules" %% "scala-collection-compat" % "2.11.0",
"org.scala-lang.modules" %% "scala-collection-compat" % "2.13.0",
scalaLogging
),
artifactProducingSettings(supportScala3 = playJsonVersion.supportsScala3)
Expand Down
6 changes: 3 additions & 3 deletions project/dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ object Dependencies {
val contentApiDefault = "com.gu" %% "content-api-client-default" % capiVersion % Test
val mockito = "org.mockito" % "mockito-all" % "1.10.19" % Test
val scalaTestMockito = "org.scalatestplus" %% "mockito-4-11" % "3.2.18.0" % Test
val scalaTest = "org.scalatest" %% "scalatest" % "3.2.18" % Test
val scalaTest = "org.scalatest" %% "scalatest" % "3.2.19" % Test
val scalaLogging = "com.typesafe.scala-logging" %% "scala-logging" % "3.9.5"
val commercialShared = "com.gu" %% "commercial-shared" % "6.1.8"

Expand All @@ -29,7 +29,7 @@ object Dependencies {

object PlayJsonVersion {
val V28 = PlayJsonVersion("28", "com.typesafe.play", "2.8.2")
val V29 = PlayJsonVersion("29", "com.typesafe.play", "2.10.4", supportsScala3 = true)
val V30 = PlayJsonVersion("30", "org.playframework", "3.0.2", supportsScala3 = true)
val V29 = PlayJsonVersion("29", "com.typesafe.play", "2.10.7", supportsScala3 = true)
val V30 = PlayJsonVersion("30", "org.playframework", "3.0.5", supportsScala3 = true)
}
}
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
addSbtPlugin("com.github.sbt" % "sbt-release" % "1.4.0")

addSbtPlugin("ch.epfl.scala" % "sbt-version-policy" % "3.2.0")
addSbtPlugin("ch.epfl.scala" % "sbt-version-policy" % "3.2.1")
Loading