Android Gradle Wrapper Update (#621)

* update gradle wrapper to 7.4.2

build.gradle.kts

@@ -62,18 +62,25 @@ tasks.processResources {
     dependsOn(":native:cmakeBuild")
 }
 
+// withSourcesJar uses output of task :native:cmakeBuild so explicitly declaring dependency:
+tasks.named("sourcesJar") {
+    dependsOn(":native:cmakeBuild")
+}
+
 tasks.test {
     useJUnit()
     testLogging {
         events("passed", "skipped", "failed")
+        showExceptions = true
+        showCauses = true
     }
     for (prop in listOf("certificate", "privatekey", "endpoint", "rootca", "privatekey_p8")) {
         if (project.hasProperty(prop)) {
             systemProperty(prop, project.property(prop).toString())
         }
     }
     //uncomment the next line to attach the debugger to the JNI layer.
-    //systemProperty("aws.crt.debugwait", "1")
+    // systemProperty("aws.crt.debugwait", "1")
 }
 
 tasks.compileTestJava {

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -72,7 +72,7 @@ case "`uname`" in
   Darwin* )
     darwin=true
     ;;
-  MINGW* )
+  MSYS* | MINGW* )
     msys=true
     ;;
   NONSTOP* )

src/test/java/software/amazon/awssdk/crt/test/S3ClientTest.java

