Skip to content

Commit edd3f88

Browse files
committed
Remove forgix merging jars for the infrastructury-api
1 parent 4e56d31 commit edd3f88

File tree

2 files changed

+15
-29
lines changed

2 files changed

+15
-29
lines changed

build.gradle

Lines changed: 14 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -277,32 +277,20 @@ allprojects {
277277
}
278278
}
279279

280-
forgix {
281-
group = "com.mrmelon54.infrastructury"
282-
mergedJarName = rootProject.forgix_merged_jar
283-
284-
if (findProject(":fabric"))
285-
fabric {
286-
jarLocation = "build/libs/${project.archives_base_name}-fabric-${rootProject.versionStr}.jar"
287-
}
288-
289-
if (findProject(":quilt"))
290-
quilt {
291-
jarLocation = "build/libs/${project.archives_base_name}-quilt-${rootProject.versionStr}.jar"
292-
}
293-
294-
if (findProject(":forge"))
295-
forge {
296-
jarLocation = "build/libs/${project.archives_base_name}-forge-${rootProject.versionStr}.jar"
297-
}
298-
299-
if (findProject(":neoforge"))
300-
custom {
301-
projectName = "neoforge"
302-
jarLocation = "build/libs/${project.archives_base_name}-neoforge-${rootProject.versionStr}.jar"
303-
}
304-
305-
//removeDuplicate "com.mrmelon54.infrastructury"
280+
tasks.register('moveJars', Sync) {
281+
var outDir = layout.buildDirectory.dir("../buildAllJars")
282+
into outDir
283+
284+
println "Outputting collected jars to ${outDir.get()}"
285+
mkdir(outDir)
286+
287+
subprojects
288+
.findAll { lib -> lib.name != "common" && lib.name != "mappings" }
289+
.each { lib ->
290+
var libJar = lib.layout.buildDirectory.file("libs/${rootProject.archives_base_name}-${lib.name}-${rootProject.versionStr}.jar")
291+
from(libJar)
292+
println "Copying from " + libJar.get()
293+
}
306294
}
307295

308296
def getVersionMetadata() {

buildsingle.sh

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,4 @@ sh gradlew clean -PmcVer="$version" --no-daemon
1111
echo "====================Building $version ===================="
1212
sh gradlew build -PmcVer="$version" --no-daemon
1313
echo "==================== Merging $version ===================="
14-
sh gradlew mergeJars -PmcVer="$version" --no-daemon
15-
echo "==================== Moving jar ===================="
16-
mv Merged/*.jar buildAllJars/
14+
sh gradlew moveJars -PmcVer="$version" --no-daemon

0 commit comments

Comments
 (0)