diff --git a/build.gradle b/build.gradle index 25affc927a..28e9f12d90 100644 --- a/build.gradle +++ b/build.gradle @@ -66,7 +66,7 @@ def ensureBuildPrerequisites(buildPrerequisitesMessage) { ensureBuildPrerequisites(buildPrerequisitesMessage) final htsjdkVersion = System.getProperty('htsjdk.version', '2.24.1') -final googleNio = 'com.google.cloud:google-cloud-nio:0.107.0-alpha:shaded' +final googleNio = 'com.google.cloud:google-cloud-nio:0.123.25' // Get the jdk files we need to run javaDoc. We need to use these during compile, testCompile, // test execution, and gatkDoc generation, but we don't want them as part of the runtime @@ -94,9 +94,7 @@ dependencies { compile 'org.broadinstitute:barclay:4.0.2' compile 'org.apache.logging.log4j:log4j-api:2.17.1' compile 'org.apache.logging.log4j:log4j-core:2.17.1' - compileOnly(googleNio) { - transitive = false - } + compileOnly(googleNio) // javadoc utilities; compile/test only to prevent redistribution of sdk jars compileOnly(javadocJDKFiles) diff --git a/src/main/java/picard/nio/GoogleStorageUtils.java b/src/main/java/picard/nio/GoogleStorageUtils.java index 1335e45d09..1e5f7c2d39 100644 --- a/src/main/java/picard/nio/GoogleStorageUtils.java +++ b/src/main/java/picard/nio/GoogleStorageUtils.java @@ -28,10 +28,10 @@ import com.google.cloud.storage.StorageOptions; import com.google.cloud.storage.contrib.nio.CloudStorageConfiguration; import com.google.cloud.storage.contrib.nio.CloudStorageFileSystemProvider; -import shaded.cloud_nio.com.google.api.client.util.Strings; -import shaded.cloud_nio.com.google.api.gax.retrying.RetrySettings; -import shaded.cloud_nio.com.google.cloud.http.HttpTransportOptions; -import shaded.cloud_nio.org.threeten.bp.Duration; +import com.google.api.client.util.Strings; +import com.google.api.gax.retrying.RetrySettings; +import com.google.cloud.http.HttpTransportOptions; +import org.threeten.bp.Duration; /** * This class serves as a connection to google's implementation of nio support for GCS housed files.