Skip to content

Commit 2d4b62f

Browse files
committed
Update GradleUtils Shared to fix classpath issues
1 parent 28d47c6 commit 2d4b62f

File tree

4 files changed

+4
-6
lines changed

4 files changed

+4
-6
lines changed

at-gradle-demo/settings.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ pluginManagement {
1111

1212
plugins {
1313
id 'org.gradle.toolchains.foojay-resolver-convention' version '1.0.0'
14-
id 'net.minecraftforge.gradleutils' version '3.3.11'
14+
id 'net.minecraftforge.gradleutils' version '3.3.12'
1515
}
1616

1717
rootProject.name = 'at-gradle-demo'

at-gradle/settings.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ plugins {
44
// NOTE: We need to load this into the classpath before GradleUtils for the service to load correctly
55
id 'io.freefair.javadoc-links' version '8.14' apply false // https://plugins.gradle.org/plugin/io.freefair.javadoc-links
66

7-
id 'net.minecraftforge.gradleutils' version '3.3.11' // https://plugins.gradle.org/plugin/net.minecraftforge.gradleutils
7+
id 'net.minecraftforge.gradleutils' version '3.3.12' // https://plugins.gradle.org/plugin/net.minecraftforge.gradleutils
88
}
99

1010
rootProject.name = 'at-gradle'
@@ -35,7 +35,7 @@ dependencyResolutionManagement {
3535
library 'gradle', 'name.remal.gradle-api', 'gradle-api' versionRef 'gradle'
3636

3737
// GradleUtils Shared Base
38-
library 'gradleutils-shared', 'net.minecraftforge', 'gradleutils-shared' version '3.3.11'
38+
library 'gradleutils-shared', 'net.minecraftforge', 'gradleutils-shared' version '3.3.12'
3939

4040
// Utils
4141
library 'utils-hash', 'net.minecraftforge', 'hash-utils' version '0.1.9'

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import java.util.List;
2323

2424
abstract class AccessTransformersContainerImpl implements AccessTransformersContainerInternal {
25-
private final AccessTransformersPlugin plugin;
2625
private final AccessTransformersProblems problems;
2726

2827
private final OptionsImpl options;
@@ -34,7 +33,6 @@ public AccessTransformersContainerImpl(
3433
Project project,
3534
Action<? super AccessTransformersContainer.Options> options
3635
) {
37-
this.plugin = project.getPlugins().getPlugin(AccessTransformersPlugin.class);
3836
this.problems = this.getObjects().newInstance(AccessTransformersProblems.class);
3937

4038
options.execute(this.options = this.getObjects().newInstance(OptionsImpl.class, project));

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ public AccessTransformersExtensionImpl(AccessTransformersPlugin plugin, Project
7575
@SuppressWarnings({"unchecked", "DataFlowIssue"})
7676
private void finish(Project project) {
7777
project.getExtensions().getByType(JavaPluginExtension.class).getSourceSets().forEach(sourceSet ->
78-
Util.forClasspathConfigurations(project.getConfigurations(), sourceSet, c -> c.extendsFrom(this.constraintsConfiguration.get()))
78+
Util.forEachClasspath(project.getConfigurations(), sourceSet, c -> c.extendsFrom(this.constraintsConfiguration.get()))
7979
);
8080

8181
project.getConfigurations().forEach(c -> c.getDependencies().matching(it ->

0 commit comments

Comments
 (0)