Workflow improvements

Author: Stefterv

.github/workflows/pull_request-gradle.yml

@@ -76,6 +76,6 @@ jobs:
       - name: Add artifact
         uses: actions/upload-artifact@v4
         with:
-          name: processing-${{ matrix.os_prefix }}-${{ matrix.arch }}-pr_${{ github.ref_name }}
+          name: processing-${{ matrix.os_prefix }}-${{ matrix.arch }}-pr_${{ github.event.pull_request.number }}
           retention-days: 5
           path: app/build/compose/binaries/main/${{ matrix.binary }}

.github/workflows/release-gradle.yml

@@ -10,16 +10,16 @@ jobs:
       build_number: ${{ steps.tag_info.outputs.build_number }}
       version: ${{ steps.tag_info.outputs.version }}
     steps:
-      - name: Extract version and build number
+      - name: Extract version and revision
         id: tag_info
         shell: bash
         run: |
           TAG_NAME="${GITHUB_REF#refs/tags/}"
-          BUILD_NUMBER=$(echo "$TAG_NAME" | cut -d'-' -f2)
+          REVISION=$(echo "$TAG_NAME" | cut -d'-' -f2)
           VERSION=$(echo "$TAG_NAME" | cut -d'-' -f3)
 
           # Set outputs for use in later jobs or steps
-          echo "build_number=$BUILD_NUMBER" >> $GITHUB_OUTPUT
+          echo "revision=$REVISION" >> $GITHUB_OUTPUT
           echo "version=$VERSION" >> $GITHUB_OUTPUT
   reference:
     name: Publish Processing Reference to release
@@ -75,7 +75,7 @@ jobs:
         ORG_GRADLE_PROJECT_signingInMemoryKeyPassword: ${{ secrets.SIGNING_IN_MEMORY_KEY_PASSWORD }}
 
         ORG_GRADLE_PROJECT_version: ${{ needs.version.outputs.version }}
-        ORG_GRADLE_PROJECT_group: ${{ vars.PROCESSING_GROUP }}
+        ORG_GRADLE_PROJECT_group: ${{ vars.GRADLE_GROUP }}
   build: 
     name: (${{ matrix.os_prefix }}/${{ matrix.arch }}) Create Processing Release
     runs-on: ${{ matrix.os }}
@@ -142,7 +142,8 @@ jobs:
         run: ./gradlew packageDistributionForCurrentOS
         env: 
           ORG_GRADLE_PROJECT_version: ${{ needs.version.outputs.version }}
-          ORG_GRADLE_PROJECT_group: ${{ vars.PROCESSING_GROUP }}
+          ORG_GRADLE_PROJECT_group: ${{ vars.GRADLE_GROUP }}
+          ORG_GRADLE_PROJECT_revision: ${{ needs.version.outputs.revision }}
 
       - name: Upload portables to release
         uses: svenstaro/upload-release-action@v2

app/build.gradle.kts

@@ -14,10 +14,6 @@ plugins{
     alias(libs.plugins.download)
 }
 
-group = rootProject.group
-version = rootProject.version
-val revision = rootProject.findProperty("revision") ?: "1300"
-
 repositories{
     mavenCentral()
     google()
@@ -40,8 +36,8 @@ compose.desktop {
         mainClass = "processing.app.ui.Start"
 
         jvmArgs(*listOf(
-            Pair("processing.version", version),
-            Pair("processing.revision", revision),
+            Pair("processing.version", rootProject.version),
+            Pair("processing.revision", findProperty("revision") ?: Int.MAX_VALUE),
             Pair("processing.contributions.source", "https://contributions-preview.processing.org/contribs.txt"),
             Pair("processing.download.page", "https://processing.org/download/"),
             Pair("processing.download.latest", "https://processing.org/download/latest.txt"),
@@ -167,6 +163,8 @@ tasks.register<Exec>("packageCustomMsi"){
     workingDir = file("windows")
     group = "compose desktop"
 
+    val version = if(version == "unspecified") "1.0.0" else version
+
     commandLine(
         "dotnet",
         "build",
@@ -187,10 +185,12 @@ tasks.register("generateSnapConfiguration"){
         else -> System.getProperty("os.arch")
     }
 
+    val version = if(version == "unspecified") "1.0.0" else version
+
     val dir = distributable.destinationDir.get()
     val content = """
     name: ${rootProject.name}
-    version: ${rootProject.version}
+    version: $version
     base: core22
     summary: A creative coding editor
     description: |

build.gradle.kts

@@ -1,6 +1,3 @@
-group = project.findProperty("group") ?: "org.processing"
-version = project.findProperty("version") ?: "0.0.0"
-
 plugins {
     kotlin("jvm") version libs.versions.kotlin apply false
     alias(libs.plugins.kotlinMultiplatform) apply false

core/build.gradle.kts

@@ -6,8 +6,6 @@ plugins {
     alias(libs.plugins.mavenPublish)
 }
 
-group = "org.processing"
-
 repositories {
     mavenCentral()
     maven { url = uri("https://jogamp.org/deployment/maven") }
@@ -23,6 +21,11 @@ sourceSets{
             exclude("**/*.java")
         }
     }
+    test{
+        java{
+            srcDirs("test")
+        }
+    }
 }
 
 dependencies {

java/lsp/build.gradle.kts

@@ -5,8 +5,6 @@ plugins{
     id("com.vanniktech.maven.publish") version "0.30.0"
 }
 
-group = "org.processing"
-
 repositories{
     mavenCentral()
     google()

java/preprocessor/build.gradle.kts

@@ -5,7 +5,7 @@ plugins{
     alias(libs.plugins.mavenPublish)
 }
 
-group = "org.processing"
+group = "$group.java"
 
 repositories{
     mavenCentral()