From f54ff30e9655d590ea54a2dca877e12ba1a4edcd Mon Sep 17 00:00:00 2001 From: Melissa Ahn Date: Tue, 17 Oct 2023 13:34:34 -0700 Subject: [PATCH 1/2] Bumped moshi and added Okio constraint --- common | 2 +- gradle/versions.gradle | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/common b/common index b54235828..4cb53dc3b 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit b54235828d20ba3fa88fe41a78062dac7f0e5851 +Subproject commit 4cb53dc3bdf2a3732a4a9fd8d9d16f4ee60f0b74 diff --git a/gradle/versions.gradle b/gradle/versions.gradle index f3c791f33..5fd2557db 100644 --- a/gradle/versions.gradle +++ b/gradle/versions.gradle @@ -50,8 +50,8 @@ ext { daggerCompilerVersion = "2.31.2" msal4jVersion = "1.10.0" mseberaApacheHttpClientVersion = "4.5.8" - moshiVersion = "1.12.0" - moshiAdaptersVersion = "1.12.0" + moshiVersion = "1.15.0" + moshiAdaptersVersion = "1.15.0" openpojoVersion = "0.9.1" equalsVerifierVersion = "3.6.1" jsonGeneratorVersion = "0.4.3" From 28fe9d7ec0d4f25dc234581aa338fc180b83bfcd Mon Sep 17 00:00:00 2001 From: Melissa Ahn Date: Tue, 17 Oct 2023 13:59:23 -0700 Subject: [PATCH 2/2] Bumping JSON version as well --- common | 2 +- gradle/versions.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/common b/common index 4cb53dc3b..20a1c2d2f 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit 4cb53dc3bdf2a3732a4a9fd8d9d16f4ee60f0b74 +Subproject commit 20a1c2d2faa6233cce99264e025cff39279d5eb5 diff --git a/gradle/versions.gradle b/gradle/versions.gradle index 5fd2557db..d989f419e 100644 --- a/gradle/versions.gradle +++ b/gradle/versions.gradle @@ -56,7 +56,7 @@ ext { equalsVerifierVersion = "3.6.1" jsonGeneratorVersion = "0.4.3" jsonSchemaFriendVersion = "0.9.1" - jsonVersion = "20200518" + jsonVersion = "20231013" junitJupiterEngineVersion = "5.7.2" junitVintageEngineVersion = "5.7.2" dbusJavaVersion = "3.3.0"