Gradle variables from Processing, Group resolution

Author: Stefterv

app/build.gradle.kts

@@ -49,14 +49,18 @@ compose.desktop {
     application {
         mainClass = "processing.app.ui.Start"
 
-        jvmArgs(*listOf(
-            Pair("processing.version", rootProject.version),
-            Pair("processing.revision", findProperty("revision") ?: Int.MAX_VALUE),
-            Pair("processing.contributions.source", "https://contributions.processing.org/contribs"),
-            Pair("processing.download.page", "https://processing.org/download/"),
-            Pair("processing.download.latest", "https://processing.org/download/latest.txt"),
-            Pair("processing.tutorials", "https://processing.org/tutorials/"),
-        ).map { "-D${it.first}=${it.second}" }.toTypedArray())
+
+        val variables = mapOf(
+            "processing.group" to (rootProject.group.takeIf { it != "" } ?: "processing"),
+            "processing.version" to rootProject.version,
+            "processing.revision" to (findProperty("revision") ?: Int.MAX_VALUE),
+            "processing.contributions.source" to "https://contributions.processing.org/contribs",
+            "processing.download.page" to "https://processing.org/download/",
+            "processing.download.latest" to "https://processing.org/download/latest.txt",
+            "processing.tutorials" to "https://processing.org/tutorials/",
+        )
+
+        jvmArgs(*variables.entries.map { "-D${it.key}=${it.value}" }.toTypedArray())
 
         nativeDistributions{
             modules("jdk.jdi", "java.compiler", "jdk.accessibility", "java.management.rmi")

app/src/processing/app/gradle/GradleService.kt

@@ -134,22 +134,36 @@ class GradleService(val editor: Editor) {
 
 
 
-    fun ProjectConnection.newSketchBuild(): BuildLauncher{
+    private fun ProjectConnection.newSketchBuild(): BuildLauncher{
         finishedTasks.clear()
-        // TODO: Research if we can generate these programmatically
-        // Ideally they would not be placed into the sketch folder
 
-        val initGradle = kotlin.io.path.createTempDirectory().resolve("init.gradle.kts").apply {
+        val workingDir = kotlin.io.path.createTempDirectory()
+        val group = System.getProperty("processing.group", "org.processing")
+
+        val variables = mapOf(
+            "group" to group,
+            "version" to Base.getVersionName(),
+            "sketchFolder" to folder.absolutePath,
+            "workingDir" to workingDir.toAbsolutePath().toString(),
+            "settings" to Platform.getSettingsFolder().absolutePath.toString()
+        )
+
+        val initGradle = workingDir.resolve("init.gradle.kts").apply {
             val content = """
                 beforeSettings{
                     pluginManagement {
                         repositories {
                             maven { url = uri("${Platform.getContentFile("repository").absolutePath}") }
-                            //mavenLocal()
                             gradlePluginPortal()
                         }
                     }
                 }
+                allprojects{
+                    repositories {
+                        maven { url = uri("${Platform.getContentFile("repository").absolutePath}") }
+                        mavenCentral()
+                    }
+                }
             """.trimIndent()
 
             writeText(content)
@@ -161,20 +175,24 @@ class GradleService(val editor: Editor) {
             Messages.log("build.gradle.kts not found in ${folder}, creating one")
             // TODO: Allow for other plugins to be registered
             // TODO: Allow for the whole configuration to be overridden
+            // TODO: Move this to java mode
             val content = """
                     // Managed by: Processing ${Base.getVersionName()}
                     // If you delete this comment Processing will no longer update the build scripts
 
                     plugins{
-                        id("processing.java.gradle") version "${Base.getVersionName()}"
+                        id("org.processing.gradle") version "${Base.getVersionName()}"
                     }
                 """.trimIndent()
             buildGradle.writeText(content)
         }
 
         return this.newBuild()
 //            .setJavaHome(Platform.getJavaHome())
-            .withArguments("--init-script", initGradle.toAbsolutePath().toString())
+            .withArguments(
+                "--init-script", initGradle.toAbsolutePath().toString(),
+                *variables.entries.map { "-Pprocessing.${it.key}=${it.value}" }.toTypedArray()
+            )
             .addProgressListener(ProgressListener { event ->
                 val name = event.descriptor.name
                 if(event is TaskStartEvent) {

java/gradle/build.gradle.kts

@@ -22,7 +22,7 @@ dependencies{
 gradlePlugin{
     plugins{
         create("processing"){
-            id = "processing.java.gradle"
+            id = "org.processing.gradle"
             implementationClass = "org.processing.java.gradle.ProcessingPlugin"
         }
     }

java/gradle/src/main/kotlin/ProcessingPlugin.kt

@@ -17,17 +17,23 @@ import javax.inject.Inject
 
 class ProcessingPlugin @Inject constructor(private val objectFactory: ObjectFactory) : Plugin<Project> {
     override fun apply(project: Project) {
+        val isProcessing = project.findProperty("processing.version") != null
+        val processingVersion = project.findProperty("processing.version") as String? ?: "4.0.0"
+        val processingGroup = project.findProperty("processing.group") as String? ?: "org.processing"
+
         project.plugins.apply(JavaPlugin::class.java)
 
-        // TODO: Only set the build directory when run from the Processing plugin
-        project.layout.buildDirectory.set(project.layout.projectDirectory.dir(".processing"))
+        if(isProcessing){
+            project.layout.buildDirectory.set(File(project.findProperty("processing.workingDir") as String))
+            project.tasks.findByName("wrapper")?.enabled = false
+        }
 
         project.plugins.apply("org.jetbrains.compose")
         project.plugins.apply("org.jetbrains.kotlin.jvm")
         project.plugins.apply("org.jetbrains.kotlin.plugin.compose")
 
         // TODO: Add to tests
-        project.dependencies.add("implementation", "org.processing:core:4.4.0")
+        project.dependencies.add("implementation", "$processingGroup:core:${processingVersion}")
         // TODO: Add tests to test if code jars are working
         project.dependencies.add("implementation", project.fileTree("src").apply { include("**/code/*.jar") })
 
@@ -66,8 +72,6 @@ class ProcessingPlugin @Inject constructor(private val objectFactory: ObjectFact
                 application.nativeDistributions.modules("java.management")
             }
         }
-        // TODO: Also only do within Processing
-        project.tasks.findByName("wrapper")?.enabled = false
 
         project.tasks.create("sketch").apply {
             group = "processing"