Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add Play v2.9 support to aid Facia Tool upgrade #307

Merged
merged 2 commits into from
Feb 29, 2024
Merged

Add Play v2.9 support to aid Facia Tool upgrade #307

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
34c196b
Add Play v2.9 support to aid Facia Tool upgrade
rtyley Feb 28, 2024
d17c968
Disable artifact compatibility checking for next release
rtyley Feb 29, 2024
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: 5 additions & 1 deletion build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ description := "Scala client for The Guardian's Facia JSON API"

val sonatypeReleaseSettings = Seq(
licenses := Seq("Apache V2" -> url("https://www.apache.org/licenses/LICENSE-2.0.html")),
releaseVersion := fromAggregatedAssessedCompatibilityWithLatestRelease().value,
// releaseVersion := fromAggregatedAssessedCompatibilityWithLatestRelease().value,
releaseCrossBuild := true, // true if you cross-build the project for multiple Scala versions
releaseProcess := Seq[ReleaseStep](
checkSnapshotDependencies,
Expand All @@ -27,9 +27,11 @@ val sonatypeReleaseSettings = Seq(
lazy val root = (project in file(".")).aggregate(
faciaJson_play27,
faciaJson_play28,
faciaJson_play29,
faciaJson_play30,
fapiClient_play27,
fapiClient_play28,
fapiClient_play29,
fapiClient_play30
).settings(
publish / skip := true,
Expand Down Expand Up @@ -77,10 +79,12 @@ def fapiClient_playJsonVersion(playJsonVersion: PlayJsonVersion) = baseProject(

lazy val faciaJson_play27 = faciaJson_playJsonVersion(PlayJsonVersion.V27)
lazy val faciaJson_play28 = faciaJson_playJsonVersion(PlayJsonVersion.V28)
lazy val faciaJson_play29 = faciaJson_playJsonVersion(PlayJsonVersion.V29)
lazy val faciaJson_play30 = faciaJson_playJsonVersion(PlayJsonVersion.V30)

lazy val fapiClient_play27 = fapiClient_playJsonVersion(PlayJsonVersion.V27).dependsOn(faciaJson_play27)
lazy val fapiClient_play28 = fapiClient_playJsonVersion(PlayJsonVersion.V28).dependsOn(faciaJson_play28)
lazy val fapiClient_play29 = fapiClient_playJsonVersion(PlayJsonVersion.V29).dependsOn(faciaJson_play29)
lazy val fapiClient_play30 = fapiClient_playJsonVersion(PlayJsonVersion.V30).dependsOn(faciaJson_play30)

Test/testOptions += Tests.Argument(
Expand Down
3 changes: 2 additions & 1 deletion project/dependencies.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import sbt._

object Dependencies {
val capiVersion = "21.0.0"
val capiVersion = "22.0.0"

val awsSdk = "com.amazonaws" % "aws-java-sdk-s3" % "1.12.524"
val commonsIo = "org.apache.commons" % "commons-io" % "1.3.2"
Expand All @@ -27,6 +27,7 @@ object Dependencies {
object PlayJsonVersion {
val V27 = PlayJsonVersion("27", "com.typesafe.play", "2.7.4")
val V28 = PlayJsonVersion("28", "com.typesafe.play", "2.8.2")
val V29 = PlayJsonVersion("29", "com.typesafe.play", "2.10.4", supportsScala3 = true)
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The supportsScala3 flag isn't actually used here - but it doesn't mean it requires Scala 3! Just that, in principle, we could create Scala 3 artifacts for this version.

val V30 = PlayJsonVersion("30", "org.playframework", "3.0.1", supportsScala3 = true)
}
}
Loading