Update buildscript

- Gradle 9.1.0
- GradleUtils 3.3.18
- Use subprojects instead of source sets for multi-versioned projects

Author: Jonathing

.gitversion .gitversion.toml.gitversion renamed to .gitversion.toml

@@ -1,75 +1,57 @@
 plugins {
     id 'java-library'
     id 'idea'
+    id 'eclipse'
     id 'maven-publish'
     alias libs.plugins.licenser
     alias libs.plugins.gradleutils
+    alias libs.plugins.gitversion
+    alias libs.plugins.changelog
 }
 
-final projectDisplayName = 'Download Utils'
-final projectVendor = 'Forge Development LLC'
+gradleutils.displayName = 'Download Utils'
 description = 'Utilities for simple download tasks'
 group = 'net.minecraftforge'
 version = gitversion.tagOffset
 
 println "Version: $version"
 
-// IDE linting + no need to say 'sourceSets.java11' every time
-final java11 = sourceSets.create('java11')
-
 java {
-    toolchain.languageVersion = JavaLanguageVersion.of 8
+    toolchain.languageVersion = JavaLanguageVersion.of(8)
     withSourcesJar()
-
-    registerFeature(java11.name) {
-        usingSourceSet java11
-        capability project.group.toString(), project.name, project.version.toString()
-        disablePublication()
-    }
-}
-
-configurations {
-    named(java11.implementationConfigurationName) { extendsFrom implementation }
-    named(java11.compileOnlyConfigurationName) { extendsFrom compileOnly }
 }
 
 dependencies {
-    implementation project(':log-utils')
-
     compileOnly libs.nulls
+
+    implementation projects.logUtils
 }
 
+final java11 = configurations.detachedConfiguration(
+    dependencies.create(projects.downloadUtils.java11) {
+        transitive = false
+    }
+)
+
 tasks.named('jar', Jar) {
+    dependsOn java11.buildDependencies
+
     manifest {
         attributes([
             'Automatic-Module-Name': 'net.minecraftforge.utils.download',
             'Multi-Release'        : 'true'
         ])
-        attributes([
-            'Specification-Title'   : projectDisplayName,
-            'Specification-Vendor'  : projectVendor,
-            'Specification-Version' : gitversion.info.tag,
-            'Implementation-Title'  : projectDisplayName,
-            'Implementation-Vendor' : projectVendor,
-            'Implementation-Version': project.version
-        ], 'net/minecraftforge/util/download/')
-    }
 
-    into('META-INF/versions/11') {
-        from java11.output
+        gradleutils.manifestDefaults(it, 'net/minecraftforge/util/download/')
     }
-}
 
