Improve Gradle tasks to rename and move directly (Thanks @DevMunky)

.github/workflows/build-and-publish-release-jars.yml

@@ -29,14 +29,9 @@ jobs:
         with:
           name: Typewriter-Releases
           path: |
-            engine/engine-paper/build/libs/Typewriter.jar
-            extensions/**/build/libs/*Extensions.jar
+            jars/engine/*.jar
+            jars/extensions/*.jar
           retention-days: 1
-      - name: Reset Extensions Gradle Builds Build
-        uses: gradle/gradle-build-action@v2
-        with:
-          arguments: clean --scan
-          build-root-directory: ./extensions
 #  ----------------------------------------------------------------------------------------------------
       - name: Publish Engine to Beta Maven Repository
         uses: gradle/gradle-build-action@v2

.github/workflows/build-development-jars-and-publish.yml

@@ -30,7 +30,7 @@ jobs:
       - name: Test Extensions
         uses: gradle/gradle-build-action@v2
         with:
-          arguments: test clean --scan
+          arguments: test --scan
           build-root-directory: ./extensions
 #  ----------------------------------------------------------------------------------------------------
       - name: Publish Engine to Beta Maven Repository
@@ -64,8 +64,8 @@ jobs:
           modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
           modrinth-featured: false
           files: |
-            engine/engine-paper/build/libs/Typewriter.jar
-            extensions/**/build/libs/*Extension.jar
+            jars/engine/*.jar
+            jars/extensions/*.jar
           name: "Typewriter v${{ steps.vars.outputs.version }} Build"
           version: "${{ steps.vars.outputs.version }}"
           version-type: "beta"

.github/workflows/build-engine.yml

@@ -18,4 +18,4 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: Typewriter.jar
-          path: engine/engine-paper/build/libs/Typewriter.jar
+          path: jars/engine/*.jar

.github/workflows/build-extension.yml

@@ -26,5 +26,4 @@ jobs:
       - name: Upload Extension
         uses: actions/upload-artifact@v4
         with:
-          name: ${{ inputs.extension }}.jar
-          path: extensions/${{ inputs.extension }}/build/libs/${{ inputs.extension }}.jar
+          path: jars/extensions/*.jar

.github/workflows/test-building.yml

@@ -25,6 +25,6 @@ jobs:
         with:
           name: Typewriter-Alpha-Builds
           path: |
-            engine/engine-paper/build/libs/Typewriter.jar
-            extensions/**/build/libs/*Extension.jar
+            jars/engine/*.jar
+            jars/extensions/*.jar
           retention-days: 1

.gitignore

@@ -132,4 +132,6 @@ code_generator/EntityHeightProperty.kt
 code_generator/EntityWidthProperty.kt
 
 # For the moment
-/marketplace
+/marketplace
+
+jars/

engine/engine-paper/build.gradle.kts

@@ -86,12 +86,8 @@ task<ShadowJar>("buildAndMove") {
     description = "Builds the jar and moves it to the server folder"
     outputs.upToDateWhen { false }
 
-    // Move the jar from the build/libs folder to the server/plugins folder
-    doLast {
-        val jar = file("build/libs/%s-%s-all.jar".format(project.name, project.version))
-        val server = file("../../server/plugins/Typewriter.jar")
-        jar.copyTo(server, overwrite = true)
-    }
+    destinationDirectory = file("../../server/plugins")
+    archiveFileName = "Typewriter.${archiveExtension.get()}"
 }
 
 task("copyFlutterWebFiles") {
@@ -105,25 +101,20 @@ task("copyFlutterWebFiles") {
     }
 }
 
-task("buildRelease") {
-    dependsOn("copyFlutterWebFiles", "shadowJar")
+task<ShadowJar>("buildRelease") {
+    dependsOn("copyFlutterWebFiles")
     group = "build"
     description = "Builds the jar including the flutter web panel"
 
     outputs.upToDateWhen { false }
 
+    archiveFileName = "Typewriter-${project.version}.${archiveExtension.get()}"
+    destinationDirectory = file("../../jars/engine")
+
     doLast {
         // Remove the flutter web folder
         val flutterWebDest = file("src/main/resources/web")
         flutterWebDest.deleteRecursively()
-
-        // Rename the jar to remove the version and -all
-        val jar = file("build/libs/%s-%s-all.jar".format(project.name, project.version))
-        if (!jar.exists()) {
-            throw IllegalStateException("Jar does not exist: ${jar.absolutePath}")
-        }
-        jar.renameTo(file("build/libs/Typewriter.jar".format(project.name)))
-        file("build/libs/%s-%s.jar".format(project.name, project.version)).delete()
     }
 }
 

extensions/build.gradle.kts

@@ -48,34 +48,21 @@ subprojects {
     }
 
     if (!project.name.startsWith("_")) {
-        tasks.register("buildAndMove") {
-            dependsOn("shadowJar")
-
+        task<ShadowJar>("buildAndMove") {
             group = "build"
             description = "Builds the jar and moves it to the server folder"
             outputs.upToDateWhen { false }
 
-            // Move the jar from the build/libs folder to the server/plugins folder
-            doLast {
-                val jar = file("build/libs/%s-%s-all.jar".format(project.name, project.version))
-                val server =
-                    file("../../server/plugins/Typewriter/extensions/%s.jar".format(project.name.capitalizeAsciiOnly()))
-                jar.copyTo(server, overwrite = true)
-            }
+            archiveFileName = "${project.name}.${archiveExtension.get()}"
+            destinationDirectory = file("../../server/plugins/Typewriter/extensions")
         }
 
-        tasks.register("buildRelease") {
-            onlyIf { !project.name.startsWith("_") }
-            dependsOn("shadowJar")
+        task<ShadowJar>("buildRelease") {
             group = "build"
             description = "Builds the jar and renames it"
 
-            doLast {
-                // Rename the jar to remove the version and -all
-                val jar = file("build/libs/%s-%s-all.jar".format(project.name, project.version))
-                jar.renameTo(file("build/libs/%s.jar".format(project.name)))
-                file("build/libs/%s-%s.jar".format(project.name, project.version)).delete()
-            }
+            archiveFileName = "${project.name}.${archiveExtension.get()}"
+            destinationDirectory = file("../../jars/extensions")
         }
 
         tasks.register("releaseSourcesJar", Jar::class) {