@@ -88,7 +88,7 @@ private S3Client createS3Client(S3ClientOptions options) {
     public void testS3ClientCreateDestroy() {
         skipIfNetworkUnavailable();
 
-        S3ClientOptions clientOptions = new S3ClientOptions().withEndpoint(ENDPOINT).withRegion(REGION)
+        S3ClientOptions clientOptions = new S3ClientOptions().withRegion(REGION)
                 .withComputeContentMd5(true);
         try (S3Client client = createS3Client(clientOptions)) {
 
@@ -105,7 +105,7 @@ public void testS3ClientCreateDestroyRetryOptions() {
             final StandardRetryOptions standardRetryOptions = new StandardRetryOptions().withInitialBucketCapacity(123)
                     .withBackoffRetryOptions(new ExponentialBackoffRetryOptions().withEventLoopGroup(retry_elg));
 
-            try (S3Client client = createS3Client(new S3ClientOptions().withEndpoint(ENDPOINT).withRegion(REGION)
+            try (S3Client client = createS3Client(new S3ClientOptions().withRegion(REGION)
                     .withStandardRetryOptions(standardRetryOptions), elg)) {
 
             }
@@ -125,7 +125,7 @@ public void testS3ClientCreateDestroyRetryOptionsUnspecifiedELG() {
             final StandardRetryOptions standardRetryOptions = new StandardRetryOptions().withInitialBucketCapacity(123)
                     .withBackoffRetryOptions(new ExponentialBackoffRetryOptions().withMaxRetries(30));
 
-            try (S3Client client = createS3Client(new S3ClientOptions().withEndpoint(ENDPOINT).withRegion(REGION)
+            try (S3Client client = createS3Client(new S3ClientOptions().withRegion(REGION)
                     .withStandardRetryOptions(standardRetryOptions), elg)) {
 
             }
@@ -147,7 +147,7 @@ public void testS3ClientCreateDestroyTcpKeepAliveOptions() {
             tcpKeepAliveOptions.setKeepAliveTimeoutSec((short) 20);
             tcpKeepAliveOptions.setKeepAliveMaxFailedProbes((short) 30);
 
-            try (S3Client client = createS3Client(new S3ClientOptions().withEndpoint(ENDPOINT).withRegion(REGION)
+            try (S3Client client = createS3Client(new S3ClientOptions().withRegion(REGION)
                     .withS3TcpKeepAliveOptions(tcpKeepAliveOptions), elg)) {
 
             }
@@ -166,7 +166,7 @@ public void testS3ClientCreateDestroyMonitoringOptions() {
             HttpMonitoringOptions monitoringOptions = new HttpMonitoringOptions();
             monitoringOptions.setMinThroughputBytesPerSecond(100);
             monitoringOptions.setAllowableThroughputFailureIntervalSeconds(10);
-            try (S3Client client = createS3Client(new S3ClientOptions().withEndpoint(ENDPOINT).withRegion(REGION)
+            try (S3Client client = createS3Client(new S3ClientOptions().withRegion(REGION)
                     .withHttpMonitoringOptions(monitoringOptions).withConnectTimeoutMs(10), elg)) {
 
             }
@@ -192,7 +192,7 @@ public void testS3ClientCreateDestroyHttpProxyOptions() {
             proxyOptions.setAuthorizationType(HttpProxyOptions.HttpProxyAuthorizationType.Basic);
             proxyOptions.setAuthorizationUsername("username");
             proxyOptions.setAuthorizationPassword("password");
-            try (S3Client client = createS3Client(new S3ClientOptions().withEndpoint(ENDPOINT).withRegion(REGION)
+            try (S3Client client = createS3Client(new S3ClientOptions().withRegion(REGION)
                     .withProxyOptions(proxyOptions), elg)) {
             }
         }
@@ -214,7 +214,7 @@ public void testS3ClientCreateDestroyHttpProxyEnvironmentVariableSetting() {
             environmentVariableSetting.setConnectionType(HttpProxyOptions.HttpProxyConnectionType.Tunneling);
             environmentVariableSetting.setEnvironmentVariableType(HttpProxyEnvironmentVariableSetting.HttpProxyEnvironmentVariableType.DISABLED);
             environmentVariableSetting.setTlsConnectionOptions(tlsConnectionOptions);
-            try (S3Client client = createS3Client(new S3ClientOptions().withEndpoint(ENDPOINT).withRegion(REGION)
+            try (S3Client client = createS3Client(new S3ClientOptions().withRegion(REGION)
                     .withProxyEnvironmentVariableSetting(environmentVariableSetting), elg)) {
             }
         }
@@ -225,7 +225,7 @@ public void testS3Get() {
         skipIfNetworkUnavailable();
         Assume.assumeTrue(hasAwsCredentials());
 
-        S3ClientOptions clientOptions = new S3ClientOptions().withEndpoint(ENDPOINT).withRegion(REGION);
+        S3ClientOptions clientOptions = new S3ClientOptions().withRegion(REGION);
         try (S3Client client = createS3Client(clientOptions)) {
             CompletableFuture<Integer> onFinishedFuture = new CompletableFuture<>();
             S3MetaRequestResponseHandler responseHandler = new S3MetaRequestResponseHandler() {
@@ -271,7 +271,7 @@ public void testS3GetWithEndpoint() {
         skipIfNetworkUnavailable();
         Assume.assumeTrue(hasAwsCredentials());
 
-        S3ClientOptions clientOptions = new S3ClientOptions().withEndpoint(ENDPOINT).withRegion(REGION);
+        S3ClientOptions clientOptions = new S3ClientOptions().withRegion(REGION);
         try (S3Client client = createS3Client(clientOptions)) {
             CompletableFuture<Integer> onFinishedFuture = new CompletableFuture<>();
             S3MetaRequestResponseHandler responseHandler = new S3MetaRequestResponseHandler() {
@@ -327,7 +327,7 @@ public void testS3GetWithBackpressure() {
         final String filePath = "/get_object_test_1MB.txt";
         final long fileSize = 1 * 1024 * 1024;
         S3ClientOptions clientOptions = new S3ClientOptions()
-                .withEndpoint(ENDPOINT)
+
                 .withRegion(REGION)
                 .withReadBackpressureEnabled(true)
                 .withInitialReadWindowSize(1024)
@@ -416,7 +416,7 @@ public void testS3GetWithBackpressureIncrementViaOnResponseBody() {
         final String filePath = "/get_object_test_1MB.txt";
         final long fileSize = 1 * 1024 * 1024;
         S3ClientOptions clientOptions = new S3ClientOptions()
-                .withEndpoint(ENDPOINT)
+
                 .withRegion(REGION)
                 .withReadBackpressureEnabled(true)
                 .withInitialReadWindowSize(1024)
@@ -462,7 +462,7 @@ public void testS3OverrideRequestCredentials() {
         skipIfNetworkUnavailable();
         Assume.assumeTrue(hasAwsCredentials());
 
-        S3ClientOptions clientOptions = new S3ClientOptions().withEndpoint(ENDPOINT).withRegion(REGION);
+        S3ClientOptions clientOptions = new S3ClientOptions().withRegion(REGION);
         boolean expectedException = false;
         byte[] madeUpCredentials = "I am a madeup credentials".getBytes();
         StaticCredentialsProvider.StaticCredentialsProviderBuilder builder = new StaticCredentialsProvider.StaticCredentialsProviderBuilder()
@@ -530,7 +530,7 @@ public void testS3Put() {
         skipIfNetworkUnavailable();
         Assume.assumeTrue(hasAwsCredentials());
 
-        S3ClientOptions clientOptions = new S3ClientOptions().withEndpoint(ENDPOINT).withRegion(REGION);
+        S3ClientOptions clientOptions = new S3ClientOptions().withRegion(REGION);
         try (S3Client client = createS3Client(clientOptions)) {
             CompletableFuture<Integer> onFinishedFuture = new CompletableFuture<>();
             S3MetaRequestResponseHandler responseHandler = new S3MetaRequestResponseHandler() {
@@ -713,7 +713,7 @@ public void testS3PutPauseResume() {
         Assume.assumeTrue(hasAwsCredentials());
 
         S3ClientOptions clientOptions = new S3ClientOptions()
-            .withEndpoint(ENDPOINT)
+
             .withRegion(REGION);
         try (S3Client client = createS3Client(clientOptions)) {
             CompletableFuture<Integer> onFinishedFuture = new CompletableFuture<>();
@@ -817,7 +817,7 @@ public void testS3PutTrailerChecksums() {
         skipIfNetworkUnavailable();
         Assume.assumeTrue(hasAwsCredentials());
 
-        S3ClientOptions clientOptions = new S3ClientOptions().withEndpoint(ENDPOINT).withRegion(REGION);
+        S3ClientOptions clientOptions = new S3ClientOptions().withRegion(REGION);
         try (S3Client client = createS3Client(clientOptions)) {
             CompletableFuture<Integer> onPutFinishedFuture = new CompletableFuture<>();
             S3MetaRequestResponseHandler responseHandler = new S3MetaRequestResponseHandler() {
@@ -933,7 +933,7 @@ public void testS3GetChecksums() {
         skipIfNetworkUnavailable();
         Assume.assumeTrue(hasAwsCredentials());
 
-        S3ClientOptions clientOptions = new S3ClientOptions().withEndpoint(ENDPOINT).withRegion(REGION);
+        S3ClientOptions clientOptions = new S3ClientOptions().withRegion(REGION);
         try (S3Client client = createS3Client(clientOptions)) {
             CompletableFuture<Integer> onFinishedFuture = new CompletableFuture<>();
             S3MetaRequestResponseHandler responseHandler = new S3MetaRequestResponseHandler() {
@@ -996,7 +996,7 @@ public void testS3Copy() {
         skipIfNetworkUnavailable();
         Assume.assumeTrue(hasAwsCredentials());
 
-        S3ClientOptions clientOptions = new S3ClientOptions().withEndpoint(ENDPOINT).withRegion(REGION);
+        S3ClientOptions clientOptions = new S3ClientOptions().withRegion(REGION);
         try (S3Client client = createS3Client(clientOptions)) {
             CompletableFuture<Integer> onFinishedFuture = new CompletableFuture<>();
             final AtomicLong totalBytesTransferred = new AtomicLong();
@@ -1181,7 +1181,7 @@ public void benchmarkS3Get() {
         // Ignore stats during warm up time, they skew results
         TransferStats.global.withSampleDelay(Duration.ofSeconds(sampleDelay));
         try (TlsContext tlsCtx = createTlsContextOptions(getContext().trustStore)) {
-            S3ClientOptions clientOptions = new S3ClientOptions().withRegion(region).withEndpoint(endpoint)
+            S3ClientOptions clientOptions = new S3ClientOptions().withRegion(region)
                     .withThroughputTargetGbps(expectedGbps).withTlsContext(useTls ? tlsCtx : null);
 
             try (S3Client client = createS3Client(clientOptions, threadCount)) {
@@ -1320,7 +1320,7 @@ public void benchmarkS3Put() {
         TransferStats.global.withSampleDelay(Duration.ofSeconds(sampleDelay));
 
         try (TlsContext tlsCtx = createTlsContextOptions(getContext().trustStore)) {
-            S3ClientOptions clientOptions = new S3ClientOptions().withRegion(region).withEndpoint(endpoint)
+            S3ClientOptions clientOptions = new S3ClientOptions().withRegion(region)
                     .withThroughputTargetGbps(expectedGbps).withTlsContext(useTls ? tlsCtx : null);
 
             try (S3Client client = createS3Client(clientOptions, threadCount)) {