Bump to gradle 8.4

SpongePowered · Nov 11, 2023 · 95835ef · 95835ef
1 parent d4411c1
commit 95835ef
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/build-logic/build.gradle b/build-logic/build.gradle
@@ -11,7 +11,7 @@ indra {
 
 dependencies {
     api("com.google.code.gson:gson:2.9.1")
-    implementation("gradle.plugin.org.jetbrains.gradle.plugin.idea-ext:gradle-idea-ext:1.1.6")
+    implementation("gradle.plugin.org.jetbrains.gradle.plugin.idea-ext:gradle-idea-ext:1.1.7")
 }
 
 indraSpotlessLicenser {

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -249,7 +249,7 @@ allprojects {
     apply(plugin = "net.kyori.indra.licenser.spotless")
 
     base {
-        archivesBaseName = name.lowercase(Locale.ENGLISH)
+        archivesName = name.lowercase(Locale.ENGLISH)
     }
 
     plugins.withId("org.spongepowered.gradle.vanilla") {
@@ -350,10 +350,10 @@ allprojects {
     }
     sourceSets.configureEach {
         val sourceSet = this
-        val sourceJarName: String = if ("main".equals(this.name)) "sourceJar" else "${this.name}SourceJar"
+        val sourceJarName: String = if ("main" == this.name) "sourceJar" else "${this.name}SourceJar"
         tasks.register(sourceJarName, Jar::class.java) {
             group = "build"
-            val classifier = if ("main".equals(sourceSet.name)) "sources" else "${sourceSet.name}sources"
+            val classifier = if ("main" == sourceSet.name) "sources" else "${sourceSet.name}sources"
             archiveClassifier.set(classifier)
             from(sourceSet.allJava)
         }

diff --git a/generator/build.gradle.kts b/generator/build.gradle.kts
@@ -39,15 +39,15 @@ indraSpotlessLicenser {
 }
 
 val apiBase = rootProject.file("SpongeAPI/src/main/java/")
-val temporaryLicenseHeader = project.buildDir.resolve("api-gen-license-header.txt")
+val temporaryLicenseHeader = project.layout.buildDirectory.file("api-gen-license-header.txt")
 tasks.register("generateApiData", JavaExec::class) {
     group = "sponge"
     description = "Generate API Catalog classes"
     javaLauncher.set(project.javaToolchains.launcherFor(java.toolchain))
 
     classpath(sourceSets.main.map { it.output }, sourceSets.main.map { it.runtimeClasspath })
     mainClass.set("org.spongepowered.vanilla.generator.GeneratorMain")
-    args(apiBase.canonicalPath, temporaryLicenseHeader.canonicalPath)
+    args(apiBase.canonicalPath, temporaryLicenseHeader.get().asFile.canonicalPath)
 
     doFirst {
         // Write a template-expanded license header to the temporary file
@@ -58,7 +58,7 @@ tasks.register("generateApiData", JavaExec::class) {
             propertyMap["name"] = "SpongeAPI"
             val out = template.make(propertyMap)
 
-            temporaryLicenseHeader.bufferedWriter(Charsets.UTF_8).use { writer ->
+            temporaryLicenseHeader.get().asFile.bufferedWriter(Charsets.UTF_8).use { writer ->
                 out.writeTo(writer)
             }
         }

diff --git a/gradle.properties b/gradle.properties
@@ -29,4 +29,4 @@ vineflowerVersion=1.9.1
 
 org.gradle.jvmargs=-Xss4m
 org.gradle.parallel=true
-org.gradle.caching=false
+org.gradle.caching=false
diff --git a/vanilla/build.gradle.kts b/vanilla/build.gradle.kts
@@ -453,7 +453,7 @@ tasks {
         this.dependencies("bootstrap", vanillaAppLaunchConfig)
         this.dependencies("main", vanillaLibrariesConfig)
         // except what we're providing through the installer
-        this.excludedDependencies(downloadNotNeeded)
+        //this.excludedDependencies(downloadNotNeeded)
 
         outputFile.set(installerResources.map { it.file("libraries.json") })
     }
@@ -539,7 +539,7 @@ publishing {
             artifact(tasks["launchSourceJar"])
             artifact(tasks["mixinsSourceJar"])
             pom {
-                artifactId = project.name.toLowerCase()
+                artifactId = project.name.lowercase()
                 this.name.set(project.name)
                 this.description.set(project.description)
                 this.url.set(projectUrl)