Skip to content

Commit

Permalink
Remove JAR Merging
Browse files Browse the repository at this point in the history
  • Loading branch information
UnlikePaladin committed Dec 10, 2023
1 parent b42a15f commit 1d912f2
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 26 deletions.
9 changes: 0 additions & 9 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,6 @@ jobs:
- name: Build using Gradle
run: ./gradlew build

- name: Merge Fabric and Forge JARs
run: ./gradlew mergeJars

- name: Upload Fabric artifacts to GitHub
uses: actions/upload-artifact@v3
with:
Expand All @@ -40,9 +37,3 @@ jobs:
with:
name: Forge-Artifacts
path: forge/build/libs/

- name: Upload Merged JAR to GitHub
uses: actions/upload-artifact@v3
with:
name: Merged-JAR
path: Merged/
18 changes: 1 addition & 17 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ plugins {
id "architectury-plugin" version "3.4-SNAPSHOT"
id "dev.architectury.loom" version "1.2-SNAPSHOT" apply false
id "io.github.juuxel.loom-vineflower" version "1.+" apply false
id "io.github.pacifistmc.forgix" version "1.2.6"
}

architectury {
Expand Down Expand Up @@ -67,19 +66,4 @@ allprojects {
targetCompatibility = JavaVersion.VERSION_17
withSourcesJar()
}
}

forgix {

group = rootProject.maven_group
mergedJarName = rootProject.archives_base_name + "-" + rootProject.mod_version + "+" + rootProject.minecraft_version + ".jar"
forge {
projectName = "forge"
jarLocation = ("build/libs/" + rootProject.archives_base_name + "-" + rootProject.mod_version + "+" + rootProject.minecraft_version + "-forge-mc.jar")
}

fabric {
projectName = "fabric" // This is the name of the fabric project. If this property is not defined then by default it'll set to "fabric" since that's the name the Architectury Template uses.
jarLocation = ("build/libs/" + rootProject.archives_base_name + "-" + rootProject.mod_version + "+" + rootProject.minecraft_version + "-fabric-mc.jar")
}
}
}

0 comments on commit 1d912f2

Please sign in to comment.