Redesign API to be more like JarJar

Author: Jonathing

at-gradle-demo/build.gradle

@@ -5,12 +5,11 @@ plugins {
 
 java.toolchain.languageVersion = JavaLanguageVersion.of(17)
 
-accessTransformers.register {
-    logLevel = LogLevel.LIFECYCLE
-    config = project.file('accesstransformer.cfg')
-}
-
 dependencies {
-    implementation accessTransformers.dep(libs.coremods)
+    implementation(libs.coremods) {
+        accessTransformers.configure(it) {
+            config = project.file('accesstransformer.cfg')
+        }
+    }
     compileOnly libs.log4j.api
 }

at-gradle-demo/gradle.properties

@@ -0,0 +1,9 @@
+org.gradle.caching=true
+org.gradle.parallel=true
+org.gradle.configureondemand=true
+
+org.gradle.configuration-cache=true
+org.gradle.configuration-cache.parallel=true
+org.gradle.configuration-cache.problems=warn
+
+net.minecraftforge.gradleutils.compilation.defaults=true

at-gradle-demo/settings.gradle

@@ -2,16 +2,16 @@ pluginManagement {
     includeBuild '../at-gradle'
 
     repositories {
-        //mavenLocal()
         mavenCentral()
         gradlePluginPortal()
         maven { url = 'https://maven.minecraftforge.net' }
+        //mavenLocal()
     }
 }
 
 plugins {
     id 'org.gradle.toolchains.foojay-resolver-convention' version '1.0.0'
-    id 'net.minecraftforge.gradleutils' version '3.2.6'
+    id 'net.minecraftforge.gradleutils' version '3.3.11'
 }
 
 rootProject.name = 'at-gradle-demo'

at-gradle/build.gradle

@@ -7,7 +7,7 @@ plugins {
     id 'idea'
     id 'eclipse'
     id 'maven-publish'
-    id 'io.freefair.javadoc-links'
+    //id 'io.freefair.javadoc-links'
     id 'net.minecraftforge.gradleutils'
     alias libs.plugins.gitversion
     alias libs.plugins.changelog
@@ -16,32 +16,19 @@ plugins {
     alias libs.plugins.shadow
 }
 
-final projectDisplayName = 'AccessTransformers Gradle Plugin'
+gradleutils.displayName = 'AccessTransformers Gradle Plugin'
 description = 'Enables Gradle projects to use AccessTransformers on dependencies with minimal hassle.'
 base.archivesName = 'accesstransformers-gradle'
 group = 'net.minecraftforge'
 version = gitversion.tagOffset
 
-println "Version: $version"
-
 java {
     toolchain.languageVersion = JavaLanguageVersion.of(17)
     withSourcesJar()
     withJavadocJar()
 }
 
-configurations {
-    // Applies the "Gradle Plugin API Version" attribute to configuration
-    // 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.get()))
-        }
-    }
-
-    named(JavaPlugin.RUNTIME_ELEMENTS_CONFIGURATION_NAME, applyGradleVersionAttribute)
-    named(ShadowJavaPlugin.SHADOW_RUNTIME_ELEMENTS_CONFIGURATION_NAME, applyGradleVersionAttribute)
-}
+gradleutils.pluginDevDefaults(configurations, libs.versions.gradle)
 
 dependencies {
     // Static Analysis
@@ -57,15 +44,6 @@ dependencies {
     implementation libs.bundles.utils
 }
 
-// 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
@@ -84,11 +62,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:'
-    }
 }
 
 changelog {
@@ -102,7 +75,7 @@ gradlePlugin {
     plugins.register('accesstransformers') {
         id = 'net.minecraftforge.accesstransformers'
         implementationClass = 'net.minecraftforge.accesstransformers.gradle.AccessTransformersPlugin'
-        displayName = projectDisplayName
+        displayName = gradleutils.displayName
         description = project.description
         tags = ['minecraftforge']
     }
@@ -118,7 +91,7 @@ publishing {
         gradleutils.promote(it)
 
         pom { pom ->
-            name = projectDisplayName
+            name = gradleutils.displayName
             description = project.description
 
             gradleutils.pom.addRemoteDetails(pom)
@@ -133,6 +106,3 @@ publishing {
         }
     }
 }
-
-idea.module { downloadSources = downloadJavadoc = true }
-eclipse.classpath { downloadSources = downloadJavadoc = true }

at-gradle/gradle.properties

@@ -7,3 +7,9 @@ org.gradle.configuration-cache.parallel=true
 org.gradle.configuration-cache.problems=warn
 
 systemProp.org.gradle.unsafe.suppress-gradle-api=true
+
+net.minecraftforge.gradleutils.publishing.use-base-archives-name=true
+net.minecraftforge.gradleutils.ide.automatic.sources=true
+net.minecraftforge.gradleutils.compilation.defaults=true
+
+net.minecraftforge.gitversion.log.version=true

at-gradle/settings.gradle

@@ -4,24 +4,24 @@ 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.6' // https://plugins.gradle.org/plugin/net.minecraftforge.gradleutils
+    id 'net.minecraftforge.gradleutils' version '3.3.11' // https://plugins.gradle.org/plugin/net.minecraftforge.gradleutils
 }
 
 rootProject.name = 'at-gradle'
 
 dependencyResolutionManagement {
     repositories {
-        //mavenLocal()
         mavenCentral()
         maven gradleutils.forgeMaven
         maven { url = 'https://maven.moddinglegacy.com/maven' } // Gradle API
+        //mavenLocal()
     }
 
     //@formatter:off
     versionCatalogs.register('libs') {
         plugin 'licenser',       'net.minecraftforge.licenser'   version '1.2.0' // https://plugins.gradle.org/plugin/net.minecraftforge.licenser
-        plugin 'gitversion',     'net.minecraftforge.gitversion' version '3.0.3' // https://plugins.gradle.org/plugin/net.minecraftforge.changelog
-        plugin 'changelog',      'net.minecraftforge.changelog'  version '3.0.3' // https://plugins.gradle.org/plugin/net.minecraftforge.changelog
+        plugin 'gitversion',     'net.minecraftforge.gitversion' version '3.1.0' // https://plugins.gradle.org/plugin/net.minecraftforge.changelog
+        plugin 'changelog',      'net.minecraftforge.changelog'  version '3.1.1' // 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
 
@@ -35,7 +35,7 @@ dependencyResolutionManagement {
         library 'gradle', 'name.remal.gradle-api', 'gradle-api'  versionRef 'gradle'
 
         // GradleUtils Shared Base
-        library 'gradleutils-shared', 'net.minecraftforge', 'gradleutils-shared' version '3.2.6'
+        library 'gradleutils-shared', 'net.minecraftforge', 'gradleutils-shared' version '3.3.11'
 
         // Utils
         library 'utils-hash', 'net.minecraftforge', 'hash-utils' version '0.1.9'

at-gradle/src/main/java/net/minecraftforge/accesstransformers/gradle/AccessTransformersConfiguration.java

@@ -0,0 +1,15 @@
+/*
+ * Copyright (c) Forge Development LLC
+ * SPDX-License-Identifier: LGPL-2.1-only
+ */
+package net.minecraftforge.accesstransformers.gradle;
+
+import org.gradle.api.file.RegularFileProperty;
+
+/// Configuration for individual dependencies to be run through AccessTransformers.
+public sealed interface AccessTransformersConfiguration permits AccessTransformersContainer.Options, AccessTransformersConfigurationInternal {
+    /// Gets the AccessTransformer configuration to use.
+    ///
+    /// @return The property for the configuration
+    RegularFileProperty getConfig();
+}

at-gradle/src/main/java/net/minecraftforge/accesstransformers/gradle/AccessTransformersConfigurationImpl.java

@@ -0,0 +1,12 @@
+/*
+ * Copyright (c) Forge Development LLC
+ * SPDX-License-Identifier: LGPL-2.1-only
+ */
+package net.minecraftforge.accesstransformers.gradle;
+
+import org.gradle.api.file.RegularFileProperty;
+
+record AccessTransformersConfigurationImpl(
+    RegularFileProperty getConfig,
+    AccessTransformersContainerImpl.OptionsImpl options
+) implements AccessTransformersConfigurationInternal { }

at-gradle/src/main/java/net/minecraftforge/accesstransformers/gradle/AccessTransformersConfigurationInternal.java

@@ -0,0 +1,15 @@
+/*
+ * Copyright (c) Forge Development LLC
+ * SPDX-License-Identifier: LGPL-2.1-only
+ */
+package net.minecraftforge.accesstransformers.gradle;
+
+import org.gradle.api.reflect.HasPublicType;
+import org.gradle.api.reflect.TypeOf;
+
+non-sealed interface AccessTransformersConfigurationInternal extends AccessTransformersConfiguration, HasPublicType {
+    @Override
+    default TypeOf<?> getPublicType() {
+        return TypeOf.typeOf(AccessTransformersConfiguration.class);
+    }
+}