update Gradle to 8.4

GrapheneOS · Nov 12, 2023 · 76f9620 · 76f9620
1 parent e4af9a6
commit 76f9620
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 46 deletions.
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
@@ -1883,12 +1883,12 @@
             <sha512 value="a18beb888a479a60c6a0dc1cdc49aae2fcde7682cc691165d5e20a7195f32e5504d83b282222eb9328d9bf18c03de0ddcc58a1568d938dcf77211500a4c37d3b" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.jetbrains.kotlin" name="kotlin-reflect" version="1.9.0">
-         <artifact name="kotlin-reflect-1.9.0.jar">
-            <sha512 value="35f66299d89ecf66689a4e2fce0b9088020eca7b24c48b20c9dc537a7b87591ee03f8d129716db2feeaf73c60ba15a2f0166234e026f2c6a6e7f3ed5fc2f3afd" origin="Generated by Gradle"/>
+      <component group="org.jetbrains.kotlin" name="kotlin-reflect" version="1.9.10">
+         <artifact name="kotlin-reflect-1.9.10.jar">
+            <sha512 value="157c785155c7644bbac1146893b293a4ec619b578f78d7d2c337d55d79401e57a35a220356cefeb2394e9a6519a6a6a09e31732c2400d3a9ffc59cc806629b6a" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="kotlin-reflect-1.9.0.pom">
-            <sha512 value="f19a25de9e6fec6c37b567a3283965f4a527a0ab131ccf8b78e70ed9d56327da0ab312a1b7c663e6b173c558daecbab7c241f36c253b9a1f9aa82df1bd6830dd" origin="Generated by Gradle"/>
+         <artifact name="kotlin-reflect-1.9.10.pom">
+            <sha512 value="a3d2d54ed87a64e8031635759883a81579b0c35e7b0cbef11a2b40d10084f4b90f6a139fd4496a5d3a42099cbdd571e1b39be41757898932aa17e190d82d25c4" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="org.jetbrains.kotlin" name="kotlin-script-runtime" version="1.9.10">
@@ -1939,14 +1939,6 @@
             <sha512 value="6b627d6ce550c7ee3b0702be27889f7efba5140499658f5443c124d4934356f054ac67e2ef62c7f51272d2224de4bcdb3133fe1664784d1f916d6765248930df" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.jetbrains.kotlin" name="kotlin-stdlib" version="1.9.0">
-         <artifact name="kotlin-stdlib-1.9.0.jar">
-            <sha512 value="7bdebd4a20a510ab798ff25e8a93c90f15cb18f3cfbd10b5bc59b4db65268a8efa215839bf6770a449cfd706be30eea3ba6c3fa3a9f45a81ee39ee94c0412aac" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="kotlin-stdlib-1.9.0.pom">
-            <sha512 value="e5d2996b9f171d5ec95f229ff1a1b8227a53020753c909ae949b6ed630d4913af1488dbbe980dda4e24e906c1e1171b8c7f7fc3bce3539740641f33ac15c10cc" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="org.jetbrains.kotlin" name="kotlin-stdlib" version="1.9.10">
          <artifact name="kotlin-stdlib-1.9.10.jar">
             <sha512 value="6eab000f55dd196a074d1d97df9d285bccace31f0cae8db1846b1c9a55a6ea5e401307a95922a1d758b4152916de47fe36d31551ad0250918e6e07ce710a83a2" origin="Generated by Gradle"/>
@@ -1963,14 +1955,6 @@
             <sha512 value="7fe21bc1fa260e554f25c5049665aa9e58d45665af5a58b223b18ef79167588724c38699bc85e629d963a86161ebec75d32512dd08773d079bcb2fe7c06f4c05" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.jetbrains.kotlin" name="kotlin-stdlib-common" version="1.9.0">
