From e84b3bfd6e0d6fb5de2b4667d7fccbcbcdfb7f03 Mon Sep 17 00:00:00 2001
From: JetsadaWijit <jetsadawijit@outlook.com>
Date: Sat, 24 Jan 2026 04:54:46 +0700
Subject: [PATCH 1/2] chore: Increment project iteration to 4

Increment project iteration from 3 to 4.
---
 gradle.properties | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 2829583..084771c 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,9 +4,10 @@ git-org-repository=mcextension
 
 # --- Artifact Identity ---
 project-version=2026.0.2
-project-iteration=3
+project-iteration=4
 project-group=io.github.mcengine
 project-artifact-id=mcextension
 project-artifact-name=MCExtension
 project-artifact-description=This project is a library designed to allow Minecraft plugins to load their own extensions.
 project-artifact-url=https://mcengine.github.io/mcextension-website
+

From 8c29e19a1453905928daa008ffc43f2192198cbd Mon Sep 17 00:00:00 2001
From: JetsadaWijit <jetsadawijit@outlook.com>
Date: Sat, 24 Jan 2026 04:55:42 +0700
Subject: [PATCH 2/2] fix: add dev-release logic to gradle and sync workflow

---
 .github/workflows/build.yml |  6 ++----
 build.gradle                | 11 +++++++++--
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 076bcf9..a29d18e 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -63,14 +63,13 @@ jobs:
 
       # 4c. Build & Publish (RELEASE)
       # Run ONLY when code is pushed/merged to master AND iteration != 0
-      # UPDATED: Added requirement for step 4b (publish_dev) to finish successfully.
+      # UPDATED: Using DEV_RELEASE_VERSION to signal clean versioning in Gradle.
       - name: Publish Release
         id: publish_release
         if: ${{ steps.publish_dev.outcome == 'success' && github.event_name == 'push' && github.ref == 'refs/heads/master' && steps.check_iteration.outputs.iteration != '0' }}
         run: ./gradlew clean build publish
         env:
-          # We pass the branch name (master) to Gradle
-          RELEASE_VERSION: ${{ steps.check_iteration.outputs.version }} 
+          DEV_RELEASE_VERSION: ${{ steps.check_iteration.outputs.version }} 
           USER_GITHUB_NAME: ${{ github.actor }}
           USER_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
@@ -95,4 +94,3 @@ jobs:
             !**/build/libs/*-sources.jar
             !**/build/libs/*-javadoc.jar
           retention-days: 1
-
diff --git a/build.gradle b/build.gradle
index ff73236..a5a580e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -8,9 +8,11 @@ plugins {
 
 // --- DYNAMIC VERSIONING LOGIC ---
 // 1. Detect Build Environment
-String buildNum = System.getenv("BUILD_NUMBER")
+String buildNum = System.getenv("BUILD_NUMBER") // Passed from GitHub Action
+String devRelease = System.getenv("DEV_RELEASE_VERSION") // Passed from GitHub Actions
 String releaseTag = System.getenv("RELEASE_VERSION") // Passed from GitHub Actions
 boolean isDevBuild = (buildNum != null && !buildNum.isEmpty())
+boolean isDevRealeaseBuild = (devRelease != null && !devRelease.isEmpty())
 
 // 2. Calculate the Version String IMMEDIATELY
 String calculatedVersion = "unspecified"
@@ -25,12 +27,17 @@ if (releaseTag != null && !releaseTag.isEmpty()) {
     def baseVersion = project.property('project-version')
     def iteration = project.hasProperty('project-iteration') ? project.property('project-iteration') : "1"
     
-    if (isDevBuild) {
+    if (isDevBuild && !isDevRealeaseBuild) {
         // CI Dev Build: "2026.0.0-1-9-DEV"
         // Format: {Version}-{Iteration}-{BuildNum}-DEV
         calculatedVersion = "${baseVersion}-${iteration}-${buildNum}-DEV"
+    } else if (isDevRealeaseBuild) {
+        // CI Dev Release Build: "2026.0.0-1"
+        // Format: {Version}-{Iteration}
+        calculatedVersion = "${baseVersion}-${iteration}"
     } else {
         // Local Build: "2026.0.0-1-SNAPSHOT"
+        // Format: {Version}-{Iteration}-SNAPSHOT
         calculatedVersion = "${baseVersion}-${iteration}-SNAPSHOT"
     }
 }