Fixed group linking so now it can be build locally

Author: Stefterv

app/build.gradle.kts

@@ -53,6 +53,7 @@ compose.desktop {
 
         jvmArgs(
             *listOf(
+                Pair("processing.group", group),
             Pair("processing.version", rootProject.version),
             Pair("processing.revision", findProperty("revision") ?: Int.MAX_VALUE),
             Pair("processing.contributions.source", "https://contributions.processing.org/contribs"),

app/src/processing/app/gradle/GradleJob.kt

@@ -92,9 +92,10 @@ class GradleJob(
                 }
                 return@map code.fileName
             }
+        val group = System.getProperty("processing.group", "org.processing")
         // Collect the variables to pass to gradle
         val variables = mapOf(
-            "group" to System.getProperty("processing.group", "org.processing"),
+            "group" to group,
             "version" to getVersionName(),
             "sketchFolder" to sketchFolder,
             "sketchbook" to getSketchbookFolder(),
@@ -173,7 +174,7 @@ class GradleJob(
                 "Processing Java",
                 "The Processing Java mode for Gradle",
                 null,
-                "org.processing.java",
+                "$group.java",
                 getVersionName()
             ))
             val propertiesFile = sketchFolder.resolve(Sketch.PROPERTIES_NAME)

app/src/processing/app/gradle/GradlePlugin.kt

@@ -12,9 +12,22 @@ data class GradlePlugin(
     val version: String){
     companion object{
         const val PROPERTIES_KEY = "sketch.plugins"
-        val plugins = mutableStateListOf<GradlePlugin>(
-            GradlePlugin("Hot Reload", "Automatically apply changes in your sketch upon saving", null, "org.processing.java.hotreload", Base.getVersionName()),
-            GradlePlugin("Android","Run your sketch on an Android device", null, "org.processing.android", Base.getVersionName()),
+        val group = System.getProperty("processing.group", "org.processing")
+        val plugins = mutableStateListOf(
+            GradlePlugin(
+                "Hot Reload",
+                "Automatically apply changes in your sketch upon saving",
+                null,
+                "$group.java.hotreload",
+                Base.getVersionName()
+            ),
+            GradlePlugin(
+                "Android",
+                "Run your sketch on an Android device",
+                null,
+                "$group.android",
+                Base.getVersionName()
+            ),
         )
     }
 }

core/build.gradle.kts

@@ -46,7 +46,10 @@ publishing{
 
 mavenPublishing{
     publishToMavenCentral(SonatypeHost.CENTRAL_PORTAL, automaticRelease = true)
-    signAllPublications()
+    if (project.hasProperty("signingInMemoryKey")) {
+        signAllPublications()
+    }
+
 
     pom{
         name.set("Processing Core")

gradle.properties

@@ -26,7 +26,7 @@ gradlePlugin{
     vcsUrl = "https://github.com/processing/processing4"
     plugins{
         create("processing.java"){
-            id = "$group.java"
+            id = "${project(":java").group}.java"
             displayName = "Processing Plugin"
             description = "Gradle plugin for building Processing sketches"
             tags = listOf("processing", "sketch", "dsl")
@@ -44,8 +44,6 @@ publishing{
         }
     }
 }
-// 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)
+    systemProperty("project.group", project(":java").group)
 }

java/gradle/build.gradle.kts

@@ -17,7 +17,7 @@ dependencies{
 gradlePlugin{
     plugins{
         create("processing.java.hotreload"){
-            id = "org.processing.java.hotreload"
+            id = "${project(":java").group}.java.hotreload"
             implementationClass = "org.processing.java.gradle.ProcessingHotReloadPlugin"
         }
     }

java/gradle/hotreload/build.gradle.kts

@@ -32,7 +32,10 @@ sourceSets {
 
 mavenPublishing {
     publishToMavenCentral(com.vanniktech.maven.publish.SonatypeHost.CENTRAL_PORTAL, automaticRelease = true)
-    signAllPublications()
+    if (project.hasProperty("signingInMemoryKey")) {
+        signAllPublications()
+    }
+
     coordinates("$group.core", name, version.toString())
 
     pom {

java/libraries/dxf/build.gradle.kts

@@ -53,7 +53,10 @@ mavenPublishing {
     coordinates("$group.core", name, version.toString())
     publishToMavenCentral(SonatypeHost.CENTRAL_PORTAL, automaticRelease = true)
 
-    signAllPublications()
+    if (project.hasProperty("signingInMemoryKey")) {
+        signAllPublications()
+    }
+
 
     pom {
         name.set("Processing Net")

java/libraries/net/build.gradle.kts

@@ -55,7 +55,10 @@ mavenPublishing{
     coordinates("$group.core", name, version.toString())
     publishToMavenCentral(SonatypeHost.CENTRAL_PORTAL, automaticRelease = true)
 
-    signAllPublications()
+    if (project.hasProperty("signingInMemoryKey")) {
+        signAllPublications()
+    }
+
 
     pom{
         name.set("Processing PDF")