upstream/MinecraftForge
1
0 Fork 0
mirror of https://github.com/MinecraftForge/MinecraftForge.git synced 2026-11-13 16:54:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bump SecureJarHandler to fix package meta issue. Closes #7881

Browse Source 
Fix version.json having duplicate libraries.
This commit is contained in:
LexManos committed 2021-07-22 14:52:17 -07:00
1 parent be5446b91c
commit b027a92dd2
2 files changed
+9 -6
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

build.gradle
+1 -1
View File
@@ -51,7 +51,7 @@ ext {
COREMODS_VERSION = '5.0.1'
EVENTBUS_VERSION = '5.0.3'
MODLAUNCHER_VERSION = '9.0.7'
SECUREJARHANDLER_VERSION = '0.9.44'
SECUREJARHANDLER_VERSION = '0.9.45'
BOOTSTRAPLAUNCHER_VERSION = '0.1.15'
ASM_VERSION = '9.1'
INSTALLER_VERSION = '2.1.4'
buildSrc/src/main/groovy/net/minecraftforge/forge/tasks/LauncherJson.groovy
+8 -5
View File
@@ -48,14 +48,16 @@ abstract class LauncherJson extends DefaultTask {
protected void exec() {
if (!json.libraries)
json.libraries = []
getArtifacts(project, project.configurations.installer, false).each { key, lib -> json.libraries.add(lib) }
getArtifacts(project, project.configurations.moduleonly, false).each { key, lib -> json.libraries.add(lib) }
def libs = [:]
getArtifacts(project, project.configurations.installer, false).each { key, lib -> libs[key] = lib }
getArtifacts(project, project.configurations.moduleonly, false).each { key, lib -> libs[key] = lib }
packedDependencies.get().collect{ project.rootProject.tasks.findByPath(it) }.forEach {
def path = Util.getMavenPath(it)
def key = Util.getMavenDep(it)
json.libraries.add([
name: Util.getMavenDep(it),
libs[key] = [
name: key,
downloads: [
artifact: [
path: path,
@@ -64,8 +66,9 @@ abstract class LauncherJson extends DefaultTask {
size: it.archiveFile.get().asFile.length()
]
]
])
]
}
libs.each { key, lib -> json.libraries.add(lib) }
Files.writeString(output.get().asFile.toPath(), new JsonBuilder(json).toPrettyString())
}
}