From ab259c2e89761c5b89a9f30ad65d346ca9e68bf2 Mon Sep 17 00:00:00 2001
From: Tyler Veness <calcmogul@gmail.com>
Date: Mon, 22 Sep 2025 10:58:14 -0700
Subject: [PATCH] [build] Fix Gradle 9 `archives` deprecation warning (#8247)

The deprecation message was:
```
The `archives` configuration added by the `base` plugin has been
deprecated and will be removed in Gradle 10.0.0. Adding artifacts to the
`archives` configuration will now result in a deprecation warning. If
you want the artifact built when running the `assemble` task, you should
add the artifact (or the task that produces it) as a dependency of the
`assemble` task directly.

val specialJar = tasks.register<Jar>("specialJar") {
    archiveBaseName.set("special")
    from("build/special")
}
tasks.named("assemble") {
    dependsOn(specialJar)
}
```
---
 shared/java/javacommon.gradle | 12 +++++++-----
 shared/javacpp/publish.gradle |  6 ++++--
 shared/jni/publish.gradle     |  6 ++++--
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/shared/java/javacommon.gradle b/shared/java/javacommon.gradle
index dd94007785..9e231898dc 100644
--- a/shared/java/javacommon.gradle
+++ b/shared/java/javacommon.gradle
@@ -39,11 +39,13 @@ task outputJavadocJar(type: Jar, dependsOn: javadoc) {
 }
 
 artifacts {
-    archives sourcesJar
-    archives javadocJar
-    archives outputJar
-    archives outputSourcesJar
-    archives outputJavadocJar
+    tasks.named("assemble") {
+        dependsOn(sourcesJar)
+        dependsOn(javadocJar)
+        dependsOn(outputJar)
+        dependsOn(outputSourcesJar)
+        dependsOn(outputJavadocJar)
+    }
 }
 
 addTaskToCopyAllOutputs(outputSourcesJar)
diff --git a/shared/javacpp/publish.gradle b/shared/javacpp/publish.gradle
index ca7fc5f7d8..7416b934ae 100644
--- a/shared/javacpp/publish.gradle
+++ b/shared/javacpp/publish.gradle
@@ -47,8 +47,10 @@ task cppHeadersZip(type: Zip) {
 }
 
 artifacts {
-    archives cppHeadersZip
-    archives cppSourcesZip
+    tasks.named("assemble") {
+        dependsOn(cppHeadersZip)
+        dependsOn(cppSourcesZip)
+    }
 }
 
 addTaskToCopyAllOutputs(cppSourcesZip)
diff --git a/shared/jni/publish.gradle b/shared/jni/publish.gradle
index 9bfe4d0282..0705fa2a98 100644
--- a/shared/jni/publish.gradle
+++ b/shared/jni/publish.gradle
@@ -62,8 +62,10 @@ task cppHeadersZip(type: Zip) {
 }
 
 artifacts {
-    archives cppHeadersZip
-    archives cppSourcesZip
+    tasks.named("assemble") {
+        dependsOn(cppHeadersZip)
+        dependsOn(cppSourcesZip)
+    }
 }
 
 addTaskToCopyAllOutputs(cppSourcesZip)