Merge branch 'gradle-publishing' into gradle-runner-final

Stefterv · Stefterv · commit 2e1ac478e942 · 2026-02-10T11:30:31.000+01:00
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -74,6 +74,43 @@ jobs:
 
         ORG_GRADLE_PROJECT_version: ${{ needs.version.outputs.version }}
         ORG_GRADLE_PROJECT_group: ${{ vars.GRADLE_GROUP }}
+
+  publish-gradle:
+    name: Publish Processing Plugins to Gradle Plugin Portal
+    runs-on: ubuntu-latest
+    needs: version
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v4
+
+      - name: Setup Processing
+        uses: ./.github/actions/setup
+
+      - name: Publish plugins to Gradle Plugin Portal
+        run: ./gradlew publishPlugins
+        env:
+          GRADLE_PUBLISH_KEY: ${{ secrets.GRADLE_PUBLISH_KEY }}
+          GRADLE_PUBLISH_SECRET: ${{ secrets.GRADLE_PUBLISH_SECRET }}
+
+          ORG_GRADLE_PROJECT_signingInMemoryKey: ${{ secrets.SIGNING_IN_MEMORY_KEY }}
+          ORG_GRADLE_PROJECT_signingInMemoryKeyPassword: ${{ secrets.SIGNING_IN_MEMORY_KEY_PASSWORD }}
+
+          ORG_GRADLE_PROJECT_version: ${{ needs.version.outputs.version }}
+          ORG_GRADLE_PROJECT_group: ${{ vars.GRADLE_GROUP }}
+                
+      - name: Publish internal plugins to Gradle Plugin Portal
+        run: ./gradlew -c gradle/plugins/settings.gradle.kts publishPlugins
+        env:
+          GRADLE_PUBLISH_KEY: ${{ secrets.GRADLE_PUBLISH_KEY }}
+          GRADLE_PUBLISH_SECRET: ${{ secrets.GRADLE_PUBLISH_SECRET }}
+
+          ORG_GRADLE_PROJECT_signingInMemoryKey: ${{ secrets.SIGNING_IN_MEMORY_KEY }}
+          ORG_GRADLE_PROJECT_signingInMemoryKeyPassword: ${{ secrets.SIGNING_IN_MEMORY_KEY_PASSWORD }}
+
+          ORG_GRADLE_PROJECT_version: ${{ needs.version.outputs.version }}
+          ORG_GRADLE_PROJECT_group: ${{ vars.GRADLE_GROUP }}
+          ORG_GRADLE_PROJECT_publishingGroup: ${{ vars.GRADLE_GROUP }}
+
   release-windows:
     name: (windows/${{ matrix.arch }}) Create Processing Release
     runs-on: ${{ matrix.os }}
