Skip to content

Commit 473e6f8

Browse files
committed
Disable config cache as it doesn't work with publishing
1 parent 40f71cb commit 473e6f8

File tree

5 files changed

+29
-14
lines changed

5 files changed

+29
-14
lines changed

fg-plugin/src/main/groovy/net/minecraftforge/gradle/ActionableLazy.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
/*
2+
* Copyright (c) Forge Development LLC and contributors
3+
* SPDX-License-Identifier: LGPL-2.1-only
4+
*/
15
package net.minecraftforge.gradle;
26

37
import groovy.lang.Closure;

fg-plugin/src/main/groovy/net/minecraftforge/gradle/Closures.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
/*
2+
* Copyright (c) Forge Development LLC and contributors
3+
* SPDX-License-Identifier: LGPL-2.1-only
4+
*/
15
package net.minecraftforge.gradle;
26

37
import groovy.lang.Closure;

fg-plugin/src/main/groovy/net/minecraftforge/gradle/Constants.java

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,23 +9,23 @@
99
/// Looking for attributes? They are in [MinecraftExtension.Attributes].
1010
final class Constants {
1111
// Caches -- BE CAREFUL when changing this
12-
public static final String CACHES_LOCATION = /* gradleUserHomeDir + */ "caches/forge_gradle_7";
12+
static final String CACHES_LOCATION = /* gradleUserHomeDir + */ "caches/forge_gradle_7";
1313

14-
public static final String FORGE_MAVEN = "https://maven.minecraftforge.net/";
14+
static final String FORGE_MAVEN = "https://maven.minecraftforge.net/";
1515

16-
public static final String MCMAVEN_VERSION = "0.3.0";
17-
public static final String MCMAVEN_DL_URL = "https://maven.minecraftforge.net/net/minecraftforge/minecraft-mavenizer/" + MCMAVEN_VERSION + "/minecraft-mavenizer-" + MCMAVEN_VERSION + ".jar";
18-
public static final String MCMAVEN_MAIN = "net.minecraftforge.mcmaven.cli.Main";
19-
public static final int MCMAVEN_JAVA_VERSION = 21;
16+
static final String MCMAVEN_VERSION = "0.3.0";
17+
static final String MCMAVEN_DL_URL = "https://maven.minecraftforge.net/net/minecraftforge/minecraft-mavenizer/" + MCMAVEN_VERSION + "/minecraft-mavenizer-" + MCMAVEN_VERSION + ".jar";
18+
static final String MCMAVEN_MAIN = "net.minecraftforge.mcmaven.cli.Main";
19+
static final int MCMAVEN_JAVA_VERSION = 21;
2020

21-
public static final String SL_VERSION = "0.1.0";
22-
public static final String SL_DL_URL = "https://maven.minecraftforge.net/net/minecraftforge/slime-launcher/" + SL_VERSION + "/slime-launcher-" + SL_VERSION + ".jar";
23-
public static final String SLIMELAUNCHER_MAIN = "net.minecraftforge.launcher.Main";
24-
public static final int SLIMELAUNCHER_JAVA_VERSION = 8;
21+
static final String SL_VERSION = "0.1.0";
22+
static final String SL_DL_URL = "https://maven.minecraftforge.net/net/minecraftforge/slime-launcher/" + SL_VERSION + "/slime-launcher-" + SL_VERSION + ".jar";
23+
static final String SLIMELAUNCHER_MAIN = "net.minecraftforge.launcher.Main";
24+
static final int SLIMELAUNCHER_JAVA_VERSION = 8;
2525

2626
/// Use these with [java.text.MessageFormat#format(String, Object...)].
27-
public static final class Messages {
28-
public static final String WELCOME = """
27+
static final class Messages {
28+
static final String WELCOME = """
2929
Welcome to ForgeGradle 7.0!
3030
3131
Here are some release highlights:

fg-plugin/src/main/groovy/net/minecraftforge/gradle/DefaultTools.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
/*
2+
* Copyright (c) Forge Development LLC and contributors
3+
* SPDX-License-Identifier: LGPL-2.1-only
4+
*/
15
package net.minecraftforge.gradle;
26

37
import net.minecraftforge.util.download.DownloadUtils;

gradle.properties

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,10 @@ org.gradle.caching=true
22
org.gradle.parallel=true
33
org.gradle.configureondemand=true
44

5-
org.gradle.configuration-cache=true
6-
org.gradle.configuration-cache.parallel=true
5+
# TODO [GradleUtils][Gradle9] Re-enable config cache in Gradle 9
6+
# Configuration Cache causes issues with plugin publishing.
7+
# Do continue to make our Gradle plugins (GU, FG7, etc.) support it though.
8+
#org.gradle.configuration-cache=true
9+
#org.gradle.configuration-cache.parallel=true
710

811
systemProp.org.gradle.unsafe.suppress-gradle-api=true

0 commit comments

Comments
 (0)