Update Gradle to 8.2.1 (#570)

Signed-off-by: Andriy Redko <[email protected]>
opensearch-project · Jul 10, 2023 · efdc5a4 · efdc5a4
1 parent 23de3e6
commit efdc5a4
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 7 deletions.
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -28,7 +28,7 @@
 
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionSha256Sum=ff7bf6a86f09b9b2c40bb8f48b25fc19cf2b2664fd1d220cd7ab833ec758d0d7
+distributionSha256Sum=03ec176d388f2aa99defcadc3ac6adf8dd2bce5145a129659537c0874dea5ad1
diff --git a/gradlew b/gradlew
@@ -133,10 +133,13 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.

diff --git a/java-client/build.gradle.kts b/java-client/build.gradle.kts
@@ -248,10 +248,10 @@ class SpdxReporter(val dest: File) : ReportRenderer {
 tasks.withType<Jar> {
     doLast {
         ant.withGroovyBuilder {
-            "checksum"("algorithm" to "md5", "file" to archivePath)
-            "checksum"("algorithm" to "sha1", "file" to archivePath)
-            "checksum"("algorithm" to "sha-256", "file" to archivePath, "fileext" to ".sha256")
-            "checksum"("algorithm" to "sha-512", "file" to archivePath, "fileext" to ".sha512")
+            "checksum"("algorithm" to "md5", "file" to archiveFile.get())
+            "checksum"("algorithm" to "sha1", "file" to archiveFile.get())
+            "checksum"("algorithm" to "sha-256", "file" to archiveFile.get(), "fileext" to ".sha256")
+            "checksum"("algorithm" to "sha-512", "file" to archiveFile.get(), "fileext" to ".sha512")
         }
     }
 }