Skip to content

Commit ff38732

Browse files
committed
1 parent 7fabadd commit ff38732

File tree

6 files changed

+35
-22
lines changed

6 files changed

+35
-22
lines changed

.github/workflows/publish_fg7.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
uses: MinecraftForge/SharedActions/.github/workflows/gradle.yml@v0
1919
with:
2020
java: 21
21-
gradle_tasks: 'check publish'
21+
gradle_tasks: 'check publish publishPlugins'
2222
artifact_name: 'forgegradle'
2323
secrets:
2424
DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
@@ -27,4 +27,5 @@ jobs:
2727
PROMOTE_ARTIFACT_PASSWORD: ${{ secrets.PROMOTE_ARTIFACT_PASSWORD }}
2828
MAVEN_USER: ${{ secrets.MAVEN_USER }}
2929
MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
30-
GRADLE_CACHE_KEY: ${{ secrets.GRADLE_CACHE_KEY }}
30+
GRADLE_PUBLISH_KEY: ${{ secrets.GRADLE_PUBLISH_KEY }}
31+
GRADLE_PUBLISH_SECRET: ${{ secrets.GRADLE_PUBLISH_SECRET }}

src/main/java/net/minecraftforge/gradle/internal/Constants.java

Lines changed: 26 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -26,42 +26,57 @@ final class Constants {
2626
/// Use these with [java.text.MessageFormat#format(String, Object...)].
2727
static final class Messages {
2828
static final String WELCOME = """
29-
Welcome to ForgeGradle 7.0 Release Candidate!
29+
Welcome to ForgeGradle 7.0!
3030
3131
Here are some release highlights:
32+
- Now requires Gradle 9.3.0.
33+
- A new message board that will display any new messages (only on the next
34+
successful build) from ForgeGradle, including release highlights and
35+
project-wide warnings.
3236
- Complete rewrite of the plugin and underlying code.
3337
- Complete overhaul of DSL objects and registrations.
3438
- Slimmed down the plugin, which now delegates many actions to separate tools.
35-
- Support for declaring defaults in settings.gradle.
36-
- Support for all Forge versions from Minecraft 1.20.6 (older versions are a
37-
work-in-progress).
39+
- Support for declaring defaults in settings.gradle (experimental).
40+
- Support for all Forge versions that are supported by ForgeGradle 6.
41+
- Minecraft 1.20.6+ are natively supported with no additional setup.
42+
- Minecraft 1.13.2 - 1.20.4 (along with certain versions of 1.12.2) are
43+
supported alongside the usage of the Renamer plugin (experimental).
3844
3945
A couple of important things to note:
4046
- Many plugins that worked with ForgeGradle 6, such as Parchment's Librarian,
4147
do not work with ForgeGradle 7. For most cases (such as parchment), we have
42-
implemented native support. If ForgeGradle 7 is lacking in some aspect,
43-
please let us know!
48+
implemented native support.
4449
- Many things that ForgeGradle 6 and older used to do are now decentralized
4550
away from the plugin. This means that your project will need to apply
4651
'net.minecraftforge.jarjar' if you wish to use Forge's Jar-in-Jar system.
4752
If you are on an older version (1.20.4 and older), you will need the
4853
'net.minecraftforge.renamer' plugin. Many of these come with our provided
4954
MDK, so this should not be an issue for you.
5055
- If you come across any lingering bugs, please report them to our GitHub
51-
issue tracker (https://github.com/MinecraftForge/ForgeGradle/issues).
52-
Please do not use Discord as a means to report issues, as they will get
53-
lost in the discussion very easily.
56+
issue tracker. Please do not use Discord as a means to report issues, as
57+
they will get lost in the discussion very easily.
58+
- If you would like to see additional examples of ForgeGradle 7 usages,
59+
please see our MDKExamples repo (https://github.com/MinecraftForge/MDKExamples).
60+
If would like to request a specific usage for ForgeGradle 7, please file an
61+
issue on the GitHub issue tracker for it.
5462
55-
For more details on this release, see https://docs.minecraftforge.net/en/fg-7.0/""";
63+
For our GitHub issue tracker, see https://github.com/MinecraftForge/ForgeGradle/issues
64+
65+
Proper documentation for ForgeGradle 7 is coming soon. For now, feel free to
66+
ask any questions you may have on the following platforms:
67+
- Forums (https://forums.minecraftforge.net/)
68+
- Discord (https://discord.minecraftforge.net/)""";
5669

5770
static final String WELCOME_CONDITION = """
58-
This message will not display again until ForgeGradle 7.0 or the below file is
71+
This message will not display again until ForgeGradle 7.1 or the below file is
5972
deleted:
6073
{}
6174
6275
Documentation will be coming at a later date. Thank you for testing
6376
ForgeGradle 7!""";
6477

78+
// TODO [ForgeGradle][Magic] Rewrite this to be more informative as to what is actually happening.
79+
// As of right now, this remains unused.
6580
static final String MAGIC = """
6681
This build is using ForgeGradle Magic. ForgeGradle Magic employs automatic
6782
behavior that is hidden from buildscript authors in order to implement and

src/main/java/net/minecraftforge/gradle/internal/ForgeGradleMessage.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,12 @@
1212

1313
import java.util.Locale;
1414

15+
// TODO [ForgeGradle] Queue Magic message
16+
// While FG7 has some magic, none of it is substantial enough for it to warrant it yet
17+
// It also needs to be rewritten in a way that makes it much more informative
1518
enum ForgeGradleMessage {
16-
WELCOME("7_0_RC_WELCOME_1", Constants.Messages.WELCOME, Constants.Messages.WELCOME_CONDITION),
17-
MAGIC("7_0_RC_MAGIC_1", Constants.Messages.MAGIC);
19+
WELCOME("7_0_WELCOME_1", Constants.Messages.WELCOME, Constants.Messages.WELCOME_CONDITION),
20+
MAGIC("7_0_MAGIC_1", Constants.Messages.MAGIC);
1821

1922
private static final String MESSAGES_DIR = "messages";
2023

src/main/java/net/minecraftforge/gradle/internal/ForgeGradlePlugin.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,6 @@ abstract class ForgeGradlePlugin extends EnhancedPlugin<ExtensionAware> {
2525

2626
private final ForgeGradleProblems problems = this.getObjects().newInstance(ForgeGradleProblems.class);
2727

28-
static {
29-
LOGGER.lifecycle("ForgeGradle 7 is an incubating plugin.");
30-
}
31-
3228
protected abstract @Inject FlowScope getFlowScope();
3329

3430
protected abstract @Inject FlowProviders getFlowProviders();

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ public ForProjectImpl(ForgeGradlePlugin plugin) {
214214
}
215215

216216
plugin.queueMessage(ForgeGradleMessage.WELCOME);
217-
plugin.queueMessage(ForgeGradleMessage.MAGIC);
217+
//plugin.queueMessage(ForgeGradleMessage.MAGIC);
218218

219219
getFlowScope().always(ForgeGradleFlowAction.AccessTransformersMissing.class, spec -> spec.parameters(parameters -> {
220220
parameters.getFailure().set(getFlowProviders().getBuildWorkResult().map(p -> p.getFailure().orElse(null)));

src/main/java/net/minecraftforge/gradle/package-info.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@
66
///
77
/// This package houses the entirety of ForgeGradle, a simple plugin designed to bootstrap the process of using
88
/// Minecraft as a dependency for your Gradle project.
9-
@Incubating
109
@NullMarked
1110
package net.minecraftforge.gradle;
1211

13-
import org.gradle.api.Incubating;
1412
import org.jspecify.annotations.NullMarked;

0 commit comments

Comments
 (0)