Skip to content

Commit e68f2a0

Browse files
JonathingJonathing
committed
Good time to put in some breaking changes
ForgeGradle 7 now requires Gradle 9.1.0. The property `minecraft.maven` (used in the repositories block) has been renamed to `minecraft.mavenizer` to reflect its relation to Mavenizer. The following functional properties have been renamed: - `net.minecraftforge.gradle.mergeSourceSets` -> `net.minecraftforge.gradle.merge-source-sets` The following warning properties have been renamed: - `net.minecraftforge.gradle.warnings.overriddenMappings` -> `net.minecraftforge.gradle.warnings.minecraft.mappings.overridden` - `net.minecraftforge.gradle.warnings.missingMinecraftDependency` -> `net.minecraftforge.gradle.warnings.minecraft.dependency.missing` - `net.minecraftforge.gradle.warnings.missingRepository.mcmaven` -> `net.minecraftforge.gradle.warnings.repository.missing.mavenizer` - `net.minecraftforge.gradle.warnings.missingRepository.mclibs` -> `net.minecraftforge.gradle.warnings.repository.missing.mojang` - `net.minecraftforge.gradle.warnings.missingRepository.forge` -> `net.minecraftforge.gradle.warnings.repository.missing.forge`
1 parent 98d0f85 commit e68f2a0

File tree

7 files changed

+46
-49
lines changed

7 files changed

+46
-49
lines changed

‎gradle/wrapper/gradle-wrapper.jar‎

1.65 KB
Binary file not shown.

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

‎gradlew‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/sh
22

33
#
4-
# Copyright © 2015-2021 the original authors.
4+
# Copyright © 2015 the original authors.
55
#
66
# Licensed under the Apache License, Version 2.0 (the "License");
77
# you may not use this file except in compliance with the License.

‎settings.gradle‎

Lines changed: 32 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -18,38 +18,36 @@ gradle.beforeProject { Project project ->
1818
}
1919
}
2020

