Skip to content

Commit

Permalink
Upgrade google-cloud-nio to match gatk (#1792)
Browse files Browse the repository at this point in the history
  • Loading branch information
lbergelson committed Apr 6, 2022
1 parent 5854951 commit b1e01c2
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 8 deletions.
6 changes: 2 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/picard/nio/GoogleStorageUtils.java
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down

0 comments on commit b1e01c2

Please sign in to comment.