From 722a72f999a9e0d370be035febc68675ef3b0b79 Mon Sep 17 00:00:00 2001 From: Jared Date: Thu, 16 Jun 2022 20:07:40 +0200 Subject: [PATCH 1/5] Add Jetbrains Annotations to test compile (#670) --- .../net/fabricmc/loom/configuration/CompileConfiguration.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java b/src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java index a08e8262..5cae549c 100644 --- a/src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java +++ b/src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java @@ -130,6 +130,7 @@ public final class CompileConfiguration { project.getDependencies().add(Constants.Configurations.LOOM_DEVELOPMENT_DEPENDENCIES, Constants.Dependencies.DEV_LAUNCH_INJECTOR + Constants.Dependencies.Versions.DEV_LAUNCH_INJECTOR); project.getDependencies().add(Constants.Configurations.LOOM_DEVELOPMENT_DEPENDENCIES, Constants.Dependencies.TERMINAL_CONSOLE_APPENDER + Constants.Dependencies.Versions.TERMINAL_CONSOLE_APPENDER); project.getDependencies().add(JavaPlugin.COMPILE_ONLY_CONFIGURATION_NAME, Constants.Dependencies.JETBRAINS_ANNOTATIONS + Constants.Dependencies.Versions.JETBRAINS_ANNOTATIONS); + project.getDependencies().add(JavaPlugin.TEST_COMPILE_ONLY_CONFIGURATION_NAME, Constants.Dependencies.JETBRAINS_ANNOTATIONS + Constants.Dependencies.Versions.JETBRAINS_ANNOTATIONS); } public static void configureCompile(Project p) { From d7001e9a3dca505f98339636179d2c393554fe55 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Sun, 19 Jun 2022 13:26:24 +0100 Subject: [PATCH 2/5] Don't use java toolchain for bootstrap project. Reverts an accidental change from fff4afe4051a905320cdef616c61b7094b66b369 --- bootstrap/build.gradle | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/bootstrap/build.gradle b/bootstrap/build.gradle index 4083cf1f..8a62397c 100644 --- a/bootstrap/build.gradle +++ b/bootstrap/build.gradle @@ -3,14 +3,12 @@ plugins { id 'groovy' } -java { - toolchain { - languageVersion = JavaLanguageVersion.of(8) - } -} +sourceCompatibility = 8 +targetCompatibility = 8 tasks.withType(JavaCompile).configureEach { it.options.encoding = "UTF-8" + it.options.release = 8 } repositories { From 9b2b857b38b4157b5ae468469c5d3bd6ef9fee35 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Tue, 21 Jun 2022 19:05:09 +0100 Subject: [PATCH 3/5] Update MC manifest url. --- src/main/java/net/fabricmc/loom/util/Constants.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/net/fabricmc/loom/util/Constants.java b/src/main/java/net/fabricmc/loom/util/Constants.java index b01c8c58..c8a30229 100644 --- a/src/main/java/net/fabricmc/loom/util/Constants.java +++ b/src/main/java/net/fabricmc/loom/util/Constants.java @@ -37,7 +37,7 @@ import net.fabricmc.loom.configuration.RemappedConfigurationEntry.PublishingMode public class Constants { public static final String LIBRARIES_BASE = "https://libraries.minecraft.net/"; public static final String RESOURCES_BASE = "https://resources.download.minecraft.net/"; - public static final String VERSION_MANIFESTS = "https://launchermeta.mojang.com/mc/game/version_manifest_v2.json"; + public static final String VERSION_MANIFESTS = "https://piston-meta.mojang.com/mc/game/version_manifest_v2.json"; public static final String EXPERIMENTAL_VERSIONS = "https://maven.fabricmc.net/net/minecraft/experimental_versions.json"; public static final String FABRIC_REPOSITORY = "https://maven.fabricmc.net/"; From 97927f913a04d8cc926632971939a7e905e9fc72 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Fri, 1 Jul 2022 18:13:56 +0100 Subject: [PATCH 4/5] Replace getRemapArchives & getSetupRemappedVariants with a gradle property. (#678) * Replace getRemapArchives & getSetupRemappedVariants with a gradle property as they are evaluated too early to be set. * Use true for all projects. * Cleanup, you can set properties for each subproject. * Fix docs. --- .../loom/api/LoomGradleExtensionAPI.java | 12 +++++------ .../configuration/CompileConfiguration.java | 2 -- .../loom/task/RemapTaskConfiguration.java | 21 ++++++++++++++++--- 3 files changed, 24 insertions(+), 11 deletions(-) diff --git a/src/main/java/net/fabricmc/loom/api/LoomGradleExtensionAPI.java b/src/main/java/net/fabricmc/loom/api/LoomGradleExtensionAPI.java index 68bb181d..841b2102 100644 --- a/src/main/java/net/fabricmc/loom/api/LoomGradleExtensionAPI.java +++ b/src/main/java/net/fabricmc/loom/api/LoomGradleExtensionAPI.java @@ -74,6 +74,10 @@ public interface LoomGradleExtensionAPI { Dependency layered(Action action); + /** + * @deprecated Broken due to be evaluated too early. Replaced with "fabric.loom.dontRemap" gradle property. + */ + @Deprecated(forRemoval = true) Property getRemapArchives(); void runs(Action> action); @@ -105,13 +109,9 @@ public interface LoomGradleExtensionAPI { Property getCustomMinecraftManifest(); /** - * If true, Loom will replace the {@code -dev} jars in the {@code *Elements} configurations - * with remapped outgoing variants. - * - *

Will only apply if {@link #getRemapArchives()} is also true. - * - * @return the property controlling the setup of remapped variants + * @deprecated Broken due to be evaluated too early. Replaced with "fabric.loom.disableRemappedVariants" gradle property. */ + @Deprecated(forRemoval = true) Property getSetupRemappedVariants(); /** diff --git a/src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java b/src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java index 5cae549c..830e8bc3 100644 --- a/src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java +++ b/src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java @@ -155,8 +155,6 @@ public final class CompileConfiguration { extension.setDependencyManager(dependencyManager); dependencyManager.handleDependencies(project); - extension.getRemapArchives().finalizeValue(); - MixinExtension mixin = LoomGradleExtension.get(project).getMixin(); if (mixin.getUseLegacyMixinAp().get()) { diff --git a/src/main/java/net/fabricmc/loom/task/RemapTaskConfiguration.java b/src/main/java/net/fabricmc/loom/task/RemapTaskConfiguration.java index 4d54eefb..14b5725e 100644 --- a/src/main/java/net/fabricmc/loom/task/RemapTaskConfiguration.java +++ b/src/main/java/net/fabricmc/loom/task/RemapTaskConfiguration.java @@ -49,7 +49,7 @@ public class RemapTaskConfiguration { final TaskContainer tasks = project.getTasks(); final LoomGradleExtension extension = LoomGradleExtension.get(project); - if (!extension.getRemapArchives().get()) { + if (getBooleanProperty(project, "fabric.loom.dontRemap")) { extension.getUnmappedModCollection().from(project.getTasks().getByName(JavaPlugin.JAR_TASK_NAME)); return; } @@ -81,7 +81,7 @@ public class RemapTaskConfiguration { trySetupSourceRemapping(project); - if (!extension.getSetupRemappedVariants().get()) { + if (getBooleanProperty(project, "fabric.loom.disableRemappedVariants")) { return; } @@ -132,7 +132,7 @@ public class RemapTaskConfiguration { tasks.named(BasePlugin.ASSEMBLE_TASK_NAME).configure(task -> task.dependsOn(remapSourcesTask)); - if (!extension.getSetupRemappedVariants().get()) { + if (getBooleanProperty(project, "fabric.loom.disableRemappedVariants")) { return; } @@ -155,4 +155,19 @@ public class RemapTaskConfiguration { } }); } + + private static boolean getBooleanProperty(Project project, String key) { + boolean result = false; + Object value = project.getProperties().get(key); + + if (value instanceof String) { + try { + result = Boolean.parseBoolean((String) value); + } catch (IllegalArgumentException ignored) { + // False + } + } + + return result; + } } From b25e5cd5a6ac87ecdb5b3632271a752256fb2629 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Sat, 2 Jul 2022 23:38:49 +0100 Subject: [PATCH 5/5] Only realise the gradle property being queried. Co-authored-by: Jason Penilla <11360596+jpenilla@users.noreply.github.com> --- .../loom/task/RemapTaskConfiguration.java | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/src/main/java/net/fabricmc/loom/task/RemapTaskConfiguration.java b/src/main/java/net/fabricmc/loom/task/RemapTaskConfiguration.java index 14b5725e..a0f2ef56 100644 --- a/src/main/java/net/fabricmc/loom/task/RemapTaskConfiguration.java +++ b/src/main/java/net/fabricmc/loom/task/RemapTaskConfiguration.java @@ -157,17 +157,13 @@ public class RemapTaskConfiguration { } private static boolean getBooleanProperty(Project project, String key) { - boolean result = false; - Object value = project.getProperties().get(key); - - if (value instanceof String) { + return project.getProviders().gradleProperty(key).map(string -> { try { - result = Boolean.parseBoolean((String) value); - } catch (IllegalArgumentException ignored) { - // False + return Boolean.parseBoolean(string); + } catch (final IllegalArgumentException ex) { + return false; } - } - - return result; + }) + .getOrElse(false); } }