diff --git a/gradle/plugins/library/build.gradle.kts b/gradle/plugins/library/build.gradle.kts
@@ -1,12 +1,17 @@
 plugins {
-    `java-gradle-plugin`
+    id("com.gradle.plugin-publish") version "2.0.0"
     kotlin("jvm") version "2.2.20"
 }
 
 gradlePlugin {
+    website = "https://processing.org/"
+    vcsUrl = "https://github.com/processing/processing4"
     plugins {
         create("processing.library") {
-            id = "org.processing.library"
+            id = project.properties.getOrElse("publishingGroup", { "org.processing" }).toString() + ".library"
+            displayName = "Processing Library Plugin"
+            description = "Gradle plugin for building Processing libraries"
+            tags = listOf("processing", "library", "dsl")
             implementationClass = "ProcessingLibraryPlugin"
         }
     }
diff --git a/java/gradle/build.gradle.kts b/java/gradle/build.gradle.kts
@@ -21,15 +21,20 @@ dependencies{
     testImplementation(libs.junit)
 }
 
-// TODO: CI/CD for publishing the plugin to the Gradle Plugin Portal
 gradlePlugin{
+    website = "https://processing.org/"
+    vcsUrl = "https://github.com/processing/processing4"
     plugins{
         create("processing.java"){
-            id = "org.processing.java"
+            id = "$group.java"
+            displayName = "Processing Plugin"
+            description = "Gradle plugin for building Processing sketches"
+            tags = listOf("processing", "sketch", "dsl")
             implementationClass = "org.processing.java.gradle.ProcessingPlugin"
         }
     }
 }
+
 publishing{
     repositories{
         mavenLocal()
@@ -38,4 +43,9 @@ publishing{
             url = uri(project(":app").layout.buildDirectory.dir("resources-bundled/common/repository").get().asFile.absolutePath)
         }
     }
+}
+// Grab the group before running tests, since the group is used in the test configuration and may be modified by the publishing configuration
+val testGroup = group.toString()
+tasks.withType<Test>().configureEach {
+    systemProperty("project.group", testGroup)
 }
diff --git a/java/gradle/src/test/kotlin/ProcessingPluginTest.kt b/java/gradle/src/test/kotlin/ProcessingPluginTest.kt
@@ -20,7 +20,7 @@ class ProcessingPluginTest{
         val sketchFolder = directory.newFolder("sketch")
         directory.newFile("sketch/build.gradle.kts").writeText("""
             plugins {
-                id("org.processing.java")
+                id("${System.getProperty("project.group")}.java")
             }
         """.trimIndent())
         directory.newFile("sketch/settings.gradle.kts")

Original file line number	Diff line number	Diff line change
`@@ -1,12 +1,17 @@`
`1`	`1`	`plugins {`
`2`		- `java-gradle-plugin`
	`2`	`+ id("com.gradle.plugin-publish") version "2.0.0"`
`3`	`3`	`kotlin("jvm") version "2.2.20"`
`4`	`4`	`}`
`5`	`5`
`6`	`6`	`gradlePlugin {`
	`7`	`+ website = "https://processing.org/"`
	`8`	`+ vcsUrl = "https://github.com/processing/processing4"`
`7`	`9`	`plugins {`
`8`	`10`	`create("processing.library") {`
`9`		`- id = "org.processing.library"`
	`11`	`+ id = project.properties.getOrElse("publishingGroup", { "org.processing" }).toString() + ".library"`
	`12`	`+ displayName = "Processing Library Plugin"`
	`13`	`+ description = "Gradle plugin for building Processing libraries"`
	`14`	`+ tags = listOf("processing", "library", "dsl")`
`10`	`15`	`implementationClass = "ProcessingLibraryPlugin"`
`11`	`16`	`}`
`12`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,15 +21,20 @@ dependencies{`
`21`	`21`	`testImplementation(libs.junit)`
`22`	`22`	`}`
`23`	`23`
`24`		`-// TODO: CI/CD for publishing the plugin to the Gradle Plugin Portal`
`25`	`24`	`gradlePlugin{`
	`25`	`+ website = "https://processing.org/"`
	`26`	`+ vcsUrl = "https://github.com/processing/processing4"`
`26`	`27`	`plugins{`
`27`	`28`	`create("processing.java"){`
`28`		`- id = "org.processing.java"`
	`29`	`+ id = "$group.java"`
	`30`	`+ displayName = "Processing Plugin"`
	`31`	`+ description = "Gradle plugin for building Processing sketches"`
	`32`	`+ tags = listOf("processing", "sketch", "dsl")`
`29`	`33`	`implementationClass = "org.processing.java.gradle.ProcessingPlugin"`
`30`	`34`	`}`
`31`	`35`	`}`
`32`	`36`	`}`
	`37`	`+`
`33`	`38`	`publishing{`
`34`	`39`	`repositories{`
`35`	`40`	`mavenLocal()`
`@@ -38,4 +43,9 @@ publishing{`
`38`	`43`	`url = uri(project(":app").layout.buildDirectory.dir("resources-bundled/common/repository").get().asFile.absolutePath)`
`39`	`44`	`}`
`40`	`45`	`}`
	`46`	`+}`
	`47`	`+// Grab the group before running tests, since the group is used in the test configuration and may be modified by the publishing configuration`
	`48`	`+val testGroup = group.toString()`
	`49`	`+tasks.withType<Test>().configureEach {`
	`50`	`+ systemProperty("project.group", testGroup)`
`41`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ class ProcessingPluginTest{`
`20`	`20`	`val sketchFolder = directory.newFolder("sketch")`
`21`	`21`	`directory.newFile("sketch/build.gradle.kts").writeText("""`
`22`	`22`	`plugins {`
`23`		`- id("org.processing.java")`
	`23`	`+ id("${System.getProperty("project.group")}.java")`
`24`	`24`	`}`
`25`	`25`	`""".trimIndent())`
`26`	`26`	`directory.newFile("sketch/settings.gradle.kts")`