Force build output directories, update actions

Author: robotgryphon

.github/workflows/tagged-release.yml

@@ -138,8 +138,8 @@ jobs:
         with:
           name: libs
           path: |
-            buildfiles/${{ needs.vars.outputs.mod_id }}-${{ needs.vars.outputs.mod_version }}.jar
-            buildfiles/${{ needs.vars.outputs.mod_id }}-${{ needs.vars.outputs.mod_version }}-api.jar
+            build-out/${{ needs.vars.outputs.mod_id }}-${{ needs.vars.outputs.mod_version }}.jar
+            build-out/${{ needs.vars.outputs.mod_id }}-${{ needs.vars.outputs.mod_version }}-api.jar
 
   view:
     name: View Changelog Output
@@ -162,7 +162,7 @@ jobs:
         uses: actions/download-artifact@v2
         with:
           name: libs
-          path: buildfiles
+          path: build-out
       - name: Download Changelog Results
         uses: actions/download-artifact@v2
         with:
@@ -181,8 +181,8 @@ jobs:
           prerelease: false
           files: |
             changelog/CHANGELOG.md
-            buildfiles/${{ needs.vars.outputs.mod_id }}-${{ needs.vars.outputs.mod_version }}.jar
-            buildfiles/${{ needs.vars.outputs.mod_id }}-${{ needs.vars.outputs.mod_version }}-api.jar
+            build-out/${{ needs.vars.outputs.mod_id }}-${{ needs.vars.outputs.mod_version }}.jar
+            build-out/${{ needs.vars.outputs.mod_id }}-${{ needs.vars.outputs.mod_version }}-api.jar
 
       - name: Full File
         id: filename

.github/workflows/test-build.yml

@@ -130,15 +130,15 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Output Dir Structure
-        run: ls -lhR buildfiles
-        
+        run: ls -lhR build-out
+
       - name: Add Artifact
         uses: actions/upload-artifact@v2
         with:
           name: libs
           path: |
-            buildfiles/${{ needs.vars.outputs.mod_id }}-${{ needs.vars.outputs.mod_version }}.jar
-            buildfiles/${{ needs.vars.outputs.mod_id }}-${{ needs.vars.outputs.mod_version }}-api.jar
+            build-out/${{ needs.vars.outputs.mod_id }}-${{ needs.vars.outputs.mod_version }}.jar
+            build-out/${{ needs.vars.outputs.mod_id }}-${{ needs.vars.outputs.mod_version }}-api.jar
 
   view:
     name: View Changelog Output

.gitignore

@@ -29,3 +29,4 @@ forge*changelog.txt
 
 logs/
 /mods/
+/build-out/

build.gradle

@@ -188,15 +188,9 @@ jar {
     }
 }
 
-// Example configuration to allow publishing using the maven-publish task
-// This is the preferred method to reobfuscate your jar file
-jar.finalizedBy('reobfJar')
-// However if you are in a multi-project build, dev time needs unobfed jar files, so you can delay the obfuscation until publishing by doing
-//publish.dependsOn('reobfJar')
-
-task srcJar (type: Jar) {
-    from sourceSets.main.java
-    classifier = 'sources'
+jar {
+    destinationDir = file("$rootDir/build-out")
+    finalizedBy('reobfJar')
 }
 
 task apiJar(type: Jar) {
@@ -205,10 +199,11 @@ task apiJar(type: Jar) {
     from(sourceSets.main.output)
     include 'com/robotgryphon/compactmachines/api/**'
     classifier = 'api'
+    destinationDir = file("$rootDir/build-out")
 }
 
 artifacts {
-    archives srcJar, apiJar
+    archives jar, apiJar
 }
 
 publishing {