Internal Gradle Runner

.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 }}

app/ant/processing/app/gradle/GradleService.java

@@ -0,0 +1,22 @@
+package processing.app.gradle;
+
+import processing.app.Mode;
+import processing.app.Sketch;
+import processing.app.ui.Editor;
+
+import java.io.PrintStream;
+
+public class GradleService {
+    public GradleService(Mode mode, Editor editor) { }
+
+    public void setEnabled(boolean enabled) {}
+    public boolean getEnabled() { return false; }
+    public void prepare(){}
+    public void run() {}
+    public void export(){}
+    public void stop() {}
+    public void startService() {}
+    public void setSketch(Sketch sketch) {}
+    public void setErr(PrintStream err) {}
+    public void setOut(PrintStream out) {}
+}

app/build.gradle.kts

@@ -51,27 +51,66 @@ compose.desktop {
     application {
         mainClass = "processing.app.ProcessingKt"
 
-        jvmArgs(*listOf(
+        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"),
             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())
+        ).map { "-D${it.first}=${it.second}" }.toTypedArray()
+        )
 
         nativeDistributions{
-            modules("jdk.jdi", "java.compiler", "jdk.accessibility", "jdk.zipfs", "java.management.rmi", "java.scripting", "jdk.httpserver")
+            modules(
+                "jdk.jdi",
+                "java.compiler",
+                "jdk.accessibility",
+                "jdk.zipfs",
+                "java.management.rmi",
+                "java.scripting",
+                "jdk.httpserver"
+            )
             targetFormats(TargetFormat.Dmg, TargetFormat.Msi, TargetFormat.Deb)
             packageName = "Processing"
 
 
 
 
-            fileAssociation("application/x-processing","pde", "Processing Source Code",rootProject.file("build/shared/lib/icons/pde-512.png"), rootProject.file("build/windows/pde.ico"), rootProject.file("build/macos/pde.icns"))
-            fileAssociation("application/x-processing","pyde", "Processing Python Source Code",rootProject.file("build/shared/lib/icons/pde-512.png"), rootProject.file("build/windows/pde.ico"), rootProject.file("build/macos/pde.icns"))
-            fileAssociation("application/x-processing","pdez", "Processing Sketch Bundle",rootProject.file("build/shared/lib/icons/pde-512.png"), rootProject.file("build/windows/pdze.ico"), rootProject.file("build/macos/pdez.icns"))
-            fileAssociation("application/x-processing","pdex", "Processing Contribution Bundle", rootProject.file("build/shared/lib/icons/pde-512.png"), rootProject.file("build/windows/pdex.ico"), rootProject.file("build/macos/pdex.icns"))
+            fileAssociation(
+                "application/x-processing",
+                "pde",
+                "Processing Source Code",
+                rootProject.file("build/shared/lib/icons/pde-512.png"),
+                rootProject.file("build/windows/pde.ico"),
+                rootProject.file("build/macos/pde.icns")
+            )
+            fileAssociation(
+                "application/x-processing",
+                "pyde",
+                "Processing Python Source Code",
+                rootProject.file("build/shared/lib/icons/pde-512.png"),
+                rootProject.file("build/windows/pde.ico"),
+                rootProject.file("build/macos/pde.icns")
+            )
+            fileAssociation(
+                "application/x-processing",
+                "pdez",
+                "Processing Sketch Bundle",
+                rootProject.file("build/shared/lib/icons/pde-512.png"),
+                rootProject.file("build/windows/pdze.ico"),
+                rootProject.file("build/macos/pdez.icns")
+            )
+            fileAssociation(
+                "application/x-processing",
+                "pdex",
+                "Processing Contribution Bundle",
+                rootProject.file("build/shared/lib/icons/pde-512.png"),
+                rootProject.file("build/windows/pdex.ico"),
+                rootProject.file("build/macos/pdex.icns")
+            )
 
             macOS{
                 bundleID = "${rootProject.group}.app"
@@ -126,6 +165,9 @@ dependencies {
     implementation(libs.kaml)
     implementation(libs.markdown)
     implementation(libs.markdownJVM)
+    implementation(gradleApi())
+    implementation(libs.clikt)
+    implementation(libs.kotlinxSerializationJson)
 
     implementation(libs.clikt)
     implementation(libs.kotlinxSerializationJson)
@@ -136,7 +178,6 @@ dependencies {
     testImplementation(libs.mockitoKotlin)
     testImplementation(libs.junitJupiter)
     testImplementation(libs.junitJupiterParams)
-
 }
 
 tasks.test {
@@ -265,7 +306,7 @@ tasks.register("generateSnapConfiguration"){
         )
     }
 }
-tasks.register("generateFlatpakConfiguration"){
+tasks.register("generateFlatpakConfiguration") {
     val identifier = findProperty("flathubidentifier") as String? ?: "org.processing.pde"
 
     val dir = distributable().destinationDir.get()
@@ -289,7 +330,7 @@ fun replaceVariablesInFile(
     target: RegularFile,
     variables: Map<String, String>,
     sections: List<String>
-){
+) {
     var content = source.asFile.readText()
     for ((key, value) in variables) {
         content = content.replace("\$$key", value)
@@ -318,7 +359,7 @@ tasks.register<Exec>("packageSnap"){
     commandLine("snapcraft")
 }
 
-tasks.register<Exec>("buildFlatpak"){
+tasks.register<Exec>("buildFlatpak") {
     onlyIf { OperatingSystem.current().isLinux }
     dependsOn("generateFlatpakConfiguration")
     group = "compose desktop"
@@ -338,7 +379,7 @@ tasks.register<Exec>("buildFlatpak"){
     )
 }
 
-tasks.register<Exec>("packageFlatpak"){
+tasks.register<Exec>("packageFlatpak") {
     onlyIf { OperatingSystem.current().isLinux }
     dependsOn("buildFlatpak")
     group = "compose desktop"
@@ -468,7 +509,7 @@ tasks.register<Copy>("includeJavaModeResources") {
 }
 // TODO: Move to java mode
 tasks.register<Copy>("renameWindres") {
-    dependsOn("includeSharedAssets","includeJavaModeResources")
+    dependsOn("includeSharedAssets", "includeJavaModeResources")
     val dir = composeResources("modes/java/application/launch4j/bin/")
     val os = DefaultNativePlatform.getCurrentOperatingSystem()
     val platform = when {
@@ -571,9 +612,9 @@ tasks.register("signResources"){
         }
         file(composeResources("Info.plist")).delete()
     }
+}
 
 
-}
 tasks.register("setExecutablePermissions") {
     description = "Sets executable permissions on binaries in Processing.app resources"
     group = "compose desktop"
@@ -598,6 +639,15 @@ tasks.register("setExecutablePermissions") {
 afterEvaluate {
     tasks.named("prepareAppResources").configure {
         dependsOn("includeProcessingResources")
+        // Make sure all libraries are bundled in the maven repository distributed with the app
+        dependsOn(
+            listOf(
+                "core",
+                "java:preprocessor",
+                "java:gradle",
+                "java:gradle:hotreload",
+                "app:utils"
+            ).map { project(":$it").tasks.named("publishAllPublicationsToAppRepository") })
     }
     tasks.named("createDistributable").configure {
         dependsOn("includeJdk")

app/src/main/resources/defaults.txt

@@ -186,6 +186,9 @@ console.temp.days = 7
 console.scrollback.lines = 500
 console.scrollback.chars = 40000
 
+# run java sketches with Gradle aka the Modern Build System
+run.use_gradle = false
+
 # Any additional Java options when running.
 # If you change this and can't run things, it's your own durn fault.
 run.options =

app/src/main/resources/languages/PDE.properties

@@ -290,6 +290,7 @@ preferences.editor.window.height.min=Minimum editor window height
 preferences.editor.smooth=Enable antialiasing in the code editor
 preferences.editor.caret.blink=Blink the caret
 preferences.editor.caret.block=Use block caret
+preferences.use_modern_build_system = Use modern build system (see Processing GitHub Wiki more details)
 
 # Sketchbook Location (Frame)
 sketchbook_location = Select new sketchbook folder
@@ -377,6 +378,13 @@ debugger.name = Name
 debugger.value = Value
 debugger.type = Type
 
+# Gradle
+gradle.instructions = About this file: \nProcessing creates this file when you run your sketch. \nIt configures the tools needed to build and export your code. \nLearn more: [Gradle Primer link]\n \nTo customize this file: \n1. Delete the line above that begins with '@processing-auto-generated'. \nThis will prevent Processing from overwriting this file in the future. \n2. Make your desired changes.
+gradle.using_gradle = Building sketch using the new build system. (See settings to switch to the legacy build system.)
+gradle.using_eclipse = Building sketch using the legacy build system. (See settings to switch to the new build system.)
+gradle.settings = Settings
+gradle.settings.plugins = Plugins (experimental)
+
 # ---------------------------------------
 # Toolbars
 

app/src/processing/app/Language.java

@@ -173,7 +173,6 @@ static public Language init() {
     return instance;
   }
 
-
   static private String get(String key) {
     LanguageBundle bundle = init().bundle;
 

app/src/processing/app/Preferences.java

@@ -416,6 +416,8 @@ static public String getSketchbookPath() {
 
 
   static protected void setSketchbookPath(String path) {
+    // Unify path seperator for all platforms
+    path = path.replace(File.separatorChar, '/');
     set("sketchbook.path.four", path); //$NON-NLS-1$
   }
 }

app/src/processing/app/Processing.kt

@@ -13,6 +13,7 @@ import com.github.ajalt.clikt.parameters.options.option
 import processing.app.api.Contributions
 import processing.app.api.SketchCommand
 import processing.app.api.Sketchbook
+import processing.app.gradle.api.Sketch
 import processing.app.ui.Start
 import java.io.File
 import java.util.prefs.Preferences
@@ -34,7 +35,8 @@ suspend fun main(args: Array<String>){
             LegacyCLI(args),
             Contributions(),
             Sketchbook(),
-            SketchCommand()
+            SketchCommand(),
+            Sketch()
         )
         .main(args)
 }

app/src/processing/app/Sketch.java

@@ -50,6 +50,8 @@
  * Stores information about files in the current sketch.
  */
 public class Sketch {
+  public static final String PROPERTIES_NAME = "sketch.properties";
+
   private final Editor editor;
   private final Mode mode;
 
@@ -1305,7 +1307,7 @@ static protected Settings loadProperties(File folder) throws IOException {
     }
     return null;
     */
-    return new Settings(new File(folder, "sketch.properties"));
+    return new Settings(new File(folder, PROPERTIES_NAME));
   }