From a0997715a18876d586dfbdc0a9a842fc5605a54d Mon Sep 17 00:00:00 2001
From: funniray <funniray10@gmail.com>
Date: Sat, 11 Nov 2023 15:57:18 +0000
Subject: [PATCH] ci: Use tag's version for plugin version

---
 .github/workflows/gradle.yml         |  14 ++++++++------
 gradle/wrapper/gradle-wrapper.jar    | Bin
 gradlew                              |   0
 spigot/build.gradle.kts              |  14 +++++++++++++-
 spigot/src/main/resources/plugin.yml |   6 ------
 sponge/build.gradle.kts              |   6 ++++--
 6 files changed, 25 insertions(+), 15 deletions(-)
 mode change 100644 => 100755 gradle/wrapper/gradle-wrapper.jar
 mode change 100644 => 100755 gradlew
 delete mode 100644 spigot/src/main/resources/plugin.yml

diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index e3b6928..d808629 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -20,12 +20,6 @@ jobs:
           java-version: '8'
           distribution: 'adopt'
           cache: 'gradle'
-      - name: Build with Gradle
-        run: gradle build
-      - uses: actions/upload-artifact@v2
-        with:
-          name: Package
-          path: build
       - name: Bump version and push tag
         id: tag_version
         uses: anothrNick/github-tag-action@1.55.0
@@ -33,6 +27,14 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           WITH_V: true
           INITIAL_VERSION: 1.0.0
+      - name: Build with Gradle
+        run: ./gradlew build
+        env:
+          VERSION: ${{ steps.tag_version.outputs.new_tag }}
+      - uses: actions/upload-artifact@v2
+        with:
+          name: Package
+          path: build
       - uses: ncipollo/release-action@v1
         with:
           artifacts: "build/*"
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
old mode 100644
new mode 100755
diff --git a/gradlew b/gradlew
old mode 100644
new mode 100755
diff --git a/spigot/build.gradle.kts b/spigot/build.gradle.kts
index 44b7d77..3872a76 100644
--- a/spigot/build.gradle.kts
+++ b/spigot/build.gradle.kts
@@ -1,10 +1,13 @@
 plugins {
     `java-library`
     id("com.github.johnrengelman.shadow") version "7.1.2"
+    id("net.minecrell.plugin-yml.bukkit") version "0.5.2"
 }
 
+val versionStr = (System.getenv("VERSION")?: "v1.0.0").removePrefix("v")
+
 group = "com.funniray.minimap"
-version = "1.0"
+version = versionStr
 
 repositories {
     mavenCentral()
@@ -60,3 +63,12 @@ tasks {
         }
     }
 }
+
+bukkit {
+    name = "MinimapControl"
+    main = "com.funniray.minimap.spigot.SpigotMinimap"
+    authors = listOf("funniray")
+    description = "Control minimap settings from server-side software"
+
+    apiVersion = "1.13"
+}
diff --git a/spigot/src/main/resources/plugin.yml b/spigot/src/main/resources/plugin.yml
deleted file mode 100644
index b154641..0000000
--- a/spigot/src/main/resources/plugin.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: Minimap
-version: '1.0'
-main: com.funniray.minimap.spigot.SpigotMinimap
-api-version: 1.13
-authors: [ Funniray ]
-description: Control minimap settings from server-side software
diff --git a/sponge/build.gradle.kts b/sponge/build.gradle.kts
index df305f8..e80d475 100644
--- a/sponge/build.gradle.kts
+++ b/sponge/build.gradle.kts
@@ -11,15 +11,17 @@ repositories {
     mavenCentral()
 }
 
+val versionStr = (System.getenv("VERSION")?: "v1.0.0").removePrefix("v")
+
 group = "com.funniray.minimap"
-version = "1.0"
+version = versionStr
 
 sponge {
     apiVersion("8.1.0")
     license("All Rights Reserved")
     loader {
         name(PluginLoaders.JAVA_PLAIN)
-        version("1.0")
+        version(versionStr)
     }
     plugin("minimap") {
         displayName("Minimap")