Fix import failure on non-java projects

Author: Jonathing

build.gradle

@@ -17,7 +17,7 @@ plugins {
     alias libs.plugins.shadow
 }
 
-final projectDisplayName = 'Forge Gradle Utilities'
+gradleutils.displayName = 'Forge Gradle Utilities'
 description = 'Small collection of utilities for standardizing MinecraftForge gradle scripts'
 base.archivesName = 'gradleutils'
 group = 'net.minecraftforge'
@@ -48,7 +48,7 @@ configurations {
     // This was added in Gradle 7, gives consumers useful errors if they are on an old version
     def applyGradleVersionAttribute = { Configuration configuration ->
         configuration.attributes {
-            attribute(GradlePluginApiVersion.GRADLE_PLUGIN_API_VERSION_ATTRIBUTE, objects.named(GradlePluginApiVersion, libs.versions.gradle.asProvider().get()))
+            attribute(GradlePluginApiVersion.GRADLE_PLUGIN_API_VERSION_ATTRIBUTE, objects.named(GradlePluginApiVersion, gradleutils.unpack(libs.versions.gradle)))
         }
     }
 
@@ -73,15 +73,6 @@ dependencies {
     implementation libs.yaml
 }
 
-// Removes local Gradle API from compileOnly. This is a workaround for bugged plugins.
-// Publish Plugin: https://github.com/gradle/plugin-portal-requests/issues/260
-// Shadow:         https://github.com/GradleUp/shadow/pull/1422
-afterEvaluate { project ->
-    project.configurations.named(JavaPlugin.COMPILE_ONLY_CONFIGURATION_NAME) { compileOnly ->
-        compileOnly.dependencies.remove(project.dependencies.gradleApi())
-    }
-}
-
 license {
     header = rootProject.file('LICENSE-header.txt')
     newLine = false
@@ -98,17 +89,8 @@ tasks.named('shadowJar', ShadowJar) {
     relocationPrefix = 'net.minecraftforge.gradleutils.shadow'
 }
 
-tasks.withType(GroovyCompile).configureEach {
-    groovyOptions.optimizationOptions.indy = true
-}
-
 tasks.withType(Javadoc).configureEach {
     javadocTool = javaToolchains.javadocToolFor { languageVersion = JavaLanguageVersion.of(24) }
-
-    options { StandardJavadocDocletOptions options ->
-        options.windowTitle = projectDisplayName + project.version
-        options.tags 'apiNote:a:API Note:', 'implNote:a:Implementation Note:', 'implSpec:a:Implementation Requirements:'
-    }
 }
 
 changelog {
@@ -122,7 +104,7 @@ gradlePlugin {
     plugins.register('gradleutils') {
         id = 'net.minecraftforge.gradleutils'
         implementationClass = 'net.minecraftforge.gradleutils.GradleUtilsPlugin'
-        displayName = projectDisplayName
+        displayName = gradleutils.displayName
         description = project.description
         tags = ['minecraftforge']
     }
@@ -138,7 +120,7 @@ publishing {
         gradleutils.promote(it)
 
         pom { pom ->
-            name = projectDisplayName
+            name = gradleutils.displayName
             description = project.description
 
             gradleutils.pom.addRemoteDetails(pom)
@@ -155,6 +137,3 @@ publishing {
         }
     }
 }
-
-idea.module { downloadSources = downloadJavadoc = true }
-eclipse.classpath { downloadSources = downloadJavadoc = true }

gradle.properties

@@ -8,4 +8,7 @@ org.gradle.configuration-cache.problems=warn
 
 systemProp.org.gradle.unsafe.suppress-gradle-api=true
 
+net.minecraftforge.gradleutils.ide.automatic.sources=true
+net.minecraftforge.gradleutils.compilation.defaults=true
+
 net.minecraftforge.gitversion.log.version=true

gradleutils-shared/build.gradle

@@ -13,7 +13,7 @@ plugins {
     alias libs.plugins.shadow
 }
 
-final projectDisplayName = 'Minecraft Forge Shared Plugin Base'
+gradleutils.displayName = 'Minecraft Forge Shared Plugin Base'
 description = 'The shared base used by all of Minecraft Forge\'s Gradle plugins'
 base.archivesName = 'gradleutils-shared'
 group = 'net.minecraftforge'
@@ -54,11 +54,6 @@ tasks.named('shadowJar', ShadowJar) {
 
 tasks.withType(Javadoc).configureEach {
     javadocTool = javaToolchains.javadocToolFor { languageVersion = JavaLanguageVersion.of(24) }
-
-    options { StandardJavadocDocletOptions options ->
-        options.windowTitle = projectDisplayName + project.version
-        options.tags 'apiNote:a:API Note:', 'implNote:a:Implementation Note:', 'implSpec:a:Implementation Requirements:'
-    }
 }
 
 // Allows the thin jar to be published, but won't be considered as the java-runtime variant in the module
@@ -78,7 +73,7 @@ publishing {
         gradleutils.promote(it)
 
         pom { pom ->
-            name = projectDisplayName
+            name = gradleutils.displayName
             description = project.description
 
             gradleutils.pom.addRemoteDetails(pom)
@@ -93,6 +88,3 @@ publishing {
         }
     }
 }
-
-idea.module { downloadSources = downloadJavadoc = true }
-eclipse.classpath { downloadSources = downloadJavadoc = true }

settings.gradle

@@ -13,8 +13,8 @@ plugins {
     // NOTE: We need to load this into the classpath before GradleUtils for the service to load correctly
     id 'io.freefair.javadoc-links' version '8.14' apply false // https://plugins.gradle.org/plugin/io.freefair.javadoc-links
 
-    id 'net.minecraftforge.gradleutils' version '3.2.0' // https://plugins.gradle.org/plugin/net.minecraftforge.gradleutils
-    id 'net.minecraftforge.gitversion'  version '3.0.2' // https://plugins.gradle.org/plugin/net.minecraftforge.gitversion
+    id 'net.minecraftforge.gradleutils' version '3.2.23' // https://plugins.gradle.org/plugin/net.minecraftforge.gradleutils
+    id 'net.minecraftforge.gitversion'  version '3.0.7'  // https://plugins.gradle.org/plugin/net.minecraftforge.gitversion
 }
 
 rootProject.name = 'gradleutils'
@@ -34,7 +34,7 @@ dependencyResolutionManagement {
             version 'gradle-javadoc-links', '8.14'
 
             plugin 'licenser',       'net.minecraftforge.licenser'  version '1.2.0' // https://plugins.gradle.org/plugin/net.minecraftforge.licenser
-            plugin 'changelog',      'net.minecraftforge.changelog' version '3.0.2' // https://plugins.gradle.org/plugin/net.minecraftforge.changelog
+            plugin 'changelog',      'net.minecraftforge.changelog' version '3.0.6' // https://plugins.gradle.org/plugin/net.minecraftforge.changelog
             plugin 'plugin-publish', 'com.gradle.plugin-publish'    version '1.3.1' // https://plugins.gradle.org/plugin/com.gradle.plugin-publish
             plugin 'shadow',         'com.gradleup.shadow'          version '9.0.2' // https://plugins.gradle.org/plugin/com.gradleup.shadow
 

src/main/groovy/net/minecraftforge/gradleutils/GradleUtilsExtensionImpl.groovy

@@ -24,6 +24,7 @@ import org.gradle.api.provider.ProviderFactory
 import org.gradle.api.publish.PublishingExtension
 import org.gradle.api.publish.maven.MavenPublication
 import org.gradle.api.publish.maven.tasks.PublishToMavenRepository
+import org.gradle.api.specs.Spec
 import org.gradle.api.tasks.TaskProvider
 import org.gradle.api.tasks.compile.GroovyCompile
 import org.gradle.api.tasks.compile.JavaCompile
@@ -162,7 +163,7 @@ import static net.minecraftforge.gradleutils.GradleUtilsPlugin.LOGGER
             // Shadow:         https://github.com/GradleUp/shadow/pull/1422
             if (this.providers.systemProperty('org.gradle.unsafe.suppress-gradle-api').map(Boolean.&parseBoolean).getOrElse(false)) {
                 final gradleApi = project.dependencies.gradleApi()
-                project.configurations.named(JavaPlugin.COMPILE_ONLY_CONFIGURATION_NAME) { compileOnly ->
+                project.configurations.named(JavaPlugin.COMPILE_ONLY_CONFIGURATION_NAME.&equals as Spec<String>).configureEach { compileOnly ->
                     compileOnly.withDependencies { it.remove(gradleApi) }
                 }
             }