imports/architectury-loom
1
0
Fork 0
mirror of https://github.com/architectury/architectury-loom.git synced 2026-04-03 05:57:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

Gradle 9.1 deprecation fixes + update test and build libs (#1338)

Browse Source 
* Update test and build libs

* Gradle deprecation fixes

* RC4
This commit is contained in:
modmuss
2025-07-29 13:03:17 +01:00
committed by GitHub
parent cc24a13679
commit 97bca29290
10 changed files with 64 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/main/java/net/fabricmc/loom/task/GenVsCodeProjectTask.java
View File

@@ -166,18 +166,18 @@ public abstract class GenVsCodeProjectTask extends AbstractLoomTask {
Path projectPath = project.getProjectDir().toPath();
String relativeRunDir = rootPath.relativize(projectPath).resolve(runConfig.runDir).toString();
return new VsCodeConfiguration(
"java",
runConfig.configName,
"launch",
"${workspaceFolder}/" + relativeRunDir,
"integratedTerminal",
false,
runConfig.mainClass,
RunConfig.joinArguments(runConfig.vmArgs),
RunConfig.joinArguments(runConfig.programArgs),
new HashMap<>(runConfig.environmentVariables),
runConfig.projectName,
rootPath.resolve(relativeRunDir).toAbsolutePath().toString()
"java",
runConfig.configName,
"launch",
"${workspaceFolder}/" + relativeRunDir,
"integratedTerminal",
false,
runConfig.mainClass,
RunConfig.joinArguments(runConfig.vmArgs),
RunConfig.joinArguments(runConfig.programArgs),
new HashMap<>(runConfig.environmentVariables),
runConfig.projectName,
rootPath.resolve(relativeRunDir).toAbsolutePath().toString()
);
}
}

4
src/main/java/net/fabricmc/loom/task/service/MigrateMappingsService.java
View File

@@ -29,7 +29,6 @@ import java.io.IOException;
import java.io.UncheckedIOException;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.Map;
import org.cadixdev.lorenz.MappingSet;
import org.cadixdev.mercury.Mercury;
@@ -174,7 +173,8 @@ public class MigrateMappingsService extends Service<MigrateMappingsService.Optio
}
} catch (IllegalDependencyNotation ignored) {
LOGGER.info("Could not locate mappings, presuming V2 Yarn");
return project.getConfigurations().detachedConfiguration(project.getDependencies().create(Map.of("group", "net.fabricmc", "name", "yarn", "version", mappings, "classifier", "v2")));
String mavenNotation = "net.fabricmc:yarn:%s:v2".formatted(mappings);
return project.getConfigurations().detachedConfiguration(project.getDependencies().create(mavenNotation));
} catch (IOException e) {
throw new UncheckedIOException("Failed to resolve mappings", e);
}