From 0020316ee148b7e06c381733b8111c669945db41 Mon Sep 17 00:00:00 2001
From: squid233 <60126026+squid233@users.noreply.github.com>
Date: Tue, 22 Aug 2023 19:01:57 +0800
Subject: [PATCH] Upgrade Gradle to 8.3

---
 build.gradle.kts                         | 6 +++---
 gradle/wrapper/gradle-wrapper.properties | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 3bc534f8..0e6decf0 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -202,7 +202,7 @@ subprojects {
 
 tasks.register("assembleJavadocArgs") {
     group = "build"
-    val mspFile = Path("${rootProject.buildDir}/tmp/modulesourcepath.args")
+    val mspFile = Path("${rootProject.layout.buildDirectory.get().asFile}/tmp/modulesourcepath.args")
     outputs.file(mspFile)
 
     doLast {
@@ -222,13 +222,13 @@ tasks.register<Javadoc>("aggregateJavadoc") {
     val projectsToDoc = Artifact.values().map { project(it.subprojectName) }
     dependsOn(projectsToDoc.map { it.getTasksByName("classes", true) })
     source(projectsToDoc.map { it.sourceSets["main"].java })
-    destinationDir = File("$buildDir/docs/javadoc")
+    destinationDir = File("${layout.buildDirectory.get().asFile}/docs/javadoc")
 
     classpath = files(projectsToDoc.map { it.configurations["compileClasspath"].files })
 
     executable = project.findProperty("javadocExecutable") as String?
 
-    options.optionFiles = listOf(File("${rootProject.buildDir}/tmp/modulesourcepath.args"))
+    options.optionFiles = listOf(File("${rootProject.layout.buildDirectory.get().asFile}/tmp/modulesourcepath.args"))
 }
 
 allprojects {
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 9f4197d5..ac72c34e 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME