From 03c6a5e8ae7f8d12c75b690119004858eef9f9a7 Mon Sep 17 00:00:00 2001
From: Claudemirovsky <63046606+Claudemirovsky@users.noreply.github.com>
Date: Thu, 14 Dec 2023 06:58:06 -0300
Subject: [PATCH] [skip ci] chore: Address deprecation warnings from gradle
 8.5+ (#2637)

---
 common.gradle       |  2 +-
 settings.gradle.kts | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/common.gradle b/common.gradle
index a0c82bf43..f8235f6f9 100644
--- a/common.gradle
+++ b/common.gradle
@@ -25,7 +25,7 @@ android {
         versionCode extVersionCode
         versionName project.ext.properties.getOrDefault("libVersion", "13") + ".$extVersionCode"
         base {
-            archivesBaseName = "aniyomi-$pkgNameSuffix-v$versionName"
+            archivesName = "aniyomi-$pkgNameSuffix-v$versionName"
         }
         def readmes = project.projectDir.listFiles({ File file ->
             file.name.equals("README.md") ||
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 0b42751df..fb5192c39 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -23,6 +23,20 @@ File(rootDir, "lib").eachDir {
     project(":lib-$libName").projectDir = File("lib/$libName")
 }
 
+// Fix deprecation warnings with Gradle 8.5+.
+// See https://docs.gradle.org/8.5/userguide/upgrading_version_8.html#deprecated_missing_project_directory
+listOf(
+    ":extensions" to "$rootDir/gradle", // Temporary workaround.
+    ":extensions:individual" to "$rootDir/src",
+    ":extensions:multisrc" to "$rootDir/generated-src",
+).forEach { (name, path) ->
+    val projectDir = file(path)
+    if (projectDir.exists()) {
+        include(name)
+        project(name).projectDir = projectDir
+    }
+}
+
 if (System.getenv("CI") == null || System.getenv("CI_MODULE_GEN") == "true") {
     // Local development (full project build)