From 12ac6cfcfe94fc3dd7029b18207b61c27effdea4 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Wed, 14 Apr 2021 20:45:17 +0100 Subject: [PATCH 1/9] Update mixin-compile-extensions --- 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 beff10df..8189e914 100644 --- a/src/main/java/net/fabricmc/loom/util/Constants.java +++ b/src/main/java/net/fabricmc/loom/util/Constants.java @@ -102,7 +102,7 @@ public class Constants { * Constants for versions of dependencies. */ public static final class Versions { - public static final String MIXIN_COMPILE_EXTENSIONS = "0.4.0"; + public static final String MIXIN_COMPILE_EXTENSIONS = "0.4.1"; public static final String DEV_LAUNCH_INJECTOR = "0.2.1+build.8"; public static final String TERMINAL_CONSOLE_APPENDER = "1.2.0"; public static final String JETBRAINS_ANNOTATIONS = "19.0.0"; From 1d009e155ea6cea6b89fb6a0eed9bc0c31309630 Mon Sep 17 00:00:00 2001 From: ByMartrixX <47987888+ByMartrixx@users.noreply.github.com> Date: Wed, 21 Apr 2021 03:51:56 -0400 Subject: [PATCH 2/9] Add loom development dependencies to test runtime classpath (#389) --- .../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 6552089b..45d114e1 100644 --- a/src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java +++ b/src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java @@ -97,6 +97,7 @@ public final class CompileConfiguration { extendsFrom(JavaPlugin.IMPLEMENTATION_CONFIGURATION_NAME, Constants.Configurations.MAPPINGS_FINAL, project); extendsFrom(JavaPlugin.RUNTIME_CLASSPATH_CONFIGURATION_NAME, Constants.Configurations.LOOM_DEVELOPMENT_DEPENDENCIES, project); + extendsFrom(JavaPlugin.TEST_RUNTIME_CLASSPATH_CONFIGURATION_NAME, Constants.Configurations.LOOM_DEVELOPMENT_DEPENDENCIES, project); } public static void configureCompile(Project p) { From b85659640d74b534af9c391fffaf6cd62c501292 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Tue, 27 Apr 2021 13:12:01 +0100 Subject: [PATCH 3/9] Update MCE --- 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 8189e914..7ca96591 100644 --- a/src/main/java/net/fabricmc/loom/util/Constants.java +++ b/src/main/java/net/fabricmc/loom/util/Constants.java @@ -102,7 +102,7 @@ public class Constants { * Constants for versions of dependencies. */ public static final class Versions { - public static final String MIXIN_COMPILE_EXTENSIONS = "0.4.1"; + public static final String MIXIN_COMPILE_EXTENSIONS = "0.4.2"; public static final String DEV_LAUNCH_INJECTOR = "0.2.1+build.8"; public static final String TERMINAL_CONSOLE_APPENDER = "1.2.0"; public static final String JETBRAINS_ANNOTATIONS = "19.0.0"; From 7de021e7c1d12f6eeaef29e62509bd98b7fc3a5b Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Tue, 27 Apr 2021 18:04:47 +0100 Subject: [PATCH 4/9] Revert "Update MCE" This reverts commit b85659640d74b534af9c391fffaf6cd62c501292. --- 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 7ca96591..8189e914 100644 --- a/src/main/java/net/fabricmc/loom/util/Constants.java +++ b/src/main/java/net/fabricmc/loom/util/Constants.java @@ -102,7 +102,7 @@ public class Constants { * Constants for versions of dependencies. */ public static final class Versions { - public static final String MIXIN_COMPILE_EXTENSIONS = "0.4.2"; + public static final String MIXIN_COMPILE_EXTENSIONS = "0.4.1"; public static final String DEV_LAUNCH_INJECTOR = "0.2.1+build.8"; public static final String TERMINAL_CONSOLE_APPENDER = "1.2.0"; public static final String JETBRAINS_ANNOTATIONS = "19.0.0"; From 974cd1fa6c90a20a3449c6d9b99b8100e25d8304 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Wed, 28 Apr 2021 22:50:53 +0100 Subject: [PATCH 5/9] Update MCE to 0.4.3 --- 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 8189e914..2c0ac66d 100644 --- a/src/main/java/net/fabricmc/loom/util/Constants.java +++ b/src/main/java/net/fabricmc/loom/util/Constants.java @@ -102,7 +102,7 @@ public class Constants { * Constants for versions of dependencies. */ public static final class Versions { - public static final String MIXIN_COMPILE_EXTENSIONS = "0.4.1"; + public static final String MIXIN_COMPILE_EXTENSIONS = "0.4.3"; public static final String DEV_LAUNCH_INJECTOR = "0.2.1+build.8"; public static final String TERMINAL_CONSOLE_APPENDER = "1.2.0"; public static final String JETBRAINS_ANNOTATIONS = "19.0.0"; From d276b4f19b4d72c42a095ec0dd8149dafe830222 Mon Sep 17 00:00:00 2001 From: Username404-59 <53659497+Username404-59@users.noreply.github.com> Date: Thu, 29 Apr 2021 14:10:09 +0200 Subject: [PATCH 6/9] Fix displayed forge version when using prefix-ranges in dev environments and fix the forge repo url too (#16) * Fix displayed forge version when using prefix-ranges in dev environments * Fix the forge repo url --- build.gradle | 2 +- .../loom/configuration/providers/forge/ForgeProvider.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index bec31cf9..39c4769a 100644 --- a/build.gradle +++ b/build.gradle @@ -47,7 +47,7 @@ sourceSets { repositories { maven { url "https://maven.fabricmc.net/" } - maven { url "https://files.minecraftforge.net/maven/" } + maven { url "https://maven.minecraftforge.net/" } maven { url "https://maven.shedaniel.me/" } mavenCentral() } diff --git a/src/main/java/net/fabricmc/loom/configuration/providers/forge/ForgeProvider.java b/src/main/java/net/fabricmc/loom/configuration/providers/forge/ForgeProvider.java index d1e0d462..80c09be9 100644 --- a/src/main/java/net/fabricmc/loom/configuration/providers/forge/ForgeProvider.java +++ b/src/main/java/net/fabricmc/loom/configuration/providers/forge/ForgeProvider.java @@ -40,7 +40,7 @@ public class ForgeProvider extends DependencyProvider { @Override public void provide(DependencyInfo dependency, Consumer postPopulationScheduler) throws Exception { - version = new ForgeVersion(dependency.getDependency().getVersion()); + version = new ForgeVersion(dependency.getResolvedVersion()); addDependency(dependency.getDepString() + ":userdev", Constants.Configurations.FORGE_USERDEV); addDependency(dependency.getDepString() + ":installer", Constants.Configurations.FORGE_INSTALLER); } From e05c885508c8eea67bb0ece6a80d04c2b83a3448 Mon Sep 17 00:00:00 2001 From: shedaniel Date: Thu, 29 Apr 2021 20:12:18 +0800 Subject: [PATCH 7/9] Change MavenConfiguration's forge maven --- .../net/fabricmc/loom/configuration/MavenConfiguration.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/net/fabricmc/loom/configuration/MavenConfiguration.java b/src/main/java/net/fabricmc/loom/configuration/MavenConfiguration.java index 118fd546..dc10e375 100644 --- a/src/main/java/net/fabricmc/loom/configuration/MavenConfiguration.java +++ b/src/main/java/net/fabricmc/loom/configuration/MavenConfiguration.java @@ -55,7 +55,7 @@ public class MavenConfiguration { project.getRepositories().maven(repo -> { repo.setName("Forge"); - repo.setUrl("https://files.minecraftforge.net/maven/"); + repo.setUrl("https://maven.minecraftforge.net/"); repo.metadataSources(sources -> { sources.mavenPom(); From cc13624989b0b4d857753e3f43cadfca155ebaa6 Mon Sep 17 00:00:00 2001 From: Username404-59 <53659497+Username404-59@users.noreply.github.com> Date: Thu, 29 Apr 2021 18:38:27 +0200 Subject: [PATCH 8/9] Workaround for FileSystemAlreadyExists errors (#17) --- src/main/java/net/fabricmc/loom/build/JarRemapper.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/net/fabricmc/loom/build/JarRemapper.java b/src/main/java/net/fabricmc/loom/build/JarRemapper.java index 063bb669..6c7f0179 100644 --- a/src/main/java/net/fabricmc/loom/build/JarRemapper.java +++ b/src/main/java/net/fabricmc/loom/build/JarRemapper.java @@ -25,6 +25,7 @@ package net.fabricmc.loom.build; import java.io.IOException; +import java.nio.file.Files; import java.nio.file.Path; import java.util.ArrayList; import java.util.Arrays; @@ -106,6 +107,7 @@ public class JarRemapper { project.getLogger().info(":remapper output -> " + data.output.getFileName().toString()); try { + Files.deleteIfExists(data.output); outputConsumer = new OutputConsumerPath.Builder(data.output).build(); } catch (Exception e) { throw new RuntimeException("Failed to create remapper output " + data.output.getFileName().toString(), e); From 73dbebbf95e8454e150519219d02ab5d32bed6ad Mon Sep 17 00:00:00 2001 From: shedaniel Date: Fri, 30 Apr 2021 10:06:42 +0800 Subject: [PATCH 9/9] Add --stacktrace --- .github/workflows/publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 91b11f36..305052e4 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -18,6 +18,6 @@ jobs: with: java-version: 1.8 - name: Upload to Maven - run: ./gradlew publish + run: ./gradlew publish --stacktrace env: MAVEN_PASS: ${{ secrets.MAVEN_PASS }} \ No newline at end of file