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 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/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); diff --git a/src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java b/src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java index ad591f76..a3e7e448 100644 --- a/src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java +++ b/src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java @@ -137,6 +137,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) { 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(); 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); } diff --git a/src/main/java/net/fabricmc/loom/util/Constants.java b/src/main/java/net/fabricmc/loom/util/Constants.java index b9059217..cc33b6fe 100644 --- a/src/main/java/net/fabricmc/loom/util/Constants.java +++ b/src/main/java/net/fabricmc/loom/util/Constants.java @@ -111,7 +111,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.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";