From 3eabcc495f4ac707eaafaa31a79922d740526c8c Mon Sep 17 00:00:00 2001 From: Tristan Garwood Date: Thu, 30 May 2024 19:25:19 -0400 Subject: [PATCH] ID-1286 Update workbenchLibs - add retries to group creation (#1449) * ID-1286 Update workbenchLibs - add retries to group creation and force sequential update after group creation. * ID-1286 Update workbenchLibs - add retries to group creation and force sequential update after group creation. * ID-1286 Update workbenchLibs - add retries to group creation and force sequential update after group creation. * Add bouncycastle to merge strategy --- automation/project/Dependencies.scala | 5 +++-- project/Dependencies.scala | 4 ++-- project/Merging.scala | 2 ++ 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/automation/project/Dependencies.scala b/automation/project/Dependencies.scala index 304c365f3..11233120f 100644 --- a/automation/project/Dependencies.scala +++ b/automation/project/Dependencies.scala @@ -7,8 +7,9 @@ object Dependencies { val akkaV = "2.6.19" val akkaHttpV = "10.2.2" - val workbenchLibV = "d16cba9" - val workbenchGoogleV = s"0.30-$workbenchLibV" + val workbenchLibV = "89f86ba" + + val workbenchGoogleV = s"0.32-$workbenchLibV" val workbenchGoogle2V = s"0.36-$workbenchLibV" val workbenchServiceTestV = "2.0-5863cbd" diff --git a/project/Dependencies.scala b/project/Dependencies.scala index c7a786ba2..9c0a0ec77 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -11,11 +11,11 @@ object Dependencies { val postgresDriverVersion = "42.7.2" val sentryVersion = "6.15.0" - val workbenchLibV = "d16cba9" // If updating this, make sure googleStorageLocal in test dependencies is up-to-date + val workbenchLibV = "89f86ba" // If updating this, make sure googleStorageLocal in test dependencies is up-to-date val workbenchUtilV = s"0.10-$workbenchLibV" val workbenchUtil2V = s"0.9-$workbenchLibV" val workbenchModelV = s"0.19-$workbenchLibV" - val workbenchGoogleV = s"0.30-$workbenchLibV" + val workbenchGoogleV = s"0.32-$workbenchLibV" val workbenchGoogle2V = s"0.36-$workbenchLibV" val workbenchNotificationsV = s"0.6-$workbenchLibV" val workbenchOauth2V = s"0.7-$workbenchLibV" diff --git a/project/Merging.scala b/project/Merging.scala index 9158a21c1..809b49c0d 100644 --- a/project/Merging.scala +++ b/project/Merging.scala @@ -7,6 +7,7 @@ object Merging { case PathList("javax", "activation", _ @_*) => MergeStrategy.first case PathList("javax", "xml", _ @_*) => MergeStrategy.first case PathList("google", "protobuf", _ @_*) => MergeStrategy.first + case PathList("org", "bouncycastle", _ @_*) => MergeStrategy.first case x if x.endsWith("/ModuleUtil.class") => MergeStrategy.first case PathList("META-INF", "versions", "9", "module-info.class") => MergeStrategy.first case PathList("META-INF", "io.netty.versions.properties") => MergeStrategy.first @@ -14,6 +15,7 @@ object Merging { case PathList("META-INF", "kotlin-stdlib.kotlin_module") => MergeStrategy.first case PathList("META-INF", "kotlin-stdlib-common.kotlin_module") => MergeStrategy.first case PathList("META-INF", "okio.kotlin_module") => MergeStrategy.first + case PathList("META-INF", "versions", "9", "OSGI-INF", "MANIFEST.MF") => MergeStrategy.first case PathList("mozilla", "public-suffix-list.txt") => MergeStrategy.first case "module-info.class" => MergeStrategy.discard