From 57c67c3cf427b65f8c3cbcf47df4e1b0f0b0fcd2 Mon Sep 17 00:00:00 2001 From: labkey-susanh Date: Tue, 23 Jun 2026 08:08:25 -0700 Subject: [PATCH 1/2] Specify explicit path to version property in parent project since implicit selection is deprecated as of Gradle 9.6.0 --- ApiKey/build.gradle | 2 +- DBUtils/build.gradle | 2 +- DeviceProxy/build.gradle | 2 +- GoogleDrive/build.gradle | 6 +++--- WNPRC_Compliance/build.gradle | 2 +- WNPRC_EHR/build.gradle | 4 ++-- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/ApiKey/build.gradle b/ApiKey/build.gradle index 4acfcccd1..7b7bb5cdc 100644 --- a/ApiKey/build.gradle +++ b/ApiKey/build.gradle @@ -24,7 +24,7 @@ dependencies { BuildUtils.addExternalDependency( project, new ExternalDependency( - "org.jooq:jooq:${jooqVersion}", + "org.jooq:jooq:${project.parent.ext.jooqVersion}", "jOOQ", "jOOQ.org", "https://www.jooq.org/", diff --git a/DBUtils/build.gradle b/DBUtils/build.gradle index 52a814798..0822ce46d 100644 --- a/DBUtils/build.gradle +++ b/DBUtils/build.gradle @@ -25,7 +25,7 @@ dependencies { BuildUtils.addExternalDependency( project, new ExternalDependency( - "org.jooq:jooq:${jooqVersion}", + "org.jooq:jooq:${project.parent.ext.jooqVersion}", "jOOQ", "jOOQ.org", "https://www.jooq.org/", diff --git a/DeviceProxy/build.gradle b/DeviceProxy/build.gradle index bdaa7f946..35376441d 100644 --- a/DeviceProxy/build.gradle +++ b/DeviceProxy/build.gradle @@ -24,7 +24,7 @@ dependencies { BuildUtils.addExternalDependency( project, new ExternalDependency( - "org.jooq:jooq:${jooqVersion}", + "org.jooq:jooq:${project.parent.ext.jooqVersion}", "jOOQ", "jOOQ.org", "https://www.jooq.org/", diff --git a/GoogleDrive/build.gradle b/GoogleDrive/build.gradle index 7fbeac174..bc7eec016 100644 --- a/GoogleDrive/build.gradle +++ b/GoogleDrive/build.gradle @@ -12,7 +12,7 @@ dependencies { BuildUtils.addExternalDependency( project, new ExternalDependency( - "com.google.api-client:google-api-client:${googleApiClientVersion}", + "com.google.api-client:google-api-client:${project.parent.ext.googleApiClientVersion}", "Google API Client Library for Java", "Google", "https://developers.google.com/api-client-library/java", @@ -25,7 +25,7 @@ dependencies { BuildUtils.addExternalDependency( project, new ExternalDependency( - "com.google.http-client:google-http-client:${googleHttpClientVersion}", + "com.google.http-client:google-http-client:${project.parent.ext.googleHttpClientVersion}", "Google HTTP Client Library for Java", "Google", "https://developers.google.com/api-client-library/java", @@ -38,7 +38,7 @@ dependencies { BuildUtils.addExternalDependency( project, new ExternalDependency( - "com.google.apis:google-api-services-drive:${googleApiServiceDriveVersion}", + "com.google.apis:google-api-services-drive:${project.parent.ext.googleApiServiceDriveVersion}", "Google Drive API Client Library for Java", "Google", "https://developers.google.com/api-client-library/java/apis/drive/v3", diff --git a/WNPRC_Compliance/build.gradle b/WNPRC_Compliance/build.gradle index 3ed6c729c..d5ff26056 100644 --- a/WNPRC_Compliance/build.gradle +++ b/WNPRC_Compliance/build.gradle @@ -24,7 +24,7 @@ dependencies { BuildUtils.addExternalDependency( project, new ExternalDependency( - "org.jooq:jooq:${jooqVersion}", + "org.jooq:jooq:${project.parent.ext.jooqVersion}", "jOOQ", "jOOQ.org", "https://www.jooq.org/", diff --git a/WNPRC_EHR/build.gradle b/WNPRC_EHR/build.gradle index 6e3d3f2ff..7a89defeb 100644 --- a/WNPRC_EHR/build.gradle +++ b/WNPRC_EHR/build.gradle @@ -40,7 +40,7 @@ dependencies { BuildUtils.addExternalDependency( project, new ExternalDependency( - "com.google.api-client:google-api-client:${googleApiClientVersion}", + "com.google.api-client:google-api-client:${project.parent.ext.googleApiClientVersion}", "Google API Client Library for Java", "Google", "https://developers.google.com/api-client-library/java", @@ -53,7 +53,7 @@ dependencies { BuildUtils.addExternalDependency( project, new ExternalDependency( - "com.google.apis:google-api-services-calendar:${googleApiServicesCalendarVersion}", + "com.google.apis:google-api-services-calendar:${project.parent.ext.googleApiServicesCalendarVersion}", "Google Calendar API Client Library for Java", "Google", "https://github.com/googleapis/google-api-java-client-services/tree/master/clients/google-api-services-calendar/v3", From a59ddeb00f55cb10f192e5656016a9a0be69ee35 Mon Sep 17 00:00:00 2001 From: labkey-susanh Date: Tue, 23 Jun 2026 13:50:15 -0700 Subject: [PATCH 2/2] Revert update for googleHttpClientVersion location --- GoogleDrive/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/GoogleDrive/build.gradle b/GoogleDrive/build.gradle index bc7eec016..b7eb3a527 100644 --- a/GoogleDrive/build.gradle +++ b/GoogleDrive/build.gradle @@ -25,7 +25,7 @@ dependencies { BuildUtils.addExternalDependency( project, new ExternalDependency( - "com.google.http-client:google-http-client:${project.parent.ext.googleHttpClientVersion}", + "com.google.http-client:google-http-client:${googleHttpClientVersion}", "Google HTTP Client Library for Java", "Google", "https://developers.google.com/api-client-library/java",