From 36cf72b702df4774ae7bf55b6e55ec77e5a04bf8 Mon Sep 17 00:00:00 2001 From: Ivan Carvalho <8753214+IvanIsCoding@users.noreply.github.com> Date: Tue, 12 Mar 2024 12:11:01 -0400 Subject: [PATCH] Switch to using BOM instead of setting individual packages (#168) --- dicom_util/build.gradle | 7 +++++-- export/build.gradle | 9 ++++++--- import/build.gradle | 7 +++++-- util/build.gradle | 4 +++- 4 files changed, 19 insertions(+), 8 deletions(-) diff --git a/dicom_util/build.gradle b/dicom_util/build.gradle index f98c444..1bbcaf7 100644 --- a/dicom_util/build.gradle +++ b/dicom_util/build.gradle @@ -33,9 +33,12 @@ repositories { } dependencies { - compile "org.json:json:20170516" + compile platform('com.google.cloud:libraries-bom:5.1.0') + compile platform('com.google.cloud:google-cloud-shared-dependencies:0.1.0') + compile "com.google.api-client:google-api-client" compile "com.google.inject:guice:4.1.0" - compile "com.google.api-client:google-api-client:1.30.5" + + compile "org.json:json:20170516" compile "junit:junit:4.12" compile "org.junit.jupiter:junit-jupiter-engine:5.0.0" compile "org.dcm4che:dcm4che-core:5.31.2" diff --git a/export/build.gradle b/export/build.gradle index 5020165..ca37078 100644 --- a/export/build.gradle +++ b/export/build.gradle @@ -52,11 +52,14 @@ repositories { } dependencies { - compile 'com.google.cloud:google-cloud-pubsub:1.98.0' + compile platform('com.google.cloud:libraries-bom:5.1.0') + compile platform('com.google.cloud:google-cloud-shared-dependencies:0.1.0') + compile 'com.google.cloud:google-cloud-pubsub' compile 'com.google.guava:guava:28.1-jre' + compile 'com.google.auth:google-auth-library-oauth2-http' + compile "com.google.api-client:google-api-client" + compile "com.beust:jcommander:1.72" - compile 'com.google.auth:google-auth-library-oauth2-http:0.17.2' - compile "com.google.api-client:google-api-client:1.30.5" compile "org.dcm4che:dcm4che-core:5.31.2" compile "org.dcm4che:dcm4che-net:5.31.2" compile project(":dicom_util") diff --git a/import/build.gradle b/import/build.gradle index 6054c6f..25250cb 100644 --- a/import/build.gradle +++ b/import/build.gradle @@ -60,10 +60,13 @@ repositories { } dependencies { + compile platform('com.google.cloud:libraries-bom:5.1.0') + compile platform('com.google.cloud:google-cloud-shared-dependencies:0.1.0') compile 'com.google.guava:guava:28.1-jre' + compile 'com.google.auth:google-auth-library-oauth2-http' + compile "com.google.api-client:google-api-client" + compile "com.beust:jcommander:1.72" - compile 'com.google.auth:google-auth-library-oauth2-http:0.17.2' - compile "com.google.api-client:google-api-client:1.30.5" compile "org.dcm4che:dcm4che-core:5.31.2" compile "org.dcm4che:dcm4che-net:5.31.2" diff --git a/util/build.gradle b/util/build.gradle index 924f7b3..66301e4 100644 --- a/util/build.gradle +++ b/util/build.gradle @@ -37,7 +37,9 @@ dependencies { compile "org.dcm4che:dcm4che-core:5.31.2" compile "org.dcm4che:dcm4che-net:5.31.2" compile "org.json:json:20180813" - compile "com.google.cloud:google-cloud-monitoring:1.98.0" + compile platform('com.google.cloud:libraries-bom:5.1.0') + compile platform('com.google.cloud:google-cloud-shared-dependencies:0.1.0') + compile "com.google.cloud:google-cloud-monitoring" testCompile "com.google.truth:truth:1.0" testCompile "junit:junit:4.2"