21-
dependencyResolutionManagement {
22-
//@formatter:off
23-
versionCatalogs.register('libs') {
24-
version 'gradleutils', '3.3.18'
25-
26-
plugin 'licenser', 'net.minecraftforge.licenser' version '1.2.0' // https://plugins.gradle.org/plugin/net.minecraftforge.licenser
27-
plugin 'gradleutils', 'net.minecraftforge.gradleutils' versionRef 'gradleutils'
28-
plugin 'gitversion', 'net.minecraftforge.gitversion' version '3.1.1' // https://plugins.gradle.org/plugin/net.minecraftforge.changelog
29-
plugin 'changelog', 'net.minecraftforge.changelog' version '3.1.2' // https://plugins.gradle.org/plugin/net.minecraftforge.changelog
30-
plugin 'plugin-publish', 'com.gradle.plugin-publish' version '2.0.0' // https://plugins.gradle.org/plugin/com.gradle.plugin-publish
31-
plugin 'shadow', 'com.gradleup.shadow' version '9.2.2' // https://plugins.gradle.org/plugin/com.gradleup.shadow
32-
33-
// Static Analysis
34-
library 'nulls', 'org.jetbrains', 'annotations' version '26.0.2'
35-
36-
// Gradle API
37-
// Original: https://github.com/remal-gradle-api/packages/packages/760197?version=9.0.0
38-
// Mirror: https://repos.moddinglegacy.com/#/modding-legacy/name/remal/gradle-api/gradle-api/9.0.0
39-
version 'gradle', '9.0.0'
40-
library 'gradle', 'name.remal.gradle-api', 'gradle-api' versionRef 'gradle'
41-
42-
// GradleUtils Shared Base
43-
library 'gradleutils-shared', 'net.minecraftforge', 'gradleutils-shared' versionRef 'gradleutils'
44-
45-
// AccessTransformers Gradle Plugin
46-
// https://plugins.gradle.org/plugin/net.minecraftforge.accesstransformers
47-
library 'accesstransformers-gradle', 'net.minecraftforge.accesstransformers', 'net.minecraftforge.accesstransformers.gradle.plugin' version '5.0.0-beta.8'
48-
49-
library 'utils-data', 'net.minecraftforge', 'json-data-utils' version '0.3.0' // https://files.minecraftforge.net/net/minecraftforge/json-data-utils/index.html
50-
library 'utils-hash', 'net.minecraftforge', 'hash-utils' version '0.1.10' // https://files.minecraftforge.net/net/minecraftforge/hash-utils/index.html
51-
library 'utils-download', 'net.minecraftforge', 'download-utils' version '0.3.2' // https://files.minecraftforge.net/net/minecraftforge/download-utils/index.html
52-
bundle 'utils', ['utils-data', 'utils-hash', 'utils-download']
53-
}
54-
//@formatter:on
21+
//@formatter:off
22+
dependencyResolutionManagement.versionCatalogs.register('libs') {
23+
version 'gradleutils', '3.3.18'
24+
25+
plugin 'licenser', 'net.minecraftforge.licenser' version '1.2.0' // https://plugins.gradle.org/plugin/net.minecraftforge.licenser
26+
plugin 'gradleutils', 'net.minecraftforge.gradleutils' versionRef 'gradleutils'
27+
plugin 'gitversion', 'net.minecraftforge.gitversion' version '3.1.1' // https://plugins.gradle.org/plugin/net.minecraftforge.changelog
28+
plugin 'changelog', 'net.minecraftforge.changelog' version '3.1.2' // https://plugins.gradle.org/plugin/net.minecraftforge.changelog
29+
plugin 'plugin-publish', 'com.gradle.plugin-publish' version '2.0.0' // https://plugins.gradle.org/plugin/com.gradle.plugin-publish
30+
plugin 'shadow', 'com.gradleup.shadow' version '9.2.2' // https://plugins.gradle.org/plugin/com.gradleup.shadow
31+
32+
// Static Analysis
33+
library 'nulls', 'org.jetbrains', 'annotations' version '26.0.2'
34+
35+
// Gradle API
36+
// Original: https://github.com/remal-gradle-api/packages/packages/760197?version=9.0.0
37+
// Mirror: https://repos.moddinglegacy.com/#/modding-legacy/name/remal/gradle-api/gradle-api/9.0.0
38+
version 'gradle', '9.1.0'
39+
library 'gradle', 'name.remal.gradle-api', 'gradle-api' versionRef 'gradle'
40+
41+
// GradleUtils Shared Base
42+
library 'gradleutils-shared', 'net.minecraftforge', 'gradleutils-shared' versionRef 'gradleutils'
43+
44+
// AccessTransformers Gradle Plugin
45+
// https://plugins.gradle.org/plugin/net.minecraftforge.accesstransformers
46+
library 'accesstransformers-gradle', 'net.minecraftforge.accesstransformers', 'net.minecraftforge.accesstransformers.gradle.plugin' version '5.0.0-beta.8'
47+
48+
library 'utils-data', 'net.minecraftforge', 'json-data-utils' version '0.3.0' // https://files.minecraftforge.net/net/minecraftforge/json-data-utils/index.html
49+
library 'utils-hash', 'net.minecraftforge', 'hash-utils' version '0.1.10' // https://files.minecraftforge.net/net/minecraftforge/hash-utils/index.html
50+
library 'utils-download', 'net.minecraftforge', 'download-utils' version '0.3.2' // https://files.minecraftforge.net/net/minecraftforge/download-utils/index.html
51+
bundle 'utils', ['utils-data', 'utils-hash', 'utils-download']
5552
}
53+
//@formatter:on

‎src/main/java/net/minecraftforge/gradle/ForgeGradleProblems.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ RuntimeException nullMappingsParam(String name) {
5656
}
5757

5858
void reportOverriddenMappings(MinecraftMappings original, MinecraftMappings replacement) {
59-
if (!this.test("net.minecraftforge.gradle.warnings.overriddenMappings")) return;
59+
if (!this.test("net.minecraftforge.gradle.warnings.minecraft.mappings.overridden")) return;
6060

6161
var comparison = "Old: (channel: %s, version: %s), New: (channel: %s, version: %s)"
6262
.formatted(original.channel(), original.version(), replacement.channel(), replacement.version());
@@ -76,7 +76,7 @@ void reportOverriddenMappings(MinecraftMappings original, MinecraftMappings repl
7676

7777
//region Dependencies
7878
void reportMissingMinecraftDependency() {
79-
if (!this.test("net.minecraftforge.gradle.warnings.missingMinecraftDependency")) return;
79+
if (!this.test("net.minecraftforge.gradle.warnings.minecraft.dependency.missing")) return;
8080

8181
LOGGER.error("ERROR: No Minecraft dependency declared! Disabling ForgeGradle. See Problems report for details.");
8282
this.report("missing-dependency", "Missing Minecraft dependency", spec -> spec
@@ -125,7 +125,7 @@ RuntimeException changingMinecraftDependency(Dependency dependency) {
125125

126126
//region Minecraft Maven
127127
void reportMcMavenNotDeclared() {
128-
if (!this.test("net.minecraftforge.gradle.warnings.missingRepository.mcmaven")) return;
128+
if (!this.test("net.minecraftforge.gradle.warnings.repository.missing.mavenizer")) return;
129129

130130
this.report("minecraft-maven-not-declared", "Minecraft Maven not declared", spec -> spec
131131
.details("""
@@ -138,7 +138,7 @@ void reportMcMavenNotDeclared() {
138138
}
139139

140140
void reportMcLibsMavenNotDeclared() {
141-
if (!this.test("net.minecraftforge.gradle.warnings.missingRepository.mclibs")) return;
141+
if (!this.test("net.minecraftforge.gradle.warnings.repository.missing.mojang")) return;
142142

143143
this.report("minecraft-libs-maven-not-declared", "Minecraft Libraries maven not declared", spec -> spec
144144
.details("""
@@ -152,7 +152,7 @@ void reportMcLibsMavenNotDeclared() {
152152
}
153153

154154
void reportForgeMavenNotDeclared() {
155-
if (!this.test("net.minecraftforge.gradle.warnings.missingRepository.forge")) return;
155+
if (!this.test("net.minecraftforge.gradle.warnings.repository.missing.forge")) return;
156156

157157
this.report("forge-maven-not-declared", "Forge maven not declared", spec -> spec
158158
.details("""

‎src/main/java/net/minecraftforge/gradle/MinecraftExtension.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public sealed interface MinecraftExtension extends MinecraftMappingsContainer pe
3939
*
4040
* @return The closure
4141
*/
42-
Action<MavenArtifactRepository> getMaven();
42+
Action<MavenArtifactRepository> getMavenizer();
4343

4444
/**
4545
* Adds the generated Minecraft maven to the given repository handler.
@@ -49,10 +49,10 @@ public sealed interface MinecraftExtension extends MinecraftMappingsContainer pe
4949
*
5050
* @param repositories The repository handler to add the maven to
5151
* @return The Minecraft maven
52-
* @see #getMaven()
52+
* @see #getMavenizer()
5353
*/
54-
default MavenArtifactRepository maven(RepositoryHandler repositories) {
55-
return repositories.maven(this.getMaven());
54+
default MavenArtifactRepository mavenizer(RepositoryHandler repositories) {
55+
return repositories.maven(this.getMavenizer());
5656
}
5757

5858
/**

‎src/main/java/net/minecraftforge/gradle/MinecraftExtensionImpl.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
import org.gradle.api.Action;
1919
import org.gradle.api.NamedDomainObjectContainer;
2020
import org.gradle.api.Project;
21-
import org.gradle.api.artifacts.Configuration;
2221
import org.gradle.api.artifacts.ExternalModuleDependency;
2322
import org.gradle.api.artifacts.ExternalModuleDependencyBundle;
2423
import org.gradle.api.artifacts.repositories.MavenArtifactRepository;
@@ -95,9 +94,9 @@ public TypeOf<?> getPublicType() {
9594
}
9695

9796
@Override
98-
public Action<MavenArtifactRepository> getMaven() {
97+
public Action<MavenArtifactRepository> getMavenizer() {
9998
return maven -> {
100-
maven.setName("MinecraftMaven");
99+
maven.setName("MinecraftMavenizer");
101100
maven.setUrl(this.mavenizerOutput.getAsFile());
102101
};
103102
}
@@ -229,7 +228,7 @@ private void finish(Project project) {
229228

230229
var sourceSetsDir = this.getObjects().directoryProperty().value(this.getProjectLayout().getBuildDirectory().dir("sourceSets"));
231230
project.getExtensions().getByType(JavaPluginExtension.class).getSourceSets().configureEach(sourceSet -> {
232-
if (this.problems.test("net.minecraftforge.gradle.mergeSourceSets")) {
231+
if (this.problems.test("net.minecraftforge.gradle.merge-source-sets")) {
233232
// This is documented in SourceSetOutput's javadoc comment
234233
var unifiedDir = sourceSetsDir.dir(sourceSet.getName());
235234
sourceSet.getOutput().setResourcesDir(unifiedDir);

0 commit comments

Comments
 (0)