-tasks.named(java11.compileJavaTaskName, JavaCompile) {
-    javaCompiler = javaToolchains.compilerFor {
-        languageVersion = JavaLanguageVersion.of 11
+    into('META-INF/versions/11') {
+        from(provider { zipTree(java11.singleFile) }) {
+            exclude 'META-INF/**'
+        }
     }
 }
 
-tasks.withType(JavaCompile).configureEach {
-    options.encoding = 'UTF-8'
-}
-
 license {
     header = rootProject.file('LICENSE-header.txt')
     newLine = false
@@ -78,20 +60,24 @@ license {
 
 changelog {
     fromBase()
-    publishAll = false
 }
 
 publishing {
+    repositories {
+        maven gradleutils.publishingForgeMaven
+    }
+
     publications.register('mavenJava', MavenPublication).configure {
         from components.java
 
-        artifactId = project.name
+        changelog.publish(it)
+        gradleutils.promote(it)
 
         pom { pom ->
-            name = projectDisplayName
+            name = gradleutils.displayName
             description = project.description
 
-            gradleutils.pom.setGitHubDetails pom
+            gradleutils.pom.addRemoteDetails(pom)
 
             licenses {
                 license gradleutils.pom.licenses.LGPLv2_1
@@ -103,10 +89,4 @@ publishing {
             }
         }
     }
-
-    repositories {
-        maven gradleutils.publishingForgeMaven
-    }
 }
-
-idea.module { downloadSources = downloadJavadoc = true }

download-utils/build.gradle

@@ -0,0 +1,21 @@
+plugins {
+    id 'java'
+    id 'idea'
+    id 'eclipse'
+    alias libs.plugins.licenser
+    alias libs.plugins.gradleutils
+}
+
+java.toolchain.languageVersion = JavaLanguageVersion.of(11)
+
+dependencies {
+    compileOnly libs.nulls
+
+    implementation projects.logUtils
+}
+
+license {
+    header = rootProject.file('LICENSE-header.txt')
+    newLine = false
+    exclude '**/*.properties'
+}

download-utils/java11/build.gradle

@@ -1,21 +1,23 @@
 plugins {
     id 'java-library'
     id 'idea'
+    id 'eclipse'
     id 'maven-publish'
     alias libs.plugins.licenser
     alias libs.plugins.gradleutils
+    alias libs.plugins.gitversion
+    alias libs.plugins.changelog
 }
 
-final projectDisplayName = 'File Utils'
-final projectVendor = 'Forge Development LLC'
+gradleutils.displayName = 'File Utils'
 description = 'Common utilities for working with files and directories'
 group = 'net.minecraftforge'
 version = gitversion.tagOffset
 
 println "Version: $version"
 
 java {
-    toolchain.languageVersion = JavaLanguageVersion.of 17
+    toolchain.languageVersion = JavaLanguageVersion.of(17)
     withSourcesJar()
 }
 
@@ -27,19 +29,9 @@ dependencies {
 tasks.named('jar', Jar) {
     manifest {
         attributes('Automatic-Module-Name': 'net.minecraftforge.utils.file')
-        attributes([
-            'Specification-Title'   : projectDisplayName,
-            'Specification-Vendor'  : projectVendor,
-            'Specification-Version' : gitversion.info.tag,
-            'Implementation-Title'  : projectDisplayName,
-            'Implementation-Vendor' : projectVendor,
-            'Implementation-Version': project.version
-        ], 'net/minecraftforge/util/file/')
-    }
-}
 
-tasks.withType(JavaCompile).configureEach {
-    options.encoding = 'UTF-8'
+        gradleutils.manifestDefaults(it, 'net/minecraftforge/util/file/')
+    }
 }
 
 license {
@@ -50,20 +42,24 @@ license {
 
 changelog {
     fromBase()
-    publishAll = false
 }
 
 publishing {
+    repositories {
+        maven gradleutils.publishingForgeMaven
+    }
+
     publications.register('mavenJava', MavenPublication) {
         from components.java
 
-        artifactId = project.name
+        changelog.publish(it)
+        gradleutils.promote(it)
 
         pom { pom ->
-            name = projectDisplayName
+            name = gradleutils.displayName
             description = project.description
 
-            gradleutils.pom.setGitHubDetails pom
+            gradleutils.pom.addRemoteDetails(pom)
 
             licenses {
                 license gradleutils.pom.licenses.LGPLv2_1
@@ -75,10 +71,4 @@ publishing {
             }
         }
     }
-
-    repositories {
-        maven gradleutils.publishingForgeMaven
-    }
 }
-
-idea.module { downloadSources = downloadJavadoc = true }

…ftforge/util/download/DownloadUtils.java …ftforge/util/download/DownloadUtils.javadownload-utils/src/java11/java/net/minecraftforge/util/download/DownloadUtils.java renamed to download-utils/java11/src/main/java/net/minecraftforge/util/download/DownloadUtils.java download-utils/src/java11/java/net/minecraftforge/util/download/DownloadUtils.java renamed to download-utils/java11/src/main/java/net/minecraftforge/util/download/DownloadUtils.java

@@ -2,5 +2,9 @@ org.gradle.caching=true
 org.gradle.parallel=true
 org.gradle.configureondemand=true
 
-# TODO Enable when Gradle fully supports
-#org.gradle.configuration-cache=true
+org.gradle.configuration-cache=true
+org.gradle.configuration-cache.parallel=true
+org.gradle.configuration-cache.problems=warn
+
+net.minecraftforge.gradleutils.ide.automatic.sources=true
+net.minecraftforge.gradleutils.compilation.defaults=true

file-utils/build.gradle

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME