From 1dd7668ce271f924cb6be3bedf8bd4cbff8ea86d Mon Sep 17 00:00:00 2001
From: 0ffz <dan.voznyy@gmail.com>
Date: Sun, 6 Jun 2021 23:36:23 -0400
Subject: [PATCH] Move publish to other workflow, fix shadow artifact not being
 generated

---
 .github/workflows/gradlecd.yml | 16 ++++++++++++++++
 .github/workflows/gradleci.yml | 16 ----------------
 .gitignore                     |  3 ---
 spigot/build.gradle            |  1 +
 4 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/gradlecd.yml b/.github/workflows/gradlecd.yml
index dfa4764..3b55476 100644
--- a/.github/workflows/gradlecd.yml
+++ b/.github/workflows/gradlecd.yml
@@ -27,3 +27,19 @@ jobs:
 
       - name: Run gradle publish
         run: gradle publish -PmineinabyssMavenUsername=${{ secrets.MAVEN_PUBLISH_USERNAME }} -PmineinabyssMavenPassword=${{ secrets.MAVEN_PUBLISH_PASSWORD }}
+
+      - name: Get version from gradle
+        shell: bash
+        id: extract_version
+        run: |
+          version=`./gradlew properties --no-daemon --console=plain -q | grep "^version:" | awk '{printf $2}'`
+          echo "::set-output name=version::$version"
+
+      - name: Create GitHub Release
+        uses: marvinpinto/action-automatic-releases@latest
+        with:
+          repo_token: "${{ secrets.GITHUB_TOKEN }}"
+          prerelease: false
+          automatic_release_tag: v${{ steps.extract_version.outputs.version }}
+          files: |
+            spigot/build/libs/*-all.jar
diff --git a/.github/workflows/gradleci.yml b/.github/workflows/gradleci.yml
index 46ecd50..bf31acd 100644
--- a/.github/workflows/gradleci.yml
+++ b/.github/workflows/gradleci.yml
@@ -30,19 +30,3 @@ jobs:
         with:
           name: build
           path: spigot/build/libs
-
-      - name: Get version from gradle
-        shell: bash
-        id: extract_version
-        run: |
-          version=`./gradlew properties --no-daemon --console=plain -q | grep "^version:" | awk '{printf $2}'`
-          echo "::set-output name=version::$version"
-
-      - name: Create GitHub Release
-        uses: marvinpinto/action-automatic-releases@latest
-        with:
-          repo_token: "${{ secrets.GITHUB_TOKEN }}"
-          prerelease: false
-          automatic_release_tag: v${{ steps.extract_version.outputs.version }}
-          files: |
-            spigot/build/libs/*-all.jar
diff --git a/.gitignore b/.gitignore
index 9469045..59b4df1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,6 +10,3 @@ gradle-app.setting
 
 # Cache of project
 .gradletasknamecache
-
-# # Work around https://youtrack.jetbrains.com/issue/IDEA-116898
-# gradle/wrapper/gradle-wrapper.properties
diff --git a/spigot/build.gradle b/spigot/build.gradle
index f0aac65..d5ba0bc 100644
--- a/spigot/build.gradle
+++ b/spigot/build.gradle
@@ -34,6 +34,7 @@ shadowJar {
     archiveBaseName.set("KotlinSpice")
     mergeServiceFiles()
 }
+build.dependsOn shadowJar
 
 
 if (project.hasProperty("plugin_path") && plugin_path) {