Skip to content

Commit 50bad72

Browse files
JamieB-gurtyley
andcommitted
Use com.gu:play-json-extensions
It's our fork maintained by the Scala Guild. Changing this means that we can remove the exclusion rules for `com.typesafe.play`, as our version of `play-json-extensions` does not depend on any packages with this group id. We also need to update jackson because our `play-json-extensions` uses a more recent version. Co-authored-by: rtyley <52038+rtyley@users.noreply.github.com>
1 parent b45be76 commit 50bad72

2 files changed

Lines changed: 6 additions & 36 deletions

File tree

build.sbt

Lines changed: 4 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@ val catsVersion: String = "2.13.0"
4444
val okHttpVersion: String = "4.12.0"
4545
val paClientVersion: String = "7.0.12"
4646
val apacheThrift: String = "0.15.0"
47-
val jacksonDatabind: String = "2.19.4"
48-
val jacksonCbor: String = "2.19.4"
49-
val jacksonScalaModule: String = "2.19.4"
47+
val jacksonDatabind: String = "2.21.2"
48+
val jacksonCbor: String = "2.21.2"
49+
val jacksonScalaModule: String = "2.21.2"
5050
val simpleConfigurationVersion: String = "1.5.7"
5151
val googleOAuthClient: String = "1.39.0"
5252
val nettyVersion: String = "4.2.2.Final"
@@ -111,7 +111,7 @@ lazy val common = project
111111
"com.amazonaws" % "aws-java-sdk-dynamodb" % awsSdkVersion,
112112
"com.amazonaws" % "aws-java-sdk-cloudwatch" % awsSdkVersion,
113113
"com.googlecode.concurrentlinkedhashmap" % "concurrentlinkedhashmap-lru" % "1.4.2",
114-
"ai.x" %% "play-json-extensions" % "0.42.0",
114+
"com.gu" %% "play-json-extensions" % "1.0.6",
115115
"org.tpolecat" %% "doobie-core" % doobieVersion,
116116
"org.tpolecat" %% "doobie-hikari" % doobieVersion,
117117
"org.tpolecat" %% "doobie-postgres" % doobieVersion,
@@ -166,11 +166,6 @@ lazy val registration = project
166166
logback,
167167
"org.tpolecat" %% "doobie-h2" % doobieVersion % Test
168168
),
169-
excludeDependencies ++= Seq(
170-
// As of Play 3.0, groupId has changed to org.playframework; exclude transitive dependencies to the old artifacts
171-
// Hopefully this workaround can be removed once play-json-extensions either updates to Play 3.0 or is merged into play-json
172-
ExclusionRule(organization = "com.typesafe.play")
173-
),
174169
Debian / packageName := name.value,
175170
version := projectVersion
176171
)
@@ -191,11 +186,6 @@ lazy val notification = project
191186
logback,
192187
"com.amazonaws" % "aws-java-sdk-sqs" % awsSdkVersion
193188
),
194-
excludeDependencies ++= Seq(
195-
// As of Play 3.0, groupId has changed to org.playframework; exclude transitive dependencies to the old artifacts
196-
// Hopefully this workaround can be removed once play-json-extensions either updates to Play 3.0 or is merged into play-json
197-
ExclusionRule(organization = "com.typesafe.play")
198-
),
199189
Debian / packageName := name.value,
200190
version := projectVersion
201191
)
@@ -215,11 +205,6 @@ lazy val report = project
215205
libraryDependencies ++= Seq(
216206
logback
217207
),
218-
excludeDependencies ++= Seq(
219-
// As of Play 3.0, groupId has changed to org.playframework; exclude transitive dependencies to the old artifacts
220-
// Hopefully this workaround can be removed once play-json-extensions either updates to Play 3.0 or is merged into play-json
221-
ExclusionRule(organization = "com.typesafe.play")
222-
),
223208
Debian / packageName := name.value,
224209
version := projectVersion
225210
)
@@ -293,9 +278,6 @@ lazy val schedulelambda = lambda("schedule", "schedulelambda")
293278
),
294279
excludeDependencies ++= Seq(
295280
ExclusionRule("org.playframework", "play-ahc-ws_2.13"),
296-
// As of Play 3.0, groupId has changed to org.playframework; exclude transitive dependencies to the old artifacts
297-
// Hopefully this workaround can be removed once play-json-extensions either updates to Play 3.0 or is merged into play-json
298-
ExclusionRule(organization = "com.typesafe.play")
299281
),
300282
)
301283
}
@@ -321,9 +303,6 @@ lazy val football = lambda("football", "football")
321303
excludeDependencies ++= Seq(
322304
ExclusionRule("org.playframework", "play-ahc-ws_2.13"),
323305
ExclusionRule("software.amazon.awssdk", "ec2"),
324-
// As of Play 3.0, groupId has changed to org.playframework; exclude transitive dependencies to the old artifacts
325-
// Hopefully this workaround can be removed once play-json-extensions either updates to Play 3.0 or is merged into play-json
326-
ExclusionRule(organization = "com.typesafe.play")
327306
),
328307
)
329308

@@ -426,9 +405,6 @@ lazy val notificationworkerlambda = lambda("notificationworkerlambda", "notifica
426405
),
427406
excludeDependencies ++= Seq(
428407
ExclusionRule("org.playframework", "play-ahc-ws_2.13"),
429-
// As of Play 3.0, groupId has changed to org.playframework; exclude transitive dependencies to the old artifacts
430-
// Hopefully this workaround can be removed once play-json-extensions either updates to Play 3.0 or is merged into play-json
431-
ExclusionRule(organization = "com.typesafe.play")
432408
),
433409
)
434410

@@ -441,9 +417,6 @@ lazy val fakebreakingnewslambda = lambda("fakebreakingnewslambda", "fakebreaking
441417
),
442418
excludeDependencies ++= Seq(
443419
ExclusionRule("org.playframework", "play-ahc-ws_2.13"),
444-
// As of Play 3.0, groupId has changed to org.playframework; exclude transitive dependencies to the old artifacts
445-
// Hopefully this workaround can be removed once play-json-extensions either updates to Play 3.0 or is merged into play-json
446-
ExclusionRule(organization = "com.typesafe.play")
447420
),
448421
)
449422

@@ -452,8 +425,5 @@ lazy val reportExtractor = lambda("reportextractor", "reportextractor", Some("co
452425
.settings(
453426
excludeDependencies ++= Seq(
454427
ExclusionRule("org.playframework", "play-ahc-ws_2.13"),
455-
// As of Play 3.0, groupId has changed to org.playframework; exclude transitive dependencies to the old artifacts
456-
// Hopefully this workaround can be removed once play-json-extensions either updates to Play 3.0 or is merged into play-json
457-
ExclusionRule(organization = "com.typesafe.play")
458428
)
459429
)

common/src/main/scala/models/Notification.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ package models
33
import java.net.URI
44
import java.util.UUID
55

6-
import ai.x.play.json.Encoders.encoder
7-
import ai.x.play.json.Jsonx
6+
import com.gu.ai.x.play.json.Encoders.encoder
7+
import com.gu.ai.x.play.json.Jsonx
88
import models.NotificationType._
99
import play.api.libs.json._
1010

0 commit comments

Comments
 (0)