-         <artifact name="kotlin-stdlib-common-1.9.0.jar">
-            <sha512 value="84410504a412febbfa37cd749c1b1d99b70aa2e53855d398a0edb91c198dda4028d26880d9b7411c9b02c049b71004818e8b0c53ec96b4f71e99c661687bdc83" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="kotlin-stdlib-common-1.9.0.pom">
-            <sha512 value="efefc4760a66f70a4e2abe60c6b3cf47f7e4c2f62937cebdd04c65c03597ba452d8e0bae7ce021da3cae4696aab4879b2fcd2f9976c6c304f74d464cd9f845d1" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="org.jetbrains.kotlin" name="kotlin-stdlib-common" version="1.9.10">
          <artifact name="kotlin-stdlib-common-1.9.10.jar">
             <sha512 value="e7166112e27edcbc1fb7b918bf66120b35f82311016f944472ebc23c848b81d7016660d5d1a3e7a1679e599c555d796d73c520a0d8178e00b36aa3668415170e" origin="Generated by Gradle"/>
@@ -1987,14 +1971,6 @@
             <sha512 value="6d2fb2db5c076aa4dcfe34be522d7dd80f14c1a45e579637cee4056fb79abc02b2bc877a925ae04367db706557b655278b55ea01bf42419f1ab8cf18937aec13" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.jetbrains.kotlin" name="kotlin-stdlib-jdk7" version="1.9.0">
-         <artifact name="kotlin-stdlib-jdk7-1.9.0.jar">
-            <sha512 value="d5ee083f9c11d351b0fdc6ae38c9c5d117a9fe98ba13ece06b774f50bff8f67f1f651401aeb57ced4f51a82d37196732780abd99fac16c6c9173d586153cb27a" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="kotlin-stdlib-jdk7-1.9.0.pom">
-            <sha512 value="67ddc71ec65aa21b6cb2bf71fe9c552809952af80d7ed671d6f8bba2bce21e6fe751108594df60ff2a95473d45a09096d30de0eedf87e9dc9db956884a83baba" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="org.jetbrains.kotlin" name="kotlin-stdlib-jdk7" version="1.9.10">
          <artifact name="kotlin-stdlib-jdk7-1.9.10.jar">
             <sha512 value="f839178f07b9d6bd9a3910d13b181399e975211fa556c3a9ead08eca30ababa74f75c79aee95224ffb7b610b9e56768eeeba18e8fae84826903adb12e122bb67" origin="Generated by Gradle"/>
@@ -2011,14 +1987,6 @@
             <sha512 value="9112b50ecc9f2274516fba55999a2aefac64f02970158a30ebf3a2f5052b66127dc571ee346b50dc677009ffafedf79aa6725f2621f7e3f8abb5fadcf507c57f" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.jetbrains.kotlin" name="kotlin-stdlib-jdk8" version="1.9.0">
-         <artifact name="kotlin-stdlib-jdk8-1.9.0.jar">
-            <sha512 value="af80d0d9785f0bdbc0b00cecf61861fcb4a3ed91510b4d936fd129c0212571247eb7662066a3e5bfb3108442806b1e9053f2cbafc2fe9630e6eb796635b5eac8" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="kotlin-stdlib-jdk8-1.9.0.pom">
-            <sha512 value="3a91c63a939d895888c4db6395c40d792f12ec5cb4830431f0543e47ae5a43416848aa1c8fe1615f2ed5dbf4b3d3fa52163d31064811ec01b1eb121eefd2cafb" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="org.jetbrains.kotlin" name="kotlin-stdlib-jdk8" version="1.9.10">
          <artifact name="kotlin-stdlib-jdk8-1.9.10.jar">
             <sha512 value="b027fc4a0be8e69f41a86ae775ce350ef0084eb4652e50a0640dbcc600db76c3fc2983e17c96b6071b5698cea636e1b2cb015e84a6c0efe95e6db668036ba3cc" origin="Generated by Gradle"/>

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=591855b517fc635b9e04de1d05d5e76ada3f89f5fc76f87978d1b245b4f69225
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
+distributionSha256Sum=3e1af3ae886920c3ac87f7a91f816c0c7c436f276a6eefdb3da152100fef72ae
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/gradlew b/gradlew
@@ -145,15 +145,15 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -202,11 +202,11 @@ fi
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \