diff --git a/java/gradle/PKGBUILD b/java/gradle/PKGBUILD
index 2f59e0fc09..3782b4cbdf 100644
--- a/java/gradle/PKGBUILD
+++ b/java/gradle/PKGBUILD
@@ -6,8 +6,7 @@
 
 pkgbase=gradle
 pkgname=('gradle' 'gradle-doc' 'gradle-src')
-pkgver=8.4
-_commit_hash='e9251e572c9bd1d01e503a0dfdf43aedaeecdc3f' # git rev-parse v${_tag_name}
+pkgver=8.5
 pkgrel=1
 pkgdesc='Powerful build system for the JVM'
 url='https://gradle.org/'
@@ -17,46 +16,40 @@ depends=('java-environment' 'bash' 'which' 'coreutils' 'findutils' 'sed')
 makedepends=('git' 'asciidoc' 'xmlto' 'groovy' 'java-environment=11')
 source=(https://services.gradle.org/distributions/${pkgbase}-${pkgver}-src.zip
         https://services.gradle.org/distributions/${pkgbase}-${pkgver}-all.zip
-        ${pkgbase}.sh
-        externalize-release-commit-hash.patch)
-sha256sums=('8c6dbc4a3d9118bf16aa120106d4dfb06950a195b15715cf4843415637d2ab5a'
-            'f2b9ed0faf8472cbe469255ae6c86eddb77076c75191741b4a462f33128dd419'
-            '6f3472486278252417af49196847ba465b56819d286658fcdf918687f89ee032'
-            'cd68dcb8bb909202c1a10181980c35bc6f11b8557618e1369464a32b718c17a0')
-sha512sums=('6bee721038f6e581e5d173425e10d94939954d03e1d8eaf3e4888a76aa2216e8f46d36edb49f50d61002d271e45ce6dbcb0fc46c2c2372429d09d589e02c5aa9'
-            '52d5f622b8ad0ab36ff84589733b47423b12f94211086a84eca9810690af29e396877f1155ee31279c4325e98cd1d55b32137d52efcf48eb1e258caeece08f22'
-            'a50b6cf8281b56b80f55a20ac9316e1eed6887da1d191ad575dec140c9819711644d7077c4dc693b8cb0f1b08ceba0033ba88b5ad138d33ffb73b786c0d4bf81'
-            '93df9d173da82b15fce0cfbcbeca0f96cd0648cb77bbaef1da383bd6754d0ffd1409b4b5628560a75cd617f4b407b4c07df3af916835914d852e1fbd36fe01e3')
+        ${pkgbase}.sh)
+sha256sums=('1f0a083efe2aee4cd5eb1a9a60d01008be02fe977e2590dd01a072aec7fe66e1'
+            'c16d517b50dd28b3f5838f0e844b7520b8f1eb610f2f29de7e4e04a1b7c9c79b'
+            '6f3472486278252417af49196847ba465b56819d286658fcdf918687f89ee032')
+sha512sums=('b8fafc9c278c99a0534ef532a081ceab2d17d98181c98a9eaddd51365d22cb545c0ad65f096dcfa00fc2b89bcc41ef82907392139e242b1fd14009d3709f7765'
+            '37a1c2989c46dad0f843565d05fd29010df10ac199d81f0ccddf56ffd490642039046d43a320ba04d1f87cbbc6d4cebf20ff66ce45ec005931cfc85aee2e0180'
+            'a50b6cf8281b56b80f55a20ac9316e1eed6887da1d191ad575dec140c9819711644d7077c4dc693b8cb0f1b08ceba0033ba88b5ad138d33ffb73b786c0d4bf81')
 
 prepare() {
   cd ${pkgbase}-${pkgver}
   # remove ADOPTIUM contraint from all build related files
   sed -i '/JvmVendorSpec.ADOPTIUM/d' \
-    build-logic/jvm/src/main/kotlin/gradlebuild.unittest-and-compile.gradle.kts \
-    subprojects/docs/src/snippets/java/toolchain-filters/groovy/build.gradle \
-    subprojects/docs/src/snippets/java/toolchain-filters/kotlin/build.gradle.kts \
+    build-logic-commons/module-identity/build.gradle.kts \
     build-logic-commons/gradle-plugin/build.gradle.kts \
-    build-logic-commons/commons/build.gradle.kts \
-    build-logic-commons/commons/src/main/kotlin/common.kt \
-    build-logic-commons/code-quality-rules/build.gradle.kts
+    build-logic/jvm/src/main/kotlin/gradlebuild.unittest-and-compile.gradle.kts \
+    build-logic-commons/gradle-plugin/src/main/kotlin/gradlebuild/commons/JavaPluginExtensions.kt \
+    build-logic-commons/code-quality-rules/build.gradle.kts \
+    build-logic-commons/basics/build.gradle.kts \
+    platforms/jvm/language-java/src/integTest/groovy/org/gradle/jvm/toolchain/JavaToolchainDownloadIntegrationTest.groovy
 
   # inhibit automatic download of binary gradle
   sed -i "s#distributionUrl=.*#distributionUrl=file\:${srcdir}/${pkgbase}-${pkgver}-all.zip#" \
     gradle/wrapper/gradle-wrapper.properties
-  # https://github.com/gradle/gradle/issues/26805
-  patch -Np1 < "${srcdir}/externalize-release-commit-hash.patch"
 }
 
 build() {
   cd ${pkgbase}-${pkgver}
   # requires java language level 6, which >=13 has dropped
   export PATH="/usr/lib/jvm/java-11-openjdk/bin:${PATH}"
-  export COMMIT_HASH="${_commit_hash}"
   ./gradlew installAll \
     -Porg.gradle.java.installations.auto-download=false \
     -PfinalRelease=true \
     -Pgradle_installPath="$(pwd)/dist" \
-    --no-configuration-cache --stacktrace
+    --no-configuration-cache
 }
 
 package_gradle() {