From 029920924527c6ec93614dfc397db99b3a265d2a Mon Sep 17 00:00:00 2001
From: Stef Tervelde <stef@steftervelde.nl>
Date: Tue, 1 Jul 2025 12:59:34 +0200
Subject: [PATCH 01/34] Squashed commit of the following:

commit 3a1aa8e712fa7e26c6fd4f61f11c25c3d63dd1b4
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Tue Jul 1 12:53:59 2025 +0200

    Restore welcome & Cleanup

commit 7d94b30f60b3b2a685734d945693ab6f2c7abe55
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Tue Jul 1 12:20:17 2025 +0200

    PR Cleanup

commit 27764e95cbab9b59ff6a714fe82236416b0f4f6f
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Mon Jun 23 13:33:50 2025 +0200

    Update Toolbar.kt

commit 97fc4c2ec9dea5c8bd21caefa7e5d08b49529232
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Mon Jun 23 13:30:47 2025 +0200

    Removed background job differentiation

commit 85566c8434f3ded9b54377104fe374d3bfd5826d
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Mon Jun 23 13:09:11 2025 +0200

    CLI Compatibility

commit 7f2f2b667c63e8c255d615481355cb1878dbe9b5
Merge: 1c8581e5c bf34adee0
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Mon Jun 23 11:14:57 2025 +0200

    Merge branch 'main' into runner

commit 1c8581e5cd51ecde11a5915035f143a0dcf31709
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Thu May 15 13:39:21 2025 +0200

    Move Gradle connection into GradleJob

commit d7420021ceb2dc368860e1954f9f21a5a238e665
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Thu May 15 10:10:33 2025 +0200

    Exclude jnilib from sources

commit 2c9ee1c77aac0e872e9ae124148d331e2dd1a6e0
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Thu May 15 09:51:08 2025 +0200

    Linux Platform addition

commit 49988e9b022dcb28d23a43d134301e24072a4ae8
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Thu May 15 09:34:44 2025 +0200

    Use forward slashes on Windows

commit da5092ef4c788ee3dd0b00463d9cbd0b698b9e0e
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Thu May 15 09:10:11 2025 +0200

    Add support for .java files & Cleanup

commit ab7c216272444d16931bf980db25698045c178c4
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Thu May 15 08:15:11 2025 +0200

    Preferences in the PDE will now be read from system before looking at files

commit 7775d016dc7b79fba3830a087b97f344dfe81658
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Wed May 14 18:07:50 2025 +0200

    Identified Bugs

commit 80c48f2fc584057bb7ce8a340dbd9f7b87855597
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Wed May 14 17:59:07 2025 +0200

    Windows Bugfix

commit 5ad43e0b49125f2313fa602ff1ef2038f891c64f
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Wed May 14 17:51:57 2025 +0200

    Set a default tab size

commit 2f99a69a69b80d77166f17d25449e1974f20d495
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Wed May 14 16:14:59 2025 +0200

    Bundle necessary plugins

commit f9b94c57018a0c0084c851a44c78d78ec73e052f
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Wed May 14 15:17:55 2025 +0200

    Only make parent dirs

commit 982c1113070a944890cf9dec92d4bcde9a5fe664
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Wed May 14 15:11:54 2025 +0200

    Show debug on gradle tests

commit 917d0d321356c43c247e9d7b711935802dbe88b8
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Wed May 14 15:08:47 2025 +0200

    Listen for folder changes

commit 12ce4422e1bc0cd5abf7173d7a001ea0a26cb35f
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Wed May 14 14:25:06 2025 +0200

    Fix saved files using an old version

commit 04ac9f2678d6308c6c8dffb68cd98bc2973e7863
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Wed May 14 13:47:21 2025 +0200

    Plugin rework for caching heavy work

commit e31d37d64df6aa9ba29ecc0e5529cf91600a3b28
Merge: df1277e58 540d299cf
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Wed May 14 10:43:43 2025 +0200

    Merge branch 'main' into runner

commit df1277e58c5665acb901a3ea81088eafeccdf283
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Wed May 14 10:39:22 2025 +0200

    Disabled modern UI for now. Added preference instead

commit c5c3b2f570cabdd1163405057bf8204d1a707336
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Mon Apr 21 14:04:39 2025 +0200

    Added todos

commit 612126a11f690ab7ec7feb7b86c9f9a786cc10cd
Merge: 3e89bfe9a ecd219b03
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Thu Apr 17 12:37:06 2025 +0200

    Merge branch 'main' into runner

commit 3e89bfe9abef46ee456fabf4d7e054a8d593855f
Merge: efa77bb8d 7489870dd
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Thu Apr 17 12:34:57 2025 +0200

    Merge branch 'runner' of https://github.com/Stefterv/processing4 into runner

commit efa77bb8d2b46680f13bba14b949e84586c81635
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Tue Apr 1 18:19:58 2025 +0200

    Cleanup

    [skip ci]

commit 7489870ddf4287adaea4b02fdc3a22b54ba3a941
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Tue Apr 1 18:19:58 2025 +0200

    Cleanup

    [skip ci]

commit 97ec5e4cb49eb980e87f37155fa3d8a96477e34c
Merge: 221ee28a0 3d6a6ce1d
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Tue Apr 1 17:54:41 2025 +0200

    Merge branch 'gradle-welcome-screen' into runner

commit 221ee28a0fcb516b6e0d129ad1028ca4ff7a51ac
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Tue Apr 1 17:53:48 2025 +0200

    Toolbar UI design start

commit a870cd03fca9113952dc34bc26db5f134ce76b1c
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Tue Apr 1 10:14:22 2025 +0200

    GradleJob Refactor

commit 2269fd35d9f91b971a163f6b63fb288adb6f9156
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Tue Apr 1 09:15:47 2025 +0200

    Gradle Runner, build script management

commit 6758d684e7863c887c3b559b7b07eeb8eab32080
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Mon Mar 31 18:40:19 2025 +0200

    Richer console output and richer exception output

commit 15114a192e36296796f5640874fd816c05e944b5
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Mon Mar 31 15:00:12 2025 +0200

    Retry vm debug connection

commit 36ce0ab1e3853eb22a28fcd84c560123aa82ae33
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Mon Mar 31 12:05:58 2025 +0200

    Runner: Fixing build errors

commit 701f9f5db84eb114721c033cd2111d16e3320147
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Sun Mar 30 23:58:36 2025 +0200

    Gradle Runner PoC Refactor

commit 947a90ea0c204ccd9c5b0139da5eba201dcf2320
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Sun Mar 30 14:51:48 2025 +0200

    Toolbar functionality PoC

commit 3d6a6ce1dfbb11650eeaa65de7a985f9d23f49d2
Merge: f7f22c5f7 2222331c9
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Sun Mar 30 08:52:37 2025 +0200

    Merge branch 'processing:main' into gradle-welcome-screen

commit 4602ef179ea92133ca5d264d8f40aea4f40d4024
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Sat Mar 29 22:50:35 2025 +0100

    Fixes for windows

commit 0d3795f89343c98ed23d9cadffd1445df25da7ba
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Sat Mar 29 22:31:47 2025 +0100

    Gradle Runner, more variables

commit ab38e5f44b5e72cbace4551ecdeddc80b70b75a1
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Sat Mar 29 20:54:02 2025 +0100

    Arguments refactor

commit 17acb01cbe30b1949c5ff60d35f5f8c59d6b567f
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Sat Mar 29 20:10:15 2025 +0100

    Copy running JDK rather than download

commit b534c26bca8737513f9808f4e737d96a173ce7ce
Merge: d6cb3eec4 2222331c9
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Sat Mar 29 18:17:20 2025 +0100

    Merge branch 'main' into runner

commit d6cb3eec45cdfeac944d5bb271ebd5733f2c36fe
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Sat Mar 29 10:20:17 2025 +0100

    Fix for signing release

commit bf82d5327f2368114e499ade3a5eb18b681a4717
Merge: 73dfa0a6e dd823a7d6
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Sat Mar 29 10:17:06 2025 +0100

    Merge branch 'runner' of https://github.com/Stefterv/processing4 into runner

commit 73dfa0a6e19c9318504c5a80d7295e495902041b
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Sat Mar 29 10:17:04 2025 +0100

    Only sign with signing set up

commit 41ef1cc9813ac6638c85ef0cabfe2121129b363c
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Fri Mar 28 09:00:23 2025 +0100

    Fix plugin name in tests

commit dd823a7d6cf0f9100a3a8ee803a38e8f2c7718cd
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Fri Mar 28 09:00:23 2025 +0100

    Fix plugin name in tests

commit 3a14ff40a41979ff7ad25a144f34629c0405e3a0
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Fri Mar 28 08:18:53 2025 +0100

    Added Stubs

commit 00f8afaa7cd179b720bbd1246c78876295939a2a
Merge: 700599ed8 1ab2359ca
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Fri Mar 28 08:13:11 2025 +0100

    Merge branch 'schema-threading' into runner

commit 700599ed8abf775379a6d14c83d4da9b1b9a05a5
Merge: 1fae4618c 499d200ef
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Fri Mar 28 08:13:06 2025 +0100

    Merge branch 'main' into runner

commit 1fae4618c926cd27044ae1ed734930943fb8723f
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Thu Mar 27 21:37:55 2025 +0100

    UI Cleanup

commit f762a3ee12842bea96cee8b011c3bdcb716d2d21
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Thu Mar 27 20:05:01 2025 +0100

    Added debugging

commit c2071a0c2624dde91f70aac1be5d60955dab624c
Merge: f453eca87 8fb9ef57b
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Thu Mar 27 18:23:23 2025 +0100

    Merge branch 'hide-scrollbars' into runner

commit f453eca87fd77d4b2b8fc96bcc9a5574a99099c0
Merge: 8f47d2110 694eb0cbe
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Thu Mar 27 18:03:34 2025 +0100

    Merge remote-tracking branch 'upstream/fix-jdk-requirement' into runner

commit 8f47d211093bbd2bd41146a113b77931cb20ebf5
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Thu Mar 27 18:00:15 2025 +0100

    Scan libaries for dependencies

commit 5d71244e0555d3d079e5b2149ba1381e524caa55
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Thu Mar 27 14:58:11 2025 +0100

    Plugin rework

commit e164fe48bc1f7ee92029ba7a85ab6a8188fea501
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Thu Mar 27 13:01:33 2025 +0100

    Gradle variables from Processing, Group resolution

commit 672c2ac479e6874965fac03a0398b6f68dc79f2d
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Thu Mar 27 11:51:08 2025 +0100

    Removed the need for settings.gradle.kts & Embedding maven repo

commit cdec594cdd57bd71b4bf0c9525af5c2921edbef0
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Wed Mar 26 18:39:04 2025 +0100

    Added export support

commit 3ad36547296ed0bfa2f457cf822c2105e90ef8d7
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Wed Mar 26 17:25:51 2025 +0100

    Gradle Runner visual styling

commit bc063e80dbda0c8f78f86b36227948954382528a
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Wed Mar 26 14:17:25 2025 +0100

    Gradle Runner PoC

commit 47d3428e6298f26aa8b6b951caaddc0d679a811e
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Sun Mar 23 18:18:54 2025 +0100

    More todo's

commit 29d76eb1d1406b81cd276ffd4ccd325edb86b930
Merge: ba496569d 9760a63b9
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Sun Mar 23 17:58:39 2025 +0100

    Merge branch 'processing:main' into gradle-plugin

commit ba496569d8f048448dd6e8e92b2faaf443cf27a7
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Tue Mar 18 10:15:40 2025 +0100

    Adding tests and direct linking

commit e01d02a8af6aa7ddc53e5a1900561473a2ed6a99
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Mon Mar 17 15:31:25 2025 +0100

    Update settings.gradle.kts

commit b0b12ddad6676e81c2981c76b270ed745ac681bd
Merge: 7e6c97add ad5c27ec4
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Mon Mar 17 15:14:35 2025 +0100

    Merge branch 'gradle-preprocessor' into gradle-plugin

commit ad5c27ec42dc6f479c1c4cee2b119568ba8fa252
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Mon Mar 17 15:11:24 2025 +0100

    Apply same parser & lexer fixes from before

commit 743ea141904c0d37127c4de6b52ed7d35ece3f32
Merge: c28a2676b 8e8f7dc5a
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Mon Mar 17 13:53:40 2025 +0100

    Merge branch 'main' into gradle-preprocessor

commit 7e6c97add90a4eb8f3ebc49faf40dcd0e61b9951
Merge: f126d4b62 8e8f7dc5a
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Mon Mar 17 13:43:21 2025 +0100

    Merge branch 'main' into gradle-plugin

commit f7f22c5f7ce8434a058d3cc5411f541777cc637e
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Mon Mar 17 10:40:37 2025 +0100

    Create Directory as well

commit d17ca0cdcda2080cf458c0352fc89e80ef4f57a7
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Mon Mar 17 10:36:35 2025 +0100

    Removed PlatformStart and create new file if doesn't exist

commit b0e7f96bddafc1a40c59d47cd81ef9919632ce84
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Mon Mar 17 10:28:12 2025 +0100

    Added initial tests

commit 0df4dc076ac6d50730e09348b941a39451197b33
Merge: 6974811be 8e8f7dc5a
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Sun Mar 16 21:18:22 2025 +0100

    Merge branch 'main' into gradle-welcome-screen

commit 6974811beb562c7c3bd6fb3ae4d94bf9831d6d3c
Merge: 7452d658c 145551246
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Tue Mar 11 20:42:46 2025 +0100

    Merge branch 'test-schema' into gradle-welcome-screen

commit 7452d658c8fdb53815d7e5f3ed7ddcaecef302aa
Merge: babf54e04 fe152b752
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Fri Mar 7 15:07:56 2025 +0100

    Merge branch 'main' into gradle-welcome-screen

commit c28a2676bd9439106800d502c856b798bd1cfc34
Merge: e18833608 fe152b752
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Fri Mar 7 15:06:27 2025 +0100

    Merge branch 'processing:main' into gradle-preprocessor

commit f126d4b6286c3f7363d13cab8797702f8cadb66c
Merge: da852b45a fe152b752
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Fri Mar 7 15:06:08 2025 +0100

    Merge branch 'processing:main' into gradle-plugin

commit babf54e04dde6ba972139c8e5744d4a6f9b449f4
Merge: 0e56f895b 00c57607d
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Mon Feb 10 17:58:35 2025 +0100

    Merge branch 'gradle-loggin' into gradle-welcome-screen

commit 0e56f895bdaac2c7597d9870eba440cd6fad0997
Merge: 54944afc2 29b557a7c
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Sun Feb 9 21:15:36 2025 +0100

    Merge branch 'main-gradle' into gradle-welcome-screen

commit 54944afc24a1058bf6fcc5a9899bfdeaa1283229
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Sun Feb 9 14:36:37 2025 +0100

    Welcome Screen: JDK Module

commit 8d8bd01d806257367b1a006f0da23b926b8f8ae3
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Sun Feb 9 13:54:07 2025 +0100

    Welcome Screen: Close Functionality

commit 3df4da94618ed66d9a2b48a601b0ce7bac9a2d4e
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Sun Feb 9 12:57:55 2025 +0100

    Welcome Screen: Bugfixes

commit cb184fb104ac9c4ead2e6352573f726189da7b70
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Sun Feb 9 12:19:33 2025 +0100

    Welcome Screen: Layout fixes

commit 3d81b02ffed2c28560bc2067f1584e05db0bad51
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Sat Feb 8 22:47:28 2025 +0100

    Welcome Screen: Language selection

commit b0c61a4467e8c9f5d02bcc8c84e47908fad22d95
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Sat Feb 8 11:10:33 2025 +0100

    Welcome Screen: Load & Display examples

commit 2f12d13422c0359562663d93202fe7ce80c3c949
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Fri Feb 7 21:53:49 2025 +0100

    Saveable/Reactive Preferences

commit 8ed2d1b40acdc38e0ecde7a5831ef47a9ad1559b
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Fri Feb 7 16:34:23 2025 +0100

    Welcome Screen: WIP

commit 5c020dd0170153bd1a31ffaeed853966e66c5175
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Fri Feb 7 15:49:25 2025 +0100

    Welcome Screen: Initial Layout

commit bd3a77ef17a456aa2ceb281cc2cf293f8be9d685
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Fri Feb 7 12:09:58 2025 +0100

    Welcome Screen: Window Abstraction

commit b1910de2e61f6b8b2492b9847ba7f35eec67317a
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Fri Feb 7 11:24:30 2025 +0100

    Welcome Screen: Initial Frame

commit da852b45a109e27b3b3226fd78a0efd41b695fad
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Wed Feb 5 20:54:32 2025 +0100

    Fullscreen support

commit 44ab816ca9fe2113f1868c3bda3372afaa9fec5d
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Wed Feb 5 20:38:27 2025 +0100

    disable full screen from settings and fixed a few bugs

commit e18833608b1f66866d17dbf8f75708e409fe6022
Merge: df745bb09 3f3e7d785
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Wed Feb 5 13:03:51 2025 +0100

    Merge branch 'main-gradle' into gradle/preprocessor

commit 031d304dbd6aa73998e07fa696b691e85dd9c2b1
Merge: 25e147eaf 3f3e7d785
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Wed Feb 5 13:03:12 2025 +0100

    Merge branch 'main-gradle' into gradle/plugin

commit 25e147eaf1bdfa8b245e86447d2066bded147b44
Merge: 7f00d5b02 3b9aea1f4
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Wed Feb 5 12:56:55 2025 +0100

    Merge branch 'main-gradle' into gradle/plugin

commit df745bb09c080929bc64d70bf90d27e9da807d8f
Merge: f016cc474 3b9aea1f4
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Wed Feb 5 12:56:38 2025 +0100

    Merge branch 'main-gradle' into gradle/preprocessor

commit 7f00d5b0289dda41d92b126149a81f20d1ccdc31
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Wed Feb 5 12:36:18 2025 +0100

    added example of plugin usage

commit f4d7fbf99b399889de6b6d0bbafa0148dcb84782
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Wed Feb 5 09:19:08 2025 +0100

    Changed naming

commit 1b8a8ed461cb39eb0489564589e144178fb1bef5
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Wed Feb 5 09:10:42 2025 +0100

    Gradle Plugin from PoC

commit 5468da0fd6b42f790340acb3e2d00472ae5f42af
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Tue Feb 4 16:18:29 2025 +0100

    Removed outdated ant backwards compatibility marks

commit 23c8a4626ac370b560169df130d86d4b58d859e2
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Mon Feb 3 12:07:01 2025 +0100

    - Imports cleanup
    - Disable system look & feel on macOS for readability
    - Cleaned unnecessary space
    - Cleaned finished TODO

commit f016cc474caa637f982c8dd21078801974aabb69
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Wed Feb 5 12:01:47 2025 +0100

    Removed core dependency from the pre-processor

commit 971d98bba0a8acf24a9430015a7c1508e2c9d2a3
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Thu Jan 30 22:59:16 2025 +0100

    Preprocessor with antlr Plugin
---
 .gitignore                                    |  25 +-
 .idea/jarRepositories.xml                     |  10 +
 .../processing/app/gradle/GradleService.java  |  15 +
 app/build.gradle.kts                          |  51 +-
 app/src/main/resources/defaults.txt           |   3 +
 app/src/processing/app/Language.java          |   1 -
 app/src/processing/app/Preferences.java       |   2 +
 app/src/processing/app/Processing.kt          |   4 +-
 app/src/processing/app/gradle/Debugger.kt     |  43 +
 app/src/processing/app/gradle/Exceptions.kt   | 103 +++
 app/src/processing/app/gradle/GradleJob.kt    | 177 ++++
 .../processing/app/gradle/GradleService.kt    | 214 +++++
 app/src/processing/app/gradle/api/Sketch.kt   |  63 ++
 app/src/processing/app/ui/Editor.java         |  12 +-
 app/src/processing/app/ui/EditorConsole.java  |   5 +
 .../processing/app/ui/PreferencesFrame.java   |  11 +
 .../app/gradle/GradleServiceTest.kt           |  13 +
 build.gradle.kts                              |  17 +-
 build/shared/lib/defaults.txt                 |   3 +
 build/shared/lib/languages/PDE.properties     |  18 +
 core/build.gradle.kts                         |  17 +-
 core/src/processing/core/PApplet.java         |  18 +-
 gradle/libs.versions.toml                     |   9 +-
 java/build.gradle.kts                         |  22 +-
 java/gradle/build.gradle.kts                  |  38 +
 java/gradle/example/.idea/.gitignore          |   5 +
 java/gradle/example/.idea/gradle.xml          |  55 ++
 java/gradle/example/.idea/kotlinc.xml         |   6 +
 java/gradle/example/.idea/misc.xml            |   4 +
 java/gradle/example/.idea/vcs.xml             |   6 +
 java/gradle/example/brightness.pde            |  32 +
 java/gradle/example/build.gradle.kts          |   3 +
 java/gradle/example/settings.gradle.kts       |   5 +
 .../src/main/kotlin/DependenciesTask.kt       |  76 ++
 java/gradle/src/main/kotlin/LibrariesTask.kt  |  71 ++
 java/gradle/src/main/kotlin/PDETask.kt        |  95 ++
 .../src/main/kotlin/ProcessingPlugin.kt       | 183 ++++
 .../src/test/kotlin/ProcessingPluginTest.kt   |  18 +
 java/lsp/build.gradle.kts                     |   5 +-
 java/preprocessor/build.gradle.kts            |  38 +-
 java/preprocessor/src/main/antlr/JavaLexer.g4 | 235 +++++
 .../preprocessor/src/main/antlr/JavaParser.g4 | 826 ++++++++++++++++++
 .../mode/java/preproc/Processing.g4           | 147 ++++
 .../main/java/processing/app/Platform.java    |  16 +-
 .../main/java/processing/app/Preferences.java |   2 +-
 java/src/processing/mode/java/JavaEditor.java |  21 +-
 .../java/preproc/PdeParseTreeListener.java    |  33 +-
 .../mode/java/preproc/TextTransform.java      |  10 +-
 java/test/resources/bug1532.pde               |   6 +-
 settings.gradle.kts                           |   1 +
 50 files changed, 2704 insertions(+), 89 deletions(-)
 create mode 100644 app/ant/processing/app/gradle/GradleService.java
 create mode 100644 app/src/processing/app/gradle/Debugger.kt
 create mode 100644 app/src/processing/app/gradle/Exceptions.kt
 create mode 100644 app/src/processing/app/gradle/GradleJob.kt
 create mode 100644 app/src/processing/app/gradle/GradleService.kt
 create mode 100644 app/src/processing/app/gradle/api/Sketch.kt
 create mode 100644 app/test/processing/app/gradle/GradleServiceTest.kt
 create mode 100644 java/gradle/build.gradle.kts
 create mode 100644 java/gradle/example/.idea/.gitignore
 create mode 100644 java/gradle/example/.idea/gradle.xml
 create mode 100644 java/gradle/example/.idea/kotlinc.xml
 create mode 100644 java/gradle/example/.idea/misc.xml
 create mode 100644 java/gradle/example/.idea/vcs.xml
 create mode 100644 java/gradle/example/brightness.pde
 create mode 100644 java/gradle/example/build.gradle.kts
 create mode 100644 java/gradle/example/settings.gradle.kts
 create mode 100644 java/gradle/src/main/kotlin/DependenciesTask.kt
 create mode 100644 java/gradle/src/main/kotlin/LibrariesTask.kt
 create mode 100644 java/gradle/src/main/kotlin/PDETask.kt
 create mode 100644 java/gradle/src/main/kotlin/ProcessingPlugin.kt
 create mode 100644 java/gradle/src/test/kotlin/ProcessingPluginTest.kt
 create mode 100644 java/preprocessor/src/main/antlr/JavaLexer.g4
 create mode 100644 java/preprocessor/src/main/antlr/JavaParser.g4
 create mode 100644 java/preprocessor/src/main/antlr/processing/mode/java/preproc/Processing.g4

diff --git a/.gitignore b/.gitignore
index 26b5b97563..b9a0753322 100644
--- a/.gitignore
+++ b/.gitignore
@@ -98,20 +98,27 @@ bin-test
 processing-examples
 
 # Maven ignores
+.kotlin
 .gradle
-core/build/
-build/publish/
-app/build
-java/build/
+.build/
+/core/build/
+/build/publish/
+/app/build
+/java/build/
 /build/reports
 /java/bin
 /java/libraries/svg/bin
 /java/preprocessor/build
 /java/lsp/build
-/.kotlin/sessions
-/core/examples/build
-
-.build/
-/app/windows/obj
 /java/gradle/build
+/core/examples/build
 /java/gradle/example/.processing
+/app/windows/obj
+/java/android/example/build
+/java/android/example/.processing
+/java/gradle/example/build
+/java/gradle/example/gradle/wrapper/gradle-wrapper.jar
+/java/gradle/example/gradle/wrapper/gradle-wrapper.properties
+/java/gradle/example/gradlew
+/java/gradle/example/gradlew.bat
+/java/gradle/example/.kotlin/errors
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
index e9be690395..2db2e88c86 100644
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -26,5 +26,15 @@
       <option name="name" value="Google" />
       <option name="url" value="https://dl.google.com/dl/android/maven2/" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="MavenLocal" />
+      <option name="name" value="MavenLocal" />
+      <option name="url" value="file:$MAVEN_REPOSITORY$/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven" />
+      <option name="name" value="maven" />
+      <option name="url" value="https://repo.gradle.org/gradle/libs-releases" />
+    </remote-repository>
   </component>
 </project>
\ No newline at end of file
diff --git a/app/ant/processing/app/gradle/GradleService.java b/app/ant/processing/app/gradle/GradleService.java
new file mode 100644
index 0000000000..0beca36abd
--- /dev/null
+++ b/app/ant/processing/app/gradle/GradleService.java
@@ -0,0 +1,15 @@
+package processing.app.gradle;
+
+import processing.app.ui.Editor;
+
+public class GradleService {
+    public GradleService(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() {}
+}
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 5323a1a829..6df826fdb8 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -1,6 +1,8 @@
 import org.gradle.internal.jvm.Jvm
+import org.gradle.kotlin.dsl.support.zipTo
 import org.gradle.internal.os.OperatingSystem
 import org.gradle.nativeplatform.platform.internal.DefaultNativePlatform
+import org.jetbrains.compose.ExperimentalComposeLibrary
 import org.jetbrains.compose.desktop.application.dsl.TargetFormat
 import org.jetbrains.compose.desktop.application.tasks.AbstractJPackageTask
 import org.jetbrains.compose.internal.de.undercouch.gradle.tasks.download.Download
@@ -49,14 +51,18 @@ compose.desktop {
     application {
         mainClass = "processing.app.ProcessingKt"
 
-        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", "java.scripting")
@@ -110,6 +116,7 @@ dependencies {
     implementation(compose.ui)
     implementation(compose.components.resources)
     implementation(compose.components.uiToolingPreview)
+    implementation(compose.materialIconsExtended)
 
     implementation(compose.desktop.currentOs)
 
@@ -117,13 +124,13 @@ dependencies {
     implementation(libs.kaml)
     implementation(libs.markdown)
     implementation(libs.markdownJVM)
+    implementation(gradleApi())
+    implementation(libs.clikt)
 
     testImplementation(kotlin("test"))
     testImplementation(libs.mockitoKotlin)
     testImplementation(libs.junitJupiter)
     testImplementation(libs.junitJupiterParams)
-
-    implementation(libs.clikt)
 }
 
 tasks.test {
@@ -405,23 +412,6 @@ tasks.register<Copy>("includeJavaModeResources") {
     from(java.layout.buildDirectory.dir("resources-bundled"))
     into(composeResources("../"))
 }
-// TODO: Move to java mode
-tasks.register<Copy>("renameWindres") {
-    dependsOn("includeSharedAssets","includeJavaModeResources")
-    val dir = composeResources("modes/java/application/launch4j/bin/")
-    val os = DefaultNativePlatform.getCurrentOperatingSystem()
-    val platform = when {
-        os.isWindows -> "windows"
-        os.isMacOsX -> "macos"
-        else -> "linux"
-    }
-    from(dir) {
-        include("*-$platform*")
-        rename("(.*)-$platform(.*)", "$1$2")
-    }
-    duplicatesStrategy = DuplicatesStrategy.INCLUDE
-    into(dir)
-}
 tasks.register("includeProcessingResources"){
     dependsOn(
         "includeJdk",
@@ -430,8 +420,7 @@ tasks.register("includeProcessingResources"){
         "includeSharedAssets",
         "includeProcessingExamples",
         "includeProcessingWebsiteExamples",
-        "includeJavaModeResources",
-        "renameWindres"
+        "includeJavaModeResources"
     )
     finalizedBy("signResources")
 }
@@ -510,9 +499,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"
@@ -537,6 +526,8 @@ 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").map { project(":$it").tasks.named("publishAllPublicationsToAppRepository") })
     }
     tasks.named("createDistributable").configure {
         finalizedBy("setExecutablePermissions")
diff --git a/app/src/main/resources/defaults.txt b/app/src/main/resources/defaults.txt
index 6e3e00f0d6..431988bb74 100644
--- a/app/src/main/resources/defaults.txt
+++ b/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 =
diff --git a/app/src/processing/app/Language.java b/app/src/processing/app/Language.java
index d55c8b710c..ad67ffe8fb 100644
--- a/app/src/processing/app/Language.java
+++ b/app/src/processing/app/Language.java
@@ -183,7 +183,6 @@ static public Language init() {
     return instance;
   }
 
-
   static private String get(String key) {
     LanguageBundle bundle = init().bundle;
 
diff --git a/app/src/processing/app/Preferences.java b/app/src/processing/app/Preferences.java
index 640c77eade..076506296f 100644
--- a/app/src/processing/app/Preferences.java
+++ b/app/src/processing/app/Preferences.java
@@ -393,6 +393,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$
   }
 }
diff --git a/app/src/processing/app/Processing.kt b/app/src/processing/app/Processing.kt
index 02465c8b5b..e503db4653 100644
--- a/app/src/processing/app/Processing.kt
+++ b/app/src/processing/app/Processing.kt
@@ -10,6 +10,7 @@ import com.github.ajalt.clikt.parameters.arguments.multiple
 import com.github.ajalt.clikt.parameters.options.flag
 import com.github.ajalt.clikt.parameters.options.help
 import com.github.ajalt.clikt.parameters.options.option
+import processing.app.gradle.api.Sketch
 import processing.app.ui.Start
 
 class Processing: SuspendingCliktCommand("processing"){
@@ -40,7 +41,8 @@ suspend fun main(args: Array<String>){
    Processing()
         .subcommands(
             LSP(),
-            LegacyCLI(args)
+            LegacyCLI(args),
+            Sketch()
         )
         .main(args)
 }
diff --git a/app/src/processing/app/gradle/Debugger.kt b/app/src/processing/app/gradle/Debugger.kt
new file mode 100644
index 0000000000..aea18ec133
--- /dev/null
+++ b/app/src/processing/app/gradle/Debugger.kt
@@ -0,0 +1,43 @@
+package processing.app.gradle
+
+import com.sun.jdi.Bootstrap
+import com.sun.jdi.VirtualMachine
+import com.sun.jdi.connect.AttachingConnector
+import kotlinx.coroutines.delay
+import processing.app.Messages
+import kotlin.time.Duration.Companion.seconds
+import kotlin.time.TimeSource
+
+class Debugger {
+    companion object {
+        suspend fun connect(port: Int?): VirtualMachine? {
+            try {
+                Messages.log("Attaching to VM $port")
+                val connector = Bootstrap.virtualMachineManager().allConnectors()
+                    .firstOrNull { it.name() == "com.sun.jdi.SocketAttach" }
+                        as AttachingConnector?
+                    ?: throw IllegalStateException("No socket attach connector found")
+                val args = connector.defaultArguments()
+                args["port"]?.setValue(port?.toString() ?: "5005")
+
+                // Try to attach the debugger, retrying if it fails
+                val start = TimeSource.Monotonic.markNow()
+                while (start.elapsedNow() < 10.seconds) {
+                    try {
+                        val sketch = connector.attach(args)
+                        sketch.resume()
+                        Messages.log("Attached to VM: ${sketch.name()}")
+                        return sketch
+                    } catch (e: Exception) {
+                        Messages.log("Error while attaching to VM: ${e.message}... Retrying")
+                    }
+                    delay(250)
+                }
+            } catch (e: Exception) {
+                Messages.log("Error while attaching to VM: ${e.message}")
+                return null
+            }
+            return null
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/processing/app/gradle/Exceptions.kt b/app/src/processing/app/gradle/Exceptions.kt
new file mode 100644
index 0000000000..947d720a2e
--- /dev/null
+++ b/app/src/processing/app/gradle/Exceptions.kt
@@ -0,0 +1,103 @@
+package processing.app.gradle
+
+import com.sun.jdi.ObjectReference
+import com.sun.jdi.StackFrame
+import com.sun.jdi.StringReference
+import com.sun.jdi.VirtualMachine
+import com.sun.jdi.event.ExceptionEvent
+import com.sun.jdi.request.EventRequest
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
+import processing.app.Messages
+
+// TODO: Consider adding a panel to the footer
+class Exceptions {
+    companion object {
+        suspend fun listen(vm: VirtualMachine) {
+            try {
+                val manager = vm.eventRequestManager()
+
+                val request = manager.createExceptionRequest(null, false, true)
+                request.setSuspendPolicy(EventRequest.SUSPEND_EVENT_THREAD)
+                request.enable()
+
+                val queue = vm.eventQueue()
+                while (true) {
+                    val eventSet = queue.remove()
+                    for (event in eventSet) {
+                        if (event is ExceptionEvent) {
+                            printExceptionDetails(event)
+                            event.thread().resume()
+                        }
+                    }
+                    eventSet.resume()
+                    delay(10)
+                }
+            } catch (e: Exception) {
+                Messages.log("Error while listening for exceptions: ${e.message}")
+            }
+        }
+
+        fun printExceptionDetails(event: ExceptionEvent) {
+            val exception = event.exception()
+            val thread = event.thread()
+            val location = event.location()
+            val stackFrames = thread.frames()
+
+            println("\n🚨 Exception Caught 🚨")
+            println("Type       : ${exception.referenceType().name()}")
+            // TODO: Fix exception message retrieval
+//        println("Message    : ${getExceptionMessage(exception)}")
+            println("Thread     : ${thread.name()}")
+            println("Location   : ${location.sourcePath()}:${location.lineNumber()}\n")
+
+            // TODO: Map to .pde file again
+            // TODO: Communicate back to Editor
+
+            // Separate stack frames
+            val userFrames = mutableListOf<StackFrame>()
+            val processingFrames = mutableListOf<StackFrame>()
+
+            stackFrames.forEach { frame ->
+                val className = frame.location().declaringType().name()
+                if (className.startsWith("processing.")) {
+                    processingFrames.add(frame)
+                } else {
+                    userFrames.add(frame)
+                }
+            }
+
+            // Print user frames first
+            println("🔍 Stacktrace (Your Code First):")
+            userFrames.forEachIndexed { index, frame -> printStackFrame(index, frame) }
+
+            // Print Processing frames second
+            if (processingFrames.isNotEmpty()) {
+                println("\n🔧 Processing Stacktrace (Hidden Initially):")
+                processingFrames.forEachIndexed { index, frame -> printStackFrame(index, frame) }
+            }
+
+            println("──────────────────────────────────\n")
+        }
+
+        fun printStackFrame(index: Int, frame: StackFrame) {
+            val location = frame.location()
+            val method = location.method()
+            println(
+                "   #$index ${location.sourcePath()}:${location.lineNumber()} -> ${
+                    method.declaringType().name()
+                }.${method.name()}()"
+            )
+        }
+
+        // Extracts the exception's message
+        fun getExceptionMessage(exception: ObjectReference): String {
+            val messageMethod = exception.referenceType().methodsByName("getMessage").firstOrNull() ?: return "Unknown"
+            val messageValue =
+                exception.invokeMethod(null, messageMethod, emptyList(), ObjectReference.INVOKE_SINGLE_THREADED)
+            return (messageValue as? StringReference)?.value() ?: "Unknown"
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/processing/app/gradle/GradleJob.kt b/app/src/processing/app/gradle/GradleJob.kt
new file mode 100644
index 0000000000..d67055a259
--- /dev/null
+++ b/app/src/processing/app/gradle/GradleJob.kt
@@ -0,0 +1,177 @@
+package processing.app.gradle
+
+import androidx.compose.runtime.mutableStateListOf
+import androidx.compose.runtime.mutableStateOf
+import com.sun.jdi.*
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import org.gradle.tooling.BuildLauncher
+import org.gradle.tooling.GradleConnector
+import org.gradle.tooling.events.ProgressListener
+import org.gradle.tooling.events.problems.ProblemEvent
+import org.gradle.tooling.events.problems.Severity
+import org.gradle.tooling.events.problems.internal.DefaultFileLocation
+import org.gradle.tooling.events.problems.internal.DefaultSingleProblemEvent
+import org.gradle.tooling.events.task.TaskFinishEvent
+import org.gradle.tooling.events.task.TaskStartEvent
+import processing.app.Base
+import processing.app.Messages
+import java.io.InputStreamReader
+import java.io.PipedInputStream
+import java.io.PipedOutputStream
+import java.lang.IllegalStateException
+
+// TODO: Move the error reporting to its own file
+// TODO: Move the output filtering to its own file
+class GradleJob{
+    enum class State{
+        NONE,
+        BUILDING,
+        RUNNING,
+        DONE
+    }
+
+    var service: GradleService? = null
+    var configure: BuildLauncher.() -> Unit = {}
+
+    val state = mutableStateOf(State.NONE)
+    val vm = mutableStateOf<VirtualMachine?>(null)
+    val problems = mutableStateListOf<ProblemEvent>()
+
+    private val scope = CoroutineScope(Dispatchers.IO)
+    private val cancel = GradleConnector.newCancellationTokenSource()
+
+    private val outputStream = PipedOutputStream()
+    private val errorStream = PipedOutputStream()
+
+    fun start() {
+        val folder = service?.sketch?.folder ?: throw IllegalStateException("Sketch folder is not set")
+        scope.launch {
+            try {
+                state.value = State.BUILDING
+
+                GradleConnector.newConnector()
+                    .forProjectDirectory(folder)
+                    .connect()
+                    .newBuild()
+                    .apply {
+                        configure()
+                        withCancellationToken(cancel.token())
+                        addStateListener()
+                        addDebugging()
+                        setStandardOutput(outputStream)
+                        setStandardError(errorStream)
+                        run()
+                    }
+            }catch (e: Exception){
+                Messages.log("Error while running: ${e.message} ${e.cause?.message}")
+            }finally {
+                state.value = State.DONE
+                vm.value = null
+            }
+        }
+        // TODO: I'm sure this can be done better
+        scope.launch {
+            try {
+                InputStreamReader(PipedInputStream(outputStream)).buffered().use { reader ->
+                    reader.lineSequence()
+                        .forEach { line ->
+                            if (cancel.token().isCancellationRequested) {
+                                return@launch
+                            }
+                            if (state.value != State.RUNNING) {
+                                return@forEach
+                            }
+                            service?.out?.println(line)
+                        }
+                }
+            }catch (e: Exception){
+                Messages.log("Error while reading output: ${e.message}")
+            }
+        }
+        scope.launch {
+            try {
+                InputStreamReader(PipedInputStream(errorStream)).buffered().use { reader ->
+                    reader.lineSequence()
+                        .forEach { line ->
+                            if (cancel.token().isCancellationRequested) {
+                                return@launch
+                            }
+                            if (state.value != State.RUNNING) {
+                                return@forEach
+                            }
+                            when{
+                                line.contains("+[IMKClient subclass]: chose IMKClient_Modern") -> return@forEach
+                                line.contains("+[IMKInputSession subclass]: chose IMKInputSession_Modern") -> return@forEach
+                                line.startsWith("__MOVE__") -> return@forEach
+                                else -> service?.err?.println(line)
+                            }
+                        }
+                }
+            }catch (e: Exception){
+                Messages.log("Error while reading error: ${e.message}")
+            }
+        }
+
+    }
+
+    fun cancel(){
+        cancel.cancel()
+    }
+    private fun BuildLauncher.addStateListener(){
+        addProgressListener(ProgressListener { event ->
+            if(event is TaskStartEvent) {
+                when(event.descriptor.name) {
+                    ":run" -> {
+                        state.value = State.RUNNING
+                        Messages.log("Start run")
+                    }
+                }
+
+            }
+            if(event is TaskFinishEvent) {
+                when(event.descriptor.name){
+                    ":jar"->{
+                        state.value = State.NONE
+                        Messages.log("Jar finished")
+                    }
+                    ":run"->{
+                        state.value = State.NONE
+                    }
+                }
+            }
+            if(event is DefaultSingleProblemEvent) {
+                // TODO: Move to UI instead of printing
+                if(event.definition.severity == Severity.ADVICE) return@ProgressListener
+                problems.add(event)
+
+                val path = (event.locations.firstOrNull() as DefaultFileLocation?)?.path
+
+                val header = """
+                    ${event.definition.id.displayName}: 
+                        ${event.contextualLabel.contextualLabel}
+                    """.trimIndent()
+
+                val details = event.details.details?.replace(path ?: "", "")
+                val solutions = event.solutions.joinToString("\n") { it.solution }
+                val content = "$header\n$details\n$solutions"
+                service?.err?.println(content)
+            }
+        })
+    }
+
+    fun BuildLauncher.addDebugging() {
+        addProgressListener(ProgressListener { event ->
+            if (event !is TaskStartEvent) return@ProgressListener
+            if (event.descriptor.name != ":run") return@ProgressListener
+
+            scope.launch {
+                val debugger = Debugger.connect(service?.debugPort) ?: return@launch
+                vm.value = debugger
+                Exceptions.listen(debugger)
+            }
+
+        })
+    }
+}
\ No newline at end of file
diff --git a/app/src/processing/app/gradle/GradleService.kt b/app/src/processing/app/gradle/GradleService.kt
new file mode 100644
index 0000000000..af04f884b4
--- /dev/null
+++ b/app/src/processing/app/gradle/GradleService.kt
@@ -0,0 +1,214 @@
+package processing.app.gradle
+
+import androidx.compose.runtime.mutableStateListOf
+import androidx.compose.runtime.mutableStateOf
+import org.gradle.tooling.BuildLauncher
+import processing.app.Base
+import processing.app.Language
+import processing.app.Messages
+import processing.app.Mode
+import processing.app.Platform
+import processing.app.Preferences
+import processing.app.Sketch
+import processing.app.ui.Editor
+import java.io.*
+import kotlin.io.path.createTempDirectory
+import kotlin.io.path.deleteIfExists
+import kotlin.io.path.writeText
+
+// TODO: Test offline mode, gradle seems to be included as not needed to be downloaded.
+// TODO: Test running examples
+// TODO: Report failures to the console
+// TODO: Highlight errors in the editor
+
+// TODO: ---- FUTURE ----
+// TODO: Improve progress tracking
+// TODO: PoC new debugger/tweak mode
+// TODO: Allow for plugins to skip gradle entirely / new modes
+// TODO: Add background building
+// TODO: Track build speed (for analytics?)
+
+// The gradle service runs the gradle tasks and manages the gradle connection
+// It will create the necessary build files for gradle to run
+// Then it will kick off a new GradleJob to run the tasks
+// GradleJob manages the gradle build and connects the debugger
+class GradleService(
+    val mode: Mode,
+    val editor: Editor?,
+) {
+    val active = mutableStateOf(Preferences.getBoolean("run.use_gradle"))
+
+    var sketch: Sketch? = null
+
+    var out: PrintStream = System.out
+    var err: PrintStream = System.err
+
+    val jobs = mutableStateListOf<GradleJob>()
+    val workingDir = createTempDirectory()
+    val debugPort = (30_000..60_000).random()
+
+    // TODO: Add support for present
+    fun run(){
+        stopActions()
+
+        val job = GradleJob()
+        job.service = this
+        job.configure = {
+            setup()
+            forTasks("run")
+        }
+        jobs.add(job)
+        job.start()
+    }
+
+    fun export(){
+        stopActions()
+
+        val job = GradleJob()
+        job.service = this
+        job.configure = {
+            setup()
+            forTasks("runDistributable")
+        }
+        jobs.add(job)
+        job.start()
+    }
+
+    fun stop(){
+        stopActions()
+    }
+
+    fun stopActions(){
+        jobs
+            .forEach(GradleJob::cancel)
+    }
+
+    private fun setupGradle(): MutableList<String> {
+        val sketch = sketch ?: throw IllegalStateException("Sketch is not set")
+
+        val unsaved = sketch.code
+            .map { code ->
+                val file = workingDir.resolve("unsaved/${code.fileName}")
+                file.parent.toFile().mkdirs()
+                // If tab is marked modified save it to the working directory
+                // Otherwise delete the file
+                if(code.isModified){
+                    file.writeText(code.documentText)
+                }else{
+                    file.deleteIfExists()
+                }
+                return@map code.fileName
+            }
+
+        val group = System.getProperty("processing.group", "org.processing")
+
+        val variables = mapOf(
+            "group" to group,
+            "version" to Base.getVersionName(),
+            "sketchFolder" to sketch.folder.absolutePath,
+            "sketchbook" to Base.getSketchbookFolder(),
+            "workingDir" to workingDir.toAbsolutePath().toString(),
+            "settings" to Platform.getSettingsFolder().absolutePath.toString(),
+            "unsaved" to unsaved.joinToString(","),
+            "debugPort" to debugPort.toString(),
+            "fullscreen" to false, // TODO: Implement
+            "display" to 1, // TODO: Implement
+            "external" to true,
+            "editor.location" to editor?.location?.let { "${it.x},${it.y}" },
+            //"awt.disable" to false,
+            //"window.color" to "0xFF000000", // TODO: Implement
+            //"stop.color" to "0xFF000000", // TODO: Implement
+            "stop.hide" to false, // TODO: Implement
+            "sketch.folder" to sketch.folder.absolutePath,
+        )
+        val repository = Platform.getContentFile("repository").absolutePath.replace("""\""", """\\""")
+
+        val initGradle = workingDir.resolve("init.gradle.kts").apply {
+            val content = """
+                beforeSettings{
+                    pluginManagement {
+                        repositories {
+                            maven { url = uri("$repository") }
+                            gradlePluginPortal()
+                        }
+                    }
+                }
+                allprojects{
+                    repositories {
+                        maven { url = uri("$repository") }
+                        mavenCentral()
+                    }
+                }
+            """.trimIndent()
+
+            writeText(content)
+        }
+
+
+        val buildGradle = sketch.folder.resolve("build.gradle.kts")
+        val generate = buildGradle.let {
+            if(!it.exists()) return@let true
+
+            val contents = it.readText()
+            if(!contents.contains("@processing-auto-generated")) return@let false
+
+            val version = contents.substringAfter("version=").substringBefore("\n")
+            if(version != Base.getVersionName()) return@let true
+
+            val modeTitle = contents.substringAfter("mode=").substringBefore(" ")
+            if(this.mode.title != modeTitle) return@let true
+
+            return@let Base.DEBUG
+        }
+        if (generate) {
+            Messages.log("build.gradle.kts outdated or not found in ${sketch.folder}, creating one")
+            val header = """
+                // @processing-auto-generated mode=${mode.title} version=${Base.getVersionName()}
+                //
+                """.trimIndent()
+
+            // TODO: add instructions keys
+            val instructions = Language.text("gradle.instructions")
+                .split("\n")
+                .joinToString("\n") { "// $it" }
+
+            val configuration =  """
+                plugins{
+                    id("org.processing.gradle") version "${Base.getVersionName()}"
+                }
+            """.trimIndent()
+            val content = "${header}\n${instructions}\n${configuration}"
+            buildGradle.writeText(content)
+        }
+        val settingsGradle = sketch.folder.resolve("settings.gradle.kts")
+        if (!settingsGradle.exists()) {
+            settingsGradle.createNewFile()
+        }
+
+        val arguments = mutableListOf("--init-script", initGradle.toAbsolutePath().toString())
+        if (!Base.DEBUG) arguments.add("--quiet")
+        arguments.addAll(variables.entries
+            .filter { it.value != null }
+            .map { "-Pprocessing.${it.key}=${it.value}" }
+        )
+
+        return arguments
+    }
+
+
+    private fun BuildLauncher.setup(extraArguments: List<String> = listOf()) {
+        setJavaHome(Platform.getJavaHome())
+
+        val arguments = setupGradle()
+        arguments.addAll(extraArguments)
+        withArguments(*arguments.toTypedArray())
+    }
+
+    // Hooks for java to check if the Gradle service is running since mutableStateOf is not accessible in java
+    fun getEnabled(): Boolean {
+        return active.value
+    }
+    fun setEnabled(active: Boolean) {
+        this.active.value = active
+    }
+}
\ No newline at end of file
diff --git a/app/src/processing/app/gradle/api/Sketch.kt b/app/src/processing/app/gradle/api/Sketch.kt
new file mode 100644
index 0000000000..04cccbb27d
--- /dev/null
+++ b/app/src/processing/app/gradle/api/Sketch.kt
@@ -0,0 +1,63 @@
+package processing.app.gradle.api
+
+import com.github.ajalt.clikt.command.SuspendingCliktCommand
+import com.github.ajalt.clikt.core.Context
+import com.github.ajalt.clikt.core.subcommands
+import com.github.ajalt.clikt.parameters.options.option
+import com.github.ajalt.clikt.parameters.options.required
+import processing.app.Base
+import processing.app.Platform
+import processing.app.Preferences
+import processing.app.contrib.ModeContribution
+import processing.app.gradle.GradleJob
+import processing.app.gradle.GradleService
+
+class Sketch : SuspendingCliktCommand("sketch") {
+    init {
+        subcommands(
+            Run()
+        )
+    }
+
+    override fun help(context: Context): String {
+        return """Manage sketches in the Processing environment."""
+    }
+
+    override suspend fun run() {
+        System.setProperty("java.awt.headless", "true")
+    }
+
+    class Run : SuspendingCliktCommand(name = "run") {
+        val sketch by option("--sketch", help = "The sketch to run")
+                        .required()
+
+        override fun help(context: Context): String {
+            return "Run the Processing sketch."
+        }
+
+        override suspend fun run() {
+            Base.setCommandLine()
+            Platform.init()
+            Preferences.init()
+            Base.locateSketchbookFolder()
+
+            // TODO: Support modes other than Java
+            val mode = ModeContribution.load(
+                null, Platform.getContentFile("modes/java"),
+                "processing.mode.java.JavaMode"
+            ).mode ?: throw IllegalStateException("Java mode not found")
+
+            System.setProperty("java.awt.headless", "false")
+
+            val service = GradleService(mode,null)
+            service.sketch = processing.app.Sketch(sketch, mode)
+            service.run()
+
+            // TODO: Use an async way to wait for the job to finish
+            //Wait for the service to finish
+            while (service.jobs.any { it.state.value != GradleJob.State.DONE }) {
+                Thread.sleep(100)
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/processing/app/ui/Editor.java b/app/src/processing/app/ui/Editor.java
index a06cbe2383..7201642ce9 100644
--- a/app/src/processing/app/ui/Editor.java
+++ b/app/src/processing/app/ui/Editor.java
@@ -48,7 +48,6 @@
 import javax.swing.text.html.*;
 import javax.swing.undo.*;
 
-import com.formdev.flatlaf.FlatLaf;
 import com.formdev.flatlaf.util.SystemInfo;
 import processing.app.Base;
 import processing.app.Formatter;
@@ -63,6 +62,7 @@
 import processing.app.SketchCode;
 import processing.app.SketchException;
 import processing.app.contrib.ContributionManager;
+import processing.app.gradle.GradleService;
 import processing.app.laf.PdeMenuItemUI;
 import processing.app.syntax.*;
 import processing.core.*;
@@ -75,6 +75,7 @@ public abstract class Editor extends JFrame implements RunnerListener {
   protected Base base;
   protected EditorState state;
   protected Mode mode;
+  protected GradleService service;
 
   // There may be certain gutter sizes that cause text bounds
   // inside the console to be calculated incorrectly.
@@ -157,6 +158,7 @@ protected Editor(final Base base, String path, final EditorState state,
     this.base = base;
     this.state = state;
     this.mode = mode;
+    this.service = new GradleService(this.mode,this);
 
     // Make sure Base.getActiveEditor() never returns null
     base.checkFirstEditor(this);
@@ -389,6 +391,9 @@ public EditorFooter createFooter() {
     return ef;
   }
 
+  public EditorFooter getFooter() {
+    return footer;
+  }
 
   public void addErrorTable(EditorFooter ef) {
     JScrollPane scrollPane = new JScrollPane();
@@ -478,6 +483,9 @@ public Mode getMode() {
     return mode;
   }
 
+  public GradleService getService() {
+    return service;
+  }
 
   public void repaintHeader() {
     header.repaint();
@@ -588,6 +596,7 @@ protected int getDividerLocation() {
    * with things in the Preferences window.
    */
   public void applyPreferences() {
+    service.setEnabled(Preferences.getBoolean("run.use_gradle"));
     // Even though this is only updating the theme (colors, icons),
     // subclasses use this to apply other preferences.
     // For instance, Java Mode applies changes to error checking.
@@ -2265,6 +2274,7 @@ protected void handleOpenInternal(String path) throws EditorException {
     } catch (IOException e) {
       throw new EditorException("Could not create the sketch.", e);
     }
+    service.setSketch(sketch);
 
     header.rebuild();
     updateTitle();
diff --git a/app/src/processing/app/ui/EditorConsole.java b/app/src/processing/app/ui/EditorConsole.java
index c8c40ee487..f2d9de97fc 100644
--- a/app/src/processing/app/ui/EditorConsole.java
+++ b/app/src/processing/app/ui/EditorConsole.java
@@ -82,6 +82,11 @@ public EditorConsole(Editor editor) {
     sketchOut = new PrintStream(new EditorConsoleStream(false));
     sketchErr = new PrintStream(new EditorConsoleStream(true));
 
+    if(editor.service != null){
+      editor.service.setOut(sketchOut);
+      editor.service.setErr(sketchErr);
+    }
+
     startTimer();
   }
 
diff --git a/app/src/processing/app/ui/PreferencesFrame.java b/app/src/processing/app/ui/PreferencesFrame.java
index a8cf68c27d..28424a2ea3 100644
--- a/app/src/processing/app/ui/PreferencesFrame.java
+++ b/app/src/processing/app/ui/PreferencesFrame.java
@@ -85,6 +85,7 @@ public class PreferencesFrame {
   JCheckBox hidpiDisableBox;
 //  JLabel hidpiRestartLabel;
   JCheckBox syncSketchNameBox;
+  JCheckBox useModernBuildSystem;
 
   JComboBox<String> displaySelectionBox;
   JComboBox<String> languageSelectionBox;
@@ -554,6 +555,9 @@ public void mouseExited(MouseEvent e) {
     runningPanel.setBorder(new TitledBorder("Running"));
     runningPanel.setLayout(new BoxLayout(runningPanel, BoxLayout.Y_AXIS));
 
+    useModernBuildSystem = new JCheckBox(Language.text("preferences.use_modern_build_system"));
+    addRow(runningPanel, useModernBuildSystem);
+
     addRow(runningPanel, displayLabel, displaySelectionBox);
     addRow(runningPanel, backgroundColorLabel, presentColor);
     addRow(runningPanel, memoryOverrideBox, memoryField, mbLabel);
@@ -827,6 +831,8 @@ protected void applyFrame() {
     Preferences.setBoolean("pdex.completion", codeCompletionBox.isSelected());
     Preferences.setBoolean("pdex.suggest.imports", importSuggestionsBox.isSelected());
 
+    Preferences.setBoolean("run.use_gradle", useModernBuildSystem.isSelected());
+
     for (Editor editor : base.getEditors()) {
       editor.applyPreferences();
     }
@@ -902,6 +908,11 @@ public void showFrame() {
     if (autoAssociateBox != null) {
       autoAssociateBox.setSelected(Preferences.getBoolean("platform.auto_file_type_associations")); //$NON-NLS-1$
     }
+
+    if(useModernBuildSystem != null) {
+      useModernBuildSystem.setSelected(Preferences.getBoolean("run.use_gradle"));
+    }
+
     // The OK Button has to be set as the default button every time the
     // PrefWindow is to be displayed
     frame.getRootPane().setDefaultButton(okButton);
diff --git a/app/test/processing/app/gradle/GradleServiceTest.kt b/app/test/processing/app/gradle/GradleServiceTest.kt
new file mode 100644
index 0000000000..64a04d447c
--- /dev/null
+++ b/app/test/processing/app/gradle/GradleServiceTest.kt
@@ -0,0 +1,13 @@
+package processing.app.gradle
+
+import org.junit.jupiter.api.Assertions.*
+import processing.app.ui.Editor
+import kotlin.test.Test
+import org.mockito.kotlin.mock
+
+class GradleServiceTest{
+
+    @Test
+    fun testRunningSketch(){
+    }
+}
\ No newline at end of file
diff --git a/build.gradle.kts b/build.gradle.kts
index 0675c2db38..faa68e5dca 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -6,6 +6,21 @@ plugins {
     alias(libs.plugins.jetbrainsCompose) apply false
 }
 
+//allprojects{
+//    repositories{
+//        maven { url = uri("https://repo.gradle.org/gradle/libs-releases") }
+//    }
+//}
+
 // Set the build directory to not /build to prevent accidental deletion through the clean action
 // Can be deleted after the migration to Gradle is complete
-layout.buildDirectory = file(".build")
\ No newline at end of file
+layout.buildDirectory = file(".build")
+
+allprojects{
+    tasks.withType<JavaCompile> {
+        options.encoding = "UTF-8"
+    }
+    tasks.withType<Javadoc> {
+        options.encoding = "UTF-8"
+    }
+}
\ No newline at end of file
diff --git a/build/shared/lib/defaults.txt b/build/shared/lib/defaults.txt
index 6e3e00f0d6..431988bb74 100644
--- a/build/shared/lib/defaults.txt
+++ b/build/shared/lib/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 =
diff --git a/build/shared/lib/languages/PDE.properties b/build/shared/lib/languages/PDE.properties
index 9d03f33c08..3ea6d7652b 100644
--- a/build/shared/lib/languages/PDE.properties
+++ b/build/shared/lib/languages/PDE.properties
@@ -621,6 +621,24 @@ update_check = Update
 update_check.updates_available.core = A new version of Processing is available,\nwould you like to visit the Processing download page?
 update_check.updates_available.contributions = There are updates available for some of the installed contributions,\nwould you like to open the the Contribution Manager now?
 
+
+# ---------------------------------------
+# Welcome
+welcome.intro.title = Welcome to Processing
+welcome.intro.message = A flexible software sketchbook and a language for learning how to code.
+welcome.intro.suggestion = Is it your first time using Processing? Try one of the examples on the right.
+welcome.action.examples = More examples
+welcome.action.tutorials = Tutorials
+welcome.action.startup = Show this window at startup
+welcome.action.go = Let's go!
+
+# ---------------------------------------
+# Beta
+beta.window.title = Welcome to Beta
+beta.title = Welcome to the Processing Beta
+beta.message = Thank you for trying out the new version of Processing. We're very grateful!\n\nPlease report any bugs on the forums.
+beta.button = Got it!
+
 # ---------------------------------------
 # Beta
 beta.window.title = Welcome to Beta
diff --git a/core/build.gradle.kts b/core/build.gradle.kts
index 8f7211b131..f646bc9b8b 100644
--- a/core/build.gradle.kts
+++ b/core/build.gradle.kts
@@ -15,6 +15,7 @@ sourceSets{
     main{
         java{
             srcDirs("src")
+            exclude("**/*.jnilib")
         }
         resources{
             srcDirs("src")
@@ -34,10 +35,21 @@ dependencies {
 
     testImplementation(libs.junit)
 }
+publishing{
+    repositories{
+        maven {
+            name = "App"
+            url = uri(project(":app").layout.buildDirectory.dir("resources-bundled/common/repository").get().asFile.absolutePath)
+        }
+    }
+}
 
 mavenPublishing{
     publishToMavenCentral(SonatypeHost.CENTRAL_PORTAL)
-    signAllPublications()
+
+    // Only sign if signing is set up
+    if(project.hasProperty("signing.keyId") || project.hasProperty("signing.signingInMemoryKey"))
+        signAllPublications()
 
     pom{
         name.set("Processing Core")
@@ -77,3 +89,6 @@ tasks.withType<Jar> {
 tasks.compileJava{
     options.encoding = "UTF-8"
 }
+tasks.javadoc{
+    options.encoding = "UTF-8"
+}
diff --git a/core/src/processing/core/PApplet.java b/core/src/processing/core/PApplet.java
index d1297ec6fb..5187ff5c0a 100644
--- a/core/src/processing/core/PApplet.java
+++ b/core/src/processing/core/PApplet.java
@@ -705,7 +705,7 @@ public class PApplet implements PConstants {
   protected boolean exitCalled;
 
   // ok to be static because it's not possible to mix enabled/disabled
-  static protected boolean disableAWT;
+  static protected boolean disableAWT = System.getProperty("processing.awt.disable", "false").equals("true");;
 
   // messages to send if attached as an external vm
 
@@ -9932,19 +9932,21 @@ static public void runSketch(final String[] args,
       System.exit(1);
     }
 
-    boolean external = false;
-    int[] location = null;
-    int[] editorLocation = null;
+    boolean external = System.getProperty("processing.external", "false").equals("true");;
+    int[] location = System.getProperty("processing.location", null) != null ?
+      parseInt(split(System.getProperty("processing.location"), ',')) : null;
 
+    int[] editorLocation = System.getProperty("processing.editor.location", null) != null ?
+      parseInt(split(System.getProperty("processing.editor.location"), ',')) : null;
     String name = null;
     int windowColor = 0;
     int stopColor = 0xff808080;
-    boolean hideStop = false;
+    boolean hideStop = System.getProperty("processing.stop.hide", "false").equals("true");
 
     int displayNum = -1;  // use default
-    boolean present = false;
-    boolean fullScreen = false;
-    float uiScale = 0;
+    boolean present = System.getProperty("processing.present", "false").equals("true");
+    boolean fullScreen = System.getProperty("processing.fullscreen", "false").equals("true");
+    float uiScale = parseInt(System.getProperty("processing.uiScale", "0"), 0);
 
     String param, value;
     String folder = calcSketchPath();
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 70f93aaff5..1de974f219 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -2,6 +2,7 @@
 kotlin = "2.0.20"
 compose-plugin = "1.7.1"
 jogl = "2.5.0"
+antlr = "4.13.2"
 jupiter = "5.12.0"
 
 [libraries]
@@ -25,6 +26,11 @@ netbeansSwing = { module = "org.netbeans.api:org-netbeans-swing-outline", versio
 ant = { module = "org.apache.ant:ant", version = "1.10.14" }
 lsp4j = { module = "org.eclipse.lsp4j:org.eclipse.lsp4j", version = "0.22.0" }
 jsoup = { module = "org.jsoup:jsoup", version = "1.17.2" }
+antlr4 = { module = "org.antlr:antlr4", version.ref = "antlr" }
+antlr4Runtime = { module = "org.antlr:antlr4-runtime", version.ref = "antlr" }
+composeGradlePlugin = { module = "org.jetbrains.compose:compose-gradle-plugin", version.ref = "compose-plugin" }
+kotlinGradlePlugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
+kotlinComposePlugin = { module = "org.jetbrains.kotlin.plugin.compose:org.jetbrains.kotlin.plugin.compose.gradle.plugin", version.ref = "kotlin" }
 markdown = { module = "com.mikepenz:multiplatform-markdown-renderer-m2", version = "0.31.0" }
 markdownJVM = { module = "com.mikepenz:multiplatform-markdown-renderer-jvm", version = "0.31.0" }
 clikt = { module = "com.github.ajalt.clikt:clikt", version = "5.0.2" }
@@ -35,4 +41,5 @@ kotlinMultiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref =
 compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
 serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
 download = { id = "de.undercouch.download", version = "5.6.0" }
-mavenPublish = { id = "com.vanniktech.maven.publish", version = "0.30.0" }
\ No newline at end of file
+mavenPublish = { id = "com.vanniktech.maven.publish", version = "0.30.0" }
+gradlePublish = { id = "com.gradle.plugin-publish", version = "1.2.1" }
\ No newline at end of file
diff --git a/java/build.gradle.kts b/java/build.gradle.kts
index 0f8e052780..74052f2085 100644
--- a/java/build.gradle.kts
+++ b/java/build.gradle.kts
@@ -1,3 +1,5 @@
+import org.gradle.nativeplatform.platform.internal.DefaultNativePlatform
+
 plugins {
     id("java")
 }
@@ -53,7 +55,7 @@ tasks.register<Copy>("extraResources"){
     include("keywords.txt")
     include("theme/**/*")
     include("application/**/*")
-    into( layout.buildDirectory.dir("resources-bundled/common/modes/java"))
+    into(layout.buildDirectory.dir("resources-bundled/common/modes/java"))
 }
 tasks.register<Copy>("copyCore"){
     val coreProject = project(":core")
@@ -64,6 +66,22 @@ tasks.register<Copy>("copyCore"){
     rename("core.+\\.jar", "core.jar")
     into(coreProject.layout.projectDirectory.dir("library"))
 }
+tasks.register<Copy>("renameWindres") {
+    val dir = layout.buildDirectory.dir("resources-bundled/common/modes/java")
+    val os = DefaultNativePlatform.getCurrentOperatingSystem()
+    val platform = when {
+        os.isWindows -> "windows"
+        os.isMacOsX -> "macos"
+        else -> "linux"
+    }
+    from(dir) {
+        include("*-$platform*")
+        rename("(.*)-$platform(.*)", "$1$2")
+    }
+    duplicatesStrategy = DuplicatesStrategy.INCLUDE
+    into(dir)
+    tasks.named("extraResources"){ dependsOn(this) }
+}
 
 val libraries = arrayOf("dxf","io","net","pdf","serial","svg")
 libraries.forEach { library ->
@@ -77,7 +95,7 @@ libraries.forEach { library ->
         include("*.properties")
         include("library/**/*")
         include("examples/**/*")
-        into( layout.buildDirectory.dir("resources-bundled/common/modes/java/libraries/$library"))
+        into(layout.buildDirectory.dir("resources-bundled/common/modes/java/libraries/$library"))
     }
     tasks.named("extraResources"){ dependsOn("library-$library-extraResources") }
 }
diff --git a/java/gradle/build.gradle.kts b/java/gradle/build.gradle.kts
new file mode 100644
index 0000000000..3aa484cb50
--- /dev/null
+++ b/java/gradle/build.gradle.kts
@@ -0,0 +1,38 @@
+plugins{
+    `java-gradle-plugin`
+    alias(libs.plugins.gradlePublish)
+
+    kotlin("jvm") version libs.versions.kotlin
+}
+
+repositories {
+    mavenCentral()
+}
+
+dependencies{
+    implementation(project(":java:preprocessor"))
+
+    implementation(libs.composeGradlePlugin)
+    implementation(libs.kotlinGradlePlugin)
+    implementation(libs.kotlinComposePlugin)
+
+    testImplementation(libs.junit)
+}
+
+gradlePlugin{
+    plugins{
+        create("processing"){
+            id = "org.processing.gradle"
+            implementationClass = "org.processing.java.gradle.ProcessingPlugin"
+        }
+    }
+}
+publishing{
+    repositories{
+        mavenLocal()
+        maven {
+            name = "App"
+            url = uri(project(":app").layout.buildDirectory.dir("resources-bundled/common/repository").get().asFile.absolutePath)
+        }
+    }
+}
\ No newline at end of file
diff --git a/java/gradle/example/.idea/.gitignore b/java/gradle/example/.idea/.gitignore
new file mode 100644
index 0000000000..a0ccf77bc5
--- /dev/null
+++ b/java/gradle/example/.idea/.gitignore
@@ -0,0 +1,5 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+# Environment-dependent path to Maven home directory
+/mavenHomeManager.xml
diff --git a/java/gradle/example/.idea/gradle.xml b/java/gradle/example/.idea/gradle.xml
new file mode 100644
index 0000000000..11bd2cc4cc
--- /dev/null
+++ b/java/gradle/example/.idea/gradle.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="GradleMigrationSettings" migrationVersion="1" />
+  <component name="GradleSettings">
+    <option name="linkedExternalProjectsSettings">
+      <GradleProjectSettings>
+        <compositeConfiguration>
+          <compositeBuild compositeDefinitionSource="SCRIPT">
+            <builds>
+              <build path="$PROJECT_DIR$/../../.." name="processing">
+                <projects>
+                  <project path="$PROJECT_DIR$/../../.." />
+                  <project path="$PROJECT_DIR$/../../../app" />
+                  <project path="$PROJECT_DIR$/../../../core" />
+                  <project path="$PROJECT_DIR$/../../../core/examples" />
+                  <project path="$PROJECT_DIR$/../.." />
+                  <project path="$PROJECT_DIR$/.." />
+                  <project path="$PROJECT_DIR$/../../libraries" />
+                  <project path="$PROJECT_DIR$/../../libraries/dxf" />
+                  <project path="$PROJECT_DIR$/../../libraries/io" />
+                  <project path="$PROJECT_DIR$/../../libraries/net" />
+                  <project path="$PROJECT_DIR$/../../libraries/pdf" />
+                  <project path="$PROJECT_DIR$/../../libraries/serial" />
+                  <project path="$PROJECT_DIR$/../../libraries/svg" />
+                  <project path="$PROJECT_DIR$/../../preprocessor" />
+                </projects>
+              </build>
+            </builds>
+          </compositeBuild>
+        </compositeConfiguration>
+        <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="gradleJvm" value="#JAVA_HOME" />
+        <option name="modules">
+          <set>
+            <option value="$PROJECT_DIR$/../../.." />
+            <option value="$PROJECT_DIR$/../../../app" />
+            <option value="$PROJECT_DIR$/../../../core" />
+            <option value="$PROJECT_DIR$/../../../core/examples" />
+            <option value="$PROJECT_DIR$/../.." />
+            <option value="$PROJECT_DIR$/.." />
+            <option value="$PROJECT_DIR$" />
+            <option value="$PROJECT_DIR$/../../libraries" />
+            <option value="$PROJECT_DIR$/../../libraries/dxf" />
+            <option value="$PROJECT_DIR$/../../libraries/io" />
+            <option value="$PROJECT_DIR$/../../libraries/net" />
+            <option value="$PROJECT_DIR$/../../libraries/pdf" />
+            <option value="$PROJECT_DIR$/../../libraries/serial" />
+            <option value="$PROJECT_DIR$/../../libraries/svg" />
+            <option value="$PROJECT_DIR$/../../preprocessor" />
+          </set>
+        </option>
+      </GradleProjectSettings>
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/java/gradle/example/.idea/kotlinc.xml b/java/gradle/example/.idea/kotlinc.xml
new file mode 100644
index 0000000000..d4b7accbaa
--- /dev/null
+++ b/java/gradle/example/.idea/kotlinc.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="KotlinJpsPluginSettings">
+    <option name="version" value="2.0.20" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/java/gradle/example/.idea/misc.xml b/java/gradle/example/.idea/misc.xml
new file mode 100644
index 0000000000..6ed36dd36d
--- /dev/null
+++ b/java/gradle/example/.idea/misc.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ExternalStorageConfigurationManager" enabled="true" />
+</project>
\ No newline at end of file
diff --git a/java/gradle/example/.idea/vcs.xml b/java/gradle/example/.idea/vcs.xml
new file mode 100644
index 0000000000..c2365ab11f
--- /dev/null
+++ b/java/gradle/example/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$/../../.." vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/java/gradle/example/brightness.pde b/java/gradle/example/brightness.pde
new file mode 100644
index 0000000000..1da8c36ac5
--- /dev/null
+++ b/java/gradle/example/brightness.pde
@@ -0,0 +1,32 @@
+/**
+ * Brightness
+ * by Rusty Robison.
+ *
+ * Brightness is the relative lightness or darkness of a color.
+ * Move the cursor vertically over each bar to alter its brightness.
+ */
+
+int barWidth = 20;
+int lastBar = -1;
+
+import controlP5.*;
+
+ControlP5 cp5;
+
+
+void setup() {
+  size(640, 360, P2D);
+  colorMode(HSB, width, 100, height);
+  noStroke();
+  background(0);
+}
+
+void draw() {
+  int whichBar = mouseX / barWidth;
+  if (whichBar != lastBar) {
+    int barX = whichBar * barWidth;
+    fill(barX, 100, mouseY);
+    rect(barX, 0, barWidth, height);
+    lastBar = whichBar;
+  }
+}
diff --git a/java/gradle/example/build.gradle.kts b/java/gradle/example/build.gradle.kts
new file mode 100644
index 0000000000..4d1d983e56
--- /dev/null
+++ b/java/gradle/example/build.gradle.kts
@@ -0,0 +1,3 @@
+plugins{
+    id("org.processing.gradle")
+}
\ No newline at end of file
diff --git a/java/gradle/example/settings.gradle.kts b/java/gradle/example/settings.gradle.kts
new file mode 100644
index 0000000000..ee9c97e155
--- /dev/null
+++ b/java/gradle/example/settings.gradle.kts
@@ -0,0 +1,5 @@
+rootProject.name = "processing-gradle-plugin-demo"
+
+pluginManagement {
+    includeBuild("../../../")
+}
\ No newline at end of file
diff --git a/java/gradle/src/main/kotlin/DependenciesTask.kt b/java/gradle/src/main/kotlin/DependenciesTask.kt
new file mode 100644
index 0000000000..320f1ebb0a
--- /dev/null
+++ b/java/gradle/src/main/kotlin/DependenciesTask.kt
@@ -0,0 +1,76 @@
+package org.processing.java.gradle
+
+import org.gradle.api.DefaultTask
+import org.gradle.api.file.RegularFileProperty
+import org.gradle.api.tasks.InputFile
+import org.gradle.api.tasks.TaskAction
+import java.io.File
+import java.io.ObjectInputStream
+
+abstract class DependenciesTask: DefaultTask() {
+    @InputFile
+    val librariesMetaData: RegularFileProperty = project.objects.fileProperty()
+
+    @InputFile
+    val sketchMetaData: RegularFileProperty = project.objects.fileProperty()
+
+    init{
+        librariesMetaData.convention(project.layout.buildDirectory.file("processing/libraries"))
+        sketchMetaData.convention(project.layout.buildDirectory.file("processing/sketch"))
+    }
+
+    @TaskAction
+    fun execute() {
+        val sketchMetaFile = sketchMetaData.get().asFile
+        val librariesMetaFile = librariesMetaData.get().asFile
+
+        val libraries = librariesMetaFile.inputStream().use { input ->
+            ObjectInputStream(input).readObject() as ArrayList<LibrariesTask.Library>
+        }
+
+        val sketch = sketchMetaFile.inputStream().use { input ->
+            ObjectInputStream(input).readObject() as PDETask.SketchMeta
+        }
+
+        val dependencies = mutableSetOf<File>()
+
+        // Loop over the import statements in the sketch and import the relevant jars from the libraries
+        sketch.importStatements.forEach import@{ statement ->
+            libraries.forEach { library ->
+                library.jars.forEach { jar ->
+                    jar.classes.forEach { className ->
+                        if (className.startsWith(statement)) {
+                            dependencies.add(jar.path)
+                            return@import
+                        }
+                    }
+                }
+            }
+        }
+        project.dependencies.add("implementation",  project.files(dependencies) )
+
+        // TODO: Add only if user is compiling for P2D or P3D
+        // Add JOGL and Gluegen dependencies
+        project.dependencies.add("runtimeOnly", "org.jogamp.jogl:jogl-all-main:2.5.0")
+        project.dependencies.add("runtimeOnly", "org.jogamp.gluegen:gluegen-rt-main:2.5.0")
+
+        // TODO: Only add the native dependencies for the platform the user is building for
+        // MacOS specific native dependencies
+        project.dependencies.add("runtimeOnly", "org.jogamp.jogl:jogl-all:2.5.0:natives-macosx-universal")
+        project.dependencies.add("runtimeOnly", "org.jogamp.gluegen:gluegen-rt:2.5.0:natives-macosx-universal")
+
+        // Windows specific native dependencies
+        project.dependencies.add("runtimeOnly", "org.jogamp.jogl:jogl-all:2.5.0:natives-windows-amd64")
+        project.dependencies.add("runtimeOnly", "org.jogamp.gluegen:gluegen-rt:2.5.0:natives-windows-amd64")
+
+        // Linux specific native dependencies
+        project.dependencies.add("runtimeOnly", "org.jogamp.jogl:jogl-all:2.5.0:natives-linux-amd64")
+        project.dependencies.add("runtimeOnly", "org.jogamp.gluegen:gluegen-rt:2.5.0:natives-linux-amd64")
+
+        // NativeWindow dependencies for all platforms
+        project.dependencies.add("implementation", "org.jogamp.jogl:nativewindow:2.5.0")
+        project.dependencies.add("runtimeOnly", "org.jogamp.jogl:nativewindow:2.5.0:natives-macosx-universal")
+        project.dependencies.add("runtimeOnly", "org.jogamp.jogl:nativewindow:2.5.0:natives-windows-amd64")
+        project.dependencies.add("runtimeOnly", "org.jogamp.jogl:nativewindow:2.5.0:natives-linux-amd64")
+    }
+}
\ No newline at end of file
diff --git a/java/gradle/src/main/kotlin/LibrariesTask.kt b/java/gradle/src/main/kotlin/LibrariesTask.kt
new file mode 100644
index 0000000000..1ac0dd51e1
--- /dev/null
+++ b/java/gradle/src/main/kotlin/LibrariesTask.kt
@@ -0,0 +1,71 @@
+package org.processing.java.gradle
+
+import org.gradle.api.DefaultTask
+import org.gradle.api.file.DirectoryProperty
+import org.gradle.api.file.RegularFileProperty
+import org.gradle.api.tasks.InputDirectory
+import org.gradle.api.tasks.OutputFile
+import org.gradle.api.tasks.TaskAction
+import java.io.File
+import java.io.ObjectOutputStream
+import java.util.jar.JarFile
+
+abstract class LibrariesTask : DefaultTask() {
+
+    // TODO: Allow this directory to not exist
+    @InputDirectory
+    val librariesDirectory: DirectoryProperty = project.objects.directoryProperty()
+
+    @OutputFile
+    val librariesMetaData: RegularFileProperty = project.objects.fileProperty()
+
+    init{
+        librariesMetaData.convention(project.layout.buildDirectory.file("processing/libraries"))
+    }
+
+    data class Jar(
+        val path: File,
+        val classes: List<String>
+    ) : java.io.Serializable
+
+    data class Library(
+        val jars: List<Jar>
+    ) : java.io.Serializable
+
+    @TaskAction
+    fun execute() {
+        val libraries = librariesDirectory.get().asFile
+            .listFiles { file -> file.isDirectory }
+            ?.map { folder ->
+                // Find all the jars in the sketchbook
+                val jars = folder.resolve("library")
+                    .listFiles{ file -> file.extension == "jar" }
+                    ?.map{ file ->
+
+                        // Inside of each jar, look for the defined classes
+                        val jar = JarFile(file)
+                        val classes = jar.entries().asSequence()
+                            .filter { entry -> entry.name.endsWith(".class") }
+                            .map { entry -> entry.name }
+                            .map { it.substringBeforeLast('/').replace('/', '.') }
+                            .distinct()
+                            .toList()
+
+                        // Return a reference to the jar and its classes
+                        return@map Jar(
+                            path = file,
+                            classes = classes
+                        )
+                    }?: emptyList()
+
+                // Save the parsed jars and which folder
+                return@map Library(
+                    jars = jars
+                )
+            }?: emptyList()
+
+        val meta = ObjectOutputStream(librariesMetaData.get().asFile.outputStream())
+        meta.writeObject(libraries)
+        meta.close()
+    }
+}
\ No newline at end of file
diff --git a/java/gradle/src/main/kotlin/PDETask.kt b/java/gradle/src/main/kotlin/PDETask.kt
new file mode 100644
index 0000000000..22e9360ac6
--- /dev/null
+++ b/java/gradle/src/main/kotlin/PDETask.kt
@@ -0,0 +1,95 @@
+package org.processing.java.gradle
+
+import org.gradle.api.file.*
+import org.gradle.api.tasks.*
+import org.gradle.internal.file.Deleter
+import org.gradle.work.InputChanges
+import processing.mode.java.preproc.PdePreprocessor
+import java.io.File
+import java.io.ObjectOutputStream
+import java.util.concurrent.Callable
+import java.util.jar.JarFile
+import javax.inject.Inject
+
+
+// TODO: Generate sourcemaps
+abstract class PDETask : SourceTask() {
+
+
+    @get:InputFiles
+    @get:PathSensitive(PathSensitivity.RELATIVE)
+    @get:IgnoreEmptyDirectories
+    @get:SkipWhenEmpty
+    open val stableSources: FileCollection = project.files(Callable<Any> { this.source })
+
+    @OutputDirectory
+    val outputDirectory = project.objects.directoryProperty()
+
+    @get:Input
+    @get:Optional
+    var workingDir: String? = null
+
+    @get:Input
+    var sketchName: String = "processing"
+
+    @get:Input
+    @get:Optional
+    var sketchBook: String? = null
+
+    @OutputFile
+    val sketchMetaData = project.objects.fileProperty()
+
+    init{
+        outputDirectory.convention(project.layout.buildDirectory.dir("generated/pde"))
+        sketchMetaData.convention(project.layout.buildDirectory.file("processing/sketch"))
+    }
+
+    data class SketchMeta(
+        val sketchName: String,
+        val sketchRenderer: String?,
+        val importStatements: List<String>
+    ) : java.io.Serializable
+
+    @TaskAction
+    fun execute() {
+        // TODO: Allow pre-processor to run on individual files (future)
+        // TODO: Only compare file names from both defined roots (e.g. sketch.pde and folder/sketch.pde should both be included)
+
+        // Using stableSources since we can only run the pre-processor on the full set of sources
+        val combined = stableSources
+            .files
+            .groupBy { it.name }
+            .map { entry ->
+                entry.value.maxByOrNull { it.lastModified() }!!
+            }
+            .joinToString("\n"){
+                 it.readText()
+         }
+        val javaFile = File(outputDirectory.get().asFile, "$sketchName.java").bufferedWriter()
+
+        val meta = PdePreprocessor
+            .builderFor(sketchName)
+            .setTabSize(4)
+            .build()
+            .write(javaFile, combined)
+
+        javaFile.flush()
+        javaFile.close()
+
+        val sketchMeta = SketchMeta(
+            sketchName = sketchName,
+            sketchRenderer = meta.sketchRenderer,
+            importStatements = meta.importStatements.map { importStatement -> importStatement.packageName }
+        )
+
+        val metaFile = ObjectOutputStream(sketchMetaData.get().asFile.outputStream())
+        metaFile.writeObject(sketchMeta)
+        metaFile.close()
+    }
+
+    @get:Inject
+    open val deleter: Deleter
+        get() {
+            throw UnsupportedOperationException("Decorator takes care of injection")
+        }
+}
\ No newline at end of file
diff --git a/java/gradle/src/main/kotlin/ProcessingPlugin.kt b/java/gradle/src/main/kotlin/ProcessingPlugin.kt
new file mode 100644
index 0000000000..472365209a
--- /dev/null
+++ b/java/gradle/src/main/kotlin/ProcessingPlugin.kt
@@ -0,0 +1,183 @@
+package org.processing.java.gradle
+
+import org.gradle.api.Plugin
+import org.gradle.api.Project
+import org.gradle.api.file.SourceDirectorySet
+import org.gradle.api.internal.file.DefaultSourceDirectorySet
+import org.gradle.api.internal.tasks.TaskDependencyFactory
+import org.gradle.api.model.ObjectFactory
+import org.gradle.api.plugins.JavaPlugin
+import org.gradle.api.plugins.JavaPluginExtension
+import org.gradle.api.tasks.JavaExec
+import org.jetbrains.compose.ComposeExtension
+import org.jetbrains.compose.desktop.DesktopExtension
+import processing.app.Preferences
+import java.io.File
+import java.util.*
+import javax.inject.Inject
+
+// TODO: CI/CD for publishing the plugin
+class ProcessingPlugin @Inject constructor(private val objectFactory: ObjectFactory) : Plugin<Project> {
+    override fun apply(project: Project) {
+        val sketchName = project.layout.projectDirectory.asFile.name.replace(Regex("[^a-zA-Z0-9_]"), "_")
+
+        val isProcessing = project.findProperty("processing.version") != null
+        val processingVersion = project.findProperty("processing.version") as String? ?: "4.3.4"
+        val processingGroup = project.findProperty("processing.group") as String? ?: "org.processing"
+        val workingDir = project.findProperty("processing.workingDir") as String?
+        val debugPort = project.findProperty("processing.debugPort") as String?
+
+        val sketchbook = project.findProperty("processing.sketchbook") as String?
+
+        // Apply the Java plugin to the Project
+        project.plugins.apply(JavaPlugin::class.java)
+
+        if(isProcessing){
+            // Set the build directory to a temp file so it doesn't clutter up the sketch folder
+            // Only if the build directory doesn't exist, otherwise proceed as normal
+            if(!project.layout.buildDirectory.asFile.get().exists()) {
+                project.layout.buildDirectory.set(File(project.findProperty("processing.workingDir") as String))
+            }
+            // Disable the wrapper in the sketch to keep it cleaner
+            project.tasks.findByName("wrapper")?.enabled = false
+        }
+
+        // Add the compose plugin to wrap the sketch in an executable
+        project.plugins.apply("org.jetbrains.compose")
+
+        // Add kotlin support
+        project.plugins.apply("org.jetbrains.kotlin.jvm")
+        // Add jetpack compose support
+        project.plugins.apply("org.jetbrains.kotlin.plugin.compose")
+
+        // Add the Processing core library (within Processing from the internal maven repo and outside from the internet)
+        project.dependencies.add("implementation", "$processingGroup:core:${processingVersion}")
+
+        // Add the jars in the code folder
+        project.dependencies.add("implementation", project.fileTree("src").apply { include("**/code/*.jar") })
+
+        // Add the repositories necessary for building the sketch
+        project.repositories.add(project.repositories.maven { it.setUrl("https://jogamp.org/deployment/maven") })
+        project.repositories.add(project.repositories.mavenCentral())
+        project.repositories.add(project.repositories.mavenLocal())
+
+        // Configure the compose Plugin
+        project.extensions.configure(ComposeExtension::class.java) { extension ->
+            extension.extensions.getByType(DesktopExtension::class.java).application { application ->
+                // Set the class to be executed initially
+                application.mainClass = sketchName
+                application.nativeDistributions.modules("java.management")
+                if(debugPort != null) {
+                    application.jvmArgs("-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=$debugPort")
+                }
+            }
+        }
+
+        // TODO: Add support for customizing distributables
+        // TODO: Setup sensible defaults for the distributables
+
+        // Add convenience tasks for running, presenting, and exporting the sketch outside of Processing
+        if(!isProcessing) {
+            project.tasks.create("sketch").apply {
+                group = "processing"
+                description = "Runs the Processing sketch"
+                dependsOn("run")
+            }
+            project.tasks.create("present").apply {
+                group = "processing"
+                description = "Presents the Processing sketch"
+                doFirst {
+                    project.tasks.withType(JavaExec::class.java).configureEach { task ->
+                        task.systemProperty("processing.fullscreen", "true")
+                    }
+                }
+                finalizedBy("run")
+            }
+            project.tasks.create("export").apply {
+                group = "processing"
+                description = "Creates a distributable version of the Processing sketch"
+
+                dependsOn("createDistributable")
+
+            }
+        }
+
+        project.afterEvaluate {
+            // Copy the result of create distributable to the project directory
+            project.tasks.named("createDistributable") { task ->
+                task.doLast {
+                    project.copy {
+                        it.from(project.tasks.named("createDistributable").get().outputs.files)
+                        it.into(project.layout.projectDirectory)
+                    }
+                }
+            }
+        }
+
+        // Move the processing variables into javaexec tasks so they can be used in the sketch as well
+        project.tasks.withType(JavaExec::class.java).configureEach { task ->
+            project.properties
+                .filterKeys { it.startsWith("processing") }
+                .forEach { (key, value) -> task.systemProperty(key, value) }
+        }
+
+        project.extensions.getByType(JavaPluginExtension::class.java).sourceSets.all { sourceSet ->
+            // For each java source set (mostly main) add a new source set for the PDE files
+            val pdeSourceSet = objectFactory.newInstance(
+                DefaultPDESourceDirectorySet::class.java,
+                objectFactory.sourceDirectorySet("${sourceSet.name}.pde", "${sourceSet.name} Processing Source")
+            ).apply {
+                filter.include("**/*.pde")
+                filter.exclude("${project.layout.buildDirectory.asFile.get().name}/**")
+
+                srcDir("./")
+                srcDir("$workingDir/unsaved")
+            }
+            sourceSet.allSource.source(pdeSourceSet)
+
+            val librariesTaskName = sourceSet.getTaskName("scanLibraries", "PDE")
+            val librariesScan = project.tasks.register(librariesTaskName, LibrariesTask::class.java) { task ->
+                task.description = "Scans the libraries in the sketchbook"
+                task.librariesDirectory.set(File(sketchbook, "libraries"))
+            }
+
+            val pdeTaskName = sourceSet.getTaskName("preprocess", "PDE")
+            val pdeTask = project.tasks.register(pdeTaskName, PDETask::class.java) { task ->
+                task.description = "Processes the ${sourceSet.name} PDE"
+                task.source = pdeSourceSet
+                task.sketchName = sketchName
+                task.workingDir = workingDir
+                task.sketchBook = sketchbook
+
+                // Set the output of the pre-processor as the input for the java compiler
+                sourceSet.java.srcDir(task.outputDirectory)
+
+                task.doLast {
+                    // Copy java files from the root to the generated directory
+                    project.copy { copyTask ->
+                        copyTask.from(project.layout.projectDirectory){ from ->
+                            from.include("*.java")
+                        }
+                        copyTask.into(task.outputDirectory)
+                    }
+                }
+            }
+
+            val depsTaskName = sourceSet.getTaskName("addLegacyDependencies", "PDE")
+            project.tasks.register(depsTaskName, DependenciesTask::class.java){ task ->
+                task.dependsOn(pdeTask, librariesScan)
+            }
+
+            project.tasks.named(
+                sourceSet.compileJavaTaskName
+            ) { task ->
+                task.dependsOn(pdeTaskName, depsTaskName)
+            }
+        }
+    }
+    abstract class DefaultPDESourceDirectorySet @Inject constructor(
+        sourceDirectorySet: SourceDirectorySet,
+        taskDependencyFactory: TaskDependencyFactory
+    ) : DefaultSourceDirectorySet(sourceDirectorySet, taskDependencyFactory), SourceDirectorySet
+}
+
diff --git a/java/gradle/src/test/kotlin/ProcessingPluginTest.kt b/java/gradle/src/test/kotlin/ProcessingPluginTest.kt
new file mode 100644
index 0000000000..2be09fd896
--- /dev/null
+++ b/java/gradle/src/test/kotlin/ProcessingPluginTest.kt
@@ -0,0 +1,18 @@
+import org.gradle.api.Task
+import org.gradle.testfixtures.ProjectBuilder
+import org.gradle.testkit.runner.GradleRunner
+import org.junit.Rule
+import org.junit.Test
+import org.junit.rules.TemporaryFolder
+
+class ProcessingPluginTest{
+    // TODO: Write tests
+    // TODO: Test on multiple platforms since there is meaningful differences between the platforms
+    @Test
+    fun testPluginAddsSketchTask(){
+        val project = ProjectBuilder.builder().build()
+        project.pluginManager.apply("org.processing.gradle")
+
+        assert(project.tasks.getByName("sketch") is Task)
+    }
+}
diff --git a/java/lsp/build.gradle.kts b/java/lsp/build.gradle.kts
index 63ac7ab721..393f30344e 100644
--- a/java/lsp/build.gradle.kts
+++ b/java/lsp/build.gradle.kts
@@ -33,7 +33,10 @@ dependencies{
 
 mavenPublishing{
     publishToMavenCentral(SonatypeHost.CENTRAL_PORTAL)
-    signAllPublications()
+
+    // Only sign if signing is set up
+    if(project.hasProperty("signing.keyId") || project.hasProperty("signing.signingInMemoryKey"))
+        signAllPublications()
 
     pom{
         name.set("Processing Language Server")
diff --git a/java/preprocessor/build.gradle.kts b/java/preprocessor/build.gradle.kts
index c6855df06d..e902afe21d 100644
--- a/java/preprocessor/build.gradle.kts
+++ b/java/preprocessor/build.gradle.kts
@@ -1,7 +1,8 @@
 import com.vanniktech.maven.publish.SonatypeHost
 
 plugins{
-    id("java")
+    java
+    antlr
     alias(libs.plugins.mavenPublish)
 }
 
@@ -14,23 +15,41 @@ repositories{
 sourceSets{
     main{
         java{
-            srcDirs("src/main/java", "../src/", "../generated/")
+            srcDirs("src/main/java", "../src/")
             include("processing/mode/java/preproc/**/*", "processing/app/**/*")
         }
     }
-
+}
+afterEvaluate{
+    tasks.withType(Jar::class.java){
+        duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+        dependsOn(tasks.generateGrammarSource)
+    }
 }
 
 dependencies{
     implementation(libs.antlr)
     implementation(libs.eclipseJDT)
 
-    implementation(project(":core"))
+    antlr(libs.antlr4)
+    implementation(libs.antlr4Runtime)
+}
+
+publishing{
+    repositories{
+        maven {
+            name = "App"
+            url = uri(project(":app").layout.buildDirectory.dir("resources-bundled/common/repository").get().asFile.absolutePath)
+        }
+    }
 }
 
 mavenPublishing{
     publishToMavenCentral(SonatypeHost.CENTRAL_PORTAL)
-    signAllPublications()
+
+    // Only sign if signing is set up
+    if(project.hasProperty("signing.keyId") || project.hasProperty("signing.signingInMemoryKey"))
+        signAllPublications()
 
     pom{
         name.set("Processing Pre-processor")
@@ -58,13 +77,4 @@ mavenPublishing{
             developerConnection.set("scm:git:ssh://git@github.com/processing/processing4.git")
         }
     }
-}
-tasks.withType<Jar> {
-    duplicatesStrategy = DuplicatesStrategy.EXCLUDE
-}
-tasks.compileJava{
-    dependsOn("ant-preproc")
-}
-ant.importBuild("../build.xml"){ antTaskName ->
-    "ant-$antTaskName"
 }
\ No newline at end of file
diff --git a/java/preprocessor/src/main/antlr/JavaLexer.g4 b/java/preprocessor/src/main/antlr/JavaLexer.g4
new file mode 100644
index 0000000000..b924864ea2
--- /dev/null
+++ b/java/preprocessor/src/main/antlr/JavaLexer.g4
@@ -0,0 +1,235 @@
+/*
+ [The "BSD licence"]
+ Copyright (c) 2013 Terence Parr, Sam Harwell
+ Copyright (c) 2017 Ivan Kochurkin (upgrade to Java 8)
+ Copyright (c) 2021 Michał Lorek (upgrade to Java 11)
+ Copyright (c) 2022 Michał Lorek (upgrade to Java 17)
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the distribution.
+ 3. The name of the author may not be used to endorse or promote products
+    derived from this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+// $antlr-format alignTrailingComments true, columnLimit 150, maxEmptyLinesToKeep 1, reflowComments false, useTab false
+// $antlr-format allowShortRulesOnASingleLine true, allowShortBlocksOnASingleLine true, minEmptyLines 0, alignSemicolons ownLine
+// $antlr-format alignColons trailing, singleLineOverrulesHangingColon true, alignLexerCommands true, alignLabels true, alignTrailers true
+
+lexer grammar JavaLexer;
+
+// Keywords
+
+ABSTRACT     : 'abstract';
+ASSERT       : 'assert';
+BOOLEAN      : 'boolean';
+BREAK        : 'break';
+BYTE         : 'byte';
+CASE         : 'case';
+CATCH        : 'catch';
+CHAR         : 'char';
+CLASS        : 'class';
+CONST        : 'const';
+CONTINUE     : 'continue';
+DEFAULT      : 'default';
+DO           : 'do';
+DOUBLE       : 'double';
+ELSE         : 'else';
+ENUM         : 'enum';
+EXTENDS      : 'extends';
+FINAL        : 'final';
+FINALLY      : 'finally';
+FLOAT        : 'float';
+FOR          : 'for';
+IF           : 'if';
+GOTO         : 'goto';
+IMPLEMENTS   : 'implements';
+IMPORT       : 'import';
+INSTANCEOF   : 'instanceof';
+INT          : 'int';
+INTERFACE    : 'interface';
+LONG         : 'long';
+NATIVE       : 'native';
+NEW          : 'new';
+PACKAGE      : 'package';
+PRIVATE      : 'private';
+PROTECTED    : 'protected';
+PUBLIC       : 'public';
+RETURN       : 'return';
+SHORT        : 'short';
+STATIC       : 'static';
+STRICTFP     : 'strictfp';
+SUPER        : 'super';
+SWITCH       : 'switch';
+SYNCHRONIZED : 'synchronized';
+THIS         : 'this';
+THROW        : 'throw';
+THROWS       : 'throws';
+TRANSIENT    : 'transient';
+TRY          : 'try';
+VOID         : 'void';
+VOLATILE     : 'volatile';
+WHILE        : 'while';
+
+// Module related keywords
+MODULE     : 'module';
+OPEN       : 'open';
+REQUIRES   : 'requires';
+EXPORTS    : 'exports';
+OPENS      : 'opens';
+TO         : 'to';
+USES       : 'uses';
+PROVIDES   : 'provides';
+WITH       : 'with';
+TRANSITIVE : 'transitive';
+
+// Local Variable Type Inference
+VAR: 'var'; // reserved type name
+
+// Switch Expressions
+YIELD: 'yield'; // reserved type name from Java 14
+
+// Records
+RECORD: 'record';
+
+// Sealed Classes
+SEALED     : 'sealed';
+PERMITS    : 'permits';
+NON_SEALED : 'non-sealed';
+
+// Literals
+
+DECIMAL_LITERAL : ('0' | [1-9] (Digits? | '_'+ Digits)) [lL]?;
+HEX_LITERAL     : '0' [xX] [0-9a-fA-F] ([0-9a-fA-F_]* [0-9a-fA-F])? [lL]?;
+OCT_LITERAL     : '0' '_'* [0-7] ([0-7_]* [0-7])? [lL]?;
+BINARY_LITERAL  : '0' [bB] [01] ([01_]* [01])? [lL]?;
+
+FLOAT_LITERAL:
+    (Digits '.' Digits? | '.' Digits) ExponentPart? [fFdD]?
+    | Digits (ExponentPart [fFdD]? | [fFdD])
+;
+
+HEX_FLOAT_LITERAL: '0' [xX] (HexDigits '.'? | HexDigits? '.' HexDigits) [pP] [+-]? Digits [fFdD]?;
+
+BOOL_LITERAL: 'true' | 'false';
+
+CHAR_LITERAL: '\'' (~['\\\r\n] | EscapeSequence) '\'';
+
+STRING_LITERAL: '"' (~["\\\r\n] | EscapeSequence)* '"';
+
+MULTI_STRING_LIT:   '"""' (~[\\] | EscapeSequence)*? '"""';
+
+TEXT_BLOCK: '"""' [ \t]* [\r\n] (. | EscapeSequence)*? '"""';
+
+NULL_LITERAL: 'null';
+
+// Separators
+
+LPAREN : '(';
+RPAREN : ')';
+LBRACE : '{';
+RBRACE : '}';
+LBRACK : '[';
+RBRACK : ']';
+SEMI   : ';';
+COMMA  : ',';
+DOT    : '.';
+
+// Operators
+
+ASSIGN   : '=';
+GT       : '>';
+LT       : '<';
+BANG     : '!';
+TILDE    : '~';
+QUESTION : '?';
+COLON    : ':';
+EQUAL    : '==';
+LE       : '<=';
+GE       : '>=';
+NOTEQUAL : '!=';
+AND      : '&&';
+OR       : '||';
+INC      : '++';
+DEC      : '--';
+ADD      : '+';
+SUB      : '-';
+MUL      : '*';
+DIV      : '/';
+BITAND   : '&';
+BITOR    : '|';
+CARET    : '^';
+MOD      : '%';
+
+ADD_ASSIGN     : '+=';
+SUB_ASSIGN     : '-=';
+MUL_ASSIGN     : '*=';
+DIV_ASSIGN     : '/=';
+AND_ASSIGN     : '&=';
+OR_ASSIGN      : '|=';
+XOR_ASSIGN     : '^=';
+MOD_ASSIGN     : '%=';
+LSHIFT_ASSIGN  : '<<=';
+RSHIFT_ASSIGN  : '>>=';
+URSHIFT_ASSIGN : '>>>=';
+
+// Java 8 tokens
+
+ARROW      : '->';
+COLONCOLON : '::';
+
+// Additional symbols not defined in the lexical specification
+
+AT       : '@';
+ELLIPSIS : '...';
+
+// Whitespace and comments
+
+WS           : [ \t\r\n\u000C]+ -> channel(HIDDEN);
+COMMENT      : '/*' .*? '*/'    -> channel(HIDDEN);
+LINE_COMMENT : '//' ~[\r\n]*    -> channel(HIDDEN);
+
+// Identifiers
+
+IDENTIFIER: Letter LetterOrDigit*;
+
+// Fragment rules
+
+fragment ExponentPart: [eE] [+-]? Digits;
+
+fragment EscapeSequence:
+    '\\' 'u005c'? [btnfr"'\\]
+    | '\\' 'u005c'? ([0-3]? [0-7])? [0-7]
+    | '\\' 'u'+ HexDigit HexDigit HexDigit HexDigit
+;
+
+fragment HexDigits: HexDigit ((HexDigit | '_')* HexDigit)?;
+
+fragment HexDigit: [0-9a-fA-F];
+
+fragment Digits: [0-9] ([0-9_]* [0-9])?;
+
+fragment LetterOrDigit: Letter | [0-9];
+
+fragment Letter:
+    [a-zA-Z$_]                        // these are the "java letters" below 0x7F
+    | ~[\u0000-\u007F\uD800-\uDBFF]   // covers all characters above 0x7F which are not a surrogate
+    | [\uD800-\uDBFF] [\uDC00-\uDFFF] // covers UTF-16 surrogate pairs encodings for U+10000 to U+10FFFF
+;
\ No newline at end of file
diff --git a/java/preprocessor/src/main/antlr/JavaParser.g4 b/java/preprocessor/src/main/antlr/JavaParser.g4
new file mode 100644
index 0000000000..d273fa8885
--- /dev/null
+++ b/java/preprocessor/src/main/antlr/JavaParser.g4
@@ -0,0 +1,826 @@
+/*
+ [The "BSD licence"]
+ Copyright (c) 2013 Terence Parr, Sam Harwell
+ Copyright (c) 2017 Ivan Kochurkin (upgrade to Java 8)
+ Copyright (c) 2021 Michał Lorek (upgrade to Java 11)
+ Copyright (c) 2022 Michał Lorek (upgrade to Java 17)
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the distribution.
+ 3. The name of the author may not be used to endorse or promote products
+    derived from this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+// $antlr-format alignTrailingComments true, columnLimit 150, minEmptyLines 1, maxEmptyLinesToKeep 1, reflowComments false, useTab false
+// $antlr-format allowShortRulesOnASingleLine false, allowShortBlocksOnASingleLine true, alignSemicolons hanging, alignColons hanging
+
+parser grammar JavaParser;
+
+options {
+    tokenVocab = JavaLexer;
+}
+
+compilationUnit
+    : packageDeclaration? (importDeclaration | ';')* (typeDeclaration | ';')* EOF
+    | moduleDeclaration EOF
+    ;
+
+packageDeclaration
+    : annotation* PACKAGE qualifiedName ';'
+    ;
+
+importDeclaration
+    : IMPORT STATIC? qualifiedName ('.' '*')? ';'
+    ;
+
+typeDeclaration
+    : classOrInterfaceModifier* (
+        classDeclaration
+        | enumDeclaration
+        | interfaceDeclaration
+        | annotationTypeDeclaration
+        | recordDeclaration
+    )
+    ;
+
+modifier
+    : classOrInterfaceModifier
+    | NATIVE
+    | SYNCHRONIZED
+    | TRANSIENT
+    | VOLATILE
+    ;
+
+classOrInterfaceModifier
+    : annotation
+    | PUBLIC
+    | PROTECTED
+    | PRIVATE
+    | STATIC
+    | ABSTRACT
+    | FINAL // FINAL for class only -- does not apply to interfaces
+    | STRICTFP
+    | SEALED     // Java17
+    | NON_SEALED // Java17
+    ;
+
+variableModifier
+    : FINAL
+    | annotation
+    ;
+
+classDeclaration
+    : CLASS identifier typeParameters? (EXTENDS typeType)? (IMPLEMENTS typeList)? (
+        PERMITS typeList
+    )? // Java17
+    classBody
+    ;
+
+typeParameters
+    : '<' typeParameter (',' typeParameter)* '>'
+    ;
+
+typeParameter
+    : annotation* identifier (EXTENDS annotation* typeBound)?
+    ;
+
+typeBound
+    : typeType ('&' typeType)*
+    ;
+
+enumDeclaration
+    : ENUM identifier (IMPLEMENTS typeList)? '{' enumConstants? ','? enumBodyDeclarations? '}'
+    ;
+
+enumConstants
+    : enumConstant (',' enumConstant)*
+    ;
+
+enumConstant
+    : annotation* identifier arguments? classBody?
+    ;
+
+enumBodyDeclarations
+    : ';' classBodyDeclaration*
+    ;
+
+interfaceDeclaration
+    : INTERFACE identifier typeParameters? (EXTENDS typeList)? (PERMITS typeList)? interfaceBody
+    ;
+
+classBody
+    : '{' classBodyDeclaration* '}'
+    ;
+
+interfaceBody
+    : '{' interfaceBodyDeclaration* '}'
+    ;
+
+classBodyDeclaration
+    : ';'
+    | STATIC? block
+    | modifier* memberDeclaration
+    ;
+
+memberDeclaration
+    : recordDeclaration //Java17
+    | methodDeclaration
+    | genericMethodDeclaration
+    | fieldDeclaration
+    | constructorDeclaration
+    | genericConstructorDeclaration
+    | interfaceDeclaration
+    | annotationTypeDeclaration
+    | classDeclaration
+    | enumDeclaration
+    ;
+
+/* We use rule this even for void methods which cannot have [] after parameters.
+   This simplifies grammar and we can consider void to be a type, which
+   renders the [] matching as a context-sensitive issue or a semantic check
+   for invalid return type after parsing.
+ */
+methodDeclaration
+    : typeTypeOrVoid identifier formalParameters ('[' ']')* (THROWS qualifiedNameList)? methodBody
+    ;
+
+methodBody
+    : block
+    | ';'
+    ;
+
+typeTypeOrVoid
+    : typeType
+    | VOID
+    ;
+
+genericMethodDeclaration
+    : typeParameters methodDeclaration
+    ;
+
+genericConstructorDeclaration
+    : typeParameters constructorDeclaration
+    ;
+
+constructorDeclaration
+    : identifier formalParameters (THROWS qualifiedNameList)? constructorBody = block
+    ;
+
+compactConstructorDeclaration
+    : modifier* identifier constructorBody = block
+    ;
+
+fieldDeclaration
+    : typeType variableDeclarators ';'
+    ;
+
+interfaceBodyDeclaration
+    : modifier* interfaceMemberDeclaration
+    | ';'
+    ;
+
+interfaceMemberDeclaration
+    : recordDeclaration // Java17
+    | constDeclaration
+    | interfaceMethodDeclaration
+    | genericInterfaceMethodDeclaration
+    | interfaceDeclaration
+    | annotationTypeDeclaration
+    | classDeclaration
+    | enumDeclaration
+    ;
+
+constDeclaration
+    : typeType constantDeclarator (',' constantDeclarator)* ';'
+    ;
+
+constantDeclarator
+    : identifier ('[' ']')* '=' variableInitializer
+    ;
+
+// Early versions of Java allows brackets after the method name, eg.
+// public int[] return2DArray() [] { ... }
+// is the same as
+// public int[][] return2DArray() { ... }
+interfaceMethodDeclaration
+    : interfaceMethodModifier* interfaceCommonBodyDeclaration
+    ;
+
+// Java8
+interfaceMethodModifier
+    : annotation
+    | PUBLIC
+    | ABSTRACT
+    | DEFAULT
+    | STATIC
+    | STRICTFP
+    ;
+
+genericInterfaceMethodDeclaration
+    : interfaceMethodModifier* typeParameters interfaceCommonBodyDeclaration
+    ;
+
+interfaceCommonBodyDeclaration
+    : annotation* typeTypeOrVoid identifier formalParameters ('[' ']')* (THROWS qualifiedNameList)? methodBody
+    ;
+
+variableDeclarators
+    : variableDeclarator (',' variableDeclarator)*
+    ;
+
+variableDeclarator
+    : variableDeclaratorId ('=' variableInitializer)?
+    ;
+
+variableDeclaratorId
+    : identifier ('[' ']')*
+    ;
+
+variableInitializer
+    : arrayInitializer
+    | expression
+    ;
+
+arrayInitializer
+    : '{' (variableInitializer (',' variableInitializer)* ','?)? '}'
+    ;
+
+classOrInterfaceType
+    : (identifier typeArguments? '.')* typeIdentifier typeArguments?
+    ;
+
+typeArgument
+    : typeType
+    | annotation* '?' ((EXTENDS | SUPER) typeType)?
+    ;
+
+qualifiedNameList
+    : qualifiedName (',' qualifiedName)*
+    ;
+
+formalParameters
+    : '(' (
+        receiverParameter?
+        | receiverParameter (',' formalParameterList)?
+        | formalParameterList?
+    ) ')'
+    ;
+
+receiverParameter
+    : typeType (identifier '.')* THIS
+    ;
+
+formalParameterList
+    : formalParameter (',' formalParameter)* (',' lastFormalParameter)?
+    | lastFormalParameter
+    ;
+
+formalParameter
+    : variableModifier* typeType variableDeclaratorId
+    ;
+
+lastFormalParameter
+    : variableModifier* typeType annotation* '...' variableDeclaratorId
+    ;
+
+// local variable type inference
+lambdaLVTIList
+    : lambdaLVTIParameter (',' lambdaLVTIParameter)*
+    ;
+
+lambdaLVTIParameter
+    : variableModifier* VAR identifier
+    ;
+
+qualifiedName
+    : identifier ('.' identifier)*
+    ;
+
+baseStringLiteral
+    : STRING_LITERAL
+    ;
+
+multilineStringLiteral
+    : MULTI_STRING_LIT
+    ;
+
+stringLiteral
+    : baseStringLiteral
+    | multilineStringLiteral
+    ;
+
+literal
+    : integerLiteral
+    | floatLiteral
+    | CHAR_LITERAL
+    | stringLiteral
+    | BOOL_LITERAL
+    | NULL_LITERAL
+    | TEXT_BLOCK // Java17
+    ;
+
+integerLiteral
+    : DECIMAL_LITERAL
+    | HEX_LITERAL
+    | OCT_LITERAL
+    | BINARY_LITERAL
+    ;
+
+floatLiteral
+    : FLOAT_LITERAL
+    | HEX_FLOAT_LITERAL
+    ;
+
+// ANNOTATIONS
+altAnnotationQualifiedName
+    : (identifier DOT)* '@' identifier
+    ;
+
+annotation
+    : ('@' qualifiedName | altAnnotationQualifiedName) (
+        '(' ( elementValuePairs | elementValue)? ')'
+    )?
+    ;
+
+elementValuePairs
+    : elementValuePair (',' elementValuePair)*
+    ;
+
+elementValuePair
+    : identifier '=' elementValue
+    ;
+
+elementValue
+    : expression
+    | annotation
+    | elementValueArrayInitializer
+    ;
+
+elementValueArrayInitializer
+    : '{' (elementValue (',' elementValue)*)? ','? '}'
+    ;
+
+annotationTypeDeclaration
+    : '@' INTERFACE identifier annotationTypeBody
+    ;
+
+annotationTypeBody
+    : '{' annotationTypeElementDeclaration* '}'
+    ;
+
+annotationTypeElementDeclaration
+    : modifier* annotationTypeElementRest
+    | ';' // this is not allowed by the grammar, but apparently allowed by the actual compiler
+    ;
+
+annotationTypeElementRest
+    : typeType annotationMethodOrConstantRest ';'
+    | classDeclaration ';'?
+    | interfaceDeclaration ';'?
+    | enumDeclaration ';'?
+    | annotationTypeDeclaration ';'?
+    | recordDeclaration ';'? // Java17
+    ;
+
+annotationMethodOrConstantRest
+    : annotationMethodRest
+    | annotationConstantRest
+    ;
+
+annotationMethodRest
+    : identifier '(' ')' defaultValue?
+    ;
+
+annotationConstantRest
+    : variableDeclarators
+    ;
+
+defaultValue
+    : DEFAULT elementValue
+    ;
+
+// MODULES - Java9
+
+moduleDeclaration
+    : OPEN? MODULE qualifiedName moduleBody
+    ;
+
+moduleBody
+    : '{' moduleDirective* '}'
+    ;
+
+moduleDirective
+    : REQUIRES requiresModifier* qualifiedName ';'
+    | EXPORTS qualifiedName (TO qualifiedName)? ';'
+    | OPENS qualifiedName (TO qualifiedName)? ';'
+    | USES qualifiedName ';'
+    | PROVIDES qualifiedName WITH qualifiedName ';'
+    ;
+
+requiresModifier
+    : TRANSITIVE
+    | STATIC
+    ;
+
+// RECORDS - Java 17
+
+recordDeclaration
+    : RECORD identifier typeParameters? recordHeader (IMPLEMENTS typeList)? recordBody
+    ;
+
+recordHeader
+    : '(' recordComponentList? ')'
+    ;
+
+recordComponentList
+    : recordComponent (',' recordComponent)*
+    ;
+
+recordComponent
+    : typeType identifier
+    ;
+
+recordBody
+    : '{' (classBodyDeclaration | compactConstructorDeclaration)* '}'
+    ;
+
+// STATEMENTS / BLOCKS
+
+block
+    : '{' blockStatement* '}'
+    ;
+
+blockStatement
+    : localVariableDeclaration ';'
+    | localTypeDeclaration
+    | statement
+    ;
+
+localVariableDeclaration
+    : variableModifier* (VAR identifier '=' expression | typeType variableDeclarators)
+    ;
+
+identifier
+    : IDENTIFIER
+    | MODULE
+    | OPEN
+    | REQUIRES
+    | EXPORTS
+    | OPENS
+    | TO
+    | USES
+    | PROVIDES
+    | WITH
+    | TRANSITIVE
+    | YIELD
+    | SEALED
+    | PERMITS
+    | RECORD
+    | VAR
+    ;
+
+typeIdentifier // Identifiers that are not restricted for type declarations
+    : IDENTIFIER
+    | MODULE
+    | OPEN
+    | REQUIRES
+    | EXPORTS
+    | OPENS
+    | TO
+    | USES
+    | PROVIDES
+    | WITH
+    | TRANSITIVE
+    | SEALED
+    | PERMITS
+    | RECORD
+    ;
+
+localTypeDeclaration
+    : classOrInterfaceModifier* (classDeclaration | interfaceDeclaration | recordDeclaration)
+    ;
+
+statement
+    : blockLabel = block
+    | ASSERT expression (':' expression)? ';'
+    | IF parExpression statement (ELSE statement)?
+    | FOR '(' forControl ')' statement
+    | WHILE parExpression statement
+    | DO statement WHILE parExpression ';'
+    | TRY block (catchClause+ finallyBlock? | finallyBlock)
+    | TRY resourceSpecification block catchClause* finallyBlock?
+    | SWITCH parExpression '{' switchBlockStatementGroup* switchLabel* '}'
+    | SYNCHRONIZED parExpression block
+    | RETURN expression? ';'
+    | THROW expression ';'
+    | BREAK identifier? ';'
+    | CONTINUE identifier? ';'
+    | YIELD expression ';' // Java17
+    | SEMI
+    | statementExpression = expression ';'
+    | switchExpression ';'? // Java17
+    | identifierLabel = identifier ':' statement
+    ;
+
+catchClause
+    : CATCH '(' variableModifier* catchType identifier ')' block
+    ;
+
+catchType
+    : qualifiedName ('|' qualifiedName)*
+    ;
+
+finallyBlock
+    : FINALLY block
+    ;
+
+resourceSpecification
+    : '(' resources ';'? ')'
+    ;
+
+resources
+    : resource (';' resource)*
+    ;
+
+resource
+    : variableModifier* (classOrInterfaceType variableDeclaratorId | VAR identifier) '=' expression
+    | qualifiedName
+    ;
+
+/** Matches cases then statements, both of which are mandatory.
+ *  To handle empty cases at the end, we add switchLabel* to statement.
+ */
+switchBlockStatementGroup
+    : switchLabel+ blockStatement+
+    ;
+
+switchLabel
+    : CASE (
+        constantExpression = expression
+        | enumConstantName = IDENTIFIER
+        | typeType varName = identifier
+    ) ':'
+    | DEFAULT ':'
+    ;
+
+forControl
+    : enhancedForControl
+    | forInit? ';' expression? ';' forUpdate = expressionList?
+    ;
+
+forInit
+    : localVariableDeclaration
+    | expressionList
+    ;
+
+enhancedForControl
+    : variableModifier* (typeType | VAR) variableDeclaratorId ':' expression
+    ;
+
+// EXPRESSIONS
+
+parExpression
+    : '(' expression ')'
+    ;
+
+expressionList
+    : expression (',' expression)*
+    ;
+
+methodCall
+    : (identifier | THIS | SUPER) arguments
+    ;
+
+expression
+    // Expression order in accordance with https://introcs.cs.princeton.edu/java/11precedence/
+    // Level 16, Primary, array and member access
+    : primary                                                       #PrimaryExpression
+    | expression '[' expression ']'                                 #SquareBracketExpression
+    | expression bop = '.' (
+        identifier
+        | methodCall
+        | THIS
+        | NEW nonWildcardTypeArguments? innerCreator
+        | SUPER superSuffix
+        | explicitGenericInvocation
+    )                                                               #MemberReferenceExpression
+    // Method calls and method references are part of primary, and hence level 16 precedence
+    | methodCall                                                    #MethodCallExpression
+    | expression '::' typeArguments? identifier                     #MethodReferenceExpression
+    | typeType '::' (typeArguments? identifier | NEW)               #MethodReferenceExpression
+    | classType '::' typeArguments? NEW                             #MethodReferenceExpression
+
+    // Java17
+    | switchExpression                                              #ExpressionSwitch
+
+    // Level 15 Post-increment/decrement operators
+    | expression postfix = ('++' | '--')                            #PostIncrementDecrementOperatorExpression
+
+    // Level 14, Unary operators
+    | prefix = ('+' | '-' | '++' | '--' | '~' | '!') expression     #UnaryOperatorExpression
+
+    // Level 13 Cast and object creation
+    | '(' annotation* typeType ('&' typeType)* ')' expression       #CastExpression
+    | NEW creator                                                   #ObjectCreationExpression
+
+    // Level 12 to 1, Remaining operators
+    // Level 12, Multiplicative operators
+    | expression bop = ('*' | '/' | '%') expression           #BinaryOperatorExpression
+    // Level 11, Additive operators
+    | expression bop = ('+' | '-') expression                 #BinaryOperatorExpression
+    // Level 10, Shift operators
+    | expression ('<' '<' | '>' '>' '>' | '>' '>') expression #BinaryOperatorExpression
+    // Level 9, Relational operators
+    | expression bop = ('<=' | '>=' | '>' | '<') expression   #BinaryOperatorExpression
+    | expression bop = INSTANCEOF (typeType | pattern)        #InstanceOfOperatorExpression
+    // Level 8, Equality Operators
+    | expression bop = ('==' | '!=') expression               #BinaryOperatorExpression
+    // Level 7, Bitwise AND
+    | expression bop = '&' expression                         #BinaryOperatorExpression
+    // Level 6, Bitwise XOR
+    | expression bop = '^' expression                         #BinaryOperatorExpression
+    // Level 5, Bitwise OR
+    | expression bop = '|' expression                         #BinaryOperatorExpression
+    // Level 4, Logic AND
+    | expression bop = '&&' expression                        #BinaryOperatorExpression
+    // Level 3, Logic OR
+    | expression bop = '||' expression                        #BinaryOperatorExpression
+    // Level 2, Ternary
+    | <assoc = right> expression bop = '?' expression ':' expression #TernaryExpression
+    // Level 1, Assignment
+    | <assoc = right> expression bop = (
+        '='
+        | '+='
+        | '-='
+        | '*='
+        | '/='
+        | '&='
+        | '|='
+        | '^='
+        | '>>='
+        | '>>>='
+        | '<<='
+        | '%='
+    ) expression                                              #BinaryOperatorExpression
+
+    // Level 0, Lambda Expression // Java8
+    | lambdaExpression                                        #ExpressionLambda
+    ;
+
+// Java17
+pattern
+    : variableModifier* typeType annotation* identifier
+    ;
+
+// Java8
+lambdaExpression
+    : lambdaParameters '->' lambdaBody
+    ;
+
+// Java8
+lambdaParameters
+    : identifier
+    | '(' formalParameterList? ')'
+    | '(' identifier (',' identifier)* ')'
+    | '(' lambdaLVTIList? ')'
+    ;
+
+// Java8
+lambdaBody
+    : expression
+    | block
+    ;
+
+primary
+    : '(' expression ')'
+    | THIS
+    | SUPER
+    | literal
+    | identifier
+    | typeTypeOrVoid '.' CLASS
+    | nonWildcardTypeArguments (explicitGenericInvocationSuffix | THIS arguments)
+    ;
+
+// Java17
+switchExpression
+    : SWITCH parExpression '{' switchLabeledRule* '}'
+    ;
+
+// Java17
+switchLabeledRule
+    : CASE (expressionList | NULL_LITERAL | guardedPattern) (ARROW | COLON) switchRuleOutcome
+    | DEFAULT (ARROW | COLON) switchRuleOutcome
+    ;
+
+// Java17
+guardedPattern
+    : '(' guardedPattern ')'
+    | variableModifier* typeType annotation* identifier ('&&' expression)*
+    | guardedPattern '&&' expression
+    ;
+
+// Java17
+switchRuleOutcome
+    : block
+    | blockStatement*
+    ;
+
+classType
+    : (classOrInterfaceType '.')? annotation* identifier typeArguments?
+    ;
+
+creator
+    : nonWildcardTypeArguments? createdName classCreatorRest
+    | createdName arrayCreatorRest
+    ;
+
+createdName
+    : identifier typeArgumentsOrDiamond? ('.' identifier typeArgumentsOrDiamond?)*
+    | primitiveType
+    ;
+
+innerCreator
+    : identifier nonWildcardTypeArgumentsOrDiamond? classCreatorRest
+    ;
+
+arrayCreatorRest
+    : ('[' ']')+ arrayInitializer
+    | ('[' expression ']')+ ('[' ']')*
+    ;
+
+classCreatorRest
+    : arguments classBody?
+    ;
+
+explicitGenericInvocation
+    : nonWildcardTypeArguments explicitGenericInvocationSuffix
+    ;
+
+typeArgumentsOrDiamond
+    : '<' '>'
+    | typeArguments
+    ;
+
+nonWildcardTypeArgumentsOrDiamond
+    : '<' '>'
+    | nonWildcardTypeArguments
+    ;
+
+nonWildcardTypeArguments
+    : '<' typeList '>'
+    ;
+
+typeList
+    : typeType (',' typeType)*
+    ;
+
+typeType
+    : annotation* (classOrInterfaceType | primitiveType) (annotation* '[' ']')*
+    ;
+
+primitiveType
+    : BOOLEAN
+    | CHAR
+    | BYTE
+    | SHORT
+    | INT
+    | LONG
+    | FLOAT
+    | DOUBLE
+    ;
+
+typeArguments
+    : '<' typeArgument (',' typeArgument)* '>'
+    ;
+
+superSuffix
+    : arguments
+    | '.' typeArguments? identifier arguments?
+    ;
+
+explicitGenericInvocationSuffix
+    : SUPER superSuffix
+    | identifier arguments
+    ;
+
+arguments
+    : '(' expressionList? ')'
+    ;
\ No newline at end of file
diff --git a/java/preprocessor/src/main/antlr/processing/mode/java/preproc/Processing.g4 b/java/preprocessor/src/main/antlr/processing/mode/java/preproc/Processing.g4
new file mode 100644
index 0000000000..2d4edc041a
--- /dev/null
+++ b/java/preprocessor/src/main/antlr/processing/mode/java/preproc/Processing.g4
@@ -0,0 +1,147 @@
+/**
+ *  Based on Java 1.7 grammar for ANTLR 4, see Java.g4
+ *
+ *  - changes main entry point to reflect sketch types 'static' | 'active'
+ *  - adds support for type converter functions like "int()"
+ *  - adds pseudo primitive type "color"
+ *  - adds HTML hex notation with hash symbol: #ff5522
+ *     - allow color to appear as part of qualified names (like in imports)
+ */
+
+grammar Processing;
+
+@lexer::members {
+  public static final int WHITESPACE = 1;
+  public static final int COMMENTS = 2;
+}
+
+@header {
+    package processing.mode.java.preproc;
+}
+
+// import Java grammar
+import JavaParser, JavaLexer;
+
+// main entry point, select sketch type
+processingSketch
+    : staticProcessingSketch
+    | javaProcessingSketch
+    | activeProcessingSketch
+//    | warnMixedModes
+    ;
+
+// java mode, is a compilation unit
+javaProcessingSketch
+    : packageDeclaration? importDeclaration* typeDeclaration+ EOF
+    ;
+
+// No method declarations, just statements
+staticProcessingSketch
+    : (importDeclaration | blockStatement | typeDeclaration)* EOF
+    ;
+
+// active mode, has function definitions
+activeProcessingSketch
+    : (importDeclaration | classBodyDeclaration)* EOF
+    ;
+
+// User incorrectly mixing modes. Included to allow for kind error message.
+warnMixedModes
+    : (importDeclaration | classBodyDeclaration | blockStatement)* blockStatement classBodyDeclaration (importDeclaration | classBodyDeclaration | blockStatement)*
+    | (importDeclaration | classBodyDeclaration | blockStatement)* classBodyDeclaration blockStatement (importDeclaration | classBodyDeclaration | blockStatement)*
+    ;
+
+variableDeclaratorId
+    : warnTypeAsVariableName
+    | IDENTIFIER ('[' ']')*
+    ;
+
+// bug #93
+// https://github.com/processing/processing/issues/93
+// prevent from types being used as variable names
+warnTypeAsVariableName
+    : primitiveType ('[' ']')* {
+        notifyErrorListeners("Type names are not allowed as variable names: "+$primitiveType.text);
+      }
+    ;
+
+// catch special API function calls that we are interested in
+methodCall
+    : functionWithPrimitiveTypeName
+    | IDENTIFIER '(' expressionList? ')'
+    | THIS '(' expressionList? ')'
+    | SUPER '(' expressionList? ')'
+    ;
+
+// these are primitive type names plus "()"
+// "color" is a special Processing primitive (== int)
+functionWithPrimitiveTypeName
+    : (  'boolean'
+      |  'byte'
+      |  'char'
+      |  'float'
+      |  'int'
+      |  'color'
+      ) '(' expressionList? ')'
+    ;
+
+// adding support for "color" primitive
+primitiveType
+    : BOOLEAN
+    | CHAR
+    | BYTE
+    | SHORT
+    | INT
+    | LONG
+    | FLOAT
+    | DOUBLE
+    | colorPrimitiveType
+    ;
+
+colorPrimitiveType
+    : 'color'
+    ;
+
+qualifiedName
+    : (IDENTIFIER | colorPrimitiveType) ('.' (IDENTIFIER | colorPrimitiveType))*
+    ;
+
+// added HexColorLiteral
+literal
+    : integerLiteral
+    | floatLiteral
+    | CHAR_LITERAL
+    | stringLiteral
+    | BOOL_LITERAL
+    | NULL_LITERAL
+    | hexColorLiteral
+    ;
+
+// As parser rule so this produces a separate listener
+// for us to alter its value.
+hexColorLiteral
+    : HexColorLiteral
+    ;
+
+// add color literal notations for
+// #ff5522
+HexColorLiteral
+    : '#' (HexDigit HexDigit)? HexDigit HexDigit HexDigit HexDigit HexDigit HexDigit
+    ;
+
+// hide but do not remove whitespace and comments
+
+WS  : [ \t\r\n\u000C]+ -> channel(1)
+    ;
+
+COMMENT
+    : '/*' .*? '*/' -> channel(2)
+    ;
+
+LINE_COMMENT
+    : '//' ~[\r\n]* -> channel(2)
+    ;
+
+CHAR_LITERAL
+    : '\'' (~['\\\r\n] | EscapeSequence)* '\''  // A bit nasty but let JDT tackle invalid chars
+		;
\ No newline at end of file
diff --git a/java/preprocessor/src/main/java/processing/app/Platform.java b/java/preprocessor/src/main/java/processing/app/Platform.java
index 079d9d79cd..b90974dd39 100644
--- a/java/preprocessor/src/main/java/processing/app/Platform.java
+++ b/java/preprocessor/src/main/java/processing/app/Platform.java
@@ -15,7 +15,21 @@ static public File getSettingsFolder() {
             }
             settingsFolder = new File(appData + "\\Processing");
         } else {
-            settingsFolder = new File(System.getProperty("user.home") + "/.processing");
+            // Check to see if the user has set a different location for their config
+            String configHomeEnv = System.getenv("XDG_CONFIG_HOME");
+            if (configHomeEnv != null && !configHomeEnv.isBlank()) {
+                settingsFolder = new File(configHomeEnv);
+                if (!settingsFolder.exists()) {
+                    settingsFolder = null;  // don't use non-existent folder
+                }
+            }
+            String snapUserCommon = System.getenv("SNAP_USER_COMMON");
+            if (snapUserCommon != null && !snapUserCommon.isBlank()) {
+                settingsFolder = new File(snapUserCommon);
+            }
+            if (settingsFolder == null) {
+                settingsFolder = new File(System.getProperty("user.home"), ".config");
+            }
         }
         return settingsFolder;
     }
diff --git a/java/preprocessor/src/main/java/processing/app/Preferences.java b/java/preprocessor/src/main/java/processing/app/Preferences.java
index 7ce476fdea..eab3a23974 100644
--- a/java/preprocessor/src/main/java/processing/app/Preferences.java
+++ b/java/preprocessor/src/main/java/processing/app/Preferences.java
@@ -58,7 +58,7 @@ static public String get(String attribute /*, String defaultValue */) {
         }
     }
     static public boolean getBoolean(String attribute) {
-        String value = get(attribute); //, null);
+        String value = get(attribute);
         return Boolean.parseBoolean(value);
     }
     static public int getInteger(String attribute /*, int defaultValue*/) {
diff --git a/java/src/processing/mode/java/JavaEditor.java b/java/src/processing/mode/java/JavaEditor.java
index 815792955d..5a6e2d60b2 100644
--- a/java/src/processing/mode/java/JavaEditor.java
+++ b/java/src/processing/mode/java/JavaEditor.java
@@ -29,7 +29,6 @@
 import java.net.HttpURLConnection;
 import java.net.URL;
 import java.nio.file.Files;
-import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -488,6 +487,10 @@ public String getCommentPrefix() {
    * Handler for Sketch → Export Application
    */
   public void handleExportApplication() {
+    if(service.getEnabled()){
+        service.export();
+        return;
+    }
     if (handleExportCheckModified()) {
       statusNotice(Language.text("export.notice.exporting"));
       ExportPrompt ep = new ExportPrompt(this, () -> {
@@ -638,6 +641,12 @@ public void handleTweak() {
   protected void handleLaunch(boolean present, boolean tweak) {
     prepareRun();
     toolbar.activateRun();
+
+    if(this.service.getEnabled()){
+      this.service.run();
+      return;
+    }
+
     synchronized (runtimeLock) {
       runtimeLaunchRequested = true;
     }
@@ -666,6 +675,16 @@ protected void handleLaunch(boolean present, boolean tweak) {
    * session or performs standard stop action if not currently debugging.
    */
   public void handleStop() {
+    if(this.service.getEnabled()){
+      // TODO: Improve Gradle UI Feedback
+      toolbar.activateStop();
+      this.service.stop();
+
+      toolbar.deactivateStop();
+      toolbar.deactivateRun();
+      return;
+    }
+
     if (debugger.isStarted()) {
       debugger.stopDebug();
 
diff --git a/java/src/processing/mode/java/preproc/PdeParseTreeListener.java b/java/src/processing/mode/java/preproc/PdeParseTreeListener.java
index cb4fd00010..c3edc810ad 100644
--- a/java/src/processing/mode/java/preproc/PdeParseTreeListener.java
+++ b/java/src/processing/mode/java/preproc/PdeParseTreeListener.java
@@ -32,7 +32,6 @@
 
 import processing.app.Base;
 import processing.app.Preferences;
-import processing.core.PApplet;
 import processing.mode.java.preproc.PdePreprocessor.Mode;
 
 /**
@@ -1234,19 +1233,35 @@ protected void writeMain(PrintWriterWithEditGen footerWriter,
     { // assemble line with applet args
       StringJoiner argsJoiner = new StringJoiner(", ");
 
-      boolean shouldFullScreen = Preferences.getBoolean("export.application.present");
-      shouldFullScreen = shouldFullScreen || Preferences.getBoolean("export.application.fullscreen");
+      boolean shouldFullScreen;
+      String presentProp = System.getProperty("processing.fullscreen");
+
+      if (presentProp != null) {
+        shouldFullScreen = presentProp.equals("true");
+      } else {
+        boolean isExportedApp = Preferences.getBoolean("export.application.present");
+        boolean isFullscreenPref = Preferences.getBoolean("export.application.fullscreen");
+        shouldFullScreen = isExportedApp || isFullscreenPref;
+      }
+
       if (shouldFullScreen) {
-        argsJoiner.add("\"" + PApplet.ARGS_FULL_SCREEN + "\"");
+        argsJoiner.add("\"--full-screen\"");
 
-        String bgColor = Preferences.get("run.present.bgcolor");
-        argsJoiner.add("\"" + PApplet.ARGS_BGCOLOR + "=" + bgColor + "\"");
+        String bgColor = System.getProperty("processing.window.color", Preferences.get("run.present.bgcolor"));
+        argsJoiner.add("\"--bgcolor=" + bgColor + "\"");
 
-        if (Preferences.getBoolean("export.application.stop")) {
+        boolean showStop;
+        var hideStop = System.getProperty("processing.stop.hide");
+        if(hideStop != null){
+          showStop = hideStop.equals("false");
+        }else{
+          showStop = Preferences.getBoolean("export.application.stop");
+        }
+        if(showStop) {
           String stopColor = Preferences.get("run.present.stop.color");
-          argsJoiner.add("\"" + PApplet.ARGS_STOP_COLOR + "=" + stopColor + "\"");
+          argsJoiner.add("\"--stop-color=" + stopColor + "\"");
         } else {
-          argsJoiner.add("\"" + PApplet.ARGS_HIDE_STOP + "\"");
+          argsJoiner.add("\"--hide-stop\"");
         }
       }
       
diff --git a/java/src/processing/mode/java/preproc/TextTransform.java b/java/src/processing/mode/java/preproc/TextTransform.java
index 77ae022f19..19ba8f3e53 100644
--- a/java/src/processing/mode/java/preproc/TextTransform.java
+++ b/java/src/processing/mode/java/preproc/TextTransform.java
@@ -8,8 +8,6 @@
 import java.util.ListIterator;
 import java.util.stream.Collectors;
 
-import processing.core.PApplet;
-
 
 public class TextTransform {
 
@@ -256,7 +254,7 @@ public int getInputOffset(int outputOffset) {
         i = -(i + 1);
         i -= 1;
       }
-      i = PApplet.constrain(i, 0, outMap.size()-1);
+      i = constrain(i, 0, outMap.size()-1);
       Edit edit = outMap.get(i);
       int diff = outputOffset - edit.toOffset;
       return edit.fromOffset + Math.min(diff, Math.max(0, edit.fromLength - 1));
@@ -271,7 +269,7 @@ public int getOutputOffset(int inputOffset) {
         i = -(i + 1);
         i -= 1;
       }
-      i = PApplet.constrain(i, 0, inMap.size()-1);
+      i = constrain(i, 0, inMap.size()-1);
       Edit edit = inMap.get(i);
       int diff = inputOffset - edit.fromOffset;
       return edit.toOffset + Math.min(diff, Math.max(0, edit.toLength - 1));
@@ -283,6 +281,10 @@ public OffsetMapper thenMapping(OffsetMapper mapper) {
     }
   }
 
+  static public final int constrain(int amt, int low, int high) {
+    return (amt < low) ? low : ((amt > high) ? high : amt);
+  }
+
 
   private static class CompositeOffsetMapper implements OffsetMapper {
     private List<OffsetMapper> mappers = new ArrayList<>();
diff --git a/java/test/resources/bug1532.pde b/java/test/resources/bug1532.pde
index 66b24b7779..ae8ecdbf8b 100644
--- a/java/test/resources/bug1532.pde
+++ b/java/test/resources/bug1532.pde
@@ -20,9 +20,9 @@ flatCube[][] grid;
 
 void setup() {
   try {
-    quicktime.QTSession.open();
-  } 
-  catch (quicktime.QTException qte) { 
+    // quicktime.QTSession.open();
+  }
+  catch (quicktime.QTException qte) {
     qte.printStackTrace();
   }
 
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 4bdcd880e8..5809665d7c 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -5,6 +5,7 @@ include(
     "app",
     "java",
     "java:preprocessor",
+    "java:gradle",
     "java:libraries:dxf",
     "java:libraries:io",
     "java:libraries:net",

From 0d1fcc45a94198a8663e8edf7986a49908a8bcf7 Mon Sep 17 00:00:00 2001
From: Stef Tervelde <stef@steftervelde.nl>
Date: Tue, 1 Jul 2025 14:40:30 +0200
Subject: [PATCH 02/34] Added documentation and todo's

---
 java/gradle/example/.idea/gradle.xml            | 1 -
 java/gradle/example/.idea/misc.xml              | 1 +
 java/gradle/src/main/kotlin/DependenciesTask.kt | 4 ++++
 java/gradle/src/main/kotlin/LibrariesTask.kt    | 4 ++++
 java/gradle/src/main/kotlin/PDETask.kt          | 5 +++--
 java/gradle/src/main/kotlin/ProcessingPlugin.kt | 1 +
 6 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/java/gradle/example/.idea/gradle.xml b/java/gradle/example/.idea/gradle.xml
index 11bd2cc4cc..ae55d4d4a2 100644
--- a/java/gradle/example/.idea/gradle.xml
+++ b/java/gradle/example/.idea/gradle.xml
@@ -29,7 +29,6 @@
           </compositeBuild>
         </compositeConfiguration>
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="#JAVA_HOME" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$/../../.." />
diff --git a/java/gradle/example/.idea/misc.xml b/java/gradle/example/.idea/misc.xml
index 6ed36dd36d..822aa1a0c3 100644
--- a/java/gradle/example/.idea/misc.xml
+++ b/java/gradle/example/.idea/misc.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_24" project-jdk-name="temurin-17" project-jdk-type="JavaSDK" />
 </project>
\ No newline at end of file
diff --git a/java/gradle/src/main/kotlin/DependenciesTask.kt b/java/gradle/src/main/kotlin/DependenciesTask.kt
index 320f1ebb0a..e847cc310c 100644
--- a/java/gradle/src/main/kotlin/DependenciesTask.kt
+++ b/java/gradle/src/main/kotlin/DependenciesTask.kt
@@ -7,6 +7,9 @@ import org.gradle.api.tasks.TaskAction
 import java.io.File
 import java.io.ObjectInputStream
 
+/*
+* The DependenciesTask resolves the dependencies for the sketch based on the libraries used
+ */
 abstract class DependenciesTask: DefaultTask() {
     @InputFile
     val librariesMetaData: RegularFileProperty = project.objects.fileProperty()
@@ -59,6 +62,7 @@ abstract class DependenciesTask: DefaultTask() {
         project.dependencies.add("runtimeOnly", "org.jogamp.jogl:jogl-all:2.5.0:natives-macosx-universal")
         project.dependencies.add("runtimeOnly", "org.jogamp.gluegen:gluegen-rt:2.5.0:natives-macosx-universal")
 
+        // TODO: Solve windows specific issue
         // Windows specific native dependencies
         project.dependencies.add("runtimeOnly", "org.jogamp.jogl:jogl-all:2.5.0:natives-windows-amd64")
         project.dependencies.add("runtimeOnly", "org.jogamp.gluegen:gluegen-rt:2.5.0:natives-windows-amd64")
diff --git a/java/gradle/src/main/kotlin/LibrariesTask.kt b/java/gradle/src/main/kotlin/LibrariesTask.kt
index 1ac0dd51e1..a6e932500c 100644
--- a/java/gradle/src/main/kotlin/LibrariesTask.kt
+++ b/java/gradle/src/main/kotlin/LibrariesTask.kt
@@ -10,6 +10,10 @@ import java.io.File
 import java.io.ObjectOutputStream
 import java.util.jar.JarFile
 
+/*
+The libraries task scans the sketchbook libraries folder for all the libraries
+This task stores the resulting information in a file that can be used later to resolve dependencies
+ */
 abstract class LibrariesTask : DefaultTask() {
 
     // TODO: Allow this directory to not exist
diff --git a/java/gradle/src/main/kotlin/PDETask.kt b/java/gradle/src/main/kotlin/PDETask.kt
index 22e9360ac6..57fa31f3ec 100644
--- a/java/gradle/src/main/kotlin/PDETask.kt
+++ b/java/gradle/src/main/kotlin/PDETask.kt
@@ -13,9 +13,10 @@ import javax.inject.Inject
 
 
 // TODO: Generate sourcemaps
+/*
+* The PDETask is the main task that processes the .pde files and generates the Java source code
+ */
 abstract class PDETask : SourceTask() {
-
-
     @get:InputFiles
     @get:PathSensitive(PathSensitivity.RELATIVE)
     @get:IgnoreEmptyDirectories
diff --git a/java/gradle/src/main/kotlin/ProcessingPlugin.kt b/java/gradle/src/main/kotlin/ProcessingPlugin.kt
index 472365209a..b02d7f0944 100644
--- a/java/gradle/src/main/kotlin/ProcessingPlugin.kt
+++ b/java/gradle/src/main/kotlin/ProcessingPlugin.kt
@@ -27,6 +27,7 @@ class ProcessingPlugin @Inject constructor(private val objectFactory: ObjectFact
         val workingDir = project.findProperty("processing.workingDir") as String?
         val debugPort = project.findProperty("processing.debugPort") as String?
 
+        // TODO: Setup sketchbook when using as a standalone plugin
         val sketchbook = project.findProperty("processing.sketchbook") as String?
 
         // Apply the Java plugin to the Project

From 4cca647724a265d01084580676d5eb7eeeace08f Mon Sep 17 00:00:00 2001
From: Stef Tervelde <stef@steftervelde.nl>
Date: Tue, 1 Jul 2025 17:02:03 +0200
Subject: [PATCH 03/34] Updated error reporting

---
 app/src/processing/app/gradle/Exceptions.kt   | 143 +++++++++---------
 app/src/processing/app/gradle/GradleJob.kt    |  55 +------
 .../processing/app/gradle/GradleService.kt    |   2 +
 .../src/main/kotlin/DependenciesTask.kt       |   2 +
 4 files changed, 79 insertions(+), 123 deletions(-)

diff --git a/app/src/processing/app/gradle/Exceptions.kt b/app/src/processing/app/gradle/Exceptions.kt
index 947d720a2e..c24a6f4dd0 100644
--- a/app/src/processing/app/gradle/Exceptions.kt
+++ b/app/src/processing/app/gradle/Exceptions.kt
@@ -1,103 +1,98 @@
 package processing.app.gradle
 
-import com.sun.jdi.ObjectReference
+import com.sun.jdi.Location
 import com.sun.jdi.StackFrame
-import com.sun.jdi.StringReference
 import com.sun.jdi.VirtualMachine
 import com.sun.jdi.event.ExceptionEvent
 import com.sun.jdi.request.EventRequest
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.delay
-import kotlinx.coroutines.launch
 import processing.app.Messages
+import processing.app.SketchException
+import processing.app.ui.Editor
 
 // TODO: Consider adding a panel to the footer
-class Exceptions {
-    companion object {
-        suspend fun listen(vm: VirtualMachine) {
-            try {
-                val manager = vm.eventRequestManager()
+class Exceptions (val vm: VirtualMachine, val editor: Editor?) {
+    suspend fun listen() {
+        try {
+            val manager = vm.eventRequestManager()
 
-                val request = manager.createExceptionRequest(null, false, true)
-                request.setSuspendPolicy(EventRequest.SUSPEND_EVENT_THREAD)
-                request.enable()
+            val request = manager.createExceptionRequest(null, false, true)
+            request.setSuspendPolicy(EventRequest.SUSPEND_EVENT_THREAD)
+            request.enable()
 
-                val queue = vm.eventQueue()
-                while (true) {
-                    val eventSet = queue.remove()
-                    for (event in eventSet) {
-                        if (event is ExceptionEvent) {
-                            printExceptionDetails(event)
-                            event.thread().resume()
-                        }
+            val queue = vm.eventQueue()
+            while (true) {
+                val eventSet = queue.remove()
+                for (event in eventSet) {
+                    if (event is ExceptionEvent) {
+                        printExceptionDetails(event)
+                        event.thread().resume()
                     }
-                    eventSet.resume()
-                    delay(10)
                 }
-            } catch (e: Exception) {
-                Messages.log("Error while listening for exceptions: ${e.message}")
+                eventSet.resume()
+                delay(10)
             }
+        } catch (e: Exception) {
+            Messages.log("Error while listening for exceptions: ${e.message}")
         }
+    }
 
-        fun printExceptionDetails(event: ExceptionEvent) {
-            val exception = event.exception()
-            val thread = event.thread()
-            val location = event.location()
-            val stackFrames = thread.frames()
+    fun printExceptionDetails(event: ExceptionEvent) {
+        val exception = event.exception()
+        val thread = event.thread()
+        val location = event.location().mapToPdeFile()
+        val stackFrames = thread.frames()
 
-            println("\n🚨 Exception Caught 🚨")
-            println("Type       : ${exception.referenceType().name()}")
-            // TODO: Fix exception message retrieval
-//        println("Message    : ${getExceptionMessage(exception)}")
-            println("Thread     : ${thread.name()}")
-            println("Location   : ${location.sourcePath()}:${location.lineNumber()}\n")
+        val (processingFrames, userFrames) = stackFrames
+            .map{
+                val location = it.location().mapToPdeFile()
+                val method = location.method()
+                it to "${method.declaringType().name()}.${method.name()}() @ ${location.sourcePath()}:${location.lineNumber()}"
+            }
+            .partition {
+                it.first.location().declaringType().name().startsWith("processing.")
+            }
 
-            // TODO: Map to .pde file again
-            // TODO: Communicate back to Editor
+        /*
+        We have 6 lines by default within the editor to display more information about the exception.
+         */
 
-            // Separate stack frames
-            val userFrames = mutableListOf<StackFrame>()
-            val processingFrames = mutableListOf<StackFrame>()
+        val message = """
+            In Processing code:
+                #processingFrames
+            
+            In your code:
+                #userFrames
+                
+        """
+            .trimIndent()
+            .replace("#processingFrames", processingFrames.joinToString("\n    ") { it.second })
+            .replace("#userFrames", userFrames.joinToString("\n    ") { it.second })
 
-            stackFrames.forEach { frame ->
-                val className = frame.location().declaringType().name()
-                if (className.startsWith("processing.")) {
-                    processingFrames.add(frame)
-                } else {
-                    userFrames.add(frame)
-                }
-            }
+        val error = """
+            Exception: ${exception.referenceType().name()} @ ${location.sourcePath()}:${location.lineNumber()}
+        """.trimIndent()
 
-            // Print user frames first
-            println("🔍 Stacktrace (Your Code First):")
-            userFrames.forEachIndexed { index, frame -> printStackFrame(index, frame) }
+        println(message)
+        System.err.println(error)
 
-            // Print Processing frames second
-            if (processingFrames.isNotEmpty()) {
-                println("\n🔧 Processing Stacktrace (Hidden Initially):")
-                processingFrames.forEachIndexed { index, frame -> printStackFrame(index, frame) }
-            }
+        editor?.statusError(exception.referenceType().name())
+    }
 
-            println("──────────────────────────────────\n")
-        }
+    fun Location.mapToPdeFile(): Location {
+        if(editor == null) return this
 
-        fun printStackFrame(index: Int, frame: StackFrame) {
-            val location = frame.location()
-            val method = location.method()
-            println(
-                "   #$index ${location.sourcePath()}:${location.lineNumber()} -> ${
-                    method.declaringType().name()
-                }.${method.name()}()"
-            )
+        // Check if the source is a .java file
+        val sketch = editor.sketch
+        sketch.code.forEach { code ->
+            if(code.extension != "java") return@forEach
+            if(sourceName() != code.fileName) return@forEach
+            return@mapToPdeFile this
         }
 
-        // Extracts the exception's message
-        fun getExceptionMessage(exception: ObjectReference): String {
-            val messageMethod = exception.referenceType().methodsByName("getMessage").firstOrNull() ?: return "Unknown"
-            val messageValue =
-                exception.invokeMethod(null, messageMethod, emptyList(), ObjectReference.INVOKE_SINGLE_THREADED)
-            return (messageValue as? StringReference)?.value() ?: "Unknown"
-        }
+        // TODO: Map to .pde file again, @see JavaBuild.placeException
+        // BLOCKED: Because we don't run the JavaBuild code.prepocOffset is empty
+
+        return this
     }
 }
\ No newline at end of file
diff --git a/app/src/processing/app/gradle/GradleJob.kt b/app/src/processing/app/gradle/GradleJob.kt
index d67055a259..e16de0cf2c 100644
--- a/app/src/processing/app/gradle/GradleJob.kt
+++ b/app/src/processing/app/gradle/GradleJob.kt
@@ -42,9 +42,6 @@ class GradleJob{
     private val scope = CoroutineScope(Dispatchers.IO)
     private val cancel = GradleConnector.newCancellationTokenSource()
 
-    private val outputStream = PipedOutputStream()
-    private val errorStream = PipedOutputStream()
-
     fun start() {
         val folder = service?.sketch?.folder ?: throw IllegalStateException("Sketch folder is not set")
         scope.launch {
@@ -60,8 +57,10 @@ class GradleJob{
                         withCancellationToken(cancel.token())
                         addStateListener()
                         addDebugging()
-                        setStandardOutput(outputStream)
-                        setStandardError(errorStream)
+                        if(Base.DEBUG) {
+                            setStandardOutput(System.out)
+                            setStandardError(System.err)
+                        }
                         run()
                     }
             }catch (e: Exception){
@@ -71,49 +70,6 @@ class GradleJob{
                 vm.value = null
             }
         }
-        // TODO: I'm sure this can be done better
-        scope.launch {
-            try {
-                InputStreamReader(PipedInputStream(outputStream)).buffered().use { reader ->
-                    reader.lineSequence()
-                        .forEach { line ->
-                            if (cancel.token().isCancellationRequested) {
-                                return@launch
-                            }
-                            if (state.value != State.RUNNING) {
-                                return@forEach
-                            }
-                            service?.out?.println(line)
-                        }
-                }
-            }catch (e: Exception){
-                Messages.log("Error while reading output: ${e.message}")
-            }
-        }
-        scope.launch {
-            try {
-                InputStreamReader(PipedInputStream(errorStream)).buffered().use { reader ->
-                    reader.lineSequence()
-                        .forEach { line ->
-                            if (cancel.token().isCancellationRequested) {
-                                return@launch
-                            }
-                            if (state.value != State.RUNNING) {
-                                return@forEach
-                            }
-                            when{
-                                line.contains("+[IMKClient subclass]: chose IMKClient_Modern") -> return@forEach
-                                line.contains("+[IMKInputSession subclass]: chose IMKInputSession_Modern") -> return@forEach
-                                line.startsWith("__MOVE__") -> return@forEach
-                                else -> service?.err?.println(line)
-                            }
-                        }
-                }
-            }catch (e: Exception){
-                Messages.log("Error while reading error: ${e.message}")
-            }
-        }
-
     }
 
     fun cancel(){
@@ -169,7 +125,8 @@ class GradleJob{
             scope.launch {
                 val debugger = Debugger.connect(service?.debugPort) ?: return@launch
                 vm.value = debugger
-                Exceptions.listen(debugger)
+                val exceptions = Exceptions(debugger, service?.editor)
+                exceptions.listen()
             }
 
         })
diff --git a/app/src/processing/app/gradle/GradleService.kt b/app/src/processing/app/gradle/GradleService.kt
index af04f884b4..4ef07f2d6c 100644
--- a/app/src/processing/app/gradle/GradleService.kt
+++ b/app/src/processing/app/gradle/GradleService.kt
@@ -20,6 +20,7 @@ import kotlin.io.path.writeText
 // TODO: Test running examples
 // TODO: Report failures to the console
 // TODO: Highlight errors in the editor
+// TODO: Stop running sketches if modern build system is turned off
 
 // TODO: ---- FUTURE ----
 // TODO: Improve progress tracking
@@ -114,6 +115,7 @@ class GradleService(
             "fullscreen" to false, // TODO: Implement
             "display" to 1, // TODO: Implement
             "external" to true,
+            "location" to null, // TODO: Implement
             "editor.location" to editor?.location?.let { "${it.x},${it.y}" },
             //"awt.disable" to false,
             //"window.color" to "0xFF000000", // TODO: Implement
diff --git a/java/gradle/src/main/kotlin/DependenciesTask.kt b/java/gradle/src/main/kotlin/DependenciesTask.kt
index e847cc310c..ced1cf5a9a 100644
--- a/java/gradle/src/main/kotlin/DependenciesTask.kt
+++ b/java/gradle/src/main/kotlin/DependenciesTask.kt
@@ -52,6 +52,8 @@ abstract class DependenciesTask: DefaultTask() {
         }
         project.dependencies.add("implementation",  project.files(dependencies) )
 
+        // TODO: Mutating the dependencies of configuration ':implementation' after it has been resolved or consumed. This
+
         // TODO: Add only if user is compiling for P2D or P3D
         // Add JOGL and Gluegen dependencies
         project.dependencies.add("runtimeOnly", "org.jogamp.jogl:jogl-all-main:2.5.0")

From 1c429618dfc903f7050fc71bd3fbad20e9899f38 Mon Sep 17 00:00:00 2001
From: Stef Tervelde <stef@steftervelde.nl>
Date: Tue, 1 Jul 2025 17:35:32 +0200
Subject: [PATCH 04/34] Gradle Task error printing

---
 .../processing/app/gradle/GradleService.java  |  9 ++++-
 app/src/processing/app/gradle/GradleJob.kt    | 34 ++++++++++++-------
 2 files changed, 30 insertions(+), 13 deletions(-)

diff --git a/app/ant/processing/app/gradle/GradleService.java b/app/ant/processing/app/gradle/GradleService.java
index 0beca36abd..98f7395133 100644
--- a/app/ant/processing/app/gradle/GradleService.java
+++ b/app/ant/processing/app/gradle/GradleService.java
@@ -1,9 +1,13 @@
 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(Editor editor) { }
+    public GradleService(Mode mode, Editor editor) { }
 
     public void setEnabled(boolean enabled) {}
     public boolean getEnabled() { return false; }
@@ -12,4 +16,7 @@ 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) {}
 }
diff --git a/app/src/processing/app/gradle/GradleJob.kt b/app/src/processing/app/gradle/GradleJob.kt
index e16de0cf2c..682c6b05e1 100644
--- a/app/src/processing/app/gradle/GradleJob.kt
+++ b/app/src/processing/app/gradle/GradleJob.kt
@@ -15,15 +15,15 @@ import org.gradle.tooling.events.problems.internal.DefaultFileLocation
 import org.gradle.tooling.events.problems.internal.DefaultSingleProblemEvent
 import org.gradle.tooling.events.task.TaskFinishEvent
 import org.gradle.tooling.events.task.TaskStartEvent
+import org.gradle.tooling.events.task.TaskSuccessResult
 import processing.app.Base
 import processing.app.Messages
+import processing.app.ui.EditorStatus
 import java.io.InputStreamReader
 import java.io.PipedInputStream
 import java.io.PipedOutputStream
 import java.lang.IllegalStateException
 
-// TODO: Move the error reporting to its own file
-// TODO: Move the output filtering to its own file
 class GradleJob{
     enum class State{
         NONE,
@@ -78,6 +78,7 @@ class GradleJob{
     private fun BuildLauncher.addStateListener(){
         addProgressListener(ProgressListener { event ->
             if(event is TaskStartEvent) {
+                service?.editor?.statusMessage("Running task: ${event.descriptor.name}", EditorStatus.NOTICE)
                 when(event.descriptor.name) {
                     ":run" -> {
                         state.value = State.RUNNING
@@ -87,6 +88,10 @@ class GradleJob{
 
             }
             if(event is TaskFinishEvent) {
+                if(event.result is TaskSuccessResult){
+                    service?.editor?.statusMessage("Finished task ${event.descriptor.name}", EditorStatus.NOTICE)
+                }
+
                 when(event.descriptor.name){
                     ":jar"->{
                         state.value = State.NONE
@@ -98,21 +103,26 @@ class GradleJob{
                 }
             }
             if(event is DefaultSingleProblemEvent) {
-                // TODO: Move to UI instead of printing
+                /*
+                We have 6 lines to display the error in the editor.
+                 */
+
                 if(event.definition.severity == Severity.ADVICE) return@ProgressListener
                 problems.add(event)
 
-                val path = (event.locations.firstOrNull() as DefaultFileLocation?)?.path
+                // TODO: Show the error on the location if it is available
+
+                val error = event.definition.id.displayName
+                service?.editor?.statusError(error)
+                System.err.println("Problem: $error")
 
-                val header = """
-                    ${event.definition.id.displayName}: 
-                        ${event.contextualLabel.contextualLabel}
-                    """.trimIndent()
+                val message = """
+                    Context: ${event.contextualLabel.contextualLabel}
+                    Solutions: ${event.solutions.joinToString("\n\t") { it.solution }}
+                """
+                    .trimIndent()
 
-                val details = event.details.details?.replace(path ?: "", "")
-                val solutions = event.solutions.joinToString("\n") { it.solution }
-                val content = "$header\n$details\n$solutions"
-                service?.err?.println(content)
+                println(message)
             }
         })
     }

From fcb554a50c186a7c12e604cfe56df0bad8e2f7b1 Mon Sep 17 00:00:00 2001
From: Stef Tervelde <stef@steftervelde.nl>
Date: Wed, 2 Jul 2025 09:42:19 +0200
Subject: [PATCH 05/34] Rename gradle plugin and further planning

---
 .../processing/app/gradle/GradleService.kt    | 20 +++++++++----------
 build.gradle.kts                              |  6 ------
 build/shared/lib/languages/PDE.properties     |  3 +++
 java/gradle/build.gradle.kts                  |  2 +-
 java/gradle/example/build.gradle.kts          |  2 +-
 .../src/main/kotlin/ProcessingPlugin.kt       |  2 +-
 .../src/test/kotlin/ProcessingPluginTest.kt   |  2 +-
 7 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/app/src/processing/app/gradle/GradleService.kt b/app/src/processing/app/gradle/GradleService.kt
index 4ef07f2d6c..7c1fe9488a 100644
--- a/app/src/processing/app/gradle/GradleService.kt
+++ b/app/src/processing/app/gradle/GradleService.kt
@@ -29,10 +29,12 @@ import kotlin.io.path.writeText
 // TODO: Add background building
 // TODO: Track build speed (for analytics?)
 
-// The gradle service runs the gradle tasks and manages the gradle connection
-// It will create the necessary build files for gradle to run
-// Then it will kick off a new GradleJob to run the tasks
-// GradleJob manages the gradle build and connects the debugger
+/*
+* The gradle service runs the gradle tasks and manages the gradle connection
+* It will create the necessary build files for gradle to run
+* Then it will kick off a new GradleJob to run the tasks
+* GradleJob manages the gradle build and connects the debugger
+*/
 class GradleService(
     val mode: Mode,
     val editor: Editor?,
@@ -92,7 +94,7 @@ class GradleService(
                 val file = workingDir.resolve("unsaved/${code.fileName}")
                 file.parent.toFile().mkdirs()
                 // If tab is marked modified save it to the working directory
-                // Otherwise delete the file
+                // Otherwise delete the file so we don't compile with old code
                 if(code.isModified){
                     file.writeText(code.documentText)
                 }else{
@@ -101,10 +103,8 @@ class GradleService(
                 return@map code.fileName
             }
 
-        val group = System.getProperty("processing.group", "org.processing")
-
         val variables = mapOf(
-            "group" to group,
+            "group" to System.getProperty("processing.group", "org.processing"),
             "version" to Base.getVersionName(),
             "sketchFolder" to sketch.folder.absolutePath,
             "sketchbook" to Base.getSketchbookFolder(),
@@ -169,14 +169,14 @@ class GradleService(
                 //
                 """.trimIndent()
 
-            // TODO: add instructions keys
             val instructions = Language.text("gradle.instructions")
                 .split("\n")
                 .joinToString("\n") { "// $it" }
 
             val configuration =  """
+                
                 plugins{
-                    id("org.processing.gradle") version "${Base.getVersionName()}"
+                    id("org.processing.java") version "${Base.getVersionName()}"
                 }
             """.trimIndent()
             val content = "${header}\n${instructions}\n${configuration}"
diff --git a/build.gradle.kts b/build.gradle.kts
index faa68e5dca..bc23e286b0 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -6,12 +6,6 @@ plugins {
     alias(libs.plugins.jetbrainsCompose) apply false
 }
 
-//allprojects{
-//    repositories{
-//        maven { url = uri("https://repo.gradle.org/gradle/libs-releases") }
-//    }
-//}
-
 // Set the build directory to not /build to prevent accidental deletion through the clean action
 // Can be deleted after the migration to Gradle is complete
 layout.buildDirectory = file(".build")
diff --git a/build/shared/lib/languages/PDE.properties b/build/shared/lib/languages/PDE.properties
index 3ea6d7652b..6ead810aa4 100644
--- a/build/shared/lib/languages/PDE.properties
+++ b/build/shared/lib/languages/PDE.properties
@@ -319,6 +319,9 @@ 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.
+
 # ---------------------------------------
 # Toolbars
 
diff --git a/java/gradle/build.gradle.kts b/java/gradle/build.gradle.kts
index 3aa484cb50..f48dea8ef1 100644
--- a/java/gradle/build.gradle.kts
+++ b/java/gradle/build.gradle.kts
@@ -22,7 +22,7 @@ dependencies{
 gradlePlugin{
     plugins{
         create("processing"){
-            id = "org.processing.gradle"
+            id = "org.processing.java"
             implementationClass = "org.processing.java.gradle.ProcessingPlugin"
         }
     }
diff --git a/java/gradle/example/build.gradle.kts b/java/gradle/example/build.gradle.kts
index 4d1d983e56..b476d51bba 100644
--- a/java/gradle/example/build.gradle.kts
+++ b/java/gradle/example/build.gradle.kts
@@ -1,3 +1,3 @@
 plugins{
-    id("org.processing.gradle")
+    id("org.processing.java")
 }
\ No newline at end of file
diff --git a/java/gradle/src/main/kotlin/ProcessingPlugin.kt b/java/gradle/src/main/kotlin/ProcessingPlugin.kt
index b02d7f0944..cc3be48607 100644
--- a/java/gradle/src/main/kotlin/ProcessingPlugin.kt
+++ b/java/gradle/src/main/kotlin/ProcessingPlugin.kt
@@ -27,7 +27,7 @@ class ProcessingPlugin @Inject constructor(private val objectFactory: ObjectFact
         val workingDir = project.findProperty("processing.workingDir") as String?
         val debugPort = project.findProperty("processing.debugPort") as String?
 
-        // TODO: Setup sketchbook when using as a standalone plugin
+        // TODO: Setup sketchbook when using as a standalone plugin, use the Java Preferences
         val sketchbook = project.findProperty("processing.sketchbook") as String?
 
         // Apply the Java plugin to the Project
diff --git a/java/gradle/src/test/kotlin/ProcessingPluginTest.kt b/java/gradle/src/test/kotlin/ProcessingPluginTest.kt
index 2be09fd896..7e43a2c39a 100644
--- a/java/gradle/src/test/kotlin/ProcessingPluginTest.kt
+++ b/java/gradle/src/test/kotlin/ProcessingPluginTest.kt
@@ -11,7 +11,7 @@ class ProcessingPluginTest{
     @Test
     fun testPluginAddsSketchTask(){
         val project = ProjectBuilder.builder().build()
-        project.pluginManager.apply("org.processing.gradle")
+        project.pluginManager.apply("org.processing.java")
 
         assert(project.tasks.getByName("sketch") is Task)
     }

From bd5aba46e8103d1546b213dabf127023b0fcabb2 Mon Sep 17 00:00:00 2001
From: Stef Tervelde <stef@steftervelde.nl>
Date: Wed, 2 Jul 2025 09:50:39 +0200
Subject: [PATCH 06/34] Allowing libraries folder to not exist, but log instead

---
 java/gradle/src/main/kotlin/LibrariesTask.kt    | 7 ++++++-
 java/gradle/src/main/kotlin/ProcessingPlugin.kt | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/java/gradle/src/main/kotlin/LibrariesTask.kt b/java/gradle/src/main/kotlin/LibrariesTask.kt
index a6e932500c..57f09bfdd4 100644
--- a/java/gradle/src/main/kotlin/LibrariesTask.kt
+++ b/java/gradle/src/main/kotlin/LibrariesTask.kt
@@ -4,6 +4,7 @@ import org.gradle.api.DefaultTask
 import org.gradle.api.file.DirectoryProperty
 import org.gradle.api.file.RegularFileProperty
 import org.gradle.api.tasks.InputDirectory
+import org.gradle.api.tasks.Optional
 import org.gradle.api.tasks.OutputFile
 import org.gradle.api.tasks.TaskAction
 import java.io.File
@@ -16,8 +17,8 @@ This task stores the resulting information in a file that can be used later to r
  */
 abstract class LibrariesTask : DefaultTask() {
 
-    // TODO: Allow this directory to not exist
     @InputDirectory
+    @Optional
     val librariesDirectory: DirectoryProperty = project.objects.directoryProperty()
 
     @OutputFile
@@ -38,6 +39,10 @@ abstract class LibrariesTask : DefaultTask() {
 
     @TaskAction
     fun execute() {
+        if (!librariesDirectory.isPresent) {
+            logger.error("Libraries directory is not set. Libraries will not be imported.")
+            return
+        }
         val libraries = librariesDirectory.get().asFile
             .listFiles { file -> file.isDirectory }
             ?.map { folder ->
diff --git a/java/gradle/src/main/kotlin/ProcessingPlugin.kt b/java/gradle/src/main/kotlin/ProcessingPlugin.kt
index cc3be48607..5d1115dcf5 100644
--- a/java/gradle/src/main/kotlin/ProcessingPlugin.kt
+++ b/java/gradle/src/main/kotlin/ProcessingPlugin.kt
@@ -139,7 +139,7 @@ class ProcessingPlugin @Inject constructor(private val objectFactory: ObjectFact
             val librariesTaskName = sourceSet.getTaskName("scanLibraries", "PDE")
             val librariesScan = project.tasks.register(librariesTaskName, LibrariesTask::class.java) { task ->
                 task.description = "Scans the libraries in the sketchbook"
-                task.librariesDirectory.set(File(sketchbook, "libraries"))
+                task.librariesDirectory.set(sketchbook?.let { File(it, "libraries") })
             }
 
             val pdeTaskName = sourceSet.getTaskName("preprocess", "PDE")

From 67de82f18d564555796f8184f5fddafd4b8102b5 Mon Sep 17 00:00:00 2001
From: Stef Tervelde <stef@steftervelde.nl>
Date: Wed, 2 Jul 2025 09:53:14 +0200
Subject: [PATCH 07/34] Removed error & out streams, has been piped directly
 into System

---
 app/src/processing/app/gradle/GradleService.kt | 3 ---
 app/src/processing/app/ui/EditorConsole.java   | 7 +------
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/app/src/processing/app/gradle/GradleService.kt b/app/src/processing/app/gradle/GradleService.kt
index 7c1fe9488a..9b22e4e339 100644
--- a/app/src/processing/app/gradle/GradleService.kt
+++ b/app/src/processing/app/gradle/GradleService.kt
@@ -43,9 +43,6 @@ class GradleService(
 
     var sketch: Sketch? = null
 
-    var out: PrintStream = System.out
-    var err: PrintStream = System.err
-
     val jobs = mutableStateListOf<GradleJob>()
     val workingDir = createTempDirectory()
     val debugPort = (30_000..60_000).random()
diff --git a/app/src/processing/app/ui/EditorConsole.java b/app/src/processing/app/ui/EditorConsole.java
index f2d9de97fc..57724970d2 100644
--- a/app/src/processing/app/ui/EditorConsole.java
+++ b/app/src/processing/app/ui/EditorConsole.java
@@ -81,12 +81,7 @@ public EditorConsole(Editor editor) {
 
     sketchOut = new PrintStream(new EditorConsoleStream(false));
     sketchErr = new PrintStream(new EditorConsoleStream(true));
-
-    if(editor.service != null){
-      editor.service.setOut(sketchOut);
-      editor.service.setErr(sketchErr);
-    }
-
+    
     startTimer();
   }
 

From e6474e189fa47bdffcd3cb8198095427188b3cd7 Mon Sep 17 00:00:00 2001
From: Stef Tervelde <stef@steftervelde.nl>
Date: Wed, 2 Jul 2025 10:29:20 +0200
Subject: [PATCH 08/34] Small tweaks and wrote motivation for Gradle Build
 system

---
 .../processing/app/gradle/GradleService.kt    |  5 +--
 app/src/processing/app/ui/EditorConsole.java  |  2 +-
 java/README.md                                | 32 +++++++++++++++----
 java/gradle/example/.idea/.name               |  1 +
 java/gradle/example/.idea/compiler.xml        |  6 ++++
 java/gradle/example/.idea/misc.xml            |  2 +-
 6 files changed, 37 insertions(+), 11 deletions(-)
 create mode 100644 java/gradle/example/.idea/.name
 create mode 100644 java/gradle/example/.idea/compiler.xml

diff --git a/app/src/processing/app/gradle/GradleService.kt b/app/src/processing/app/gradle/GradleService.kt
index 9b22e4e339..4e8bfde0a5 100644
--- a/app/src/processing/app/gradle/GradleService.kt
+++ b/app/src/processing/app/gradle/GradleService.kt
@@ -20,10 +20,9 @@ import kotlin.io.path.writeText
 // TODO: Test running examples
 // TODO: Report failures to the console
 // TODO: Highlight errors in the editor
-// TODO: Stop running sketches if modern build system is turned off
 
 // TODO: ---- FUTURE ----
-// TODO: Improve progress tracking
+// TODO: Improve progress tracking and show it in the UI
 // TODO: PoC new debugger/tweak mode
 // TODO: Allow for plugins to skip gradle entirely / new modes
 // TODO: Add background building
@@ -196,6 +195,7 @@ class GradleService(
 
 
     private fun BuildLauncher.setup(extraArguments: List<String> = listOf()) {
+        // TODO: Instead of shipping Processing with a build-in JDK we should download the JDK through Gradle
         setJavaHome(Platform.getJavaHome())
 
         val arguments = setupGradle()
@@ -208,6 +208,7 @@ class GradleService(
         return active.value
     }
     fun setEnabled(active: Boolean) {
+        if(!active) stopActions()
         this.active.value = active
     }
 }
\ No newline at end of file
diff --git a/app/src/processing/app/ui/EditorConsole.java b/app/src/processing/app/ui/EditorConsole.java
index 57724970d2..c8c40ee487 100644
--- a/app/src/processing/app/ui/EditorConsole.java
+++ b/app/src/processing/app/ui/EditorConsole.java
@@ -81,7 +81,7 @@ public EditorConsole(Editor editor) {
 
     sketchOut = new PrintStream(new EditorConsoleStream(false));
     sketchErr = new PrintStream(new EditorConsoleStream(true));
-    
+
     startTimer();
   }
 
diff --git a/java/README.md b/java/README.md
index a4be6e9a87..0a905208d0 100644
--- a/java/README.md
+++ b/java/README.md
@@ -3,8 +3,9 @@
 This the Java Mode in Processing. It compiles your sketches and runs them. It is the primary mode of Processing.
 
 ## Folders
-- `application` assets for exporting applications within the mode
-- `generated` generated antlr code for the mode, should be moved to a proper `antlr` plugin within gradle
+- `application` assets for exporting applications within the mode (Deprecated)
+- `generated` generated antlr code for the mode, should be moved to a proper `antlr` plugin within gradle (Deprecated)
+- `gradle` the Processing java gradle plugin
 - `libraries` libraries that are available within the mode
 - `lsp` gradle build system for the language server protocol, in the future we should decouple the lsp from the java mode and pde and move all relevant code here. For now it can be found in `src/.../lsp`
 - `mode` legacy files for `Ant`
@@ -13,8 +14,25 @@ This the Java Mode in Processing. It compiles your sketches and runs them. It is
 - `test` tests for the mode
 - `theme` assets for the mode, related to autocomplete and syntax highlighting
 
-## Future plans
-- Decouple the `lsp` and `preprocessor` from the mode and move them to their own repositories
-- Move the `antlr` code to a proper plugin within gradle
-- Create a gradle plugin to convert `.pde` file to `.java` files
-- Create a gradle based version of Java mode.
\ No newline at end of file
+## The Modern Build system
+
+Since 2025 work has started on creating a new internal build system for the Java Mode based on Gradle.
+The goal is to simplify by leaning more on Gradle, which provides a lot of the functionality that was build before out of the box and a lot more.
+
+### How it used to work
+
+The build system used to be based on some parts Ant, some parts eclipse (org.eclipse.jdt.core) and a lot of custom work build up over the years.
+
+### How it will work going forward
+
+The modern build system is based around Gradle, the main service (GradleService) for building a sketch with Gradle is included in `app` instead of into the Java mode as future modes are most likely also based on Gradle if they use `core` in some way. Most _Modes_ should/could probably be a Gradle plugin going forward.
+Breaking the build system away from the java mode will mean that we create an island of isolation when it comes to the build system, allowing contributors to work on the build system without running the editor.
+Another upside is that when we publish the Gradle plugin to the Gradle Plugin repository, it will become trivial to run Processing sketches outside the PDE and improvements made to the build system will be usable for everyone. 
+There is now also an opportunity for creating contributions that modify the build system in more subtle ways rather than having to make a complete new mode, e.g. a compilation step for shaders or some setup tweaks to make JavaFX work out of the box.
+Furthermore, this change will embed Processing more into the wider Java ecosystem, if users want to upgrade from using Processing to Java whilst still using `core` that will become possible and won't  need a rewrite of what they already created. 
+
+### How to work on the modern build system
+
+If you want to work on the build system without the PDE, open `/java/gradle/example` into a new intellij IDEA window, this is set up to compile the Processing Java plugin and run sketches standalone.
+
+Within the editor, the gradle plugin is embedded in Processing's embedded maven repository so that Gradle can find it.  
\ No newline at end of file
diff --git a/java/gradle/example/.idea/.name b/java/gradle/example/.idea/.name
new file mode 100644
index 0000000000..fb61c9d808
--- /dev/null
+++ b/java/gradle/example/.idea/.name
@@ -0,0 +1 @@
+processing-gradle-plugin-demo
\ No newline at end of file
diff --git a/java/gradle/example/.idea/compiler.xml b/java/gradle/example/.idea/compiler.xml
new file mode 100644
index 0000000000..b589d56e9f
--- /dev/null
+++ b/java/gradle/example/.idea/compiler.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CompilerConfiguration">
+    <bytecodeTargetLevel target="17" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/java/gradle/example/.idea/misc.xml b/java/gradle/example/.idea/misc.xml
index 822aa1a0c3..5a50b6cd23 100644
--- a/java/gradle/example/.idea/misc.xml
+++ b/java/gradle/example/.idea/misc.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_24" project-jdk-name="temurin-17" project-jdk-type="JavaSDK" />
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="temurin-17" project-jdk-type="JavaSDK" />
 </project>
\ No newline at end of file

From 1762b74c90cb98d6cf28e15b944c5474882780e8 Mon Sep 17 00:00:00 2001
From: Stef Tervelde <stef@steftervelde.nl>
Date: Wed, 2 Jul 2025 11:56:34 +0200
Subject: [PATCH 09/34] Simplified Gradle Service, improved sketch logging,
 fixed toolbar state

---
 app/src/processing/app/gradle/GradleJob.kt    |  5 ++-
 .../processing/app/gradle/GradleService.kt    | 34 +++++++++----------
 app/src/processing/app/ui/EditorConsole.java  |  4 +++
 java/src/processing/mode/java/JavaEditor.java |  7 ++--
 4 files changed, 26 insertions(+), 24 deletions(-)

diff --git a/app/src/processing/app/gradle/GradleJob.kt b/app/src/processing/app/gradle/GradleJob.kt
index 682c6b05e1..1bfa833d90 100644
--- a/app/src/processing/app/gradle/GradleJob.kt
+++ b/app/src/processing/app/gradle/GradleJob.kt
@@ -57,8 +57,8 @@ class GradleJob{
                         withCancellationToken(cancel.token())
                         addStateListener()
                         addDebugging()
+                        setStandardOutput(System.out)
                         if(Base.DEBUG) {
-                            setStandardOutput(System.out)
                             setStandardError(System.err)
                         }
                         run()
@@ -83,6 +83,7 @@ class GradleJob{
                     ":run" -> {
                         state.value = State.RUNNING
                         Messages.log("Start run")
+                        service?.editor?.toolbar?.activateRun()
                     }
                 }
 
@@ -99,6 +100,8 @@ class GradleJob{
                     }
                     ":run"->{
                         state.value = State.NONE
+                        service?.editor?.toolbar?.deactivateRun()
+                        service?.editor?.toolbar?.deactivateStop()
                     }
                 }
             }
diff --git a/app/src/processing/app/gradle/GradleService.kt b/app/src/processing/app/gradle/GradleService.kt
index 4e8bfde0a5..40ffc06a27 100644
--- a/app/src/processing/app/gradle/GradleService.kt
+++ b/app/src/processing/app/gradle/GradleService.kt
@@ -2,6 +2,10 @@ package processing.app.gradle
 
 import androidx.compose.runtime.mutableStateListOf
 import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.snapshotFlow
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
 import org.gradle.tooling.BuildLauncher
 import processing.app.Base
 import processing.app.Language
@@ -46,38 +50,32 @@ class GradleService(
     val workingDir = createTempDirectory()
     val debugPort = (30_000..60_000).random()
 
-    // TODO: Add support for present
     fun run(){
-        stopActions()
-
-        val job = GradleJob()
-        job.service = this
-        job.configure = {
-            setup()
-            forTasks("run")
-        }
-        jobs.add(job)
-        job.start()
+        startAction("run")
     }
 
     fun export(){
+        startAction("runDistributable")
+    }
+
+    fun stop(){
         stopActions()
+    }
+
+    private fun startAction(vararg tasks: String) {
+        if(!active.value) return
 
         val job = GradleJob()
         job.service = this
         job.configure = {
             setup()
-            forTasks("runDistributable")
+            forTasks(tasks.joinToString(" "))
         }
         jobs.add(job)
         job.start()
     }
 
-    fun stop(){
-        stopActions()
-    }
-
-    fun stopActions(){
+    private fun stopActions(){
         jobs
             .forEach(GradleJob::cancel)
     }
@@ -108,7 +106,7 @@ class GradleService(
             "settings" to Platform.getSettingsFolder().absolutePath.toString(),
             "unsaved" to unsaved.joinToString(","),
             "debugPort" to debugPort.toString(),
-            "fullscreen" to false, // TODO: Implement
+            "fullscreen" to System.getProperty("processing.fullscreen", "false").equals("true"),
             "display" to 1, // TODO: Implement
             "external" to true,
             "location" to null, // TODO: Implement
diff --git a/app/src/processing/app/ui/EditorConsole.java b/app/src/processing/app/ui/EditorConsole.java
index c8c40ee487..468b104854 100644
--- a/app/src/processing/app/ui/EditorConsole.java
+++ b/app/src/processing/app/ui/EditorConsole.java
@@ -254,7 +254,11 @@ private boolean suppressMessage(String what, boolean err) {
         // "java.lang.NoSuchMethodError: accessibilityHitTest"
         // https://github.com/processing/processing4/issues/368
         return true;
+      } else if (what.contains("__MOVE__")) {
+        // Don't display the "Move" message that is used to position the sketch window
+        return true;
       }
+
     } else {  // !err
       if (what.contains("Listening for transport dt_socket at address")) {
         // Message from the JVM about the socket launch for debug
diff --git a/java/src/processing/mode/java/JavaEditor.java b/java/src/processing/mode/java/JavaEditor.java
index 5a6e2d60b2..537a60369b 100644
--- a/java/src/processing/mode/java/JavaEditor.java
+++ b/java/src/processing/mode/java/JavaEditor.java
@@ -643,6 +643,8 @@ protected void handleLaunch(boolean present, boolean tweak) {
     toolbar.activateRun();
 
     if(this.service.getEnabled()){
+      System.setProperty("processing.fullscreen", present ? "true" : "false");
+      System.setProperty("processing.tweak", tweak ? "true" : "false");
       this.service.run();
       return;
     }
@@ -676,12 +678,7 @@ protected void handleLaunch(boolean present, boolean tweak) {
    */
   public void handleStop() {
     if(this.service.getEnabled()){
-      // TODO: Improve Gradle UI Feedback
-      toolbar.activateStop();
       this.service.stop();
-
-      toolbar.deactivateStop();
-      toolbar.deactivateRun();
       return;
     }
 

From 5409912c38f2740dd165f04aa025a97dc36ff0d7 Mon Sep 17 00:00:00 2001
From: Stef Tervelde <stef@steftervelde.nl>
Date: Wed, 2 Jul 2025 13:42:41 +0200
Subject: [PATCH 10/34] Improved Gradle Error logging

---
 app/src/processing/app/gradle/GradleJob.kt | 56 ++++++++++++++++++----
 1 file changed, 46 insertions(+), 10 deletions(-)

diff --git a/app/src/processing/app/gradle/GradleJob.kt b/app/src/processing/app/gradle/GradleJob.kt
index 1bfa833d90..064915cca5 100644
--- a/app/src/processing/app/gradle/GradleJob.kt
+++ b/app/src/processing/app/gradle/GradleJob.kt
@@ -6,6 +6,7 @@ import com.sun.jdi.*
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
+import org.gradle.tooling.BuildCancelledException
 import org.gradle.tooling.BuildLauncher
 import org.gradle.tooling.GradleConnector
 import org.gradle.tooling.events.ProgressListener
@@ -29,6 +30,7 @@ class GradleJob{
         NONE,
         BUILDING,
         RUNNING,
+        ERROR,
         DONE
     }
 
@@ -64,7 +66,31 @@ class GradleJob{
                         run()
                     }
             }catch (e: Exception){
-                Messages.log("Error while running: ${e.message} ${e.cause?.message}")
+                val causesList = mutableListOf<Throwable>()
+                var cause: Throwable? = e
+                while (cause != null && cause.cause != cause) {
+                    causesList.add(cause)
+                    cause = cause.cause
+                }
+
+                val errors = causesList.joinToString("\n") { it.message ?: "Unknown error" }
+
+                val skip = listOf(BuildCancelledException::class)
+
+                if (skip.any { it.isInstance(e) }) {
+                    Messages.log("Gradle job error: $errors")
+                    return@launch
+                }
+
+                if(state.value != State.BUILDING){
+                    Messages.log("Gradle job error: $errors")
+                    return@launch
+                }
+
+                // An error occurred during the build process
+
+                System.err.println(errors)
+                service?.editor?.statusError(cause?.message)
             }finally {
                 state.value = State.DONE
                 vm.value = null
@@ -94,30 +120,40 @@ class GradleJob{
                 }
 
                 when(event.descriptor.name){
-                    ":jar"->{
-                        state.value = State.NONE
-                        Messages.log("Jar finished")
-                    }
                     ":run"->{
-                        state.value = State.NONE
+                        state.value = State.DONE
                         service?.editor?.toolbar?.deactivateRun()
                         service?.editor?.toolbar?.deactivateStop()
                     }
                 }
             }
             if(event is DefaultSingleProblemEvent) {
-                /*
-                We have 6 lines to display the error in the editor.
-                 */
 
-                if(event.definition.severity == Severity.ADVICE) return@ProgressListener
+
                 problems.add(event)
 
+                val skip = listOf(
+                    "mutating-the-dependencies-of-configuration-implementation-after-it-has-been-resolved-or-consumed-this-behavior-has-been-deprecated",
+                    "mutating-the-dependencies-of-configuration-runtimeonly-after-it-has-been-resolved-or-consumed-this-behavior-has-been-deprecated"
+                )
+                if(skip.any { event.definition.id.name.contains(it) }) {
+                    Messages.log(event.toString())
+                    return@ProgressListener
+                }
+
+                if(event.definition.severity == Severity.ADVICE) {
+                    Messages.log(event.toString())
+                    return@ProgressListener
+                }
                 // TODO: Show the error on the location if it is available
+                /*
+                We have 6 lines to display the error in the editor.
+                 */
 
                 val error = event.definition.id.displayName
                 service?.editor?.statusError(error)
                 System.err.println("Problem: $error")
+                state.value = State.ERROR
 
                 val message = """
                     Context: ${event.contextualLabel.contextualLabel}

From efd03dba54654775cb6c481f688776774ffe7602 Mon Sep 17 00:00:00 2001
From: Stef Tervelde <stef@steftervelde.nl>
Date: Wed, 2 Jul 2025 15:58:02 +0200
Subject: [PATCH 11/34] Fixed gradle runner issues

---
 app/src/processing/app/gradle/Debugger.kt     |  1 +
 .../src/main/kotlin/DependenciesTask.kt       | 33 +++++++++----------
 .../src/main/kotlin/ProcessingPlugin.kt       |  4 +--
 3 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/app/src/processing/app/gradle/Debugger.kt b/app/src/processing/app/gradle/Debugger.kt
index aea18ec133..bdc78c9545 100644
--- a/app/src/processing/app/gradle/Debugger.kt
+++ b/app/src/processing/app/gradle/Debugger.kt
@@ -10,6 +10,7 @@ import kotlin.time.TimeSource
 
 class Debugger {
     companion object {
+        // TODO: Stop if build has failed
         suspend fun connect(port: Int?): VirtualMachine? {
             try {
                 Messages.log("Attaching to VM $port")
diff --git a/java/gradle/src/main/kotlin/DependenciesTask.kt b/java/gradle/src/main/kotlin/DependenciesTask.kt
index ced1cf5a9a..8d9e09e258 100644
--- a/java/gradle/src/main/kotlin/DependenciesTask.kt
+++ b/java/gradle/src/main/kotlin/DependenciesTask.kt
@@ -1,6 +1,7 @@
 package org.processing.java.gradle
 
 import org.gradle.api.DefaultTask
+import org.gradle.api.GradleException
 import org.gradle.api.file.RegularFileProperty
 import org.gradle.api.tasks.InputFile
 import org.gradle.api.tasks.TaskAction
@@ -57,26 +58,22 @@ abstract class DependenciesTask: DefaultTask() {
         // TODO: Add only if user is compiling for P2D or P3D
         // Add JOGL and Gluegen dependencies
         project.dependencies.add("runtimeOnly", "org.jogamp.jogl:jogl-all-main:2.5.0")
-        project.dependencies.add("runtimeOnly", "org.jogamp.gluegen:gluegen-rt-main:2.5.0")
+        project.dependencies.add("runtimeOnly", "org.jogamp.gluegen:gluegen-rt:2.5.0")
 
-        // TODO: Only add the native dependencies for the platform the user is building for
-        // MacOS specific native dependencies
-        project.dependencies.add("runtimeOnly", "org.jogamp.jogl:jogl-all:2.5.0:natives-macosx-universal")
-        project.dependencies.add("runtimeOnly", "org.jogamp.gluegen:gluegen-rt:2.5.0:natives-macosx-universal")
+        val os = System.getProperty("os.name").lowercase()
+        val arch = System.getProperty("os.arch").lowercase()
 
-        // TODO: Solve windows specific issue
-        // Windows specific native dependencies
-        project.dependencies.add("runtimeOnly", "org.jogamp.jogl:jogl-all:2.5.0:natives-windows-amd64")
-        project.dependencies.add("runtimeOnly", "org.jogamp.gluegen:gluegen-rt:2.5.0:natives-windows-amd64")
-
-        // Linux specific native dependencies
-        project.dependencies.add("runtimeOnly", "org.jogamp.jogl:jogl-all:2.5.0:natives-linux-amd64")
-        project.dependencies.add("runtimeOnly", "org.jogamp.gluegen:gluegen-rt:2.5.0:natives-linux-amd64")
+        val variant = when {
+            os.contains("mac") -> "macosx-universal"
+            os.contains("win") && arch.contains("64") -> "windows-amd64"
+            os.contains("linux") && arch.contains("aarch64") -> "linux-aarch64"
+            os.contains("linux") && arch.contains("arm") -> "linux-arm"
+            os.contains("linux") && arch.contains("amd64") -> "linux-amd64"
+            else -> throw GradleException("Unsupported OS/architecture: $os / $arch")
+        }
 
-        // NativeWindow dependencies for all platforms
-        project.dependencies.add("implementation", "org.jogamp.jogl:nativewindow:2.5.0")
-        project.dependencies.add("runtimeOnly", "org.jogamp.jogl:nativewindow:2.5.0:natives-macosx-universal")
-        project.dependencies.add("runtimeOnly", "org.jogamp.jogl:nativewindow:2.5.0:natives-windows-amd64")
-        project.dependencies.add("runtimeOnly", "org.jogamp.jogl:nativewindow:2.5.0:natives-linux-amd64")
+        project.dependencies.add("runtimeOnly", "org.jogamp.gluegen:gluegen-rt:2.5.0:natives-$variant")
+        project.dependencies.add("runtimeOnly", "org.jogamp.jogl:nativewindow:2.5.0:natives-$variant")
+        project.dependencies.add("runtimeOnly", "org.jogamp.jogl:newt:2.5.0:natives-$variant")
     }
 }
\ No newline at end of file
diff --git a/java/gradle/src/main/kotlin/ProcessingPlugin.kt b/java/gradle/src/main/kotlin/ProcessingPlugin.kt
index 5d1115dcf5..ef45574137 100644
--- a/java/gradle/src/main/kotlin/ProcessingPlugin.kt
+++ b/java/gradle/src/main/kotlin/ProcessingPlugin.kt
@@ -67,9 +67,9 @@ class ProcessingPlugin @Inject constructor(private val objectFactory: ObjectFact
             extension.extensions.getByType(DesktopExtension::class.java).application { application ->
                 // Set the class to be executed initially
                 application.mainClass = sketchName
-                application.nativeDistributions.modules("java.management")
+                application.nativeDistributions.modules("java.management","jdk.jdwp.agent")
                 if(debugPort != null) {
-                    application.jvmArgs("-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=$debugPort")
+                    application.jvmArgs("-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=$debugPort")
                 }
             }
         }

From 772567c54074c59485e0c19a8ba0ffddf7c4252f Mon Sep 17 00:00:00 2001
From: Stef Tervelde <stef@steftervelde.nl>
Date: Wed, 2 Jul 2025 20:34:37 +0200
Subject: [PATCH 12/34] Build system indicators, Language keys and filtering
 SLF4J warnings

---
 app/src/processing/app/gradle/GradleJob.kt     | 1 +
 app/src/processing/app/gradle/GradleService.kt | 1 +
 app/src/processing/app/ui/EditorConsole.java   | 3 +++
 build/shared/lib/languages/PDE.properties      | 3 +++
 java/src/processing/mode/java/Compiler.java    | 1 +
 5 files changed, 9 insertions(+)

diff --git a/app/src/processing/app/gradle/GradleJob.kt b/app/src/processing/app/gradle/GradleJob.kt
index 064915cca5..916c7e83f9 100644
--- a/app/src/processing/app/gradle/GradleJob.kt
+++ b/app/src/processing/app/gradle/GradleJob.kt
@@ -49,6 +49,7 @@ class GradleJob{
         scope.launch {
             try {
                 state.value = State.BUILDING
+                service?.editor?.statusMessage("Building sketch", EditorStatus.NOTICE)
 
                 GradleConnector.newConnector()
                     .forProjectDirectory(folder)
diff --git a/app/src/processing/app/gradle/GradleService.kt b/app/src/processing/app/gradle/GradleService.kt
index 40ffc06a27..61e150fba2 100644
--- a/app/src/processing/app/gradle/GradleService.kt
+++ b/app/src/processing/app/gradle/GradleService.kt
@@ -64,6 +64,7 @@ class GradleService(
 
     private fun startAction(vararg tasks: String) {
         if(!active.value) return
+        editor?.let { println(Language.text("gradle.using_gradle"))  }
 
         val job = GradleJob()
         job.service = this
diff --git a/app/src/processing/app/ui/EditorConsole.java b/app/src/processing/app/ui/EditorConsole.java
index 468b104854..f49283823f 100644
--- a/app/src/processing/app/ui/EditorConsole.java
+++ b/app/src/processing/app/ui/EditorConsole.java
@@ -257,6 +257,9 @@ private boolean suppressMessage(String what, boolean err) {
       } else if (what.contains("__MOVE__")) {
         // Don't display the "Move" message that is used to position the sketch window
         return true;
+      }else if (what.startsWith("SLF4J: ")) {
+        // Don't display the SLF4J messages
+        return true;
       }
 
     } else {  // !err
diff --git a/build/shared/lib/languages/PDE.properties b/build/shared/lib/languages/PDE.properties
index 6ead810aa4..8dcc6bae7c 100644
--- a/build/shared/lib/languages/PDE.properties
+++ b/build/shared/lib/languages/PDE.properties
@@ -232,6 +232,7 @@ preferences.launch_programs_in = Launch programs in
 preferences.launch_programs_in.mode = mode
 preferences.file = More preferences can be edited directly in the file:
 preferences.file.hint = (Edit only when Processing is not running.)
+preferences.use_modern_build_system = Use modern build system (see Processing GitHub Wiki more details)
 
 # Sketchbook Location (Frame)
 sketchbook_location = Select new sketchbook folder
@@ -321,6 +322,8 @@ 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.)
 
 # ---------------------------------------
 # Toolbars
diff --git a/java/src/processing/mode/java/Compiler.java b/java/src/processing/mode/java/Compiler.java
index 3e97931699..dc76473b09 100644
--- a/java/src/processing/mode/java/Compiler.java
+++ b/java/src/processing/mode/java/Compiler.java
@@ -52,6 +52,7 @@ public class Compiler {
    * @throws SketchException Only if there's a problem. Only then.
    */
   static public boolean compile(JavaBuild build) throws SketchException {
+    System.out.println(Language.text("gradle.using_eclipse"));
 
     // This will be filled in if anyone gets angry
     SketchException exception = null;

From b165d0a511b8e7b81327744daaf0efec7ce3c3f1 Mon Sep 17 00:00:00 2001
From: Stef Tervelde <stef@steftervelde.nl>
Date: Wed, 2 Jul 2025 21:25:52 +0200
Subject: [PATCH 13/34] Add all library jars

---
 app/src/processing/app/gradle/GradleService.kt  | 2 ++
 java/gradle/src/main/kotlin/DependenciesTask.kt | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/src/processing/app/gradle/GradleService.kt b/app/src/processing/app/gradle/GradleService.kt
index 61e150fba2..ec557f3b25 100644
--- a/app/src/processing/app/gradle/GradleService.kt
+++ b/app/src/processing/app/gradle/GradleService.kt
@@ -84,6 +84,8 @@ class GradleService(
     private fun setupGradle(): MutableList<String> {
         val sketch = sketch ?: throw IllegalStateException("Sketch is not set")
 
+        // TODO: if sketch is read-only, copy it whole to the temporary working directory / sketch
+
         val unsaved = sketch.code
             .map { code ->
                 val file = workingDir.resolve("unsaved/${code.fileName}")
diff --git a/java/gradle/src/main/kotlin/DependenciesTask.kt b/java/gradle/src/main/kotlin/DependenciesTask.kt
index 8d9e09e258..8e2cb9bca3 100644
--- a/java/gradle/src/main/kotlin/DependenciesTask.kt
+++ b/java/gradle/src/main/kotlin/DependenciesTask.kt
@@ -44,7 +44,7 @@ abstract class DependenciesTask: DefaultTask() {
                 library.jars.forEach { jar ->
                     jar.classes.forEach { className ->
                         if (className.startsWith(statement)) {
-                            dependencies.add(jar.path)
+                            dependencies.addAll(library.jars.map { it.path } )
                             return@import
                         }
                     }

From e727dbf59654462b015d38cf06161d6c40a5f02a Mon Sep 17 00:00:00 2001
From: Stef Tervelde <stef@steftervelde.nl>
Date: Wed, 2 Jul 2025 21:33:12 +0200
Subject: [PATCH 14/34] Support for readonly sketches

---
 app/src/processing/app/gradle/GradleService.kt | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/app/src/processing/app/gradle/GradleService.kt b/app/src/processing/app/gradle/GradleService.kt
index ec557f3b25..2a9988da3c 100644
--- a/app/src/processing/app/gradle/GradleService.kt
+++ b/app/src/processing/app/gradle/GradleService.kt
@@ -84,7 +84,12 @@ class GradleService(
     private fun setupGradle(): MutableList<String> {
         val sketch = sketch ?: throw IllegalStateException("Sketch is not set")
 
-        // TODO: if sketch is read-only, copy it whole to the temporary working directory / sketch
+        val sketchFolder = if(sketch.isReadOnly) workingDir.resolve("sketch").toFile() else sketch.folder
+        if(sketch.isReadOnly){
+            // If the sketch is read-only, we copy it to the working directory
+            // This allows us to run the sketch without modifying the original files
+            sketch.folder.copyRecursively(sketchFolder, overwrite = true)
+        }
 
         val unsaved = sketch.code
             .map { code ->
@@ -118,7 +123,7 @@ class GradleService(
             //"window.color" to "0xFF000000", // TODO: Implement
             //"stop.color" to "0xFF000000", // TODO: Implement
             "stop.hide" to false, // TODO: Implement
-            "sketch.folder" to sketch.folder.absolutePath,
+            "sketch.folder" to sketchFolder,
         )
         val repository = Platform.getContentFile("repository").absolutePath.replace("""\""", """\\""")
 
@@ -144,7 +149,7 @@ class GradleService(
         }
 
 
-        val buildGradle = sketch.folder.resolve("build.gradle.kts")
+        val buildGradle = sketchFolder.resolve("build.gradle.kts")
         val generate = buildGradle.let {
             if(!it.exists()) return@let true
 
@@ -179,13 +184,16 @@ class GradleService(
             val content = "${header}\n${instructions}\n${configuration}"
             buildGradle.writeText(content)
         }
-        val settingsGradle = sketch.folder.resolve("settings.gradle.kts")
+        val settingsGradle = sketchFolder.resolve("settings.gradle.kts")
         if (!settingsGradle.exists()) {
             settingsGradle.createNewFile()
         }
 
         val arguments = mutableListOf("--init-script", initGradle.toAbsolutePath().toString())
         if (!Base.DEBUG) arguments.add("--quiet")
+        if(sketch.isReadOnly){
+            arguments += listOf("--project-dir", sketchFolder.absolutePath)
+        }
         arguments.addAll(variables.entries
             .filter { it.value != null }
             .map { "-Pprocessing.${it.key}=${it.value}" }

From 24cb4f4f9b1161ec10472c11b86aee9481124162 Mon Sep 17 00:00:00 2001
From: Stef Tervelde <stef@steftervelde.nl>
Date: Fri, 4 Jul 2025 06:23:00 +0200
Subject: [PATCH 15/34] Improved Error reporting

---
 app/src/processing/app/gradle/GradleJob.kt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/processing/app/gradle/GradleJob.kt b/app/src/processing/app/gradle/GradleJob.kt
index 916c7e83f9..a0aed015f8 100644
--- a/app/src/processing/app/gradle/GradleJob.kt
+++ b/app/src/processing/app/gradle/GradleJob.kt
@@ -83,7 +83,7 @@ class GradleJob{
                     return@launch
                 }
 
-                if(state.value != State.BUILDING){
+                if(state.value == State.RUNNING){
                     Messages.log("Gradle job error: $errors")
                     return@launch
                 }
@@ -91,7 +91,7 @@ class GradleJob{
                 // An error occurred during the build process
 
                 System.err.println(errors)
-                service?.editor?.statusError(cause?.message)
+                service?.editor?.statusError(causesList.last().message)
             }finally {
                 state.value = State.DONE
                 vm.value = null

From d7c6aeba90d452727cb970b39cbdcf1b635538e0 Mon Sep 17 00:00:00 2001
From: Stef Tervelde <stef@steftervelde.nl>
Date: Fri, 4 Jul 2025 06:54:50 +0200
Subject: [PATCH 16/34] Also copy Untitled sketches

---
 app/src/processing/app/gradle/GradleService.kt | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/src/processing/app/gradle/GradleService.kt b/app/src/processing/app/gradle/GradleService.kt
index 2a9988da3c..148846a844 100644
--- a/app/src/processing/app/gradle/GradleService.kt
+++ b/app/src/processing/app/gradle/GradleService.kt
@@ -84,8 +84,10 @@ class GradleService(
     private fun setupGradle(): MutableList<String> {
         val sketch = sketch ?: throw IllegalStateException("Sketch is not set")
 
-        val sketchFolder = if(sketch.isReadOnly) workingDir.resolve("sketch").toFile() else sketch.folder
-        if(sketch.isReadOnly){
+        val copy = sketch.isReadOnly || sketch.isUntitled
+
+        val sketchFolder = if(copy) workingDir.resolve("sketch").toFile() else sketch.folder
+        if(copy){
             // If the sketch is read-only, we copy it to the working directory
             // This allows us to run the sketch without modifying the original files
             sketch.folder.copyRecursively(sketchFolder, overwrite = true)
@@ -108,7 +110,7 @@ class GradleService(
         val variables = mapOf(
             "group" to System.getProperty("processing.group", "org.processing"),
             "version" to Base.getVersionName(),
-            "sketchFolder" to sketch.folder.absolutePath,
+            "sketchFolder" to sketchFolder,
             "sketchbook" to Base.getSketchbookFolder(),
             "workingDir" to workingDir.toAbsolutePath().toString(),
             "settings" to Platform.getSettingsFolder().absolutePath.toString(),
@@ -123,7 +125,6 @@ class GradleService(
             //"window.color" to "0xFF000000", // TODO: Implement
             //"stop.color" to "0xFF000000", // TODO: Implement
             "stop.hide" to false, // TODO: Implement
-            "sketch.folder" to sketchFolder,
         )
         val repository = Platform.getContentFile("repository").absolutePath.replace("""\""", """\\""")
 
@@ -191,7 +192,7 @@ class GradleService(
 
         val arguments = mutableListOf("--init-script", initGradle.toAbsolutePath().toString())
         if (!Base.DEBUG) arguments.add("--quiet")
-        if(sketch.isReadOnly){
+        if(copy){
             arguments += listOf("--project-dir", sketchFolder.absolutePath)
         }
         arguments.addAll(variables.entries

From cebc352db9fc863f12e8c3798073d27a84ab6594 Mon Sep 17 00:00:00 2001
From: Stef Tervelde <stef@steftervelde.nl>
Date: Fri, 4 Jul 2025 07:36:31 +0200
Subject: [PATCH 17/34] Snap support

---
 app/src/processing/app/gradle/GradleJob.kt | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/app/src/processing/app/gradle/GradleJob.kt b/app/src/processing/app/gradle/GradleJob.kt
index 916c7e83f9..cbdc06eb2b 100644
--- a/app/src/processing/app/gradle/GradleJob.kt
+++ b/app/src/processing/app/gradle/GradleJob.kt
@@ -2,7 +2,7 @@ package processing.app.gradle
 
 import androidx.compose.runtime.mutableStateListOf
 import androidx.compose.runtime.mutableStateOf
-import com.sun.jdi.*
+import com.sun.jdi.VirtualMachine
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -12,18 +12,14 @@ import org.gradle.tooling.GradleConnector
 import org.gradle.tooling.events.ProgressListener
 import org.gradle.tooling.events.problems.ProblemEvent
 import org.gradle.tooling.events.problems.Severity
-import org.gradle.tooling.events.problems.internal.DefaultFileLocation
 import org.gradle.tooling.events.problems.internal.DefaultSingleProblemEvent
 import org.gradle.tooling.events.task.TaskFinishEvent
 import org.gradle.tooling.events.task.TaskStartEvent
 import org.gradle.tooling.events.task.TaskSuccessResult
 import processing.app.Base
 import processing.app.Messages
+import processing.app.Platform
 import processing.app.ui.EditorStatus
-import java.io.InputStreamReader
-import java.io.PipedInputStream
-import java.io.PipedOutputStream
-import java.lang.IllegalStateException
 
 class GradleJob{
     enum class State{
@@ -53,6 +49,12 @@ class GradleJob{
 
                 GradleConnector.newConnector()
                     .forProjectDirectory(folder)
+                    .apply {
+                        // TODO: Remove when switched to classic confinement within Snap
+                        if(System.getenv("SNAP_USER_COMMON") != null){
+                            useGradleUserHomeDir(Platform.getSettingsFolder().resolve("gradle"))
+                        }
+                    }
                     .connect()
                     .newBuild()
                     .apply {

From 5729e8811882754e51868b7d443223870a001f3f Mon Sep 17 00:00:00 2001
From: Stef Tervelde <stef@steftervelde.nl>
Date: Mon, 7 Jul 2025 11:01:58 +0200
Subject: [PATCH 18/34] Show error logs to the user

---
 app/src/processing/app/gradle/GradleJob.kt | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/app/src/processing/app/gradle/GradleJob.kt b/app/src/processing/app/gradle/GradleJob.kt
index 90e027e2db..eeb2366ecc 100644
--- a/app/src/processing/app/gradle/GradleJob.kt
+++ b/app/src/processing/app/gradle/GradleJob.kt
@@ -63,9 +63,7 @@ class GradleJob{
                         addStateListener()
                         addDebugging()
                         setStandardOutput(System.out)
-                        if(Base.DEBUG) {
-                            setStandardError(System.err)
-                        }
+                        setStandardError(System.err)
                         run()
                     }
             }catch (e: Exception){

From a11d2ffabec8a1d18d1541eb1efb1d4cfd2220d7 Mon Sep 17 00:00:00 2001
From: Stef Tervelde <stef@steftervelde.nl>
Date: Mon, 7 Jul 2025 15:22:21 +0200
Subject: [PATCH 19/34] Logging sketches to separate stream & small refactor

---
 app/src/processing/app/gradle/GradleJob.kt    | 61 +++++++++++--
 .../processing/app/gradle/GradleService.kt    | 86 +++++++++----------
 .../src/main/kotlin/ProcessingPlugin.kt       |  7 ++
 3 files changed, 101 insertions(+), 53 deletions(-)

diff --git a/app/src/processing/app/gradle/GradleJob.kt b/app/src/processing/app/gradle/GradleJob.kt
index eeb2366ecc..fd90884ae7 100644
--- a/app/src/processing/app/gradle/GradleJob.kt
+++ b/app/src/processing/app/gradle/GradleJob.kt
@@ -5,6 +5,7 @@ import androidx.compose.runtime.mutableStateOf
 import com.sun.jdi.VirtualMachine
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
 import org.gradle.tooling.BuildCancelledException
 import org.gradle.tooling.BuildLauncher
@@ -20,6 +21,8 @@ import processing.app.Base
 import processing.app.Messages
 import processing.app.Platform
 import processing.app.ui.EditorStatus
+import java.io.PrintStream
+import java.net.ServerSocket
 
 class GradleJob{
     enum class State{
@@ -36,16 +39,17 @@ class GradleJob{
     val state = mutableStateOf(State.NONE)
     val vm = mutableStateOf<VirtualMachine?>(null)
     val problems = mutableStateListOf<ProblemEvent>()
+    val jobs = mutableStateListOf<Job>()
 
     private val scope = CoroutineScope(Dispatchers.IO)
     private val cancel = GradleConnector.newCancellationTokenSource()
 
     fun start() {
         val folder = service?.sketch?.folder ?: throw IllegalStateException("Sketch folder is not set")
-        scope.launch {
+        launchJob {
             try {
                 state.value = State.BUILDING
-                service?.editor?.statusMessage("Building sketch", EditorStatus.NOTICE)
+                service?.editor?.statusMessage("Connecting to Gradle", EditorStatus.NOTICE)
 
                 GradleConnector.newConnector()
                     .forProjectDirectory(folder)
@@ -56,14 +60,20 @@ class GradleJob{
                         }
                     }
                     .connect()
+                    .apply {
+                        service?.editor?.statusMessage("Building sketch", EditorStatus.NOTICE)
+                    }
                     .newBuild()
                     .apply {
                         configure()
                         withCancellationToken(cancel.token())
                         addStateListener()
                         addDebugging()
-                        setStandardOutput(System.out)
-                        setStandardError(System.err)
+                        addLogserver()
+                        if(Base.DEBUG) {
+                            setStandardOutput(System.out)
+                            setStandardError(System.err)
+                        }
                         run()
                     }
             }catch (e: Exception){
@@ -80,12 +90,12 @@ class GradleJob{
 
                 if (skip.any { it.isInstance(e) }) {
                     Messages.log("Gradle job error: $errors")
-                    return@launch
+                    return@launchJob
                 }
 
                 if(state.value == State.RUNNING){
                     Messages.log("Gradle job error: $errors")
-                    return@launch
+                    return@launchJob
                 }
 
                 // An error occurred during the build process
@@ -98,10 +108,16 @@ class GradleJob{
             }
         }
     }
+    fun launchJob(block: suspend CoroutineScope.() -> Unit){
+        val job = scope.launch { block() }
+        jobs.add(job)
+    }
 
     fun cancel(){
         cancel.cancel()
+        jobs.forEach(Job::cancel)
     }
+
     private fun BuildLauncher.addStateListener(){
         addProgressListener(ProgressListener { event ->
             if(event is TaskStartEvent) {
@@ -167,13 +183,42 @@ class GradleJob{
         })
     }
 
+    fun addLogserver(){
+        launchJob {
+            startLogServer(service?.logPort ?: 5006, System.out)
+        }
+        launchJob{
+            startLogServer(service?.errPort ?: 5007, System.err)
+        }
+    }
+    fun startLogServer(port: Int, target: PrintStream){
+        val server = ServerSocket(port)
+        Messages.log("Log server started on port $port")
+        val client = server.accept()
+        Messages.log("Log server client connected")
+
+        val reader = client.getInputStream().bufferedReader()
+        try {
+            reader.forEachLine { line ->
+                if (line.isNotBlank()) {
+                    target.println(line)
+                }
+            }
+        } catch (e: Exception) {
+            Messages.log("Error while reading from log server: ${e.message}")
+        } finally {
+            client.close()
+            server.close()
+        }
+    }
+
     fun BuildLauncher.addDebugging() {
         addProgressListener(ProgressListener { event ->
             if (event !is TaskStartEvent) return@ProgressListener
             if (event.descriptor.name != ":run") return@ProgressListener
 
-            scope.launch {
-                val debugger = Debugger.connect(service?.debugPort) ?: return@launch
+            launchJob {
+                val debugger = Debugger.connect(service?.debugPort) ?: return@launchJob
                 vm.value = debugger
                 val exceptions = Exceptions(debugger, service?.editor)
                 exceptions.listen()
diff --git a/app/src/processing/app/gradle/GradleService.kt b/app/src/processing/app/gradle/GradleService.kt
index 148846a844..2f18f4301d 100644
--- a/app/src/processing/app/gradle/GradleService.kt
+++ b/app/src/processing/app/gradle/GradleService.kt
@@ -2,20 +2,19 @@ package processing.app.gradle
 
 import androidx.compose.runtime.mutableStateListOf
 import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.snapshotFlow
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
 import org.gradle.tooling.BuildLauncher
-import processing.app.Base
-import processing.app.Language
+import processing.app.Base.DEBUG
+import processing.app.Base.getSketchbookFolder
+import processing.app.Base.getVersionName
+import processing.app.Language.text
 import processing.app.Messages
 import processing.app.Mode
 import processing.app.Platform
+import processing.app.Platform.getContentFile
+import processing.app.Platform.getSettingsFolder
 import processing.app.Preferences
 import processing.app.Sketch
 import processing.app.ui.Editor
-import java.io.*
 import kotlin.io.path.createTempDirectory
 import kotlin.io.path.deleteIfExists
 import kotlin.io.path.writeText
@@ -48,51 +47,51 @@ class GradleService(
 
     val jobs = mutableStateListOf<GradleJob>()
     val workingDir = createTempDirectory()
+
     val debugPort = (30_000..60_000).random()
+    val logPort = debugPort + 1
+    val errPort = logPort + 1
 
     fun run(){
-        startAction("run")
+        startJob("run")
     }
 
     fun export(){
-        startAction("runDistributable")
+        startJob("runDistributable")
     }
 
     fun stop(){
-        stopActions()
+        stopJobs()
     }
 
-    private fun startAction(vararg tasks: String) {
+    private fun startJob(vararg tasks: String) {
         if(!active.value) return
-        editor?.let { println(Language.text("gradle.using_gradle"))  }
+        editor?.let { println(text("gradle.using_gradle"))  }
 
         val job = GradleJob()
         job.service = this
         job.configure = {
-            setup()
+            setupGradle()
             forTasks(tasks.joinToString(" "))
         }
         jobs.add(job)
         job.start()
     }
 
-    private fun stopActions(){
-        jobs
-            .forEach(GradleJob::cancel)
+    private fun stopJobs(){
+        jobs.forEach(GradleJob::cancel)
     }
 
-    private fun setupGradle(): MutableList<String> {
+    private fun BuildLauncher.setupGradle(extraArguments: List<String> = listOf()) {
         val sketch = sketch ?: throw IllegalStateException("Sketch is not set")
-
         val copy = sketch.isReadOnly || sketch.isUntitled
-
         val sketchFolder = if(copy) workingDir.resolve("sketch").toFile() else sketch.folder
         if(copy){
             // If the sketch is read-only, we copy it to the working directory
             // This allows us to run the sketch without modifying the original files
             sketch.folder.copyRecursively(sketchFolder, overwrite = true)
         }
-
+        // Save the unsaved code into the working directory for gradle to compile
         val unsaved = sketch.code
             .map { code ->
                 val file = workingDir.resolve("unsaved/${code.fileName}")
@@ -106,16 +105,18 @@ class GradleService(
                 }
                 return@map code.fileName
             }
-
+        // Collect the variables to pass to gradle
         val variables = mapOf(
             "group" to System.getProperty("processing.group", "org.processing"),
-            "version" to Base.getVersionName(),
+            "version" to getVersionName(),
             "sketchFolder" to sketchFolder,
-            "sketchbook" to Base.getSketchbookFolder(),
+            "sketchbook" to getSketchbookFolder(),
             "workingDir" to workingDir.toAbsolutePath().toString(),
-            "settings" to Platform.getSettingsFolder().absolutePath.toString(),
+            "settings" to getSettingsFolder().absolutePath.toString(),
             "unsaved" to unsaved.joinToString(","),
             "debugPort" to debugPort.toString(),
+            "logPort" to logPort.toString(),
+            "errPort" to errPort.toString(),
             "fullscreen" to System.getProperty("processing.fullscreen", "false").equals("true"),
             "display" to 1, // TODO: Implement
             "external" to true,
@@ -126,8 +127,8 @@ class GradleService(
             //"stop.color" to "0xFF000000", // TODO: Implement
             "stop.hide" to false, // TODO: Implement
         )
-        val repository = Platform.getContentFile("repository").absolutePath.replace("""\""", """\\""")
-
+        val repository = getContentFile("repository").absolutePath.replace("""\""", """\\""")
+        // Create the init.gradle.kts file in the working directory
         val initGradle = workingDir.resolve("init.gradle.kts").apply {
             val content = """
                 beforeSettings{
@@ -148,8 +149,7 @@ class GradleService(
 
             writeText(content)
         }
-
-
+        // Create the build.gradle.kts file in the sketch folder
         val buildGradle = sketchFolder.resolve("build.gradle.kts")
         val generate = buildGradle.let {
             if(!it.exists()) return@let true
@@ -158,59 +158,55 @@ class GradleService(
             if(!contents.contains("@processing-auto-generated")) return@let false
 
             val version = contents.substringAfter("version=").substringBefore("\n")
-            if(version != Base.getVersionName()) return@let true
+            if(version != getVersionName()) return@let true
 
             val modeTitle = contents.substringAfter("mode=").substringBefore(" ")
-            if(this.mode.title != modeTitle) return@let true
+            if(mode.title != modeTitle) return@let true
 
-            return@let Base.DEBUG
+            return@let DEBUG
         }
         if (generate) {
             Messages.log("build.gradle.kts outdated or not found in ${sketch.folder}, creating one")
             val header = """
-                // @processing-auto-generated mode=${mode.title} version=${Base.getVersionName()}
+                // @processing-auto-generated mode=${mode.title} version=${getVersionName()}
                 //
                 """.trimIndent()
 
-            val instructions = Language.text("gradle.instructions")
+            val instructions = text("gradle.instructions")
                 .split("\n")
                 .joinToString("\n") { "// $it" }
 
             val configuration =  """
                 
                 plugins{
-                    id("org.processing.java") version "${Base.getVersionName()}"
+                    id("org.processing.java") version "${getVersionName()}"
                 }
             """.trimIndent()
             val content = "${header}\n${instructions}\n${configuration}"
             buildGradle.writeText(content)
         }
+        // Create the settings.gradle.kts file in the sketch folder
         val settingsGradle = sketchFolder.resolve("settings.gradle.kts")
         if (!settingsGradle.exists()) {
             settingsGradle.createNewFile()
         }
-
+        // Collect the arguments to pass to gradle
         val arguments = mutableListOf("--init-script", initGradle.toAbsolutePath().toString())
-        if (!Base.DEBUG) arguments.add("--quiet")
+        if (!DEBUG) arguments.add("--quiet")
         if(copy){
             arguments += listOf("--project-dir", sketchFolder.absolutePath)
         }
+
         arguments.addAll(variables.entries
             .filter { it.value != null }
             .map { "-Pprocessing.${it.key}=${it.value}" }
         )
+        arguments.addAll(extraArguments)
 
-        return arguments
-    }
-
+        withArguments(*arguments.toTypedArray())
 
-    private fun BuildLauncher.setup(extraArguments: List<String> = listOf()) {
         // TODO: Instead of shipping Processing with a build-in JDK we should download the JDK through Gradle
         setJavaHome(Platform.getJavaHome())
-
-        val arguments = setupGradle()
-        arguments.addAll(extraArguments)
-        withArguments(*arguments.toTypedArray())
     }
 
     // Hooks for java to check if the Gradle service is running since mutableStateOf is not accessible in java
@@ -218,7 +214,7 @@ class GradleService(
         return active.value
     }
     fun setEnabled(active: Boolean) {
-        if(!active) stopActions()
+        if(!active) stopJobs()
         this.active.value = active
     }
 }
\ No newline at end of file
diff --git a/java/gradle/src/main/kotlin/ProcessingPlugin.kt b/java/gradle/src/main/kotlin/ProcessingPlugin.kt
index ef45574137..2864a88e0e 100644
--- a/java/gradle/src/main/kotlin/ProcessingPlugin.kt
+++ b/java/gradle/src/main/kotlin/ProcessingPlugin.kt
@@ -13,6 +13,7 @@ import org.jetbrains.compose.ComposeExtension
 import org.jetbrains.compose.desktop.DesktopExtension
 import processing.app.Preferences
 import java.io.File
+import java.net.Socket
 import java.util.*
 import javax.inject.Inject
 
@@ -26,6 +27,8 @@ class ProcessingPlugin @Inject constructor(private val objectFactory: ObjectFact
         val processingGroup = project.findProperty("processing.group") as String? ?: "org.processing"
         val workingDir = project.findProperty("processing.workingDir") as String?
         val debugPort = project.findProperty("processing.debugPort") as String?
+        val logPort = project.findProperty("processing.logPort") as String?
+        val errPort = project.findProperty("processing.errPort") as String?
 
         // TODO: Setup sketchbook when using as a standalone plugin, use the Java Preferences
         val sketchbook = project.findProperty("processing.sketchbook") as String?
@@ -120,6 +123,10 @@ class ProcessingPlugin @Inject constructor(private val objectFactory: ObjectFact
             project.properties
                 .filterKeys { it.startsWith("processing") }
                 .forEach { (key, value) -> task.systemProperty(key, value) }
+
+            if(logPort != null) task.standardOutput =  Socket("localhost", logPort.toInt()).outputStream
+            if(errPort != null) task.errorOutput = Socket("localhost", errPort.toInt()).outputStream
+
         }
 
         project.extensions.getByType(JavaPluginExtension::class.java).sourceSets.all { sourceSet ->

From b64505d47662419e9332a41cdf7a883b60fb2fba Mon Sep 17 00:00:00 2001
From: Stef Tervelde <stef@steftervelde.nl>
Date: Mon, 7 Jul 2025 16:21:59 +0200
Subject: [PATCH 20/34] Gradle Service refactor

---
 app/src/processing/app/gradle/Debugger.kt     |   1 -
 app/src/processing/app/gradle/GradleJob.kt    | 296 +++++++++++++-----
 .../processing/app/gradle/GradleService.kt    | 153 +--------
 app/src/processing/app/gradle/Log.kt          |  30 ++
 4 files changed, 254 insertions(+), 226 deletions(-)
 create mode 100644 app/src/processing/app/gradle/Log.kt

diff --git a/app/src/processing/app/gradle/Debugger.kt b/app/src/processing/app/gradle/Debugger.kt
index bdc78c9545..aea18ec133 100644
--- a/app/src/processing/app/gradle/Debugger.kt
+++ b/app/src/processing/app/gradle/Debugger.kt
@@ -10,7 +10,6 @@ import kotlin.time.TimeSource
 
 class Debugger {
     companion object {
-        // TODO: Stop if build has failed
         suspend fun connect(port: Int?): VirtualMachine? {
             try {
                 Messages.log("Attaching to VM $port")
diff --git a/app/src/processing/app/gradle/GradleJob.kt b/app/src/processing/app/gradle/GradleJob.kt
index fd90884ae7..2904d4164f 100644
--- a/app/src/processing/app/gradle/GradleJob.kt
+++ b/app/src/processing/app/gradle/GradleJob.kt
@@ -17,14 +17,29 @@ import org.gradle.tooling.events.problems.internal.DefaultSingleProblemEvent
 import org.gradle.tooling.events.task.TaskFinishEvent
 import org.gradle.tooling.events.task.TaskStartEvent
 import org.gradle.tooling.events.task.TaskSuccessResult
-import processing.app.Base
+import processing.app.Base.DEBUG
+import processing.app.Base.getSketchbookFolder
+import processing.app.Base.getVersionName
+import processing.app.Language.text
 import processing.app.Messages
 import processing.app.Platform
+import processing.app.Platform.getContentFile
+import processing.app.Platform.getSettingsFolder
+import processing.app.Sketch
+import processing.app.gradle.Log.Companion.startLogServer
+import processing.app.ui.Editor
 import processing.app.ui.EditorStatus
-import java.io.PrintStream
-import java.net.ServerSocket
+import java.nio.file.Path
+import kotlin.io.path.deleteIfExists
+import kotlin.io.path.writeText
 
-class GradleJob{
+// Starts a gradle job to run the sketch
+class GradleJob(
+    vararg val tasks: String,
+    val workingDir: Path,
+    val sketch: Sketch,
+    val editor: Editor? = null,
+){
     enum class State{
         NONE,
         BUILDING,
@@ -33,8 +48,9 @@ class GradleJob{
         DONE
     }
 
-    var service: GradleService? = null
-    var configure: BuildLauncher.() -> Unit = {}
+    val debugPort = (30_000..60_000).random()
+    val logPort = debugPort + 1
+    val errPort = logPort + 1
 
     val state = mutableStateOf(State.NONE)
     val vm = mutableStateOf<VirtualMachine?>(null)
@@ -44,70 +60,177 @@ class GradleJob{
     private val scope = CoroutineScope(Dispatchers.IO)
     private val cancel = GradleConnector.newCancellationTokenSource()
 
+
+    // All the configuration for the gradle build
+    private fun BuildLauncher.setupGradle(extraArguments: List<String> = listOf()) {
+        val copy = sketch.isReadOnly || sketch.isUntitled
+
+        val sketchFolder = if(copy) workingDir.resolve("sketch").toFile() else sketch.folder
+
+        if(copy){
+            // If the sketch is read-only, we copy it to the working directory
+            // This allows us to run the sketch without modifying the original files
+            sketch.folder.copyRecursively(sketchFolder, overwrite = true)
+        }
+        // Save the unsaved code into the working directory for gradle to compile
+        val unsaved = sketch.code
+            .map { code ->
+                val file = workingDir.resolve("unsaved/${code.fileName}")
+                file.parent.toFile().mkdirs()
+                // If tab is marked modified save it to the working directory
+                // Otherwise delete the file so we don't compile with old code
+                if(code.isModified){
+                    file.writeText(code.documentText)
+                }else{
+                    file.deleteIfExists()
+                }
+                return@map code.fileName
+            }
+        // Collect the variables to pass to gradle
+        val variables = mapOf(
+            "group" to System.getProperty("processing.group", "org.processing"),
+            "version" to getVersionName(),
+            "sketchFolder" to sketchFolder,
+            "sketchbook" to getSketchbookFolder(),
+            "workingDir" to workingDir.toAbsolutePath().toString(),
+            "settings" to getSettingsFolder().absolutePath.toString(),
+            "unsaved" to unsaved.joinToString(","),
+            "debugPort" to debugPort.toString(),
+            "logPort" to logPort.toString(),
+            "errPort" to errPort.toString(),
+            "fullscreen" to System.getProperty("processing.fullscreen", "false").equals("true"),
+            "display" to 1, // TODO: Implement
+            "external" to true,
+            "location" to null, // TODO: Implement
+            "editor.location" to editor?.location?.let { "${it.x},${it.y}" },
+            //"awt.disable" to false,
+            //"window.color" to "0xFF000000", // TODO: Implement
+            //"stop.color" to "0xFF000000", // TODO: Implement
+            "stop.hide" to false, // TODO: Implement
+        )
+        val repository = getContentFile("repository").absolutePath.replace("""\""", """\\""")
+        // Create the init.gradle.kts file in the working directory
+        // This allows us to run the gradle plugin that has been bundled with the editor
+        val initGradle = workingDir.resolve("init.gradle.kts").apply {
+            val content = """
+                beforeSettings{
+                    pluginManagement {
+                        repositories {
+                            maven("$repository")
+                            gradlePluginPortal()
+                        }
+                    }
+                }
+                allprojects{
+                    repositories {
+                        maven("$repository")
+                        mavenCentral()
+                    }
+                }
+            """.trimIndent()
+
+            writeText(content)
+        }
+        // Create the build.gradle.kts file in the sketch folder
+        val buildGradle = sketchFolder.resolve("build.gradle.kts")
+        val generate = buildGradle.let {
+            if(!it.exists()) return@let true
+
+            val contents = it.readText()
+            if(!contents.contains("@processing-auto-generated")) return@let false
+
+            val version = contents.substringAfter("version=").substringBefore("\n")
+            if(version != getVersionName()) return@let true
+
+            val modeTitle = contents.substringAfter("mode=").substringBefore(" ")
+            if(sketch.mode.title != modeTitle) return@let true
+
+            return@let DEBUG
+        }
+        if (generate) {
+            Messages.log("build.gradle.kts outdated or not found in ${sketch.folder}, creating one")
+            val header = """
+                // @processing-auto-generated mode=${sketch.mode.title} version=${getVersionName()}
+                //
+                """.trimIndent()
+
+            val instructions = text("gradle.instructions")
+                .split("\n")
+                .joinToString("\n") { "// $it" }
+
+            val configuration =  """
+                plugins{
+                    id("org.processing.java") version "${getVersionName()}"
+                }
+            """.trimIndent()
+            val content = "${header}\n${instructions}\n\n${configuration}"
+            buildGradle.writeText(content)
+        }
+        // Create and empty settings.gradle.kts file in the sketch folder
+        val settingsGradle = sketchFolder.resolve("settings.gradle.kts")
+        if (!settingsGradle.exists()) {
+            settingsGradle.createNewFile()
+        }
+        // Collect the arguments to pass to gradle
+        val arguments = mutableListOf("--init-script", initGradle.toAbsolutePath().toString())
+        // Hide Gradle output from the console if not in debug mode
+        if(!DEBUG) arguments += "--quiet"
+
+        if(copy) arguments += listOf("--project-dir", sketchFolder.absolutePath)
+
+        arguments += variables.entries
+            .filter { it.value != null }
+            .map { "-Pprocessing.${it.key}=${it.value}" }
+
+        arguments += extraArguments
+
+        withArguments(*arguments.toTypedArray())
+
+        forTasks(*tasks)
+
+        // TODO: Instead of shipping Processing with a build-in JDK we should download the JDK through Gradle
+        setJavaHome(Platform.getJavaHome())
+        withCancellationToken(cancel.token())
+    }
+
     fun start() {
-        val folder = service?.sketch?.folder ?: throw IllegalStateException("Sketch folder is not set")
         launchJob {
-            try {
+            handleExceptions {
                 state.value = State.BUILDING
-                service?.editor?.statusMessage("Connecting to Gradle", EditorStatus.NOTICE)
 
+                // Connect Gradle, configure the build and run it
                 GradleConnector.newConnector()
-                    .forProjectDirectory(folder)
+                    .forProjectDirectory(sketch.folder)
                     .apply {
+                        editor?.statusMessage("Connecting to Gradle", EditorStatus.NOTICE)
                         // TODO: Remove when switched to classic confinement within Snap
-                        if(System.getenv("SNAP_USER_COMMON") != null){
-                            useGradleUserHomeDir(Platform.getSettingsFolder().resolve("gradle"))
+                        if (System.getenv("SNAP_USER_COMMON") != null) {
+                            useGradleUserHomeDir(getSettingsFolder().resolve("gradle"))
                         }
                     }
                     .connect()
                     .apply {
-                        service?.editor?.statusMessage("Building sketch", EditorStatus.NOTICE)
+                        editor?.statusMessage("Building sketch", EditorStatus.NOTICE)
                     }
                     .newBuild()
                     .apply {
-                        configure()
-                        withCancellationToken(cancel.token())
-                        addStateListener()
-                        addDebugging()
-                        addLogserver()
-                        if(Base.DEBUG) {
+                        if (DEBUG) {
                             setStandardOutput(System.out)
                             setStandardError(System.err)
                         }
-                        run()
-                    }
-            }catch (e: Exception){
-                val causesList = mutableListOf<Throwable>()
-                var cause: Throwable? = e
-                while (cause != null && cause.cause != cause) {
-                    causesList.add(cause)
-                    cause = cause.cause
-                }
-
-                val errors = causesList.joinToString("\n") { it.message ?: "Unknown error" }
-
-                val skip = listOf(BuildCancelledException::class)
-
-                if (skip.any { it.isInstance(e) }) {
-                    Messages.log("Gradle job error: $errors")
-                    return@launchJob
-                }
 
-                if(state.value == State.RUNNING){
-                    Messages.log("Gradle job error: $errors")
-                    return@launchJob
-                }
+                        setupGradle()
 
-                // An error occurred during the build process
+                        addStateListener()
+                        addLogserver()
+                        addDebugging()
 
-                System.err.println(errors)
-                service?.editor?.statusError(causesList.last().message)
-            }finally {
-                state.value = State.DONE
-                vm.value = null
+                    }
+                    .run()
             }
         }
     }
+
     fun launchJob(block: suspend CoroutineScope.() -> Unit){
         val job = scope.launch { block() }
         jobs.add(job)
@@ -118,29 +241,66 @@ class GradleJob{
         jobs.forEach(Job::cancel)
     }
 
+    // Handle exception thrown by Gradle
+    private fun handleExceptions(action: () -> Unit){
+        try{
+            action()
+        }catch (e: Exception){
+            val causesList = mutableListOf<Throwable>()
+            var cause: Throwable? = e
+
+            while (cause != null && cause.cause != cause) {
+                causesList.add(cause)
+                cause = cause.cause
+            }
+
+            val errors = causesList.joinToString("\n") { it.message ?: "Unknown error" }
+
+            val skip = listOf(BuildCancelledException::class)
+
+            if (skip.any { it.isInstance(e) }) {
+                Messages.log("Gradle job error: $errors")
+                return
+            }
+
+            if(state.value == State.RUNNING){
+                Messages.log("Gradle job error: $errors")
+                return
+            }
+
+            // An error occurred during the build process
+
+            System.err.println(errors)
+            editor?.statusError(causesList.last().message)
+        }finally {
+            state.value = State.DONE
+            vm.value = null
+        }
+    }
+
     private fun BuildLauncher.addStateListener(){
         addProgressListener(ProgressListener { event ->
             if(event is TaskStartEvent) {
-                service?.editor?.statusMessage("Running task: ${event.descriptor.name}", EditorStatus.NOTICE)
+                editor?.statusMessage("Running task: ${event.descriptor.name}", EditorStatus.NOTICE)
                 when(event.descriptor.name) {
                     ":run" -> {
                         state.value = State.RUNNING
                         Messages.log("Start run")
-                        service?.editor?.toolbar?.activateRun()
+                        editor?.toolbar?.activateRun()
                     }
                 }
 
             }
             if(event is TaskFinishEvent) {
                 if(event.result is TaskSuccessResult){
-                    service?.editor?.statusMessage("Finished task ${event.descriptor.name}", EditorStatus.NOTICE)
+                    editor?.statusMessage("Finished task ${event.descriptor.name}", EditorStatus.NOTICE)
                 }
 
                 when(event.descriptor.name){
                     ":run"->{
                         state.value = State.DONE
-                        service?.editor?.toolbar?.deactivateRun()
-                        service?.editor?.toolbar?.deactivateStop()
+                        editor?.toolbar?.deactivateRun()
+                        editor?.toolbar?.deactivateStop()
                     }
                 }
             }
@@ -168,7 +328,7 @@ class GradleJob{
                  */
 
                 val error = event.definition.id.displayName
-                service?.editor?.statusError(error)
+                editor?.statusError(error)
                 System.err.println("Problem: $error")
                 state.value = State.ERROR
 
@@ -183,32 +343,12 @@ class GradleJob{
         })
     }
 
-    fun addLogserver(){
+    fun BuildLauncher.addLogserver(){
         launchJob {
-            startLogServer(service?.logPort ?: 5006, System.out)
+            startLogServer(logPort, System.out)
         }
         launchJob{
-            startLogServer(service?.errPort ?: 5007, System.err)
-        }
-    }
-    fun startLogServer(port: Int, target: PrintStream){
-        val server = ServerSocket(port)
-        Messages.log("Log server started on port $port")
-        val client = server.accept()
-        Messages.log("Log server client connected")
-
-        val reader = client.getInputStream().bufferedReader()
-        try {
-            reader.forEachLine { line ->
-                if (line.isNotBlank()) {
-                    target.println(line)
-                }
-            }
-        } catch (e: Exception) {
-            Messages.log("Error while reading from log server: ${e.message}")
-        } finally {
-            client.close()
-            server.close()
+            startLogServer(errPort, System.err)
         }
     }
 
@@ -218,9 +358,9 @@ class GradleJob{
             if (event.descriptor.name != ":run") return@ProgressListener
 
             launchJob {
-                val debugger = Debugger.connect(service?.debugPort) ?: return@launchJob
+                val debugger = Debugger.connect(debugPort) ?: return@launchJob
                 vm.value = debugger
-                val exceptions = Exceptions(debugger, service?.editor)
+                val exceptions = Exceptions(debugger, editor)
                 exceptions.listen()
             }
 
diff --git a/app/src/processing/app/gradle/GradleService.kt b/app/src/processing/app/gradle/GradleService.kt
index 2f18f4301d..908518f0ee 100644
--- a/app/src/processing/app/gradle/GradleService.kt
+++ b/app/src/processing/app/gradle/GradleService.kt
@@ -2,22 +2,12 @@ package processing.app.gradle
 
 import androidx.compose.runtime.mutableStateListOf
 import androidx.compose.runtime.mutableStateOf
-import org.gradle.tooling.BuildLauncher
-import processing.app.Base.DEBUG
-import processing.app.Base.getSketchbookFolder
-import processing.app.Base.getVersionName
 import processing.app.Language.text
-import processing.app.Messages
 import processing.app.Mode
-import processing.app.Platform
-import processing.app.Platform.getContentFile
-import processing.app.Platform.getSettingsFolder
 import processing.app.Preferences
 import processing.app.Sketch
 import processing.app.ui.Editor
 import kotlin.io.path.createTempDirectory
-import kotlin.io.path.deleteIfExists
-import kotlin.io.path.writeText
 
 // TODO: Test offline mode, gradle seems to be included as not needed to be downloaded.
 // TODO: Test running examples
@@ -48,10 +38,6 @@ class GradleService(
     val jobs = mutableStateListOf<GradleJob>()
     val workingDir = createTempDirectory()
 
-    val debugPort = (30_000..60_000).random()
-    val logPort = debugPort + 1
-    val errPort = logPort + 1
-
     fun run(){
         startJob("run")
     }
@@ -68,12 +54,12 @@ class GradleService(
         if(!active.value) return
         editor?.let { println(text("gradle.using_gradle"))  }
 
-        val job = GradleJob()
-        job.service = this
-        job.configure = {
-            setupGradle()
-            forTasks(tasks.joinToString(" "))
-        }
+        val job = GradleJob(
+            tasks = tasks,
+            workingDir  = workingDir,
+            sketch = sketch ?: throw IllegalStateException("Sketch is not set"),
+            editor = editor
+        )
         jobs.add(job)
         job.start()
     }
@@ -82,133 +68,6 @@ class GradleService(
         jobs.forEach(GradleJob::cancel)
     }
 
-    private fun BuildLauncher.setupGradle(extraArguments: List<String> = listOf()) {
-        val sketch = sketch ?: throw IllegalStateException("Sketch is not set")
-        val copy = sketch.isReadOnly || sketch.isUntitled
-        val sketchFolder = if(copy) workingDir.resolve("sketch").toFile() else sketch.folder
-        if(copy){
-            // If the sketch is read-only, we copy it to the working directory
-            // This allows us to run the sketch without modifying the original files
-            sketch.folder.copyRecursively(sketchFolder, overwrite = true)
-        }
-        // Save the unsaved code into the working directory for gradle to compile
-        val unsaved = sketch.code
-            .map { code ->
-                val file = workingDir.resolve("unsaved/${code.fileName}")
-                file.parent.toFile().mkdirs()
-                // If tab is marked modified save it to the working directory
-                // Otherwise delete the file so we don't compile with old code
-                if(code.isModified){
-                    file.writeText(code.documentText)
-                }else{
-                    file.deleteIfExists()
-                }
-                return@map code.fileName
-            }
-        // Collect the variables to pass to gradle
-        val variables = mapOf(
-            "group" to System.getProperty("processing.group", "org.processing"),
-            "version" to getVersionName(),
-            "sketchFolder" to sketchFolder,
-            "sketchbook" to getSketchbookFolder(),
-            "workingDir" to workingDir.toAbsolutePath().toString(),
-            "settings" to getSettingsFolder().absolutePath.toString(),
-            "unsaved" to unsaved.joinToString(","),
-            "debugPort" to debugPort.toString(),
-            "logPort" to logPort.toString(),
-            "errPort" to errPort.toString(),
-            "fullscreen" to System.getProperty("processing.fullscreen", "false").equals("true"),
-            "display" to 1, // TODO: Implement
-            "external" to true,
-            "location" to null, // TODO: Implement
-            "editor.location" to editor?.location?.let { "${it.x},${it.y}" },
-            //"awt.disable" to false,
-            //"window.color" to "0xFF000000", // TODO: Implement
-            //"stop.color" to "0xFF000000", // TODO: Implement
-            "stop.hide" to false, // TODO: Implement
-        )
-        val repository = getContentFile("repository").absolutePath.replace("""\""", """\\""")
-        // Create the init.gradle.kts file in the working directory
-        val initGradle = workingDir.resolve("init.gradle.kts").apply {
-            val content = """
-                beforeSettings{
-                    pluginManagement {
-                        repositories {
-                            maven { url = uri("$repository") }
-                            gradlePluginPortal()
-                        }
-                    }
-                }
-                allprojects{
-                    repositories {
-                        maven { url = uri("$repository") }
-                        mavenCentral()
-                    }
-                }
-            """.trimIndent()
-
-            writeText(content)
-        }
-        // Create the build.gradle.kts file in the sketch folder
-        val buildGradle = sketchFolder.resolve("build.gradle.kts")
-        val generate = buildGradle.let {
-            if(!it.exists()) return@let true
-
-            val contents = it.readText()
-            if(!contents.contains("@processing-auto-generated")) return@let false
-
-            val version = contents.substringAfter("version=").substringBefore("\n")
-            if(version != getVersionName()) return@let true
-
-            val modeTitle = contents.substringAfter("mode=").substringBefore(" ")
-            if(mode.title != modeTitle) return@let true
-
-            return@let DEBUG
-        }
-        if (generate) {
-            Messages.log("build.gradle.kts outdated or not found in ${sketch.folder}, creating one")
-            val header = """
-                // @processing-auto-generated mode=${mode.title} version=${getVersionName()}
-                //
-                """.trimIndent()
-
-            val instructions = text("gradle.instructions")
-                .split("\n")
-                .joinToString("\n") { "// $it" }
-
-            val configuration =  """
-                
-                plugins{
-                    id("org.processing.java") version "${getVersionName()}"
-                }
-            """.trimIndent()
-            val content = "${header}\n${instructions}\n${configuration}"
-            buildGradle.writeText(content)
-        }
-        // Create the settings.gradle.kts file in the sketch folder
-        val settingsGradle = sketchFolder.resolve("settings.gradle.kts")
-        if (!settingsGradle.exists()) {
-            settingsGradle.createNewFile()
-        }
-        // Collect the arguments to pass to gradle
-        val arguments = mutableListOf("--init-script", initGradle.toAbsolutePath().toString())
-        if (!DEBUG) arguments.add("--quiet")
-        if(copy){
-            arguments += listOf("--project-dir", sketchFolder.absolutePath)
-        }
-
-        arguments.addAll(variables.entries
-            .filter { it.value != null }
-            .map { "-Pprocessing.${it.key}=${it.value}" }
-        )
-        arguments.addAll(extraArguments)
-
-        withArguments(*arguments.toTypedArray())
-
-        // TODO: Instead of shipping Processing with a build-in JDK we should download the JDK through Gradle
-        setJavaHome(Platform.getJavaHome())
-    }
-
     // Hooks for java to check if the Gradle service is running since mutableStateOf is not accessible in java
     fun getEnabled(): Boolean {
         return active.value
diff --git a/app/src/processing/app/gradle/Log.kt b/app/src/processing/app/gradle/Log.kt
new file mode 100644
index 0000000000..30ca070cf6
--- /dev/null
+++ b/app/src/processing/app/gradle/Log.kt
@@ -0,0 +1,30 @@
+package processing.app.gradle
+
+import processing.app.Messages
+import java.io.PrintStream
+import java.net.ServerSocket
+
+class Log{
+    companion object{
+        fun startLogServer(port: Int, target: PrintStream){
+            val server = ServerSocket(port)
+            Messages.Companion.log("Log server started on port $port")
+            val client = server.accept()
+            Messages.Companion.log("Log server client connected")
+
+            val reader = client.getInputStream().bufferedReader()
+            try {
+                reader.forEachLine { line ->
+                    if (line.isNotBlank()) {
+                        target.println(line)
+                    }
+                }
+            } catch (e: Exception) {
+                Messages.Companion.log("Error while reading from log server: ${e.message}")
+            } finally {
+                client.close()
+                server.close()
+            }
+        }
+    }
+}

From 7379166bc482f3d17c59eeafbe272e9f6d647a32 Mon Sep 17 00:00:00 2001
From: Stef Tervelde <stef@steftervelde.nl>
Date: Tue, 8 Jul 2025 10:26:16 +0200
Subject: [PATCH 21/34] Processing Plugin tests & Refactor

---
 app/src/processing/app/gradle/GradleJob.kt    |  15 +-
 java/gradle/build.gradle.kts                  |   3 +
 java/gradle/src/main/kotlin/LibrariesTask.kt  |   4 +
 java/gradle/src/main/kotlin/PDETask.kt        |  29 +--
 .../src/main/kotlin/ProcessingPlugin.kt       |  34 ++-
 .../src/test/kotlin/ProcessingPluginTest.kt   | 198 +++++++++++++++++-
 6 files changed, 227 insertions(+), 56 deletions(-)

diff --git a/app/src/processing/app/gradle/GradleJob.kt b/app/src/processing/app/gradle/GradleJob.kt
index 2904d4164f..135f28de60 100644
--- a/app/src/processing/app/gradle/GradleJob.kt
+++ b/app/src/processing/app/gradle/GradleJob.kt
@@ -33,7 +33,9 @@ import java.nio.file.Path
 import kotlin.io.path.deleteIfExists
 import kotlin.io.path.writeText
 
-// Starts a gradle job to run the sketch
+/*
+* The gradle job runs the gradle tasks and manages the gradle connection
+ */
 class GradleJob(
     vararg val tasks: String,
     val workingDir: Path,
@@ -231,16 +233,18 @@ class GradleJob(
         }
     }
 
-    fun launchJob(block: suspend CoroutineScope.() -> Unit){
-        val job = scope.launch { block() }
-        jobs.add(job)
-    }
+
 
     fun cancel(){
         cancel.cancel()
         jobs.forEach(Job::cancel)
     }
 
+    private fun launchJob(block: suspend CoroutineScope.() -> Unit){
+        val job = scope.launch { block() }
+        jobs.add(job)
+    }
+
     // Handle exception thrown by Gradle
     private fun handleExceptions(action: () -> Unit){
         try{
@@ -278,6 +282,7 @@ class GradleJob(
         }
     }
 
+    // TODO: Move to separate file
     private fun BuildLauncher.addStateListener(){
         addProgressListener(ProgressListener { event ->
             if(event is TaskStartEvent) {
diff --git a/java/gradle/build.gradle.kts b/java/gradle/build.gradle.kts
index f48dea8ef1..6c446b13cf 100644
--- a/java/gradle/build.gradle.kts
+++ b/java/gradle/build.gradle.kts
@@ -7,6 +7,7 @@ plugins{
 
 repositories {
     mavenCentral()
+    maven("https://jogamp.org/deployment/maven")
 }
 
 dependencies{
@@ -16,9 +17,11 @@ dependencies{
     implementation(libs.kotlinGradlePlugin)
     implementation(libs.kotlinComposePlugin)
 
+    testImplementation(project(":core"))
     testImplementation(libs.junit)
 }
 
+// TODO: CI/CD for publishing the plugin to the Gradle Plugin Portal
 gradlePlugin{
     plugins{
         create("processing"){
diff --git a/java/gradle/src/main/kotlin/LibrariesTask.kt b/java/gradle/src/main/kotlin/LibrariesTask.kt
index 57f09bfdd4..472d9e3b77 100644
--- a/java/gradle/src/main/kotlin/LibrariesTask.kt
+++ b/java/gradle/src/main/kotlin/LibrariesTask.kt
@@ -17,6 +17,7 @@ This task stores the resulting information in a file that can be used later to r
  */
 abstract class LibrariesTask : DefaultTask() {
 
+    // TODO: Allow multiple directories
     @InputDirectory
     @Optional
     val librariesDirectory: DirectoryProperty = project.objects.directoryProperty()
@@ -41,6 +42,9 @@ abstract class LibrariesTask : DefaultTask() {
     fun execute() {
         if (!librariesDirectory.isPresent) {
             logger.error("Libraries directory is not set. Libraries will not be imported.")
+            val meta = ObjectOutputStream(librariesMetaData.get().asFile.outputStream())
+            meta.writeObject(arrayListOf<Library>())
+            meta.close()
             return
         }
         val libraries = librariesDirectory.get().asFile
diff --git a/java/gradle/src/main/kotlin/PDETask.kt b/java/gradle/src/main/kotlin/PDETask.kt
index 57fa31f3ec..ccde2bec80 100644
--- a/java/gradle/src/main/kotlin/PDETask.kt
+++ b/java/gradle/src/main/kotlin/PDETask.kt
@@ -7,6 +7,7 @@ import org.gradle.work.InputChanges
 import processing.mode.java.preproc.PdePreprocessor
 import java.io.File
 import java.io.ObjectOutputStream
+import java.io.Serializable
 import java.util.concurrent.Callable
 import java.util.jar.JarFile
 import javax.inject.Inject
@@ -14,7 +15,7 @@ import javax.inject.Inject
 
 // TODO: Generate sourcemaps
 /*
-* The PDETask is the main task that processes the .pde files and generates the Java source code
+* The PDETask is the main task that processes the .pde files and generates the Java source code through the PdePreprocessor.
  */
 abstract class PDETask : SourceTask() {
     @get:InputFiles
@@ -24,21 +25,13 @@ abstract class PDETask : SourceTask() {
     open val stableSources: FileCollection = project.files(Callable<Any> { this.source })
 
     @OutputDirectory
-    val outputDirectory = project.objects.directoryProperty()
-
-    @get:Input
-    @get:Optional
-    var workingDir: String? = null
+    val outputDirectory: DirectoryProperty = project.objects.directoryProperty()
 
     @get:Input
     var sketchName: String = "processing"
 
-    @get:Input
-    @get:Optional
-    var sketchBook: String? = null
-
     @OutputFile
-    val sketchMetaData = project.objects.fileProperty()
+    val sketchMetaData: RegularFileProperty = project.objects.fileProperty()
 
     init{
         outputDirectory.convention(project.layout.buildDirectory.dir("generated/pde"))
@@ -49,18 +42,16 @@ abstract class PDETask : SourceTask() {
         val sketchName: String,
         val sketchRenderer: String?,
         val importStatements: List<String>
-    ) : java.io.Serializable
+    ) : Serializable
 
     @TaskAction
     fun execute() {
-        // TODO: Allow pre-processor to run on individual files (future)
-        // TODO: Only compare file names from both defined roots (e.g. sketch.pde and folder/sketch.pde should both be included)
-
         // Using stableSources since we can only run the pre-processor on the full set of sources
         val combined = stableSources
             .files
             .groupBy { it.name }
             .map { entry ->
+                // TODO: Select by which one is in the unsaved folder
                 entry.value.maxByOrNull { it.lastModified() }!!
             }
             .joinToString("\n"){
@@ -74,6 +65,8 @@ abstract class PDETask : SourceTask() {
             .build()
             .write(javaFile, combined)
 
+        // TODO: Save the edits to meta files
+
         javaFile.flush()
         javaFile.close()
 
@@ -87,10 +80,4 @@ abstract class PDETask : SourceTask() {
         metaFile.writeObject(sketchMeta)
         metaFile.close()
     }
-
-    @get:Inject
-    open val deleter: Deleter
-        get() {
-            throw UnsupportedOperationException("Decorator takes care of injection")
-        }
 }
\ No newline at end of file
diff --git a/java/gradle/src/main/kotlin/ProcessingPlugin.kt b/java/gradle/src/main/kotlin/ProcessingPlugin.kt
index 2864a88e0e..0af297e95e 100644
--- a/java/gradle/src/main/kotlin/ProcessingPlugin.kt
+++ b/java/gradle/src/main/kotlin/ProcessingPlugin.kt
@@ -17,7 +17,6 @@ import java.net.Socket
 import java.util.*
 import javax.inject.Inject
 
-// TODO: CI/CD for publishing the plugin
 class ProcessingPlugin @Inject constructor(private val objectFactory: ObjectFactory) : Plugin<Project> {
     override fun apply(project: Project) {
         val sketchName = project.layout.projectDirectory.asFile.name.replace(Regex("[^a-zA-Z0-9_]"), "_")
@@ -32,6 +31,7 @@ class ProcessingPlugin @Inject constructor(private val objectFactory: ObjectFact
 
         // TODO: Setup sketchbook when using as a standalone plugin, use the Java Preferences
         val sketchbook = project.findProperty("processing.sketchbook") as String?
+        val settings = project.findProperty("processing.settings") as String?
 
         // Apply the Java plugin to the Project
         project.plugins.apply(JavaPlugin::class.java)
@@ -46,13 +46,12 @@ class ProcessingPlugin @Inject constructor(private val objectFactory: ObjectFact
             project.tasks.findByName("wrapper")?.enabled = false
         }
 
-        // Add the compose plugin to wrap the sketch in an executable
-        project.plugins.apply("org.jetbrains.compose")
-
         // Add kotlin support
         project.plugins.apply("org.jetbrains.kotlin.jvm")
         // Add jetpack compose support
         project.plugins.apply("org.jetbrains.kotlin.plugin.compose")
+        // Add the compose plugin to wrap the sketch in an executable
+        project.plugins.apply("org.jetbrains.compose")
 
         // Add the Processing core library (within Processing from the internal maven repo and outside from the internet)
         project.dependencies.add("implementation", "$processingGroup:core:${processingVersion}")
@@ -129,8 +128,7 @@ class ProcessingPlugin @Inject constructor(private val objectFactory: ObjectFact
 
         }
 
-        project.extensions.getByType(JavaPluginExtension::class.java).sourceSets.all { sourceSet ->
-            // For each java source set (mostly main) add a new source set for the PDE files
+        project.extensions.getByType(JavaPluginExtension::class.java).sourceSets.first().let{ sourceSet ->
             val pdeSourceSet = objectFactory.newInstance(
                 DefaultPDESourceDirectorySet::class.java,
                 objectFactory.sourceDirectorySet("${sourceSet.name}.pde", "${sourceSet.name} Processing Source")
@@ -142,11 +140,16 @@ class ProcessingPlugin @Inject constructor(private val objectFactory: ObjectFact
                 srcDir("$workingDir/unsaved")
             }
             sourceSet.allSource.source(pdeSourceSet)
+            sourceSet.java.srcDir(project.layout.projectDirectory).apply {
+                include("**/*.java")
+                exclude("${project.layout.buildDirectory.asFile.get()}/**/*")
+            }
 
             val librariesTaskName = sourceSet.getTaskName("scanLibraries", "PDE")
             val librariesScan = project.tasks.register(librariesTaskName, LibrariesTask::class.java) { task ->
                 task.description = "Scans the libraries in the sketchbook"
                 task.librariesDirectory.set(sketchbook?.let { File(it, "libraries") })
+                // TODO: Save the libraries metadata to settings folder to share between sketches
             }
 
             val pdeTaskName = sourceSet.getTaskName("preprocess", "PDE")
@@ -154,31 +157,20 @@ class ProcessingPlugin @Inject constructor(private val objectFactory: ObjectFact
                 task.description = "Processes the ${sourceSet.name} PDE"
                 task.source = pdeSourceSet
                 task.sketchName = sketchName
-                task.workingDir = workingDir
-                task.sketchBook = sketchbook
 
                 // Set the output of the pre-processor as the input for the java compiler
                 sourceSet.java.srcDir(task.outputDirectory)
-
-                task.doLast {
-                    // Copy java files from the root to the generated directory
-                    project.copy { copyTask ->
-                        copyTask.from(project.layout.projectDirectory){ from ->
-                            from.include("*.java")
-                        }
-                        copyTask.into(task.outputDirectory)
-                    }
-                }
             }
 
             val depsTaskName = sourceSet.getTaskName("addLegacyDependencies", "PDE")
             project.tasks.register(depsTaskName, DependenciesTask::class.java){ task ->
+                task.librariesMetaData
                 task.dependsOn(pdeTask, librariesScan)
+                // TODO: Save the libraries metadata to settings folder to share between sketches
             }
 
-            project.tasks.named(
-                sourceSet.compileJavaTaskName
-            ) { task ->
+            // Make sure that the PDE task runs before the java compilation task
+            project.tasks.named(sourceSet.compileJavaTaskName) { task ->
                 task.dependsOn(pdeTaskName, depsTaskName)
             }
         }
diff --git a/java/gradle/src/test/kotlin/ProcessingPluginTest.kt b/java/gradle/src/test/kotlin/ProcessingPluginTest.kt
index 7e43a2c39a..a58e16b606 100644
--- a/java/gradle/src/test/kotlin/ProcessingPluginTest.kt
+++ b/java/gradle/src/test/kotlin/ProcessingPluginTest.kt
@@ -1,18 +1,198 @@
-import org.gradle.api.Task
-import org.gradle.testfixtures.ProjectBuilder
+import org.gradle.testkit.runner.BuildResult
 import org.gradle.testkit.runner.GradleRunner
-import org.junit.Rule
 import org.junit.Test
 import org.junit.rules.TemporaryFolder
+import java.io.File
+import java.lang.management.ManagementFactory
+import java.net.URLClassLoader
 
 class ProcessingPluginTest{
-    // TODO: Write tests
-    // TODO: Test on multiple platforms since there is meaningful differences between the platforms
+    // TODO: Test on multiple platforms since there are meaningful differences between the platforms
+    data class TemporaryProcessingSketchResult(
+        val buildResult: BuildResult,
+        val sketchFolder: File,
+        val classLoader: ClassLoader
+    )
+
+    fun createTemporaryProcessingSketch(vararg arguments: String, configure: (sketchFolder: File) -> Unit): TemporaryProcessingSketchResult{
+        val directory = TemporaryFolder()
+        directory.create()
+        val sketchFolder = directory.newFolder("sketch")
+        directory.newFile("sketch/build.gradle.kts").writeText("""
+            plugins {
+                id("org.processing.java")
+            }
+        """.trimIndent())
+        directory.newFile("sketch/settings.gradle.kts")
+        configure(sketchFolder)
+
+        val buildResult = GradleRunner.create()
+            .withProjectDir(sketchFolder)
+            .withArguments(*arguments)
+            .withPluginClasspath()
+            .withDebug(true)
+            .build()
+
+        val classDir = sketchFolder.resolve("build/classes/java/main")
+        val classLoader = URLClassLoader(arrayOf(classDir.toURI().toURL()), this::class.java.classLoader)
+
+        return TemporaryProcessingSketchResult(
+            buildResult,
+            sketchFolder,
+            classLoader
+        )
+    }
+
     @Test
-    fun testPluginAddsSketchTask(){
-        val project = ProjectBuilder.builder().build()
-        project.pluginManager.apply("org.processing.java")
+    fun testSinglePDE(){
+        val (buildResult, sketchFolder, classLoader) = createTemporaryProcessingSketch("build"){ sketchFolder ->
+            sketchFolder.resolve("sketch.pde").writeText("""
+                void setup(){
+                    size(100, 100);
+                }
+                
+                void draw(){
+                    println("Hello World");
+                }
+            """.trimIndent())
+        }
+
+        val sketchClass = classLoader.loadClass("sketch")
+
+        assert(sketchClass != null) {
+            "Class sketch not found"
+        }
+
+        assert(sketchClass?.methods?.find { method -> method.name == "setup" } != null) {
+            "Method setup not found in class sketch"
+        }
 
-        assert(project.tasks.getByName("sketch") is Task)
+        assert(sketchClass?.methods?.find { method -> method.name == "draw" } != null) {
+            "Method draw not found in class sketch"
+        }
+    }
+
+    @Test
+    fun testMultiplePDE(){
+        val (buildResult, sketchFolder, classLoader) = createTemporaryProcessingSketch("build"){ sketchFolder ->
+            sketchFolder.resolve("sketch.pde").writeText(""")
+                void setup(){
+                    size(100, 100);
+                }
+                
+                void draw(){
+                    otherFunction();
+                }
+            """.trimIndent())
+            sketchFolder.resolve("sketch2.pde").writeText("""
+                void otherFunction(){
+                    println("Hi");
+                }
+            """.trimIndent())
+        }
+
+        val sketchClass = classLoader.loadClass("sketch")
+
+        assert(sketchClass != null) {
+            "Class sketch not found"
+        }
+
+        assert(sketchClass?.methods?.find { method -> method.name == "otherFunction" } != null) {
+            "Method otherFunction not found in class sketch"
+        }
+
+    }
+
+    @Test
+    fun testJavaSourceFile(){
+        val (buildResult, sketchFolder, classLoader) = createTemporaryProcessingSketch("build"){ sketchFolder ->
+            sketchFolder.resolve("sketch.pde").writeText("""
+                void setup(){
+                    size(100, 100);
+                }
+                
+                void draw(){
+                    println("Hello World");
+                }
+            """.trimIndent())
+            sketchFolder.resolve("extra.java").writeText("""
+                class SketchJava {
+                    public void javaMethod() {
+                        System.out.println("Hello from Java");
+                    }
+                }
+            """.trimIndent())
+        }
+        val sketchJavaClass = classLoader.loadClass("SketchJava")
+
+        assert(sketchJavaClass != null) {
+            "Class SketchJava not found"
+        }
+
+        assert(sketchJavaClass?.methods?.find { method -> method.name == "javaMethod" } != null) {
+            "Method javaMethod not found in class SketchJava"
+        }
+    }
+
+    @Test
+    fun testWithUnsavedSource(){
+        val (buildResult, sketchFolder, classLoader) = createTemporaryProcessingSketch("build"){ sketchFolder ->
+            sketchFolder.resolve("sketch.pde").writeText("""
+                void setup(){
+                    size(100, 100);
+                }
+                
+                void draw(){
+                    println("Hello World");
+                }
+            """.trimIndent())
+            sketchFolder.resolve("../unsaved").mkdirs()
+            sketchFolder.resolve("../unsaved/sketch.pde").writeText("""
+                void setup(){
+                    size(100, 100);
+                }
+                
+                void draw(){
+                    println("Hello World");
+                }
+                
+                void newMethod(){
+                    println("This is an unsaved method");
+                }
+            """.trimIndent())
+            sketchFolder.resolve("gradle.properties").writeText(""")
+                processing.workingDir = ${sketchFolder.parentFile.absolutePath}
+            """.trimIndent())
+        }
+        val sketchClass = classLoader.loadClass("sketch")
+
+        assert(sketchClass != null) {
+            "Class sketch not found"
+        }
+
+        assert(sketchClass?.methods?.find { method -> method.name == "newMethod" } != null) {
+            "Method otherFunction not found in class sketch"
+        }
+    }
+
+}
+
+
+fun isDebuggerAttached(): Boolean {
+    val runtimeMxBean = ManagementFactory.getRuntimeMXBean()
+    val inputArguments = runtimeMxBean.inputArguments
+    return inputArguments.any {
+        it.contains("-agentlib:jdwp")
     }
 }
+fun openFolderInFinder(folder: File) {
+    if (!folder.exists() || !folder.isDirectory) {
+        println("Invalid directory: ${folder.absolutePath}")
+        return
+    }
+
+    val process = ProcessBuilder("open", folder.absolutePath)
+        .inheritIO()
+        .start()
+    process.waitFor()
+}
\ No newline at end of file

From a36c8a353b4bdfef31a3089a8a1d9115e228be6a Mon Sep 17 00:00:00 2001
From: Stef Tervelde <stef@steftervelde.nl>
Date: Tue, 8 Jul 2025 10:31:12 +0200
Subject: [PATCH 22/34] Plugin tests bugfixes

---
 java/gradle/src/main/kotlin/PDETask.kt        |  4 +-
 .../src/test/kotlin/ProcessingPluginTest.kt   | 39 +++++++++++--------
 2 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/java/gradle/src/main/kotlin/PDETask.kt b/java/gradle/src/main/kotlin/PDETask.kt
index ccde2bec80..76ac195e53 100644
--- a/java/gradle/src/main/kotlin/PDETask.kt
+++ b/java/gradle/src/main/kotlin/PDETask.kt
@@ -51,8 +51,8 @@ abstract class PDETask : SourceTask() {
             .files
             .groupBy { it.name }
             .map { entry ->
-                // TODO: Select by which one is in the unsaved folder
-                entry.value.maxByOrNull { it.lastModified() }!!
+                entry.value.firstOrNull { it.parentFile?.name == "unsaved" }
+                    ?: entry.value.first()
             }
             .joinToString("\n"){
                  it.readText()
diff --git a/java/gradle/src/test/kotlin/ProcessingPluginTest.kt b/java/gradle/src/test/kotlin/ProcessingPluginTest.kt
index a58e16b606..91f50a29c2 100644
--- a/java/gradle/src/test/kotlin/ProcessingPluginTest.kt
+++ b/java/gradle/src/test/kotlin/ProcessingPluginTest.kt
@@ -75,7 +75,7 @@ class ProcessingPluginTest{
     @Test
     fun testMultiplePDE(){
         val (buildResult, sketchFolder, classLoader) = createTemporaryProcessingSketch("build"){ sketchFolder ->
-            sketchFolder.resolve("sketch.pde").writeText(""")
+            sketchFolder.resolve("sketch.pde").writeText("""
                 void setup(){
                     size(100, 100);
                 }
@@ -175,24 +175,29 @@ class ProcessingPluginTest{
         }
     }
 
-}
+    @Test
+    fun testImportingLibrary(){
+
+    }
 
+    fun isDebuggerAttached(): Boolean {
+        val runtimeMxBean = ManagementFactory.getRuntimeMXBean()
+        val inputArguments = runtimeMxBean.inputArguments
+        return inputArguments.any {
+            it.contains("-agentlib:jdwp")
+        }
+    }
+    fun openFolderInFinder(folder: File) {
+        if (!folder.exists() || !folder.isDirectory) {
+            println("Invalid directory: ${folder.absolutePath}")
+            return
+        }
 
-fun isDebuggerAttached(): Boolean {
-    val runtimeMxBean = ManagementFactory.getRuntimeMXBean()
-    val inputArguments = runtimeMxBean.inputArguments
-    return inputArguments.any {
-        it.contains("-agentlib:jdwp")
+        val process = ProcessBuilder("open", folder.absolutePath)
+            .inheritIO()
+            .start()
+        process.waitFor()
     }
 }
-fun openFolderInFinder(folder: File) {
-    if (!folder.exists() || !folder.isDirectory) {
-        println("Invalid directory: ${folder.absolutePath}")
-        return
-    }
 
-    val process = ProcessBuilder("open", folder.absolutePath)
-        .inheritIO()
-        .start()
-    process.waitFor()
-}
\ No newline at end of file
+

From b7123906b4b1e698a4532da560911b7e3d6e9801 Mon Sep 17 00:00:00 2001
From: Stef Tervelde <stef@steftervelde.nl>
Date: Tue, 8 Jul 2025 11:59:28 +0200
Subject: [PATCH 23/34] Fixed rename Windres task

---
 java/build.gradle.kts                         | 42 ++++++++-----------
 .../src/test/kotlin/ProcessingPluginTest.kt   |  2 +-
 2 files changed, 19 insertions(+), 25 deletions(-)

diff --git a/java/build.gradle.kts b/java/build.gradle.kts
index 74052f2085..c8712a5c2e 100644
--- a/java/build.gradle.kts
+++ b/java/build.gradle.kts
@@ -50,39 +50,33 @@ tasks.compileJava{
 // Most of these are shims to be compatible with the old build system
 // They should be removed in the future, as we work towards making things more Gradle-native
 tasks.register<Copy>("extraResources"){
-    dependsOn(":java:copyCore")
-    from(".")
-    include("keywords.txt")
-    include("theme/**/*")
-    include("application/**/*")
-    into(layout.buildDirectory.dir("resources-bundled/common/modes/java"))
-}
-tasks.register<Copy>("copyCore"){
-    val coreProject = project(":core")
-    dependsOn(coreProject.tasks.jar)
-    from(coreProject.tasks.jar) {
-        include("core*.jar")
-    }
-    rename("core.+\\.jar", "core.jar")
-    into(coreProject.layout.projectDirectory.dir("library"))
-}
-tasks.register<Copy>("renameWindres") {
-    val dir = layout.buildDirectory.dir("resources-bundled/common/modes/java")
+    dependsOn("copyCore")
     val os = DefaultNativePlatform.getCurrentOperatingSystem()
     val platform = when {
         os.isWindows -> "windows"
         os.isMacOsX -> "macos"
         else -> "linux"
     }
-    from(dir) {
-        include("*-$platform*")
+    from(layout.projectDirectory){
+        include("keywords.txt")
+        include("theme/**/*")
+        include("application/**/*")
+        exclude("application/launch4j/bin/*")
+    }
+    from(layout.projectDirectory){
+        include ("application/launch4j/bin/*$platform")
         rename("(.*)-$platform(.*)", "$1$2")
     }
-    duplicatesStrategy = DuplicatesStrategy.INCLUDE
-    into(dir)
-    tasks.named("extraResources"){ dependsOn(this) }
+    into(layout.buildDirectory.dir("resources-bundled/common/modes/java"))
+}
+tasks.register<Copy>("copyCore"){
+    val coreProject = project(":core")
+    dependsOn(coreProject.tasks.jar)
+    from(coreProject.tasks.jar)
+    include("core*.jar")
+    rename("core.+\\.jar", "core.jar")
+    into(coreProject.layout.projectDirectory.dir("library"))
 }
-
 val libraries = arrayOf("dxf","io","net","pdf","serial","svg")
 libraries.forEach { library ->
     tasks.register<Copy>("library-$library-extraResources"){
diff --git a/java/gradle/src/test/kotlin/ProcessingPluginTest.kt b/java/gradle/src/test/kotlin/ProcessingPluginTest.kt
index 91f50a29c2..190e0e7362 100644
--- a/java/gradle/src/test/kotlin/ProcessingPluginTest.kt
+++ b/java/gradle/src/test/kotlin/ProcessingPluginTest.kt
@@ -177,7 +177,7 @@ class ProcessingPluginTest{
 
     @Test
     fun testImportingLibrary(){
-
+        // TODO: Implement a test that imports a Processing library and uses it in the sketch
     }
 
     fun isDebuggerAttached(): Boolean {

From c55e2864280013045ed0a8dbe784d022f07617d6 Mon Sep 17 00:00:00 2001
From: Stef Tervelde <stef@steftervelde.nl>
Date: Tue, 8 Jul 2025 12:23:05 +0200
Subject: [PATCH 24/34] Speed up gradle compilations

---
 app/src/processing/app/gradle/GradleService.kt | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/app/src/processing/app/gradle/GradleService.kt b/app/src/processing/app/gradle/GradleService.kt
index 908518f0ee..a921f166e3 100644
--- a/app/src/processing/app/gradle/GradleService.kt
+++ b/app/src/processing/app/gradle/GradleService.kt
@@ -34,6 +34,12 @@ class GradleService(
     val active = mutableStateOf(Preferences.getBoolean("run.use_gradle"))
 
     var sketch: Sketch? = null
+        set (value) {
+            field = value
+            if(value == null) return
+            // If the sketch is set, we start the build process to speed up the first run
+            startJob("build")
+        }
 
     val jobs = mutableStateListOf<GradleJob>()
     val workingDir = createTempDirectory()

From 550200cc7437e5e3538878440b929b83de02fb50 Mon Sep 17 00:00:00 2001
From: Stef Tervelde <stef@steftervelde.nl>
Date: Wed, 9 Jul 2025 09:41:40 +0200
Subject: [PATCH 25/34] Comments and planning

---
 app/src/processing/app/gradle/Debugger.kt     |  1 +
 app/src/processing/app/gradle/Exceptions.kt   |  3 +-
 app/src/processing/app/gradle/GradleJob.kt    | 38 +++++++++++++++++--
 .../processing/app/gradle/GradleService.kt    |  8 +---
 app/src/processing/app/gradle/api/Sketch.kt   |  3 ++
 5 files changed, 42 insertions(+), 11 deletions(-)

diff --git a/app/src/processing/app/gradle/Debugger.kt b/app/src/processing/app/gradle/Debugger.kt
index aea18ec133..9c93bd824a 100644
--- a/app/src/processing/app/gradle/Debugger.kt
+++ b/app/src/processing/app/gradle/Debugger.kt
@@ -21,6 +21,7 @@ class Debugger {
                 args["port"]?.setValue(port?.toString() ?: "5005")
 
                 // Try to attach the debugger, retrying if it fails
+                // TODO: Stop retrying after the job has been cancelled / failed
                 val start = TimeSource.Monotonic.markNow()
                 while (start.elapsedNow() < 10.seconds) {
                     try {
diff --git a/app/src/processing/app/gradle/Exceptions.kt b/app/src/processing/app/gradle/Exceptions.kt
index c24a6f4dd0..c913ef4f8b 100644
--- a/app/src/processing/app/gradle/Exceptions.kt
+++ b/app/src/processing/app/gradle/Exceptions.kt
@@ -56,6 +56,7 @@ class Exceptions (val vm: VirtualMachine, val editor: Editor?) {
         /*
         We have 6 lines by default within the editor to display more information about the exception.
          */
+        // TODO: Improve the display and clarity of the exception details
 
         val message = """
             In Processing code:
@@ -91,7 +92,7 @@ class Exceptions (val vm: VirtualMachine, val editor: Editor?) {
         }
 
         // TODO: Map to .pde file again, @see JavaBuild.placeException
-        // BLOCKED: Because we don't run the JavaBuild code.prepocOffset is empty
+        // TODO: This functionality should be provided by the mode
 
         return this
     }
diff --git a/app/src/processing/app/gradle/GradleJob.kt b/app/src/processing/app/gradle/GradleJob.kt
index 135f28de60..006b138f61 100644
--- a/app/src/processing/app/gradle/GradleJob.kt
+++ b/app/src/processing/app/gradle/GradleJob.kt
@@ -63,7 +63,12 @@ class GradleJob(
     private val cancel = GradleConnector.newCancellationTokenSource()
 
 
-    // All the configuration for the gradle build
+    /*
+    Set up the gradle build launcher with the necessary configuration
+    This includes setting the working directory, the tasks to run,
+    and the arguments to pass to gradle.
+    Create the necessary build files if they do not exist.
+     */
     private fun BuildLauncher.setupGradle(extraArguments: List<String> = listOf()) {
         val copy = sketch.isReadOnly || sketch.isUntitled
 
@@ -195,6 +200,9 @@ class GradleJob(
         withCancellationToken(cancel.token())
     }
 
+    /*
+    Start the gradle job and run the tasks
+     */
     fun start() {
         launchJob {
             handleExceptions {
@@ -234,18 +242,26 @@ class GradleJob(
     }
 
 
-
+    /*
+    Cancel the gradle job and all the jobs that were launched in this scope
+     */
     fun cancel(){
         cancel.cancel()
         jobs.forEach(Job::cancel)
     }
 
+    /*
+    Add a job to the scope and add it to the list of jobs so we can cancel it later
+     */
     private fun launchJob(block: suspend CoroutineScope.() -> Unit){
         val job = scope.launch { block() }
         jobs.add(job)
     }
 
-    // Handle exception thrown by Gradle
+
+    /*
+    Handle exceptions that occur during the build process and inform the user about them
+     */
     private fun handleExceptions(action: () -> Unit){
         try{
             action()
@@ -282,7 +298,11 @@ class GradleJob(
         }
     }
 
-    // TODO: Move to separate file
+    // TODO: Move to separate file?
+    /*
+    Add a progress listener to the build launcher
+    to track the progress of the build and update the editor status accordingly
+     */
     private fun BuildLauncher.addStateListener(){
         addProgressListener(ProgressListener { event ->
             if(event is TaskStartEvent) {
@@ -328,6 +348,7 @@ class GradleJob(
                     return@ProgressListener
                 }
                 // TODO: Show the error on the location if it is available
+                // TODO: This functionality should be provided by the mode
                 /*
                 We have 6 lines to display the error in the editor.
                  */
@@ -348,6 +369,11 @@ class GradleJob(
         })
     }
 
+    /*
+    Start log servers for the standard output and error streams
+    This allows us to capture the output of Processing and display it in the editor
+    Whilst keeping the gradle output separate
+     */
     fun BuildLauncher.addLogserver(){
         launchJob {
             startLogServer(logPort, System.out)
@@ -357,6 +383,10 @@ class GradleJob(
         }
     }
 
+    /*
+    Connected a debugger to the gradle run task
+    This allows us to debug the sketch while it is running
+     */
     fun BuildLauncher.addDebugging() {
         addProgressListener(ProgressListener { event ->
             if (event !is TaskStartEvent) return@ProgressListener
diff --git a/app/src/processing/app/gradle/GradleService.kt b/app/src/processing/app/gradle/GradleService.kt
index a921f166e3..2739a75191 100644
--- a/app/src/processing/app/gradle/GradleService.kt
+++ b/app/src/processing/app/gradle/GradleService.kt
@@ -9,17 +9,13 @@ import processing.app.Sketch
 import processing.app.ui.Editor
 import kotlin.io.path.createTempDirectory
 
-// TODO: Test offline mode, gradle seems to be included as not needed to be downloaded.
-// TODO: Test running examples
-// TODO: Report failures to the console
-// TODO: Highlight errors in the editor
+// TODO: Highlight errors in the editor in the right place
 
 // TODO: ---- FUTURE ----
 // TODO: Improve progress tracking and show it in the UI
 // TODO: PoC new debugger/tweak mode
-// TODO: Allow for plugins to skip gradle entirely / new modes
-// TODO: Add background building
 // TODO: Track build speed (for analytics?)
+// TODO: Bundle Gradle with the app
 
 /*
 * The gradle service runs the gradle tasks and manages the gradle connection
diff --git a/app/src/processing/app/gradle/api/Sketch.kt b/app/src/processing/app/gradle/api/Sketch.kt
index 04cccbb27d..30e6245d18 100644
--- a/app/src/processing/app/gradle/api/Sketch.kt
+++ b/app/src/processing/app/gradle/api/Sketch.kt
@@ -3,6 +3,7 @@ package processing.app.gradle.api
 import com.github.ajalt.clikt.command.SuspendingCliktCommand
 import com.github.ajalt.clikt.core.Context
 import com.github.ajalt.clikt.core.subcommands
+import com.github.ajalt.clikt.parameters.options.default
 import com.github.ajalt.clikt.parameters.options.option
 import com.github.ajalt.clikt.parameters.options.required
 import processing.app.Base
@@ -31,6 +32,8 @@ class Sketch : SuspendingCliktCommand("sketch") {
         val sketch by option("--sketch", help = "The sketch to run")
                         .required()
 
+        val mode by option("--mode", help = "The mode to use for running the sketch (only java is supported for now)")
+
         override fun help(context: Context): String {
             return "Run the Processing sketch."
         }

From f916d272acbd5297cf4865948a0500eefae99bd4 Mon Sep 17 00:00:00 2001
From: Stef Tervelde <stef@steftervelde.nl>
Date: Wed, 16 Jul 2025 11:26:37 +0200
Subject: [PATCH 26/34] Adding a settings panel to the editor

For upcoming plugin support we need a way to enable plugins based on each sketch
---
 .../processing/app/gradle/GradleService.kt    |  8 +++++++
 .../processing/app/gradle/GradleSettings.kt   | 23 +++++++++++++++++++
 app/src/processing/app/ui/EditorFooter.java   | 15 ++++++++----
 build/shared/lib/footer/settings.svg          |  1 +
 build/shared/lib/languages/PDE.properties     |  1 +
 .../src/main/kotlin/ProcessingPlugin.kt       |  2 +-
 6 files changed, 44 insertions(+), 6 deletions(-)
 create mode 100644 app/src/processing/app/gradle/GradleSettings.kt
 create mode 100644 build/shared/lib/footer/settings.svg

diff --git a/app/src/processing/app/gradle/GradleService.kt b/app/src/processing/app/gradle/GradleService.kt
index 2739a75191..23d25fba86 100644
--- a/app/src/processing/app/gradle/GradleService.kt
+++ b/app/src/processing/app/gradle/GradleService.kt
@@ -29,6 +29,8 @@ class GradleService(
 ) {
     val active = mutableStateOf(Preferences.getBoolean("run.use_gradle"))
 
+    val settings = GradleSettings()
+
     var sketch: Sketch? = null
         set (value) {
             field = value
@@ -77,5 +79,11 @@ class GradleService(
     fun setEnabled(active: Boolean) {
         if(!active) stopJobs()
         this.active.value = active
+        val editor = editor ?: return
+        if(active){
+            editor.footer?.addPanel(settings, text("gradle.settings"), "/lib/footer/settings")
+        }else{
+            editor.footer?.removePanel(settings)
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/processing/app/gradle/GradleSettings.kt b/app/src/processing/app/gradle/GradleSettings.kt
new file mode 100644
index 0000000000..9c05658ed4
--- /dev/null
+++ b/app/src/processing/app/gradle/GradleSettings.kt
@@ -0,0 +1,23 @@
+package processing.app.gradle
+
+import androidx.compose.material.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.awt.ComposePanel
+import javax.swing.JPanel
+
+class GradleSettings : JPanel() {
+    init{
+        val compose = ComposePanel()
+        compose.setContent {
+            Panel()
+        }
+        this.add(compose)
+    }
+    companion object{
+        @Composable
+        fun Panel(){
+            Text("Gradle settings will be here soon")
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/processing/app/ui/EditorFooter.java b/app/src/processing/app/ui/EditorFooter.java
index 276b78364c..827fd90a88 100644
--- a/app/src/processing/app/ui/EditorFooter.java
+++ b/app/src/processing/app/ui/EditorFooter.java
@@ -154,11 +154,16 @@ public void addPanel(Component comp, String name, String icon) {
     cardPanel.add(name, comp);
   }
 
-
-//  public void setPanel(int index) {
-//    cardLayout.show(cardPanel, tabs.get(index).name);
-//  }
-
+  /**
+   * Remove a panel from the footer.
+   * @param comp Component that links to this tab.
+   * */
+  public void removePanel(Component comp){
+    cardLayout.show(cardPanel, tabs.get(0).title);
+    tabs.removeIf(tab -> tab.comp == comp);
+    cardPanel.remove(comp);
+    repaint();
+  }
 
   public void setPanel(Component comp) {
     for (Tab tab : tabs) {
diff --git a/build/shared/lib/footer/settings.svg b/build/shared/lib/footer/settings.svg
new file mode 100644
index 0000000000..e2d89118a2
--- /dev/null
+++ b/build/shared/lib/footer/settings.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M12,15.5A3.5,3.5 0 0,1 8.5,12A3.5,3.5 0 0,1 12,8.5A3.5,3.5 0 0,1 15.5,12A3.5,3.5 0 0,1 12,15.5M19.43,12.97C19.47,12.65 19.5,12.33 19.5,12C19.5,11.67 19.47,11.34 19.43,11L21.54,9.37C21.73,9.22 21.78,8.95 21.66,8.73L19.66,5.27C19.54,5.05 19.27,4.96 19.05,5.05L16.56,6.05C16.04,5.66 15.5,5.32 14.87,5.07L14.5,2.42C14.46,2.18 14.25,2 14,2H10C9.75,2 9.54,2.18 9.5,2.42L9.13,5.07C8.5,5.32 7.96,5.66 7.44,6.05L4.95,5.05C4.73,4.96 4.46,5.05 4.34,5.27L2.34,8.73C2.21,8.95 2.27,9.22 2.46,9.37L4.57,11C4.53,11.34 4.5,11.67 4.5,12C4.5,12.33 4.53,12.65 4.57,12.97L2.46,14.63C2.27,14.78 2.21,15.05 2.34,15.27L4.34,18.73C4.46,18.95 4.73,19.03 4.95,18.95L7.44,17.94C7.96,18.34 8.5,18.68 9.13,18.93L9.5,21.58C9.54,21.82 9.75,22 10,22H14C14.25,22 14.46,21.82 14.5,21.58L14.87,18.93C15.5,18.67 16.04,18.34 16.56,17.94L19.05,18.95C19.27,19.03 19.54,18.95 19.66,18.73L21.66,15.27C21.78,15.05 21.73,14.78 21.54,14.63L19.43,12.97Z" fill="silver" /></svg>
\ No newline at end of file
diff --git a/build/shared/lib/languages/PDE.properties b/build/shared/lib/languages/PDE.properties
index 8dcc6bae7c..a4b6fedf60 100644
--- a/build/shared/lib/languages/PDE.properties
+++ b/build/shared/lib/languages/PDE.properties
@@ -324,6 +324,7 @@ debugger.type = Type
 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
 
 # ---------------------------------------
 # Toolbars
diff --git a/java/gradle/src/main/kotlin/ProcessingPlugin.kt b/java/gradle/src/main/kotlin/ProcessingPlugin.kt
index 0af297e95e..f84662820a 100644
--- a/java/gradle/src/main/kotlin/ProcessingPlugin.kt
+++ b/java/gradle/src/main/kotlin/ProcessingPlugin.kt
@@ -69,7 +69,7 @@ class ProcessingPlugin @Inject constructor(private val objectFactory: ObjectFact
             extension.extensions.getByType(DesktopExtension::class.java).application { application ->
                 // Set the class to be executed initially
                 application.mainClass = sketchName
-                application.nativeDistributions.modules("java.management","jdk.jdwp.agent")
+                application.nativeDistributions.includeAllModules = true
                 if(debugPort != null) {
                     application.jvmArgs("-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=$debugPort")
                 }

From 0c674adc54adbe1b420c844989d198764086a351 Mon Sep 17 00:00:00 2001
From: Stef Tervelde <stef@steftervelde.nl>
Date: Thu, 17 Jul 2025 12:13:56 +0200
Subject: [PATCH 27/34] Initial Gradle Plugin configuration

---
 app/src/processing/app/Preferences.kt         |   1 +
 app/src/processing/app/Sketch.java            |   4 +-
 app/src/processing/app/gradle/GradleJob.kt    |   1 +
 app/src/processing/app/gradle/GradlePlugin.kt |  20 ++
 .../processing/app/gradle/GradleService.kt    |  28 +--
 .../processing/app/gradle/GradleSettings.kt   | 192 +++++++++++++++++-
 app/src/processing/app/gradle/api/Sketch.kt   |   2 +-
 app/src/processing/app/ui/EditorFooter.java   |   1 +
 build/shared/lib/footer/settings.svg          |   9 +-
 build/shared/lib/languages/PDE.properties     |   1 +
 .../src/main/kotlin/ProcessingPlugin.kt       |  67 ++++--
 java/src/processing/mode/java/JavaEditor.java |   3 +
 12 files changed, 285 insertions(+), 44 deletions(-)
 create mode 100644 app/src/processing/app/gradle/GradlePlugin.kt

diff --git a/app/src/processing/app/Preferences.kt b/app/src/processing/app/Preferences.kt
index c5645c9bbc..87f36fe358 100644
--- a/app/src/processing/app/Preferences.kt
+++ b/app/src/processing/app/Preferences.kt
@@ -34,6 +34,7 @@ fun loadPreferences(): Properties{
     }
 }
 
+// TODO: Move this to a more appropriate place
 @Composable
 fun watchFile(file: File): Any? {
     val scope = rememberCoroutineScope()
diff --git a/app/src/processing/app/Sketch.java b/app/src/processing/app/Sketch.java
index 8bb50352b0..52c0de5b20 100644
--- a/app/src/processing/app/Sketch.java
+++ b/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));
   }
 
 
diff --git a/app/src/processing/app/gradle/GradleJob.kt b/app/src/processing/app/gradle/GradleJob.kt
index 006b138f61..28b6b64338 100644
--- a/app/src/processing/app/gradle/GradleJob.kt
+++ b/app/src/processing/app/gradle/GradleJob.kt
@@ -118,6 +118,7 @@ class GradleJob(
         val repository = getContentFile("repository").absolutePath.replace("""\""", """\\""")
         // Create the init.gradle.kts file in the working directory
         // This allows us to run the gradle plugin that has been bundled with the editor
+        // TODO: Add the plugin repositories if they are defined
         val initGradle = workingDir.resolve("init.gradle.kts").apply {
             val content = """
                 beforeSettings{
diff --git a/app/src/processing/app/gradle/GradlePlugin.kt b/app/src/processing/app/gradle/GradlePlugin.kt
new file mode 100644
index 0000000000..0ebbdc36cf
--- /dev/null
+++ b/app/src/processing/app/gradle/GradlePlugin.kt
@@ -0,0 +1,20 @@
+package processing.app.gradle
+
+import androidx.compose.runtime.mutableStateListOf
+import processing.app.Base
+import java.nio.file.Path
+
+data class GradlePlugin(
+    val name: String,
+    val description: String,
+    val repository: Path?,
+    val id: String,
+    val version: String){
+    companion object{
+        const val PROPERTIES_KEY = "sketch.plugins"
+        val plugins = mutableStateListOf<GradlePlugin>(
+            GradlePlugin("Hot Reload (experimental)", "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()),
+        )
+    }
+}
\ No newline at end of file
diff --git a/app/src/processing/app/gradle/GradleService.kt b/app/src/processing/app/gradle/GradleService.kt
index 23d25fba86..b6a4769c3a 100644
--- a/app/src/processing/app/gradle/GradleService.kt
+++ b/app/src/processing/app/gradle/GradleService.kt
@@ -2,11 +2,13 @@ package processing.app.gradle
 
 import androidx.compose.runtime.mutableStateListOf
 import androidx.compose.runtime.mutableStateOf
+import androidx.compose.ui.awt.ComposePanel
 import processing.app.Language.text
 import processing.app.Mode
 import processing.app.Preferences
 import processing.app.Sketch
 import processing.app.ui.Editor
+import processing.app.ui.Theme
 import kotlin.io.path.createTempDirectory
 
 // TODO: Highlight errors in the editor in the right place
@@ -28,17 +30,7 @@ class GradleService(
     val editor: Editor?,
 ) {
     val active = mutableStateOf(Preferences.getBoolean("run.use_gradle"))
-
-    val settings = GradleSettings()
-
-    var sketch: Sketch? = null
-        set (value) {
-            field = value
-            if(value == null) return
-            // If the sketch is set, we start the build process to speed up the first run
-            startJob("build")
-        }
-
+    var sketch = mutableStateOf<Sketch?>(null)
     val jobs = mutableStateListOf<GradleJob>()
     val workingDir = createTempDirectory()
 
@@ -61,7 +53,7 @@ class GradleService(
         val job = GradleJob(
             tasks = tasks,
             workingDir  = workingDir,
-            sketch = sketch ?: throw IllegalStateException("Sketch is not set"),
+            sketch = sketch.value ?: throw IllegalStateException("Sketch is not set"),
             editor = editor
         )
         jobs.add(job)
@@ -72,18 +64,16 @@ class GradleService(
         jobs.forEach(GradleJob::cancel)
     }
 
-    // Hooks for java to check if the Gradle service is running since mutableStateOf is not accessible in java
+    // Hooks for java to interact with the Gradle service since mutableStateOf is not accessible in java
+    fun setSketch(sketch: Sketch){
+        this.sketch.value = sketch
+        startJob("build")
+    }
     fun getEnabled(): Boolean {
         return active.value
     }
     fun setEnabled(active: Boolean) {
         if(!active) stopJobs()
         this.active.value = active
-        val editor = editor ?: return
-        if(active){
-            editor.footer?.addPanel(settings, text("gradle.settings"), "/lib/footer/settings")
-        }else{
-            editor.footer?.removePanel(settings)
-        }
     }
 }
\ No newline at end of file
diff --git a/app/src/processing/app/gradle/GradleSettings.kt b/app/src/processing/app/gradle/GradleSettings.kt
index 9c05658ed4..8eebd7699d 100644
--- a/app/src/processing/app/gradle/GradleSettings.kt
+++ b/app/src/processing/app/gradle/GradleSettings.kt
@@ -1,23 +1,195 @@
 package processing.app.gradle
 
+import androidx.compose.foundation.VerticalScrollbar
+import androidx.compose.foundation.background
+import androidx.compose.foundation.gestures.scrollable
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxHeight
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.rememberScrollbarAdapter
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.material.Checkbox
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.Surface
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.runtime.snapshotFlow
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
 import androidx.compose.ui.awt.ComposePanel
+import androidx.compose.ui.awt.SwingPanel
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.text.style.TextDecoration
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.em
+import androidx.compose.ui.unit.sp
+import com.formdev.flatlaf.util.SwingUtils
+import com.github.ajalt.mordant.rendering.TextStyle
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import processing.app.Language.text
+import processing.app.Settings
+import processing.app.Sketch
+import processing.app.ui.Editor
+import processing.app.ui.EditorFooter
+import processing.app.ui.Theme
+import processing.app.ui.theme.ProcessingTheme
+import processing.app.watchFile
+import java.awt.Dimension
+import java.util.UUID
+import javax.swing.JCheckBox
 import javax.swing.JPanel
+import javax.swing.SwingUtilities
 
-class GradleSettings : JPanel() {
-    init{
-        val compose = ComposePanel()
-        compose.setContent {
-            Panel()
-        }
-        this.add(compose)
-    }
+class GradleSettings{
     companion object{
+        private val scope = CoroutineScope(Dispatchers.IO)
+
+        @JvmStatic
+        fun addGradleSettings(footer: EditorFooter, service: GradleService){
+            val panel = ComposePanel()
+            panel.setContent {
+                Panel(service)
+            }
+            scope.launch {
+                // Only add the panel to the footer when Gradle is active
+                // Can be removed later when Gradle becomes the default build system
+                snapshotFlow { service.active.value }
+                    .collect { active ->
+                        SwingUtilities.invokeLater {
+                            if(active){
+                                footer.addPanel(panel, text("gradle.settings"), "/lib/footer/settings")
+                            }else{
+                                footer.removePanel(panel)
+                            }
+                        }
+                    }
+            }
+        }
+
         @Composable
-        fun Panel(){
-            Text("Gradle settings will be here soon")
+        fun Panel(service: GradleService){
+            val properties = service.sketch.value?.folder?.resolve(Sketch.PROPERTIES_NAME) ?: return
+            // TODO: Rewatch again is the sketch is saved in a different location
+
+            val changed = watchFile(properties)
+
+            val settings = remember(changed) {Settings(properties) }
+
+            LaunchedEffect(changed){
+                /*
+                If the sketch.id is not set, generate a new UUID and save it.
+                We will use this key to save preferences that do not influence the sketch itself,
+                so they are not code, but do influence how the sketch shows up in the editor.
+                This is useful for things like favoring a sketch
+                These are items that should not be shared between users/computers
+                // TODO: Reset id on save-as?
+                 */
+                if(settings.get("sketch.id") == null){
+                    // TODO: Should this watch the file or should it update a bunch on running the sketch?
+                    settings.set("sketch.id", UUID.randomUUID().toString())
+                    settings.save()
+                }
+            }
+            val stateVertical = rememberScrollState(0)
+
+            ProcessingTheme {
+                Box {
+                    Row(
+                        modifier = Modifier
+                            .background(Color(Theme.getColor("editor.line.highlight.color").rgb))
+                            .padding(start = Editor.LEFT_GUTTER.dp)
+                            .fillMaxSize()
+                            .verticalScroll(stateVertical)
+                            .padding(vertical = 4.dp)
+                    ) {
+                        PluginsPanel(settings)
+                    }
+                    VerticalScrollbar(
+                        modifier = Modifier
+                            .align(Alignment.CenterEnd)
+                            .padding(8.dp)
+                            .fillMaxHeight(),
+                        adapter = rememberScrollbarAdapter(stateVertical)
+                    )
+                }
+            }
         }
 
+        @Composable
+        private fun PluginsPanel(settings: Settings) {
+            // Grab the installed plugins
+            val plugins = GradlePlugin.plugins
+
+            // Grab the enabled plugins
+            val pluginSetting = (settings.get(GradlePlugin.PROPERTIES_KEY) ?: "")
+                .split(",")
+                .map { it.trim() }
+                .filter{ it.isNotEmpty() }
+
+            // Link plugins in the settings to their installed counterparts
+            val enabledPlugins = pluginSetting
+                .map { id -> plugins.find { plugin -> plugin.id == id } }
+            Column {
+                Text(
+                    text = text("gradle.settings.plugins"),
+                    textAlign = TextAlign.Start,
+                    fontSize = 10.sp,
+                    fontWeight = FontWeight.Bold
+                )
+                Column(verticalArrangement = Arrangement.spacedBy(4.dp)) {
+                    GradlePlugin.plugins.map { plugin ->
+                        Row() {
+                            Checkbox(
+                                checked = enabledPlugins.contains(plugin),
+                                modifier = Modifier
+                                    .padding(start = 0.dp, end = 8.dp)
+                                    .size(24.dp),
+                                onCheckedChange = { checked ->
+                                    scope.launch {
+                                        // Work from the setting as we do not want to remove missing plugins
+                                        val current = pluginSetting.toMutableSet()
+                                        if (checked) {
+                                            current.add(plugin.id)
+                                        } else {
+                                            current.remove(plugin.id)
+                                        }
+                                        settings.set(GradlePlugin.PROPERTIES_KEY, current.joinToString(","))
+                                        settings.save()
+                                    }
+                                },
+                            )
+                            Column {
+                                Text(
+                                    text = plugin.name,
+                                    textAlign = TextAlign.Start,
+                                    fontSize = 12.sp
+                                )
+                                Text(
+                                    text = plugin.description,
+                                    textAlign = TextAlign.Start,
+                                    fontSize = 10.sp,
+                                )
+                            }
+                        }
+
+                    }
+                }
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/processing/app/gradle/api/Sketch.kt b/app/src/processing/app/gradle/api/Sketch.kt
index 30e6245d18..635094ec83 100644
--- a/app/src/processing/app/gradle/api/Sketch.kt
+++ b/app/src/processing/app/gradle/api/Sketch.kt
@@ -53,7 +53,7 @@ class Sketch : SuspendingCliktCommand("sketch") {
             System.setProperty("java.awt.headless", "false")
 
             val service = GradleService(mode,null)
-            service.sketch = processing.app.Sketch(sketch, mode)
+            service.sketch.value = processing.app.Sketch(sketch, mode)
             service.run()
 
             // TODO: Use an async way to wait for the job to finish
diff --git a/app/src/processing/app/ui/EditorFooter.java b/app/src/processing/app/ui/EditorFooter.java
index 827fd90a88..b1d710cb52 100644
--- a/app/src/processing/app/ui/EditorFooter.java
+++ b/app/src/processing/app/ui/EditorFooter.java
@@ -152,6 +152,7 @@ public void addPanel(Component comp, String name) {
   public void addPanel(Component comp, String name, String icon) {
     tabs.add(new Tab(comp, name, icon));
     cardPanel.add(name, comp);
+    repaint();
   }
 
   /**
diff --git a/build/shared/lib/footer/settings.svg b/build/shared/lib/footer/settings.svg
index e2d89118a2..25a9736fff 100644
--- a/build/shared/lib/footer/settings.svg
+++ b/build/shared/lib/footer/settings.svg
@@ -1 +1,8 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M12,15.5A3.5,3.5 0 0,1 8.5,12A3.5,3.5 0 0,1 12,8.5A3.5,3.5 0 0,1 15.5,12A3.5,3.5 0 0,1 12,15.5M19.43,12.97C19.47,12.65 19.5,12.33 19.5,12C19.5,11.67 19.47,11.34 19.43,11L21.54,9.37C21.73,9.22 21.78,8.95 21.66,8.73L19.66,5.27C19.54,5.05 19.27,4.96 19.05,5.05L16.56,6.05C16.04,5.66 15.5,5.32 14.87,5.07L14.5,2.42C14.46,2.18 14.25,2 14,2H10C9.75,2 9.54,2.18 9.5,2.42L9.13,5.07C8.5,5.32 7.96,5.66 7.44,6.05L4.95,5.05C4.73,4.96 4.46,5.05 4.34,5.27L2.34,8.73C2.21,8.95 2.27,9.22 2.46,9.37L4.57,11C4.53,11.34 4.5,11.67 4.5,12C4.5,12.33 4.53,12.65 4.57,12.97L2.46,14.63C2.27,14.78 2.21,15.05 2.34,15.27L4.34,18.73C4.46,18.95 4.73,19.03 4.95,18.95L7.44,17.94C7.96,18.34 8.5,18.68 9.13,18.93L9.5,21.58C9.54,21.82 9.75,22 10,22H14C14.25,22 14.46,21.82 14.5,21.58L14.87,18.93C15.5,18.67 16.04,18.34 16.56,17.94L19.05,18.95C19.27,19.03 19.54,18.95 19.66,18.73L21.66,15.27C21.78,15.05 21.73,14.78 21.54,14.63L19.43,12.97Z" fill="silver" /></svg>
\ No newline at end of file
+<svg width="32" height="32" viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg">
+    <line y1="-1.04167" x2="16.6667" y2="-1.04167" transform="matrix(-1 0 0 1 24.333 9.66675)" stroke="silver" stroke-width="2.08333"/>
+    <line y1="-1.04167" x2="16.6667" y2="-1.04167" transform="matrix(-1 0 0 1 24.333 17.1667)" stroke="silver" stroke-width="2.08333"/>
+    <line y1="-1.04167" x2="16.6667" y2="-1.04167" transform="matrix(-1 0 0 1 24.333 24.5833)" stroke="silver" stroke-width="2.08333"/>
+    <circle cx="3.33333" cy="3.33333" r="3.33333" transform="matrix(-1 0 0 1 14.167 5.16675)" fill="silver"/>
+    <circle cx="3.33333" cy="3.33333" r="3.33333" transform="matrix(-1 0 0 1 26.833 12.75)" fill="silver"/>
+    <circle cx="3.33333" cy="3.33333" r="3.33333" transform="matrix(-1 0 0 1 19.167 20.0833)" fill="silver"/>
+</svg>
diff --git a/build/shared/lib/languages/PDE.properties b/build/shared/lib/languages/PDE.properties
index a4b6fedf60..7d9b19c52b 100644
--- a/build/shared/lib/languages/PDE.properties
+++ b/build/shared/lib/languages/PDE.properties
@@ -325,6 +325,7 @@ gradle.instructions = About this file: \nProcessing creates this file when you r
 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
 
 # ---------------------------------------
 # Toolbars
diff --git a/java/gradle/src/main/kotlin/ProcessingPlugin.kt b/java/gradle/src/main/kotlin/ProcessingPlugin.kt
index f84662820a..fd7d1b5bf5 100644
--- a/java/gradle/src/main/kotlin/ProcessingPlugin.kt
+++ b/java/gradle/src/main/kotlin/ProcessingPlugin.kt
@@ -11,10 +11,9 @@ import org.gradle.api.plugins.JavaPluginExtension
 import org.gradle.api.tasks.JavaExec
 import org.jetbrains.compose.ComposeExtension
 import org.jetbrains.compose.desktop.DesktopExtension
-import processing.app.Preferences
 import java.io.File
 import java.net.Socket
-import java.util.*
+import java.util.Properties
 import javax.inject.Inject
 
 class ProcessingPlugin @Inject constructor(private val objectFactory: ObjectFactory) : Plugin<Project> {
@@ -33,7 +32,10 @@ class ProcessingPlugin @Inject constructor(private val objectFactory: ObjectFact
         val sketchbook = project.findProperty("processing.sketchbook") as String?
         val settings = project.findProperty("processing.settings") as String?
 
-        // Apply the Java plugin to the Project
+        // Apply the Java plugin to the Project, equivalent of
+        // plugins {
+        //     java
+        // }
         project.plugins.apply(JavaPlugin::class.java)
 
         if(isProcessing){
@@ -46,25 +48,67 @@ class ProcessingPlugin @Inject constructor(private val objectFactory: ObjectFact
             project.tasks.findByName("wrapper")?.enabled = false
         }
 
-        // Add kotlin support
+        // Add kotlin support, equivalent of
+        // plugins {
+        //     kotlin("jvm") version "1.8.0"
+        //     kotlin("plugin.compose") version "1.8.0"
+        // }
         project.plugins.apply("org.jetbrains.kotlin.jvm")
         // Add jetpack compose support
         project.plugins.apply("org.jetbrains.kotlin.plugin.compose")
         // Add the compose plugin to wrap the sketch in an executable
         project.plugins.apply("org.jetbrains.compose")
 
-        // Add the Processing core library (within Processing from the internal maven repo and outside from the internet)
+        val propertiesFile = project.layout.projectDirectory.file("sketch.properties")
+        if (propertiesFile.asFile.exists()) {
+            val properties = Properties()
+            properties.load(propertiesFile.asFile.inputStream())
+
+            val pluginsSetting = properties.getProperty("sketch.plugins")
+            if (pluginsSetting != null && pluginsSetting.isNotEmpty()) {
+                val plugins = pluginsSetting.split(",").map { it.trim() }
+
+                plugins.forEach { pluginId ->
+                    // Apply the plugin to the project, equivalent of
+                    // plugins {
+                    //     id("org.processing.java.hotreload")
+                    // }
+                    project.plugins.apply(pluginId)
+                }
+            }
+        }
+
+        // Add the Processing core library (within Processing from the internal maven repo and outside from the internet), equivalent of
+        // dependencies {
+        //     implementation("org.processing:core:4.3.4")
+        // }
         project.dependencies.add("implementation", "$processingGroup:core:${processingVersion}")
 
-        // Add the jars in the code folder
+        // Add the jars in the code folder, equivalent of
+        // dependencies {
+        //     implementation(fileTree("src") { include("**/code/*.jar") })
+        // }
         project.dependencies.add("implementation", project.fileTree("src").apply { include("**/code/*.jar") })
 
-        // Add the repositories necessary for building the sketch
+        // Add the repositories necessary for building the sketch, equivalent of
+        // repositories {
+        //     maven("https://jogamp.org/deployment/maven")
+        //     mavenCentral()
+        //     mavenLocal()
+        // }
         project.repositories.add(project.repositories.maven { it.setUrl("https://jogamp.org/deployment/maven") })
         project.repositories.add(project.repositories.mavenCentral())
         project.repositories.add(project.repositories.mavenLocal())
 
-        // Configure the compose Plugin
+        // Configure the compose Plugin, equivalent of
+        // compose {
+        //     application {
+        //         mainClass.set(sketchName)
+        //         nativeDistributions {
+        //             includeAllModules()
+        //         }
+        //     }
+        // }
         project.extensions.configure(ComposeExtension::class.java) { extension ->
             extension.extensions.getByType(DesktopExtension::class.java).application { application ->
                 // Set the class to be executed initially
@@ -140,10 +184,9 @@ class ProcessingPlugin @Inject constructor(private val objectFactory: ObjectFact
                 srcDir("$workingDir/unsaved")
             }
             sourceSet.allSource.source(pdeSourceSet)
-            sourceSet.java.srcDir(project.layout.projectDirectory).apply {
-                include("**/*.java")
-                exclude("${project.layout.buildDirectory.asFile.get()}/**/*")
-            }
+//            sourceSet.java.srcDir(project.layout.projectDirectory).apply {
+//                include("*.java")
+//            }
 
             val librariesTaskName = sourceSet.getTaskName("scanLibraries", "PDE")
             val librariesScan = project.tasks.register(librariesTaskName, LibrariesTask::class.java) { task ->
diff --git a/java/src/processing/mode/java/JavaEditor.java b/java/src/processing/mode/java/JavaEditor.java
index 537a60369b..b9dcf0b066 100644
--- a/java/src/processing/mode/java/JavaEditor.java
+++ b/java/src/processing/mode/java/JavaEditor.java
@@ -62,6 +62,8 @@
 import processing.mode.java.tweak.SketchParser;
 import processing.mode.java.tweak.TweakClient;
 
+import static processing.app.gradle.GradleSettings.addGradleSettings;
+
 
 public class JavaEditor extends Editor {
   JavaMode jmode;
@@ -205,6 +207,7 @@ public void rebuild() {
   public EditorFooter createFooter() {
     EditorFooter footer = super.createFooter();
     addErrorTable(footer);
+    addGradleSettings(footer, service);
     return footer;
   }
 

From fdc43dc7d284fabd405acdce859e95cd3382b32d Mon Sep 17 00:00:00 2001
From: Stef Tervelde <stef@steftervelde.nl>
Date: Thu, 17 Jul 2025 15:49:40 +0200
Subject: [PATCH 28/34] Hot Reloading plugin

---
 app/build.gradle.kts                          |  2 +-
 app/src/processing/app/gradle/GradleJob.kt    | 39 ++++++++++++++++++-
 app/src/processing/app/gradle/GradlePlugin.kt |  2 +-
 build/shared/lib/languages/PDE.properties     |  2 +-
 java/gradle/build.gradle.kts                  |  2 +-
 java/gradle/hotreload/build.gradle.kts        | 33 ++++++++++++++++
 .../java/gradle/ProcessingHotReloadPlugin.kt  | 24 ++++++++++++
 .../src/main/kotlin/ProcessingPlugin.kt       | 19 ---------
 settings.gradle.kts                           |  1 +
 9 files changed, 99 insertions(+), 25 deletions(-)
 create mode 100644 java/gradle/hotreload/build.gradle.kts
 create mode 100644 java/gradle/hotreload/src/main/kotlin/org/processing/java/gradle/ProcessingHotReloadPlugin.kt

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 6df826fdb8..3188acc313 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -527,7 +527,7 @@ 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").map { project(":$it").tasks.named("publishAllPublicationsToAppRepository") })
+        dependsOn(listOf("core","java:preprocessor", "java:gradle", "java:gradle:hotreload").map { project(":$it").tasks.named("publishAllPublicationsToAppRepository") })
     }
     tasks.named("createDistributable").configure {
         finalizedBy("setExecutablePermissions")
diff --git a/app/src/processing/app/gradle/GradleJob.kt b/app/src/processing/app/gradle/GradleJob.kt
index 28b6b64338..080b58f8cf 100644
--- a/app/src/processing/app/gradle/GradleJob.kt
+++ b/app/src/processing/app/gradle/GradleJob.kt
@@ -25,6 +25,7 @@ import processing.app.Messages
 import processing.app.Platform
 import processing.app.Platform.getContentFile
 import processing.app.Platform.getSettingsFolder
+import processing.app.Settings
 import processing.app.Sketch
 import processing.app.gradle.Log.Companion.startLogServer
 import processing.app.ui.Editor
@@ -32,6 +33,7 @@ import processing.app.ui.EditorStatus
 import java.nio.file.Path
 import kotlin.io.path.deleteIfExists
 import kotlin.io.path.writeText
+import kotlin.text.split
 
 /*
 * The gradle job runs the gradle tasks and manages the gradle connection
@@ -166,11 +168,44 @@ class GradleJob(
                 .split("\n")
                 .joinToString("\n") { "// $it" }
 
+            val enabledPlugins = mutableListOf(GradlePlugin(
+                "Processing Java",
+                "The Processing Java mode for Gradle",
+                null,
+                "org.processing.java",
+                getVersionName()
+            ))
+            val propertiesFile = sketchFolder.resolve(Sketch.PROPERTIES_NAME)
+            if(propertiesFile.exists()){
+                val sketchSettings = Settings(propertiesFile)
+
+                // Grab the installed plugins
+                val plugins = GradlePlugin.plugins
+
+                // Grab the enabled plugins
+                val pluginSetting = (sketchSettings.get(GradlePlugin.PROPERTIES_KEY) ?: "")
+                    .split(",")
+                    .map { it.trim() }
+                    .filter{ it.isNotEmpty() }
+
+                // Link plugins in the settings to their installed counterparts
+                enabledPlugins.addAll(
+                    pluginSetting
+                        .mapNotNull { id ->
+                            plugins.find { plugin -> plugin.id == id
+                            }
+                        }
+                )
+            }
+
+            val pluginList = enabledPlugins
+                .joinToString("\n    ") { "id(\"${it.id}\") version \"${it.version}\"" }
+
             val configuration =  """
                 plugins{
-                    id("org.processing.java") version "${getVersionName()}"
+                    #plugins
                 }
-            """.trimIndent()
+            """.trimIndent().replace("#plugins", pluginList)
             val content = "${header}\n${instructions}\n\n${configuration}"
             buildGradle.writeText(content)
         }
diff --git a/app/src/processing/app/gradle/GradlePlugin.kt b/app/src/processing/app/gradle/GradlePlugin.kt
index 0ebbdc36cf..798dd97936 100644
--- a/app/src/processing/app/gradle/GradlePlugin.kt
+++ b/app/src/processing/app/gradle/GradlePlugin.kt
@@ -13,7 +13,7 @@ data class GradlePlugin(
     companion object{
         const val PROPERTIES_KEY = "sketch.plugins"
         val plugins = mutableStateListOf<GradlePlugin>(
-            GradlePlugin("Hot Reload (experimental)", "Automatically apply changes in your sketch upon saving", null, "org.processing.java.hotreload", Base.getVersionName()),
+            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()),
         )
     }
diff --git a/build/shared/lib/languages/PDE.properties b/build/shared/lib/languages/PDE.properties
index 7d9b19c52b..5210bd3476 100644
--- a/build/shared/lib/languages/PDE.properties
+++ b/build/shared/lib/languages/PDE.properties
@@ -325,7 +325,7 @@ gradle.instructions = About this file: \nProcessing creates this file when you r
 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
+gradle.settings.plugins = Plugins (experimental)
 
 # ---------------------------------------
 # Toolbars
diff --git a/java/gradle/build.gradle.kts b/java/gradle/build.gradle.kts
index 6c446b13cf..0171384f44 100644
--- a/java/gradle/build.gradle.kts
+++ b/java/gradle/build.gradle.kts
@@ -24,7 +24,7 @@ dependencies{
 // TODO: CI/CD for publishing the plugin to the Gradle Plugin Portal
 gradlePlugin{
     plugins{
-        create("processing"){
+        create("processing.java"){
             id = "org.processing.java"
             implementationClass = "org.processing.java.gradle.ProcessingPlugin"
         }
diff --git a/java/gradle/hotreload/build.gradle.kts b/java/gradle/hotreload/build.gradle.kts
new file mode 100644
index 0000000000..e4873a8c31
--- /dev/null
+++ b/java/gradle/hotreload/build.gradle.kts
@@ -0,0 +1,33 @@
+plugins {
+    `java-gradle-plugin`
+    kotlin("jvm") version libs.versions.kotlin
+    alias(libs.plugins.gradlePublish)
+
+}
+
+
+repositories {
+    mavenCentral()
+}
+
+dependencies{
+    implementation("org.jetbrains.compose.hot-reload:hot-reload-gradle-plugin:1.0.0-beta03")
+}
+
+gradlePlugin{
+    plugins{
+        create("processing.java.hotreload"){
+            id = "org.processing.java.hotreload"
+            implementationClass = "org.processing.java.gradle.ProcessingHotReloadPlugin"
+        }
+    }
+}
+publishing{
+    repositories{
+        mavenLocal()
+        maven {
+            name = "App"
+            url = uri(project(":app").layout.buildDirectory.dir("resources-bundled/common/repository").get().asFile.absolutePath)
+        }
+    }
+}
\ No newline at end of file
diff --git a/java/gradle/hotreload/src/main/kotlin/org/processing/java/gradle/ProcessingHotReloadPlugin.kt b/java/gradle/hotreload/src/main/kotlin/org/processing/java/gradle/ProcessingHotReloadPlugin.kt
new file mode 100644
index 0000000000..8eaecc35f4
--- /dev/null
+++ b/java/gradle/hotreload/src/main/kotlin/org/processing/java/gradle/ProcessingHotReloadPlugin.kt
@@ -0,0 +1,24 @@
+package org.processing.java.gradle
+
+import org.gradle.api.Plugin
+import org.gradle.api.Project
+import org.gradle.api.tasks.GradleBuild
+import org.jetbrains.compose.reload.gradle.ComposeHotReloadPlugin
+import org.jetbrains.compose.reload.gradle.ComposeHotRun
+
+class ProcessingHotReloadPlugin: Plugin<Project> {
+    override fun apply(project: Project) {
+        project.plugins.apply(ComposeHotReloadPlugin::class.java)
+
+        project.repositories.google()
+
+        project.afterEvaluate {
+            project.tasks.named("hotRun", ComposeHotRun::class.java){ task ->
+                task.isAutoReloadEnabled.set(true)
+            }
+            project.tasks.named("run").configure { task ->
+                task.dependsOn("hotRun")
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/java/gradle/src/main/kotlin/ProcessingPlugin.kt b/java/gradle/src/main/kotlin/ProcessingPlugin.kt
index fd7d1b5bf5..a45f2ff84b 100644
--- a/java/gradle/src/main/kotlin/ProcessingPlugin.kt
+++ b/java/gradle/src/main/kotlin/ProcessingPlugin.kt
@@ -59,25 +59,6 @@ class ProcessingPlugin @Inject constructor(private val objectFactory: ObjectFact
         // Add the compose plugin to wrap the sketch in an executable
         project.plugins.apply("org.jetbrains.compose")
 
-        val propertiesFile = project.layout.projectDirectory.file("sketch.properties")
-        if (propertiesFile.asFile.exists()) {
-            val properties = Properties()
-            properties.load(propertiesFile.asFile.inputStream())
-
-            val pluginsSetting = properties.getProperty("sketch.plugins")
-            if (pluginsSetting != null && pluginsSetting.isNotEmpty()) {
-                val plugins = pluginsSetting.split(",").map { it.trim() }
-
-                plugins.forEach { pluginId ->
-                    // Apply the plugin to the project, equivalent of
-                    // plugins {
-                    //     id("org.processing.java.hotreload")
-                    // }
-                    project.plugins.apply(pluginId)
-                }
-            }
-        }
-
         // Add the Processing core library (within Processing from the internal maven repo and outside from the internet), equivalent of
         // dependencies {
         //     implementation("org.processing:core:4.3.4")
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 5809665d7c..b9615e1ca6 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -6,6 +6,7 @@ include(
     "java",
     "java:preprocessor",
     "java:gradle",
+    "java:gradle:hotreload",
     "java:libraries:dxf",
     "java:libraries:io",
     "java:libraries:net",

From 578c2876066d07a0df415f8581a45d60cb092984 Mon Sep 17 00:00:00 2001
From: Stef Tervelde <stef@steftervelde.nl>
Date: Fri, 18 Jul 2025 10:43:33 +0200
Subject: [PATCH 29/34] Build on save

---
 .gitignore                                    |  2 +
 app/src/processing/app/gradle/GradleJob.kt    |  3 ++
 .../processing/app/gradle/GradleService.kt    | 48 +++++++++++++++++--
 .../java/gradle/ProcessingHotReloadPlugin.kt  | 13 +++--
 4 files changed, 60 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index b9a0753322..0a951eebf6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -122,3 +122,5 @@ processing-examples
 /java/gradle/example/gradlew
 /java/gradle/example/gradlew.bat
 /java/gradle/example/.kotlin/errors
+/java/gradle/hotreload/build
+*.iml
diff --git a/app/src/processing/app/gradle/GradleJob.kt b/app/src/processing/app/gradle/GradleJob.kt
index 080b58f8cf..90f77060df 100644
--- a/app/src/processing/app/gradle/GradleJob.kt
+++ b/app/src/processing/app/gradle/GradleJob.kt
@@ -72,6 +72,7 @@ class GradleJob(
     Create the necessary build files if they do not exist.
      */
     private fun BuildLauncher.setupGradle(extraArguments: List<String> = listOf()) {
+
         val copy = sketch.isReadOnly || sketch.isUntitled
 
         val sketchFolder = if(copy) workingDir.resolve("sketch").toFile() else sketch.folder
@@ -218,6 +219,8 @@ class GradleJob(
         val arguments = mutableListOf("--init-script", initGradle.toAbsolutePath().toString())
         // Hide Gradle output from the console if not in debug mode
         if(!DEBUG) arguments += "--quiet"
+        // TODO: Fix continuous mode for the hot reload
+        arguments += "-t"
 
         if(copy) arguments += listOf("--project-dir", sketchFolder.absolutePath)
 
diff --git a/app/src/processing/app/gradle/GradleService.kt b/app/src/processing/app/gradle/GradleService.kt
index b6a4769c3a..34d0498a27 100644
--- a/app/src/processing/app/gradle/GradleService.kt
+++ b/app/src/processing/app/gradle/GradleService.kt
@@ -2,7 +2,12 @@ package processing.app.gradle
 
 import androidx.compose.runtime.mutableStateListOf
 import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.neverEqualPolicy
 import androidx.compose.ui.awt.ComposePanel
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
 import processing.app.Language.text
 import processing.app.Mode
 import processing.app.Preferences
@@ -30,7 +35,7 @@ class GradleService(
     val editor: Editor?,
 ) {
     val active = mutableStateOf(Preferences.getBoolean("run.use_gradle"))
-    var sketch = mutableStateOf<Sketch?>(null)
+    var sketch = mutableStateOf<Sketch?>(null, neverEqualPolicy())
     val jobs = mutableStateListOf<GradleJob>()
     val workingDir = createTempDirectory()
 
@@ -52,7 +57,7 @@ class GradleService(
 
         val job = GradleJob(
             tasks = tasks,
-            workingDir  = workingDir,
+            workingDir = workingDir,
             sketch = sketch.value ?: throw IllegalStateException("Sketch is not set"),
             editor = editor
         )
@@ -64,10 +69,47 @@ class GradleService(
         jobs.forEach(GradleJob::cancel)
     }
 
+    private val scope = CoroutineScope(Dispatchers.IO)
+
+    /*
+    Watch the sketch folder for changes and start a build job when the sketch is modified
+    This need to be done properly to use hooks in the future but right now this is the simplest way to do it
+     */
+    init{
+        scope.launch {
+            var path = ""
+            var modified = false
+            var sketched: Sketch? = null
+            while(true){
+                sketch.value?.let { sketch ->
+                    if(sketch.folder.absolutePath != path){
+                        path = sketch.folder.absolutePath
+                        if(sketched == sketch){
+                            // The same sketch has its folder changed, trigger updates downstream from the service
+                            this@GradleService.sketch.value = sketch
+                        }else {
+                            sketched = sketch
+                        }
+                        startJob("build")
+                    }
+                    if(sketch.isModified != modified){
+                        modified = sketch.isModified
+                        if(!modified){
+                            // If the sketch is no longer modified, start the build job, aka build on save
+                            startJob("build")
+                        }
+                    }
+                }
+
+
+                delay(100)
+            }
+        }
+    }
+
     // Hooks for java to interact with the Gradle service since mutableStateOf is not accessible in java
     fun setSketch(sketch: Sketch){
         this.sketch.value = sketch
-        startJob("build")
     }
     fun getEnabled(): Boolean {
         return active.value
diff --git a/java/gradle/hotreload/src/main/kotlin/org/processing/java/gradle/ProcessingHotReloadPlugin.kt b/java/gradle/hotreload/src/main/kotlin/org/processing/java/gradle/ProcessingHotReloadPlugin.kt
index 8eaecc35f4..9ee60ab494 100644
--- a/java/gradle/hotreload/src/main/kotlin/org/processing/java/gradle/ProcessingHotReloadPlugin.kt
+++ b/java/gradle/hotreload/src/main/kotlin/org/processing/java/gradle/ProcessingHotReloadPlugin.kt
@@ -2,7 +2,10 @@ package org.processing.java.gradle
 
 import org.gradle.api.Plugin
 import org.gradle.api.Project
-import org.gradle.api.tasks.GradleBuild
+import org.gradle.api.plugins.JavaPlugin
+import org.gradle.api.plugins.JavaPluginExtension
+import org.gradle.jvm.toolchain.JavaLanguageVersion
+import org.gradle.jvm.toolchain.JvmVendorSpec
 import org.jetbrains.compose.reload.gradle.ComposeHotReloadPlugin
 import org.jetbrains.compose.reload.gradle.ComposeHotRun
 
@@ -11,10 +14,14 @@ class ProcessingHotReloadPlugin: Plugin<Project> {
         project.plugins.apply(ComposeHotReloadPlugin::class.java)
 
         project.repositories.google()
+        project.extensions.getByType(JavaPluginExtension::class.java).toolchain {
+            it.languageVersion.set(JavaLanguageVersion.of(21))
+            it.vendor.set(JvmVendorSpec.JETBRAINS)
+        }
 
         project.afterEvaluate {
-            project.tasks.named("hotRun", ComposeHotRun::class.java){ task ->
-                task.isAutoReloadEnabled.set(true)
+            project.tasks.named("build").configure { task ->
+                task.finalizedBy("reload")
             }
             project.tasks.named("run").configure { task ->
                 task.dependsOn("hotRun")

From 570e9db45767a5cd0368c819cc46eb2280462404 Mon Sep 17 00:00:00 2001
From: Stef Tervelde <stef@steftervelde.nl>
Date: Fri, 18 Jul 2025 21:42:08 +0200
Subject: [PATCH 30/34] Automatically download jdk

---
 app/src/processing/app/gradle/GradleJob.kt                 | 7 ++++---
 .../processing/java/gradle/ProcessingHotReloadPlugin.kt    | 2 --
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/app/src/processing/app/gradle/GradleJob.kt b/app/src/processing/app/gradle/GradleJob.kt
index 90f77060df..8c23fff69e 100644
--- a/app/src/processing/app/gradle/GradleJob.kt
+++ b/app/src/processing/app/gradle/GradleJob.kt
@@ -122,10 +122,14 @@ class GradleJob(
         // Create the init.gradle.kts file in the working directory
         // This allows us to run the gradle plugin that has been bundled with the editor
         // TODO: Add the plugin repositories if they are defined
+        // TODO: Feedback when the JDK is being downloaded
         val initGradle = workingDir.resolve("init.gradle.kts").apply {
             val content = """
                 beforeSettings{
                     pluginManagement {
+                        plugins {
+                            id("org.gradle.toolchains.foojay-resolver-convention") version "1.0.0"
+                        }
                         repositories {
                             maven("$repository")
                             gradlePluginPortal()
@@ -219,9 +223,6 @@ class GradleJob(
         val arguments = mutableListOf("--init-script", initGradle.toAbsolutePath().toString())
         // Hide Gradle output from the console if not in debug mode
         if(!DEBUG) arguments += "--quiet"
-        // TODO: Fix continuous mode for the hot reload
-        arguments += "-t"
-
         if(copy) arguments += listOf("--project-dir", sketchFolder.absolutePath)
 
         arguments += variables.entries
diff --git a/java/gradle/hotreload/src/main/kotlin/org/processing/java/gradle/ProcessingHotReloadPlugin.kt b/java/gradle/hotreload/src/main/kotlin/org/processing/java/gradle/ProcessingHotReloadPlugin.kt
index 9ee60ab494..4776d4ebce 100644
--- a/java/gradle/hotreload/src/main/kotlin/org/processing/java/gradle/ProcessingHotReloadPlugin.kt
+++ b/java/gradle/hotreload/src/main/kotlin/org/processing/java/gradle/ProcessingHotReloadPlugin.kt
@@ -2,12 +2,10 @@ package org.processing.java.gradle
 
 import org.gradle.api.Plugin
 import org.gradle.api.Project
-import org.gradle.api.plugins.JavaPlugin
 import org.gradle.api.plugins.JavaPluginExtension
 import org.gradle.jvm.toolchain.JavaLanguageVersion
 import org.gradle.jvm.toolchain.JvmVendorSpec
 import org.jetbrains.compose.reload.gradle.ComposeHotReloadPlugin
-import org.jetbrains.compose.reload.gradle.ComposeHotRun
 
 class ProcessingHotReloadPlugin: Plugin<Project> {
     override fun apply(project: Project) {

From 00e4243374cc56e22214c3a5dc169e99960de18b Mon Sep 17 00:00:00 2001
From: Stef Tervelde <stef@steftervelde.nl>
Date: Mon, 8 Sep 2025 18:50:25 +0200
Subject: [PATCH 31/34] Squashed commit of the following:

commit 046a216be25ee63690be773f8d6fca1f42ddfb6f
Merge: 570e9db45 198f59397
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Mon Sep 8 18:27:48 2025 +0200

    Merge branch 'main' into gradle-runner

commit 570e9db45767a5cd0368c819cc46eb2280462404
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Fri Jul 18 21:42:08 2025 +0200

    Automatically download jdk

commit 578c2876066d07a0df415f8581a45d60cb092984
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Fri Jul 18 10:43:33 2025 +0200

    Build on save

commit fdc43dc7d284fabd405acdce859e95cd3382b32d
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Thu Jul 17 15:49:40 2025 +0200

    Hot Reloading plugin

commit 0c674adc54adbe1b420c844989d198764086a351
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Thu Jul 17 12:13:56 2025 +0200

    Initial Gradle Plugin configuration

commit f916d272acbd5297cf4865948a0500eefae99bd4
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Wed Jul 16 11:26:37 2025 +0200

    Adding a settings panel to the editor

    For upcoming plugin support we need a way to enable plugins based on each sketch

commit 550200cc7437e5e3538878440b929b83de02fb50
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Wed Jul 9 09:41:40 2025 +0200

    Comments and planning

commit c55e2864280013045ed0a8dbe784d022f07617d6
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Tue Jul 8 12:23:05 2025 +0200

    Speed up gradle compilations

commit b7123906b4b1e698a4532da560911b7e3d6e9801
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Tue Jul 8 11:59:28 2025 +0200

    Fixed rename Windres task

commit a36c8a353b4bdfef31a3089a8a1d9115e228be6a
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Tue Jul 8 10:31:12 2025 +0200

    Plugin tests bugfixes

commit 7379166bc482f3d17c59eeafbe272e9f6d647a32
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Tue Jul 8 10:26:16 2025 +0200

    Processing Plugin tests & Refactor

commit b64505d47662419e9332a41cdf7a883b60fb2fba
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Mon Jul 7 16:21:59 2025 +0200

    Gradle Service refactor

commit a11d2ffabec8a1d18d1541eb1efb1d4cfd2220d7
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Mon Jul 7 15:22:21 2025 +0200

    Logging sketches to separate stream & small refactor

commit 5729e8811882754e51868b7d443223870a001f3f
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Mon Jul 7 11:01:58 2025 +0200

    Show error logs to the user

commit b709fe3a9d0d1b40db0a970b5b728ed481e859fd
Merge: cebc352db d7c6aeba9
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Fri Jul 4 07:36:32 2025 +0200

    Merge branch 'gradle-runner' of https://github.com/Stefterv/processing4 into gradle-runner

commit cebc352db9fc863f12e8c3798073d27a84ab6594
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Fri Jul 4 07:36:31 2025 +0200

    Snap support

commit d7c6aeba90d452727cb970b39cbdcf1b635538e0
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Fri Jul 4 06:54:50 2025 +0200

    Also copy Untitled sketches

commit 24cb4f4f9b1161ec10472c11b86aee9481124162
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Fri Jul 4 06:23:00 2025 +0200

    Improved Error reporting

commit e727dbf59654462b015d38cf06161d6c40a5f02a
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Wed Jul 2 21:33:12 2025 +0200

    Support for readonly sketches

commit b165d0a511b8e7b81327744daaf0efec7ce3c3f1
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Wed Jul 2 21:25:52 2025 +0200

    Add all library jars

commit 772567c54074c59485e0c19a8ba0ffddf7c4252f
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Wed Jul 2 20:34:37 2025 +0200

    Build system indicators, Language keys and filtering SLF4J warnings

commit efd03dba54654775cb6c481f688776774ffe7602
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Wed Jul 2 15:58:02 2025 +0200

    Fixed gradle runner issues

commit 5409912c38f2740dd165f04aa025a97dc36ff0d7
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Wed Jul 2 13:42:41 2025 +0200

    Improved Gradle Error logging

commit 1762b74c90cb98d6cf28e15b944c5474882780e8
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Wed Jul 2 11:56:34 2025 +0200

    Simplified Gradle Service, improved sketch logging, fixed toolbar state

commit e6474e189fa47bdffcd3cb8198095427188b3cd7
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Wed Jul 2 10:29:20 2025 +0200

    Small tweaks and wrote motivation for Gradle Build system

commit 67de82f18d564555796f8184f5fddafd4b8102b5
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Wed Jul 2 09:53:14 2025 +0200

    Removed error & out streams, has been piped directly into System

commit bd5aba46e8103d1546b213dabf127023b0fcabb2
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Wed Jul 2 09:50:39 2025 +0200

    Allowing libraries folder to not exist, but log instead

commit fcb554a50c186a7c12e604cfe56df0bad8e2f7b1
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Wed Jul 2 09:42:19 2025 +0200

    Rename gradle plugin and further planning

commit 1c429618dfc903f7050fc71bd3fbad20e9899f38
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Tue Jul 1 17:35:32 2025 +0200

    Gradle Task error printing

commit 4cca647724a265d01084580676d5eb7eeeace08f
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Tue Jul 1 17:02:03 2025 +0200

    Updated error reporting

commit 0d1fcc45a94198a8663e8edf7986a49908a8bcf7
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Tue Jul 1 14:40:30 2025 +0200

    Added documentation and todo's

commit 029920924527c6ec93614dfc397db99b3a265d2a
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Tue Jul 1 12:59:34 2025 +0200

    Squashed commit of the following:

    commit 3a1aa8e712fa7e26c6fd4f61f11c25c3d63dd1b4
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Tue Jul 1 12:53:59 2025 +0200

        Restore welcome & Cleanup

    commit 7d94b30f60b3b2a685734d945693ab6f2c7abe55
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Tue Jul 1 12:20:17 2025 +0200

        PR Cleanup

    commit 27764e95cbab9b59ff6a714fe82236416b0f4f6f
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Mon Jun 23 13:33:50 2025 +0200

        Update Toolbar.kt

    commit 97fc4c2ec9dea5c8bd21caefa7e5d08b49529232
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Mon Jun 23 13:30:47 2025 +0200

        Removed background job differentiation

    commit 85566c8434f3ded9b54377104fe374d3bfd5826d
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Mon Jun 23 13:09:11 2025 +0200

        CLI Compatibility

    commit 7f2f2b667c63e8c255d615481355cb1878dbe9b5
    Merge: 1c8581e5c bf34adee0
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Mon Jun 23 11:14:57 2025 +0200

        Merge branch 'main' into runner

    commit 1c8581e5cd51ecde11a5915035f143a0dcf31709
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Thu May 15 13:39:21 2025 +0200

        Move Gradle connection into GradleJob

    commit d7420021ceb2dc368860e1954f9f21a5a238e665
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Thu May 15 10:10:33 2025 +0200

        Exclude jnilib from sources

    commit 2c9ee1c77aac0e872e9ae124148d331e2dd1a6e0
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Thu May 15 09:51:08 2025 +0200

        Linux Platform addition

    commit 49988e9b022dcb28d23a43d134301e24072a4ae8
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Thu May 15 09:34:44 2025 +0200

        Use forward slashes on Windows

    commit da5092ef4c788ee3dd0b00463d9cbd0b698b9e0e
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Thu May 15 09:10:11 2025 +0200

        Add support for .java files & Cleanup

    commit ab7c216272444d16931bf980db25698045c178c4
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Thu May 15 08:15:11 2025 +0200

        Preferences in the PDE will now be read from system before looking at files

    commit 7775d016dc7b79fba3830a087b97f344dfe81658
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Wed May 14 18:07:50 2025 +0200

        Identified Bugs

    commit 80c48f2fc584057bb7ce8a340dbd9f7b87855597
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Wed May 14 17:59:07 2025 +0200

        Windows Bugfix

    commit 5ad43e0b49125f2313fa602ff1ef2038f891c64f
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Wed May 14 17:51:57 2025 +0200

        Set a default tab size

    commit 2f99a69a69b80d77166f17d25449e1974f20d495
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Wed May 14 16:14:59 2025 +0200

        Bundle necessary plugins

    commit f9b94c57018a0c0084c851a44c78d78ec73e052f
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Wed May 14 15:17:55 2025 +0200

        Only make parent dirs

    commit 982c1113070a944890cf9dec92d4bcde9a5fe664
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Wed May 14 15:11:54 2025 +0200

        Show debug on gradle tests

    commit 917d0d321356c43c247e9d7b711935802dbe88b8
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Wed May 14 15:08:47 2025 +0200

        Listen for folder changes

    commit 12ce4422e1bc0cd5abf7173d7a001ea0a26cb35f
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Wed May 14 14:25:06 2025 +0200

        Fix saved files using an old version

    commit 04ac9f2678d6308c6c8dffb68cd98bc2973e7863
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Wed May 14 13:47:21 2025 +0200

        Plugin rework for caching heavy work

    commit e31d37d64df6aa9ba29ecc0e5529cf91600a3b28
    Merge: df1277e58 540d299cf
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Wed May 14 10:43:43 2025 +0200

        Merge branch 'main' into runner

    commit df1277e58c5665acb901a3ea81088eafeccdf283
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Wed May 14 10:39:22 2025 +0200

        Disabled modern UI for now. Added preference instead

    commit c5c3b2f570cabdd1163405057bf8204d1a707336
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Mon Apr 21 14:04:39 2025 +0200

        Added todos

    commit 612126a11f690ab7ec7feb7b86c9f9a786cc10cd
    Merge: 3e89bfe9a ecd219b03
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Thu Apr 17 12:37:06 2025 +0200

        Merge branch 'main' into runner

    commit 3e89bfe9abef46ee456fabf4d7e054a8d593855f
    Merge: efa77bb8d 7489870dd
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Thu Apr 17 12:34:57 2025 +0200

        Merge branch 'runner' of https://github.com/Stefterv/processing4 into runner

    commit efa77bb8d2b46680f13bba14b949e84586c81635
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Tue Apr 1 18:19:58 2025 +0200

        Cleanup

        [skip ci]

    commit 7489870ddf4287adaea4b02fdc3a22b54ba3a941
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Tue Apr 1 18:19:58 2025 +0200

        Cleanup

        [skip ci]

    commit 97ec5e4cb49eb980e87f37155fa3d8a96477e34c
    Merge: 221ee28a0 3d6a6ce1d
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Tue Apr 1 17:54:41 2025 +0200

        Merge branch 'gradle-welcome-screen' into runner

    commit 221ee28a0fcb516b6e0d129ad1028ca4ff7a51ac
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Tue Apr 1 17:53:48 2025 +0200

        Toolbar UI design start

    commit a870cd03fca9113952dc34bc26db5f134ce76b1c
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Tue Apr 1 10:14:22 2025 +0200

        GradleJob Refactor

    commit 2269fd35d9f91b971a163f6b63fb288adb6f9156
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Tue Apr 1 09:15:47 2025 +0200

        Gradle Runner, build script management

    commit 6758d684e7863c887c3b559b7b07eeb8eab32080
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Mon Mar 31 18:40:19 2025 +0200

        Richer console output and richer exception output

    commit 15114a192e36296796f5640874fd816c05e944b5
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Mon Mar 31 15:00:12 2025 +0200

        Retry vm debug connection

    commit 36ce0ab1e3853eb22a28fcd84c560123aa82ae33
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Mon Mar 31 12:05:58 2025 +0200

        Runner: Fixing build errors

    commit 701f9f5db84eb114721c033cd2111d16e3320147
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Sun Mar 30 23:58:36 2025 +0200

        Gradle Runner PoC Refactor

    commit 947a90ea0c204ccd9c5b0139da5eba201dcf2320
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Sun Mar 30 14:51:48 2025 +0200

        Toolbar functionality PoC

    commit 3d6a6ce1dfbb11650eeaa65de7a985f9d23f49d2
    Merge: f7f22c5f7 2222331c9
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Sun Mar 30 08:52:37 2025 +0200

        Merge branch 'processing:main' into gradle-welcome-screen

    commit 4602ef179ea92133ca5d264d8f40aea4f40d4024
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Sat Mar 29 22:50:35 2025 +0100

        Fixes for windows

    commit 0d3795f89343c98ed23d9cadffd1445df25da7ba
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Sat Mar 29 22:31:47 2025 +0100

        Gradle Runner, more variables

    commit ab38e5f44b5e72cbace4551ecdeddc80b70b75a1
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Sat Mar 29 20:54:02 2025 +0100

        Arguments refactor

    commit 17acb01cbe30b1949c5ff60d35f5f8c59d6b567f
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Sat Mar 29 20:10:15 2025 +0100

        Copy running JDK rather than download

    commit b534c26bca8737513f9808f4e737d96a173ce7ce
    Merge: d6cb3eec4 2222331c9
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Sat Mar 29 18:17:20 2025 +0100

        Merge branch 'main' into runner

    commit d6cb3eec45cdfeac944d5bb271ebd5733f2c36fe
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Sat Mar 29 10:20:17 2025 +0100

        Fix for signing release

    commit bf82d5327f2368114e499ade3a5eb18b681a4717
    Merge: 73dfa0a6e dd823a7d6
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Sat Mar 29 10:17:06 2025 +0100

        Merge branch 'runner' of https://github.com/Stefterv/processing4 into runner

    commit 73dfa0a6e19c9318504c5a80d7295e495902041b
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Sat Mar 29 10:17:04 2025 +0100

        Only sign with signing set up

    commit 41ef1cc9813ac6638c85ef0cabfe2121129b363c
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Fri Mar 28 09:00:23 2025 +0100

        Fix plugin name in tests

    commit dd823a7d6cf0f9100a3a8ee803a38e8f2c7718cd
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Fri Mar 28 09:00:23 2025 +0100

        Fix plugin name in tests

    commit 3a14ff40a41979ff7ad25a144f34629c0405e3a0
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Fri Mar 28 08:18:53 2025 +0100

        Added Stubs

    commit 00f8afaa7cd179b720bbd1246c78876295939a2a
    Merge: 700599ed8 1ab2359ca
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Fri Mar 28 08:13:11 2025 +0100

        Merge branch 'schema-threading' into runner

    commit 700599ed8abf775379a6d14c83d4da9b1b9a05a5
    Merge: 1fae4618c 499d200ef
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Fri Mar 28 08:13:06 2025 +0100

        Merge branch 'main' into runner

    commit 1fae4618c926cd27044ae1ed734930943fb8723f
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Thu Mar 27 21:37:55 2025 +0100

        UI Cleanup

    commit f762a3ee12842bea96cee8b011c3bdcb716d2d21
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Thu Mar 27 20:05:01 2025 +0100

        Added debugging

    commit c2071a0c2624dde91f70aac1be5d60955dab624c
    Merge: f453eca87 8fb9ef57b
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Thu Mar 27 18:23:23 2025 +0100

        Merge branch 'hide-scrollbars' into runner

    commit f453eca87fd77d4b2b8fc96bcc9a5574a99099c0
    Merge: 8f47d2110 694eb0cbe
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Thu Mar 27 18:03:34 2025 +0100

        Merge remote-tracking branch 'upstream/fix-jdk-requirement' into runner

    commit 8f47d211093bbd2bd41146a113b77931cb20ebf5
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Thu Mar 27 18:00:15 2025 +0100

        Scan libaries for dependencies

    commit 5d71244e0555d3d079e5b2149ba1381e524caa55
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Thu Mar 27 14:58:11 2025 +0100

        Plugin rework

    commit e164fe48bc1f7ee92029ba7a85ab6a8188fea501
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Thu Mar 27 13:01:33 2025 +0100

        Gradle variables from Processing, Group resolution

    commit 672c2ac479e6874965fac03a0398b6f68dc79f2d
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Thu Mar 27 11:51:08 2025 +0100

        Removed the need for settings.gradle.kts & Embedding maven repo

    commit cdec594cdd57bd71b4bf0c9525af5c2921edbef0
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Wed Mar 26 18:39:04 2025 +0100

        Added export support

    commit 3ad36547296ed0bfa2f457cf822c2105e90ef8d7
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Wed Mar 26 17:25:51 2025 +0100

        Gradle Runner visual styling

    commit bc063e80dbda0c8f78f86b36227948954382528a
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Wed Mar 26 14:17:25 2025 +0100

        Gradle Runner PoC

    commit 47d3428e6298f26aa8b6b951caaddc0d679a811e
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Sun Mar 23 18:18:54 2025 +0100

        More todo's

    commit 29d76eb1d1406b81cd276ffd4ccd325edb86b930
    Merge: ba496569d 9760a63b9
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Sun Mar 23 17:58:39 2025 +0100

        Merge branch 'processing:main' into gradle-plugin

    commit ba496569d8f048448dd6e8e92b2faaf443cf27a7
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Tue Mar 18 10:15:40 2025 +0100

        Adding tests and direct linking

    commit e01d02a8af6aa7ddc53e5a1900561473a2ed6a99
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Mon Mar 17 15:31:25 2025 +0100

        Update settings.gradle.kts

    commit b0b12ddad6676e81c2981c76b270ed745ac681bd
    Merge: 7e6c97add ad5c27ec4
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Mon Mar 17 15:14:35 2025 +0100

        Merge branch 'gradle-preprocessor' into gradle-plugin

    commit ad5c27ec42dc6f479c1c4cee2b119568ba8fa252
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Mon Mar 17 15:11:24 2025 +0100

        Apply same parser & lexer fixes from before

    commit 743ea141904c0d37127c4de6b52ed7d35ece3f32
    Merge: c28a2676b 8e8f7dc5a
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Mon Mar 17 13:53:40 2025 +0100

        Merge branch 'main' into gradle-preprocessor

    commit 7e6c97add90a4eb8f3ebc49faf40dcd0e61b9951
    Merge: f126d4b62 8e8f7dc5a
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Mon Mar 17 13:43:21 2025 +0100

        Merge branch 'main' into gradle-plugin

    commit f7f22c5f7ce8434a058d3cc5411f541777cc637e
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Mon Mar 17 10:40:37 2025 +0100

        Create Directory as well

    commit d17ca0cdcda2080cf458c0352fc89e80ef4f57a7
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Mon Mar 17 10:36:35 2025 +0100

        Removed PlatformStart and create new file if doesn't exist

    commit b0e7f96bddafc1a40c59d47cd81ef9919632ce84
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Mon Mar 17 10:28:12 2025 +0100

        Added initial tests

    commit 0df4dc076ac6d50730e09348b941a39451197b33
    Merge: 6974811be 8e8f7dc5a
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Sun Mar 16 21:18:22 2025 +0100

        Merge branch 'main' into gradle-welcome-screen

    commit 6974811beb562c7c3bd6fb3ae4d94bf9831d6d3c
    Merge: 7452d658c 145551246
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Tue Mar 11 20:42:46 2025 +0100

        Merge branch 'test-schema' into gradle-welcome-screen

    commit 7452d658c8fdb53815d7e5f3ed7ddcaecef302aa
    Merge: babf54e04 fe152b752
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Fri Mar 7 15:07:56 2025 +0100

        Merge branch 'main' into gradle-welcome-screen

    commit c28a2676bd9439106800d502c856b798bd1cfc34
    Merge: e18833608 fe152b752
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Fri Mar 7 15:06:27 2025 +0100

        Merge branch 'processing:main' into gradle-preprocessor

    commit f126d4b6286c3f7363d13cab8797702f8cadb66c
    Merge: da852b45a fe152b752
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Fri Mar 7 15:06:08 2025 +0100

        Merge branch 'processing:main' into gradle-plugin

    commit babf54e04dde6ba972139c8e5744d4a6f9b449f4
    Merge: 0e56f895b 00c57607d
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Mon Feb 10 17:58:35 2025 +0100

        Merge branch 'gradle-loggin' into gradle-welcome-screen

    commit 0e56f895bdaac2c7597d9870eba440cd6fad0997
    Merge: 54944afc2 29b557a7c
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Sun Feb 9 21:15:36 2025 +0100

        Merge branch 'main-gradle' into gradle-welcome-screen

    commit 54944afc24a1058bf6fcc5a9899bfdeaa1283229
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Sun Feb 9 14:36:37 2025 +0100

        Welcome Screen: JDK Module

    commit 8d8bd01d806257367b1a006f0da23b926b8f8ae3
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Sun Feb 9 13:54:07 2025 +0100

        Welcome Screen: Close Functionality

    commit 3df4da94618ed66d9a2b48a601b0ce7bac9a2d4e
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Sun Feb 9 12:57:55 2025 +0100

        Welcome Screen: Bugfixes

    commit cb184fb104ac9c4ead2e6352573f726189da7b70
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Sun Feb 9 12:19:33 2025 +0100

        Welcome Screen: Layout fixes

    commit 3d81b02ffed2c28560bc2067f1584e05db0bad51
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Sat Feb 8 22:47:28 2025 +0100

        Welcome Screen: Language selection

    commit b0c61a4467e8c9f5d02bcc8c84e47908fad22d95
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Sat Feb 8 11:10:33 2025 +0100

        Welcome Screen: Load & Display examples

    commit 2f12d13422c0359562663d93202fe7ce80c3c949
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Fri Feb 7 21:53:49 2025 +0100

        Saveable/Reactive Preferences

    commit 8ed2d1b40acdc38e0ecde7a5831ef47a9ad1559b
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Fri Feb 7 16:34:23 2025 +0100

        Welcome Screen: WIP

    commit 5c020dd0170153bd1a31ffaeed853966e66c5175
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Fri Feb 7 15:49:25 2025 +0100

        Welcome Screen: Initial Layout

    commit bd3a77ef17a456aa2ceb281cc2cf293f8be9d685
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Fri Feb 7 12:09:58 2025 +0100

        Welcome Screen: Window Abstraction

    commit b1910de2e61f6b8b2492b9847ba7f35eec67317a
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Fri Feb 7 11:24:30 2025 +0100

        Welcome Screen: Initial Frame

    commit da852b45a109e27b3b3226fd78a0efd41b695fad
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Wed Feb 5 20:54:32 2025 +0100

        Fullscreen support

    commit 44ab816ca9fe2113f1868c3bda3372afaa9fec5d
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Wed Feb 5 20:38:27 2025 +0100

        disable full screen from settings and fixed a few bugs

    commit e18833608b1f66866d17dbf8f75708e409fe6022
    Merge: df745bb09 3f3e7d785
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Wed Feb 5 13:03:51 2025 +0100

        Merge branch 'main-gradle' into gradle/preprocessor

    commit 031d304dbd6aa73998e07fa696b691e85dd9c2b1
    Merge: 25e147eaf 3f3e7d785
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Wed Feb 5 13:03:12 2025 +0100

        Merge branch 'main-gradle' into gradle/plugin

    commit 25e147eaf1bdfa8b245e86447d2066bded147b44
    Merge: 7f00d5b02 3b9aea1f4
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Wed Feb 5 12:56:55 2025 +0100

        Merge branch 'main-gradle' into gradle/plugin

    commit df745bb09c080929bc64d70bf90d27e9da807d8f
    Merge: f016cc474 3b9aea1f4
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Wed Feb 5 12:56:38 2025 +0100

        Merge branch 'main-gradle' into gradle/preprocessor

    commit 7f00d5b0289dda41d92b126149a81f20d1ccdc31
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Wed Feb 5 12:36:18 2025 +0100

        added example of plugin usage

    commit f4d7fbf99b399889de6b6d0bbafa0148dcb84782
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Wed Feb 5 09:19:08 2025 +0100

        Changed naming

    commit 1b8a8ed461cb39eb0489564589e144178fb1bef5
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Wed Feb 5 09:10:42 2025 +0100

        Gradle Plugin from PoC

    commit 5468da0fd6b42f790340acb3e2d00472ae5f42af
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Tue Feb 4 16:18:29 2025 +0100

        Removed outdated ant backwards compatibility marks

    commit 23c8a4626ac370b560169df130d86d4b58d859e2
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Mon Feb 3 12:07:01 2025 +0100

        - Imports cleanup
        - Disable system look & feel on macOS for readability
        - Cleaned unnecessary space
        - Cleaned finished TODO

    commit f016cc474caa637f982c8dd21078801974aabb69
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Wed Feb 5 12:01:47 2025 +0100

        Removed core dependency from the pre-processor

    commit 971d98bba0a8acf24a9430015a7c1508e2c9d2a3
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Thu Jan 30 22:59:16 2025 +0100

        Preprocessor with antlr Plugin
---
 gradle/libs.versions.toml                     |   9 +-
 java/preprocessor/build.gradle.kts            |  42 +-
 java/preprocessor/src/main/antlr/JavaLexer.g4 | 235 +++++
 .../preprocessor/src/main/antlr/JavaParser.g4 | 826 ++++++++++++++++++
 .../mode/java/preproc/Processing.g4           | 147 ++++
 .../main/java/processing/app/Platform.java    |  16 +-
 .../main/java/processing/app/Preferences.java |   2 +-
 .../java/preproc/PdeParseTreeListener.java    |  33 +-
 .../mode/java/preproc/TextTransform.java      |  10 +-
 9 files changed, 1289 insertions(+), 31 deletions(-)
 create mode 100644 java/preprocessor/src/main/antlr/JavaLexer.g4
 create mode 100644 java/preprocessor/src/main/antlr/JavaParser.g4
 create mode 100644 java/preprocessor/src/main/antlr/processing/mode/java/preproc/Processing.g4

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index dfacae1ead..236949d8c7 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -2,6 +2,7 @@
 kotlin = "2.0.20"
 compose-plugin = "1.7.1"
 jogl = "2.5.0"
+antlr = "4.13.2"
 jupiter = "5.12.0"
 
 [libraries]
@@ -25,6 +26,11 @@ netbeansSwing = { module = "org.netbeans.api:org-netbeans-swing-outline", versio
 ant = { module = "org.apache.ant:ant", version = "1.10.14" }
 lsp4j = { module = "org.eclipse.lsp4j:org.eclipse.lsp4j", version = "0.22.0" }
 jsoup = { module = "org.jsoup:jsoup", version = "1.17.2" }
+antlr4 = { module = "org.antlr:antlr4", version.ref = "antlr" }
+antlr4Runtime = { module = "org.antlr:antlr4-runtime", version.ref = "antlr" }
+composeGradlePlugin = { module = "org.jetbrains.compose:compose-gradle-plugin", version.ref = "compose-plugin" }
+kotlinGradlePlugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
+kotlinComposePlugin = { module = "org.jetbrains.kotlin.plugin.compose:org.jetbrains.kotlin.plugin.compose.gradle.plugin", version.ref = "kotlin" }
 markdown = { module = "com.mikepenz:multiplatform-markdown-renderer-m2", version = "0.31.0" }
 markdownJVM = { module = "com.mikepenz:multiplatform-markdown-renderer-jvm", version = "0.31.0" }
 clikt = { module = "com.github.ajalt.clikt:clikt", version = "5.0.2" }
@@ -36,4 +42,5 @@ kotlinMultiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref =
 compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
 serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
 download = { id = "de.undercouch.download", version = "5.6.0" }
-mavenPublish = { id = "com.vanniktech.maven.publish", version = "0.30.0" }
\ No newline at end of file
+mavenPublish = { id = "com.vanniktech.maven.publish", version = "0.30.0" }
+gradlePublish = { id = "com.gradle.plugin-publish", version = "1.2.1" }
\ No newline at end of file
diff --git a/java/preprocessor/build.gradle.kts b/java/preprocessor/build.gradle.kts
index f2bc2a2d9f..8e4300d311 100644
--- a/java/preprocessor/build.gradle.kts
+++ b/java/preprocessor/build.gradle.kts
@@ -1,7 +1,8 @@
 import com.vanniktech.maven.publish.SonatypeHost
 
 plugins{
-    id("java")
+    java
+    antlr
     alias(libs.plugins.mavenPublish)
 }
 
@@ -14,24 +15,44 @@ repositories{
 sourceSets{
     main{
         java{
-            srcDirs("src/main/java", "../src/", "../generated/")
+            srcDirs("src/main/java", "../src/")
             include("processing/mode/java/preproc/**/*", "processing/app/**/*")
         }
     }
-
+}
+afterEvaluate{
+    tasks.withType(Jar::class.java){
+        duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+        dependsOn(tasks.generateGrammarSource)
+    }
 }
 
 dependencies{
+    implementation(project(":core"))
+    implementation(project(":app:utils"))
+
     implementation(libs.antlr)
     implementation(libs.eclipseJDT)
 
-    implementation(project(":core"))
-    implementation(project(":app:utils"))
+    antlr(libs.antlr4)
+    implementation(libs.antlr4Runtime)
+}
+
+publishing{
+    repositories{
+        maven {
+            name = "App"
+            url = uri(project(":app").layout.buildDirectory.dir("resources-bundled/common/repository").get().asFile.absolutePath)
+        }
+    }
 }
 
 mavenPublishing{
     publishToMavenCentral(SonatypeHost.CENTRAL_PORTAL)
-    signAllPublications()
+
+    // Only sign if signing is set up
+    if(project.hasProperty("signing.keyId") || project.hasProperty("signing.signingInMemoryKey"))
+        signAllPublications()
 
     pom{
         name.set("Processing Pre-processor")
@@ -59,13 +80,4 @@ mavenPublishing{
             developerConnection.set("scm:git:ssh://git@github.com/processing/processing4.git")
         }
     }
-}
-tasks.withType<Jar> {
-    duplicatesStrategy = DuplicatesStrategy.EXCLUDE
-}
-tasks.compileJava{
-    dependsOn("ant-preproc")
-}
-ant.importBuild("../build.xml"){ antTaskName ->
-    "ant-$antTaskName"
 }
\ No newline at end of file
diff --git a/java/preprocessor/src/main/antlr/JavaLexer.g4 b/java/preprocessor/src/main/antlr/JavaLexer.g4
new file mode 100644
index 0000000000..b924864ea2
--- /dev/null
+++ b/java/preprocessor/src/main/antlr/JavaLexer.g4
@@ -0,0 +1,235 @@
+/*
+ [The "BSD licence"]
+ Copyright (c) 2013 Terence Parr, Sam Harwell
+ Copyright (c) 2017 Ivan Kochurkin (upgrade to Java 8)
+ Copyright (c) 2021 Michał Lorek (upgrade to Java 11)
+ Copyright (c) 2022 Michał Lorek (upgrade to Java 17)
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the distribution.
+ 3. The name of the author may not be used to endorse or promote products
+    derived from this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+// $antlr-format alignTrailingComments true, columnLimit 150, maxEmptyLinesToKeep 1, reflowComments false, useTab false
+// $antlr-format allowShortRulesOnASingleLine true, allowShortBlocksOnASingleLine true, minEmptyLines 0, alignSemicolons ownLine
+// $antlr-format alignColons trailing, singleLineOverrulesHangingColon true, alignLexerCommands true, alignLabels true, alignTrailers true
+
+lexer grammar JavaLexer;
+
+// Keywords
+
+ABSTRACT     : 'abstract';
+ASSERT       : 'assert';
+BOOLEAN      : 'boolean';
+BREAK        : 'break';
+BYTE         : 'byte';
+CASE         : 'case';
+CATCH        : 'catch';
+CHAR         : 'char';
+CLASS        : 'class';
+CONST        : 'const';
+CONTINUE     : 'continue';
+DEFAULT      : 'default';
+DO           : 'do';
+DOUBLE       : 'double';
+ELSE         : 'else';
+ENUM         : 'enum';
+EXTENDS      : 'extends';
+FINAL        : 'final';
+FINALLY      : 'finally';
+FLOAT        : 'float';
+FOR          : 'for';
+IF           : 'if';
+GOTO         : 'goto';
+IMPLEMENTS   : 'implements';
+IMPORT       : 'import';
+INSTANCEOF   : 'instanceof';
+INT          : 'int';
+INTERFACE    : 'interface';
+LONG         : 'long';
+NATIVE       : 'native';
+NEW          : 'new';
+PACKAGE      : 'package';
+PRIVATE      : 'private';
+PROTECTED    : 'protected';
+PUBLIC       : 'public';
+RETURN       : 'return';
+SHORT        : 'short';
+STATIC       : 'static';
+STRICTFP     : 'strictfp';
+SUPER        : 'super';
+SWITCH       : 'switch';
+SYNCHRONIZED : 'synchronized';
+THIS         : 'this';
+THROW        : 'throw';
+THROWS       : 'throws';
+TRANSIENT    : 'transient';
+TRY          : 'try';
+VOID         : 'void';
+VOLATILE     : 'volatile';
+WHILE        : 'while';
+
+// Module related keywords
+MODULE     : 'module';
+OPEN       : 'open';
+REQUIRES   : 'requires';
+EXPORTS    : 'exports';
+OPENS      : 'opens';
+TO         : 'to';
+USES       : 'uses';
+PROVIDES   : 'provides';
+WITH       : 'with';
+TRANSITIVE : 'transitive';
+
+// Local Variable Type Inference
+VAR: 'var'; // reserved type name
+
+// Switch Expressions
+YIELD: 'yield'; // reserved type name from Java 14
+
+// Records
+RECORD: 'record';
+
+// Sealed Classes
+SEALED     : 'sealed';
+PERMITS    : 'permits';
+NON_SEALED : 'non-sealed';
+
+// Literals
+
+DECIMAL_LITERAL : ('0' | [1-9] (Digits? | '_'+ Digits)) [lL]?;
+HEX_LITERAL     : '0' [xX] [0-9a-fA-F] ([0-9a-fA-F_]* [0-9a-fA-F])? [lL]?;
+OCT_LITERAL     : '0' '_'* [0-7] ([0-7_]* [0-7])? [lL]?;
+BINARY_LITERAL  : '0' [bB] [01] ([01_]* [01])? [lL]?;
+
+FLOAT_LITERAL:
+    (Digits '.' Digits? | '.' Digits) ExponentPart? [fFdD]?
+    | Digits (ExponentPart [fFdD]? | [fFdD])
+;
+
+HEX_FLOAT_LITERAL: '0' [xX] (HexDigits '.'? | HexDigits? '.' HexDigits) [pP] [+-]? Digits [fFdD]?;
+
+BOOL_LITERAL: 'true' | 'false';
+
+CHAR_LITERAL: '\'' (~['\\\r\n] | EscapeSequence) '\'';
+
+STRING_LITERAL: '"' (~["\\\r\n] | EscapeSequence)* '"';
+
+MULTI_STRING_LIT:   '"""' (~[\\] | EscapeSequence)*? '"""';
+
+TEXT_BLOCK: '"""' [ \t]* [\r\n] (. | EscapeSequence)*? '"""';
+
+NULL_LITERAL: 'null';
+
+// Separators
+
+LPAREN : '(';
+RPAREN : ')';
+LBRACE : '{';
+RBRACE : '}';
+LBRACK : '[';
+RBRACK : ']';
+SEMI   : ';';
+COMMA  : ',';
+DOT    : '.';
+
+// Operators
+
+ASSIGN   : '=';
+GT       : '>';
+LT       : '<';
+BANG     : '!';
+TILDE    : '~';
+QUESTION : '?';
+COLON    : ':';
+EQUAL    : '==';
+LE       : '<=';
+GE       : '>=';
+NOTEQUAL : '!=';
+AND      : '&&';
+OR       : '||';
+INC      : '++';
+DEC      : '--';
+ADD      : '+';
+SUB      : '-';
+MUL      : '*';
+DIV      : '/';
+BITAND   : '&';
+BITOR    : '|';
+CARET    : '^';
+MOD      : '%';
+
+ADD_ASSIGN     : '+=';
+SUB_ASSIGN     : '-=';
+MUL_ASSIGN     : '*=';
+DIV_ASSIGN     : '/=';
+AND_ASSIGN     : '&=';
+OR_ASSIGN      : '|=';
+XOR_ASSIGN     : '^=';
+MOD_ASSIGN     : '%=';
+LSHIFT_ASSIGN  : '<<=';
+RSHIFT_ASSIGN  : '>>=';
+URSHIFT_ASSIGN : '>>>=';
+
+// Java 8 tokens
+
+ARROW      : '->';
+COLONCOLON : '::';
+
+// Additional symbols not defined in the lexical specification
+
+AT       : '@';
+ELLIPSIS : '...';
+
+// Whitespace and comments
+
+WS           : [ \t\r\n\u000C]+ -> channel(HIDDEN);
+COMMENT      : '/*' .*? '*/'    -> channel(HIDDEN);
+LINE_COMMENT : '//' ~[\r\n]*    -> channel(HIDDEN);
+
+// Identifiers
+
+IDENTIFIER: Letter LetterOrDigit*;
+
+// Fragment rules
+
+fragment ExponentPart: [eE] [+-]? Digits;
+
+fragment EscapeSequence:
+    '\\' 'u005c'? [btnfr"'\\]
+    | '\\' 'u005c'? ([0-3]? [0-7])? [0-7]
+    | '\\' 'u'+ HexDigit HexDigit HexDigit HexDigit
+;
+
+fragment HexDigits: HexDigit ((HexDigit | '_')* HexDigit)?;
+
+fragment HexDigit: [0-9a-fA-F];
+
+fragment Digits: [0-9] ([0-9_]* [0-9])?;
+
+fragment LetterOrDigit: Letter | [0-9];
+
+fragment Letter:
+    [a-zA-Z$_]                        // these are the "java letters" below 0x7F
+    | ~[\u0000-\u007F\uD800-\uDBFF]   // covers all characters above 0x7F which are not a surrogate
+    | [\uD800-\uDBFF] [\uDC00-\uDFFF] // covers UTF-16 surrogate pairs encodings for U+10000 to U+10FFFF
+;
\ No newline at end of file
diff --git a/java/preprocessor/src/main/antlr/JavaParser.g4 b/java/preprocessor/src/main/antlr/JavaParser.g4
new file mode 100644
index 0000000000..d273fa8885
--- /dev/null
+++ b/java/preprocessor/src/main/antlr/JavaParser.g4
@@ -0,0 +1,826 @@
+/*
+ [The "BSD licence"]
+ Copyright (c) 2013 Terence Parr, Sam Harwell
+ Copyright (c) 2017 Ivan Kochurkin (upgrade to Java 8)
+ Copyright (c) 2021 Michał Lorek (upgrade to Java 11)
+ Copyright (c) 2022 Michał Lorek (upgrade to Java 17)
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the distribution.
+ 3. The name of the author may not be used to endorse or promote products
+    derived from this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+// $antlr-format alignTrailingComments true, columnLimit 150, minEmptyLines 1, maxEmptyLinesToKeep 1, reflowComments false, useTab false
+// $antlr-format allowShortRulesOnASingleLine false, allowShortBlocksOnASingleLine true, alignSemicolons hanging, alignColons hanging
+
+parser grammar JavaParser;
+
+options {
+    tokenVocab = JavaLexer;
+}
+
+compilationUnit
+    : packageDeclaration? (importDeclaration | ';')* (typeDeclaration | ';')* EOF
+    | moduleDeclaration EOF
+    ;
+
+packageDeclaration
+    : annotation* PACKAGE qualifiedName ';'
+    ;
+
+importDeclaration
+    : IMPORT STATIC? qualifiedName ('.' '*')? ';'
+    ;
+
+typeDeclaration
+    : classOrInterfaceModifier* (
+        classDeclaration
+        | enumDeclaration
+        | interfaceDeclaration
+        | annotationTypeDeclaration
+        | recordDeclaration
+    )
+    ;
+
+modifier
+    : classOrInterfaceModifier
+    | NATIVE
+    | SYNCHRONIZED
+    | TRANSIENT
+    | VOLATILE
+    ;
+
+classOrInterfaceModifier
+    : annotation
+    | PUBLIC
+    | PROTECTED
+    | PRIVATE
+    | STATIC
+    | ABSTRACT
+    | FINAL // FINAL for class only -- does not apply to interfaces
+    | STRICTFP
+    | SEALED     // Java17
+    | NON_SEALED // Java17
+    ;
+
+variableModifier
+    : FINAL
+    | annotation
+    ;
+
+classDeclaration
+    : CLASS identifier typeParameters? (EXTENDS typeType)? (IMPLEMENTS typeList)? (
+        PERMITS typeList
+    )? // Java17
+    classBody
+    ;
+
+typeParameters
+    : '<' typeParameter (',' typeParameter)* '>'
+    ;
+
+typeParameter
+    : annotation* identifier (EXTENDS annotation* typeBound)?
+    ;
+
+typeBound
+    : typeType ('&' typeType)*
+    ;
+
+enumDeclaration
+    : ENUM identifier (IMPLEMENTS typeList)? '{' enumConstants? ','? enumBodyDeclarations? '}'
+    ;
+
+enumConstants
+    : enumConstant (',' enumConstant)*
+    ;
+
+enumConstant
+    : annotation* identifier arguments? classBody?
+    ;
+
+enumBodyDeclarations
+    : ';' classBodyDeclaration*
+    ;
+
+interfaceDeclaration
+    : INTERFACE identifier typeParameters? (EXTENDS typeList)? (PERMITS typeList)? interfaceBody
+    ;
+
+classBody
+    : '{' classBodyDeclaration* '}'
+    ;
+
+interfaceBody
+    : '{' interfaceBodyDeclaration* '}'
+    ;
+
+classBodyDeclaration
+    : ';'
+    | STATIC? block
+    | modifier* memberDeclaration
+    ;
+
+memberDeclaration
+    : recordDeclaration //Java17
+    | methodDeclaration
+    | genericMethodDeclaration
+    | fieldDeclaration
+    | constructorDeclaration
+    | genericConstructorDeclaration
+    | interfaceDeclaration
+    | annotationTypeDeclaration
+    | classDeclaration
+    | enumDeclaration
+    ;
+
+/* We use rule this even for void methods which cannot have [] after parameters.
+   This simplifies grammar and we can consider void to be a type, which
+   renders the [] matching as a context-sensitive issue or a semantic check
+   for invalid return type after parsing.
+ */
+methodDeclaration
+    : typeTypeOrVoid identifier formalParameters ('[' ']')* (THROWS qualifiedNameList)? methodBody
+    ;
+
+methodBody
+    : block
+    | ';'
+    ;
+
+typeTypeOrVoid
+    : typeType
+    | VOID
+    ;
+
+genericMethodDeclaration
+    : typeParameters methodDeclaration
+    ;
+
+genericConstructorDeclaration
+    : typeParameters constructorDeclaration
+    ;
+
+constructorDeclaration
+    : identifier formalParameters (THROWS qualifiedNameList)? constructorBody = block
+    ;
+
+compactConstructorDeclaration
+    : modifier* identifier constructorBody = block
+    ;
+
+fieldDeclaration
+    : typeType variableDeclarators ';'
+    ;
+
+interfaceBodyDeclaration
+    : modifier* interfaceMemberDeclaration
+    | ';'
+    ;
+
+interfaceMemberDeclaration
+    : recordDeclaration // Java17
+    | constDeclaration
+    | interfaceMethodDeclaration
+    | genericInterfaceMethodDeclaration
+    | interfaceDeclaration
+    | annotationTypeDeclaration
+    | classDeclaration
+    | enumDeclaration
+    ;
+
+constDeclaration
+    : typeType constantDeclarator (',' constantDeclarator)* ';'
+    ;
+
+constantDeclarator
+    : identifier ('[' ']')* '=' variableInitializer
+    ;
+
+// Early versions of Java allows brackets after the method name, eg.
+// public int[] return2DArray() [] { ... }
+// is the same as
+// public int[][] return2DArray() { ... }
+interfaceMethodDeclaration
+    : interfaceMethodModifier* interfaceCommonBodyDeclaration
+    ;
+
+// Java8
+interfaceMethodModifier
+    : annotation
+    | PUBLIC
+    | ABSTRACT
+    | DEFAULT
+    | STATIC
+    | STRICTFP
+    ;
+
+genericInterfaceMethodDeclaration
+    : interfaceMethodModifier* typeParameters interfaceCommonBodyDeclaration
+    ;
+
+interfaceCommonBodyDeclaration
+    : annotation* typeTypeOrVoid identifier formalParameters ('[' ']')* (THROWS qualifiedNameList)? methodBody
+    ;
+
+variableDeclarators
+    : variableDeclarator (',' variableDeclarator)*
+    ;
+
+variableDeclarator
+    : variableDeclaratorId ('=' variableInitializer)?
+    ;
+
+variableDeclaratorId
+    : identifier ('[' ']')*
+    ;
+
+variableInitializer
+    : arrayInitializer
+    | expression
+    ;
+
+arrayInitializer
+    : '{' (variableInitializer (',' variableInitializer)* ','?)? '}'
+    ;
+
+classOrInterfaceType
+    : (identifier typeArguments? '.')* typeIdentifier typeArguments?
+    ;
+
+typeArgument
+    : typeType
+    | annotation* '?' ((EXTENDS | SUPER) typeType)?
+    ;
+
+qualifiedNameList
+    : qualifiedName (',' qualifiedName)*
+    ;
+
+formalParameters
+    : '(' (
+        receiverParameter?
+        | receiverParameter (',' formalParameterList)?
+        | formalParameterList?
+    ) ')'
+    ;
+
+receiverParameter
+    : typeType (identifier '.')* THIS
+    ;
+
+formalParameterList
+    : formalParameter (',' formalParameter)* (',' lastFormalParameter)?
+    | lastFormalParameter
+    ;
+
+formalParameter
+    : variableModifier* typeType variableDeclaratorId
+    ;
+
+lastFormalParameter
+    : variableModifier* typeType annotation* '...' variableDeclaratorId
+    ;
+
+// local variable type inference
+lambdaLVTIList
+    : lambdaLVTIParameter (',' lambdaLVTIParameter)*
+    ;
+
+lambdaLVTIParameter
+    : variableModifier* VAR identifier
+    ;
+
+qualifiedName
+    : identifier ('.' identifier)*
+    ;
+
+baseStringLiteral
+    : STRING_LITERAL
+    ;
+
+multilineStringLiteral
+    : MULTI_STRING_LIT
+    ;
+
+stringLiteral
+    : baseStringLiteral
+    | multilineStringLiteral
+    ;
+
+literal
+    : integerLiteral
+    | floatLiteral
+    | CHAR_LITERAL
+    | stringLiteral
+    | BOOL_LITERAL
+    | NULL_LITERAL
+    | TEXT_BLOCK // Java17
+    ;
+
+integerLiteral
+    : DECIMAL_LITERAL
+    | HEX_LITERAL
+    | OCT_LITERAL
+    | BINARY_LITERAL
+    ;
+
+floatLiteral
+    : FLOAT_LITERAL
+    | HEX_FLOAT_LITERAL
+    ;
+
+// ANNOTATIONS
+altAnnotationQualifiedName
+    : (identifier DOT)* '@' identifier
+    ;
+
+annotation
+    : ('@' qualifiedName | altAnnotationQualifiedName) (
+        '(' ( elementValuePairs | elementValue)? ')'
+    )?
+    ;
+
+elementValuePairs
+    : elementValuePair (',' elementValuePair)*
+    ;
+
+elementValuePair
+    : identifier '=' elementValue
+    ;
+
+elementValue
+    : expression
+    | annotation
+    | elementValueArrayInitializer
+    ;
+
+elementValueArrayInitializer
+    : '{' (elementValue (',' elementValue)*)? ','? '}'
+    ;
+
+annotationTypeDeclaration
+    : '@' INTERFACE identifier annotationTypeBody
+    ;
+
+annotationTypeBody
+    : '{' annotationTypeElementDeclaration* '}'
+    ;
+
+annotationTypeElementDeclaration
+    : modifier* annotationTypeElementRest
+    | ';' // this is not allowed by the grammar, but apparently allowed by the actual compiler
+    ;
+
+annotationTypeElementRest
+    : typeType annotationMethodOrConstantRest ';'
+    | classDeclaration ';'?
+    | interfaceDeclaration ';'?
+    | enumDeclaration ';'?
+    | annotationTypeDeclaration ';'?
+    | recordDeclaration ';'? // Java17
+    ;
+
+annotationMethodOrConstantRest
+    : annotationMethodRest
+    | annotationConstantRest
+    ;
+
+annotationMethodRest
+    : identifier '(' ')' defaultValue?
+    ;
+
+annotationConstantRest
+    : variableDeclarators
+    ;
+
+defaultValue
+    : DEFAULT elementValue
+    ;
+
+// MODULES - Java9
+
+moduleDeclaration
+    : OPEN? MODULE qualifiedName moduleBody
+    ;
+
+moduleBody
+    : '{' moduleDirective* '}'
+    ;
+
+moduleDirective
+    : REQUIRES requiresModifier* qualifiedName ';'
+    | EXPORTS qualifiedName (TO qualifiedName)? ';'
+    | OPENS qualifiedName (TO qualifiedName)? ';'
+    | USES qualifiedName ';'
+    | PROVIDES qualifiedName WITH qualifiedName ';'
+    ;
+
+requiresModifier
+    : TRANSITIVE
+    | STATIC
+    ;
+
+// RECORDS - Java 17
+
+recordDeclaration
+    : RECORD identifier typeParameters? recordHeader (IMPLEMENTS typeList)? recordBody
+    ;
+
+recordHeader
+    : '(' recordComponentList? ')'
+    ;
+
+recordComponentList
+    : recordComponent (',' recordComponent)*
+    ;
+
+recordComponent
+    : typeType identifier
+    ;
+
+recordBody
+    : '{' (classBodyDeclaration | compactConstructorDeclaration)* '}'
+    ;
+
+// STATEMENTS / BLOCKS
+
+block
+    : '{' blockStatement* '}'
+    ;
+
+blockStatement
+    : localVariableDeclaration ';'
+    | localTypeDeclaration
+    | statement
+    ;
+
+localVariableDeclaration
+    : variableModifier* (VAR identifier '=' expression | typeType variableDeclarators)
+    ;
+
+identifier
+    : IDENTIFIER
+    | MODULE
+    | OPEN
+    | REQUIRES
+    | EXPORTS
+    | OPENS
+    | TO
+    | USES
+    | PROVIDES
+    | WITH
+    | TRANSITIVE
+    | YIELD
+    | SEALED
+    | PERMITS
+    | RECORD
+    | VAR
+    ;
+
+typeIdentifier // Identifiers that are not restricted for type declarations
+    : IDENTIFIER
+    | MODULE
+    | OPEN
+    | REQUIRES
+    | EXPORTS
+    | OPENS
+    | TO
+    | USES
+    | PROVIDES
+    | WITH
+    | TRANSITIVE
+    | SEALED
+    | PERMITS
+    | RECORD
+    ;
+
+localTypeDeclaration
+    : classOrInterfaceModifier* (classDeclaration | interfaceDeclaration | recordDeclaration)
+    ;
+
+statement
+    : blockLabel = block
+    | ASSERT expression (':' expression)? ';'
+    | IF parExpression statement (ELSE statement)?
+    | FOR '(' forControl ')' statement
+    | WHILE parExpression statement
+    | DO statement WHILE parExpression ';'
+    | TRY block (catchClause+ finallyBlock? | finallyBlock)
+    | TRY resourceSpecification block catchClause* finallyBlock?
+    | SWITCH parExpression '{' switchBlockStatementGroup* switchLabel* '}'
+    | SYNCHRONIZED parExpression block
+    | RETURN expression? ';'
+    | THROW expression ';'
+    | BREAK identifier? ';'
+    | CONTINUE identifier? ';'
+    | YIELD expression ';' // Java17
+    | SEMI
+    | statementExpression = expression ';'
+    | switchExpression ';'? // Java17
+    | identifierLabel = identifier ':' statement
+    ;
+
+catchClause
+    : CATCH '(' variableModifier* catchType identifier ')' block
+    ;
+
+catchType
+    : qualifiedName ('|' qualifiedName)*
+    ;
+
+finallyBlock
+    : FINALLY block
+    ;
+
+resourceSpecification
+    : '(' resources ';'? ')'
+    ;
+
+resources
+    : resource (';' resource)*
+    ;
+
+resource
+    : variableModifier* (classOrInterfaceType variableDeclaratorId | VAR identifier) '=' expression
+    | qualifiedName
+    ;
+
+/** Matches cases then statements, both of which are mandatory.
+ *  To handle empty cases at the end, we add switchLabel* to statement.
+ */
+switchBlockStatementGroup
+    : switchLabel+ blockStatement+
+    ;
+
+switchLabel
+    : CASE (
+        constantExpression = expression
+        | enumConstantName = IDENTIFIER
+        | typeType varName = identifier
+    ) ':'
+    | DEFAULT ':'
+    ;
+
+forControl
+    : enhancedForControl
+    | forInit? ';' expression? ';' forUpdate = expressionList?
+    ;
+
+forInit
+    : localVariableDeclaration
+    | expressionList
+    ;
+
+enhancedForControl
+    : variableModifier* (typeType | VAR) variableDeclaratorId ':' expression
+    ;
+
+// EXPRESSIONS
+
+parExpression
+    : '(' expression ')'
+    ;
+
+expressionList
+    : expression (',' expression)*
+    ;
+
+methodCall
+    : (identifier | THIS | SUPER) arguments
+    ;
+
+expression
+    // Expression order in accordance with https://introcs.cs.princeton.edu/java/11precedence/
+    // Level 16, Primary, array and member access
+    : primary                                                       #PrimaryExpression
+    | expression '[' expression ']'                                 #SquareBracketExpression
+    | expression bop = '.' (
+        identifier
+        | methodCall
+        | THIS
+        | NEW nonWildcardTypeArguments? innerCreator
+        | SUPER superSuffix
+        | explicitGenericInvocation
+    )                                                               #MemberReferenceExpression
+    // Method calls and method references are part of primary, and hence level 16 precedence
+    | methodCall                                                    #MethodCallExpression
+    | expression '::' typeArguments? identifier                     #MethodReferenceExpression
+    | typeType '::' (typeArguments? identifier | NEW)               #MethodReferenceExpression
+    | classType '::' typeArguments? NEW                             #MethodReferenceExpression
+
+    // Java17
+    | switchExpression                                              #ExpressionSwitch
+
+    // Level 15 Post-increment/decrement operators
+    | expression postfix = ('++' | '--')                            #PostIncrementDecrementOperatorExpression
+
+    // Level 14, Unary operators
+    | prefix = ('+' | '-' | '++' | '--' | '~' | '!') expression     #UnaryOperatorExpression
+
+    // Level 13 Cast and object creation
+    | '(' annotation* typeType ('&' typeType)* ')' expression       #CastExpression
+    | NEW creator                                                   #ObjectCreationExpression
+
+    // Level 12 to 1, Remaining operators
+    // Level 12, Multiplicative operators
+    | expression bop = ('*' | '/' | '%') expression           #BinaryOperatorExpression
+    // Level 11, Additive operators
+    | expression bop = ('+' | '-') expression                 #BinaryOperatorExpression
+    // Level 10, Shift operators
+    | expression ('<' '<' | '>' '>' '>' | '>' '>') expression #BinaryOperatorExpression
+    // Level 9, Relational operators
+    | expression bop = ('<=' | '>=' | '>' | '<') expression   #BinaryOperatorExpression
+    | expression bop = INSTANCEOF (typeType | pattern)        #InstanceOfOperatorExpression
+    // Level 8, Equality Operators
+    | expression bop = ('==' | '!=') expression               #BinaryOperatorExpression
+    // Level 7, Bitwise AND
+    | expression bop = '&' expression                         #BinaryOperatorExpression
+    // Level 6, Bitwise XOR
+    | expression bop = '^' expression                         #BinaryOperatorExpression
+    // Level 5, Bitwise OR
+    | expression bop = '|' expression                         #BinaryOperatorExpression
+    // Level 4, Logic AND
+    | expression bop = '&&' expression                        #BinaryOperatorExpression
+    // Level 3, Logic OR
+    | expression bop = '||' expression                        #BinaryOperatorExpression
+    // Level 2, Ternary
+    | <assoc = right> expression bop = '?' expression ':' expression #TernaryExpression
+    // Level 1, Assignment
+    | <assoc = right> expression bop = (
+        '='
+        | '+='
+        | '-='
+        | '*='
+        | '/='
+        | '&='
+        | '|='
+        | '^='
+        | '>>='
+        | '>>>='
+        | '<<='
+        | '%='
+    ) expression                                              #BinaryOperatorExpression
+
+    // Level 0, Lambda Expression // Java8
+    | lambdaExpression                                        #ExpressionLambda
+    ;
+
+// Java17
+pattern
+    : variableModifier* typeType annotation* identifier
+    ;
+
+// Java8
+lambdaExpression
+    : lambdaParameters '->' lambdaBody
+    ;
+
+// Java8
+lambdaParameters
+    : identifier
+    | '(' formalParameterList? ')'
+    | '(' identifier (',' identifier)* ')'
+    | '(' lambdaLVTIList? ')'
+    ;
+
+// Java8
+lambdaBody
+    : expression
+    | block
+    ;
+
+primary
+    : '(' expression ')'
+    | THIS
+    | SUPER
+    | literal
+    | identifier
+    | typeTypeOrVoid '.' CLASS
+    | nonWildcardTypeArguments (explicitGenericInvocationSuffix | THIS arguments)
+    ;
+
+// Java17
+switchExpression
+    : SWITCH parExpression '{' switchLabeledRule* '}'
+    ;
+
+// Java17
+switchLabeledRule
+    : CASE (expressionList | NULL_LITERAL | guardedPattern) (ARROW | COLON) switchRuleOutcome
+    | DEFAULT (ARROW | COLON) switchRuleOutcome
+    ;
+
+// Java17
+guardedPattern
+    : '(' guardedPattern ')'
+    | variableModifier* typeType annotation* identifier ('&&' expression)*
+    | guardedPattern '&&' expression
+    ;
+
+// Java17
+switchRuleOutcome
+    : block
+    | blockStatement*
+    ;
+
+classType
+    : (classOrInterfaceType '.')? annotation* identifier typeArguments?
+    ;
+
+creator
+    : nonWildcardTypeArguments? createdName classCreatorRest
+    | createdName arrayCreatorRest
+    ;
+
+createdName
+    : identifier typeArgumentsOrDiamond? ('.' identifier typeArgumentsOrDiamond?)*
+    | primitiveType
+    ;
+
+innerCreator
+    : identifier nonWildcardTypeArgumentsOrDiamond? classCreatorRest
+    ;
+
+arrayCreatorRest
+    : ('[' ']')+ arrayInitializer
+    | ('[' expression ']')+ ('[' ']')*
+    ;
+
+classCreatorRest
+    : arguments classBody?
+    ;
+
+explicitGenericInvocation
+    : nonWildcardTypeArguments explicitGenericInvocationSuffix
+    ;
+
+typeArgumentsOrDiamond
+    : '<' '>'
+    | typeArguments
+    ;
+
+nonWildcardTypeArgumentsOrDiamond
+    : '<' '>'
+    | nonWildcardTypeArguments
+    ;
+
+nonWildcardTypeArguments
+    : '<' typeList '>'
+    ;
+
+typeList
+    : typeType (',' typeType)*
+    ;
+
+typeType
+    : annotation* (classOrInterfaceType | primitiveType) (annotation* '[' ']')*
+    ;
+
+primitiveType
+    : BOOLEAN
+    | CHAR
+    | BYTE
+    | SHORT
+    | INT
+    | LONG
+    | FLOAT
+    | DOUBLE
+    ;
+
+typeArguments
+    : '<' typeArgument (',' typeArgument)* '>'
+    ;
+
+superSuffix
+    : arguments
+    | '.' typeArguments? identifier arguments?
+    ;
+
+explicitGenericInvocationSuffix
+    : SUPER superSuffix
+    | identifier arguments
+    ;
+
+arguments
+    : '(' expressionList? ')'
+    ;
\ No newline at end of file
diff --git a/java/preprocessor/src/main/antlr/processing/mode/java/preproc/Processing.g4 b/java/preprocessor/src/main/antlr/processing/mode/java/preproc/Processing.g4
new file mode 100644
index 0000000000..2d4edc041a
--- /dev/null
+++ b/java/preprocessor/src/main/antlr/processing/mode/java/preproc/Processing.g4
@@ -0,0 +1,147 @@
+/**
+ *  Based on Java 1.7 grammar for ANTLR 4, see Java.g4
+ *
+ *  - changes main entry point to reflect sketch types 'static' | 'active'
+ *  - adds support for type converter functions like "int()"
+ *  - adds pseudo primitive type "color"
+ *  - adds HTML hex notation with hash symbol: #ff5522
+ *     - allow color to appear as part of qualified names (like in imports)
+ */
+
+grammar Processing;
+
+@lexer::members {
+  public static final int WHITESPACE = 1;
+  public static final int COMMENTS = 2;
+}
+
+@header {
+    package processing.mode.java.preproc;
+}
+
+// import Java grammar
+import JavaParser, JavaLexer;
+
+// main entry point, select sketch type
+processingSketch
+    : staticProcessingSketch
+    | javaProcessingSketch
+    | activeProcessingSketch
+//    | warnMixedModes
+    ;
+
+// java mode, is a compilation unit
+javaProcessingSketch
+    : packageDeclaration? importDeclaration* typeDeclaration+ EOF
+    ;
+
+// No method declarations, just statements
+staticProcessingSketch
+    : (importDeclaration | blockStatement | typeDeclaration)* EOF
+    ;
+
+// active mode, has function definitions
+activeProcessingSketch
+    : (importDeclaration | classBodyDeclaration)* EOF
+    ;
+
+// User incorrectly mixing modes. Included to allow for kind error message.
+warnMixedModes
+    : (importDeclaration | classBodyDeclaration | blockStatement)* blockStatement classBodyDeclaration (importDeclaration | classBodyDeclaration | blockStatement)*
+    | (importDeclaration | classBodyDeclaration | blockStatement)* classBodyDeclaration blockStatement (importDeclaration | classBodyDeclaration | blockStatement)*
+    ;
+
+variableDeclaratorId
+    : warnTypeAsVariableName
+    | IDENTIFIER ('[' ']')*
+    ;
+
+// bug #93
+// https://github.com/processing/processing/issues/93
+// prevent from types being used as variable names
+warnTypeAsVariableName
+    : primitiveType ('[' ']')* {
+        notifyErrorListeners("Type names are not allowed as variable names: "+$primitiveType.text);
+      }
+    ;
+
+// catch special API function calls that we are interested in
+methodCall
+    : functionWithPrimitiveTypeName
+    | IDENTIFIER '(' expressionList? ')'
+    | THIS '(' expressionList? ')'
+    | SUPER '(' expressionList? ')'
+    ;
+
+// these are primitive type names plus "()"
+// "color" is a special Processing primitive (== int)
+functionWithPrimitiveTypeName
+    : (  'boolean'
+      |  'byte'
+      |  'char'
+      |  'float'
+      |  'int'
+      |  'color'
+      ) '(' expressionList? ')'
+    ;
+
+// adding support for "color" primitive
+primitiveType
+    : BOOLEAN
+    | CHAR
+    | BYTE
+    | SHORT
+    | INT
+    | LONG
+    | FLOAT
+    | DOUBLE
+    | colorPrimitiveType
+    ;
+
+colorPrimitiveType
+    : 'color'
+    ;
+
+qualifiedName
+    : (IDENTIFIER | colorPrimitiveType) ('.' (IDENTIFIER | colorPrimitiveType))*
+    ;
+
+// added HexColorLiteral
+literal
+    : integerLiteral
+    | floatLiteral
+    | CHAR_LITERAL
+    | stringLiteral
+    | BOOL_LITERAL
+    | NULL_LITERAL
+    | hexColorLiteral
+    ;
+
+// As parser rule so this produces a separate listener
+// for us to alter its value.
+hexColorLiteral
+    : HexColorLiteral
+    ;
+
+// add color literal notations for
+// #ff5522
+HexColorLiteral
+    : '#' (HexDigit HexDigit)? HexDigit HexDigit HexDigit HexDigit HexDigit HexDigit
+    ;
+
+// hide but do not remove whitespace and comments
+
+WS  : [ \t\r\n\u000C]+ -> channel(1)
+    ;
+
+COMMENT
+    : '/*' .*? '*/' -> channel(2)
+    ;
+
+LINE_COMMENT
+    : '//' ~[\r\n]* -> channel(2)
+    ;
+
+CHAR_LITERAL
+    : '\'' (~['\\\r\n] | EscapeSequence)* '\''  // A bit nasty but let JDT tackle invalid chars
+		;
\ No newline at end of file
diff --git a/java/preprocessor/src/main/java/processing/app/Platform.java b/java/preprocessor/src/main/java/processing/app/Platform.java
index 079d9d79cd..b90974dd39 100644
--- a/java/preprocessor/src/main/java/processing/app/Platform.java
+++ b/java/preprocessor/src/main/java/processing/app/Platform.java
@@ -15,7 +15,21 @@ static public File getSettingsFolder() {
             }
             settingsFolder = new File(appData + "\\Processing");
         } else {
-            settingsFolder = new File(System.getProperty("user.home") + "/.processing");
+            // Check to see if the user has set a different location for their config
+            String configHomeEnv = System.getenv("XDG_CONFIG_HOME");
+            if (configHomeEnv != null && !configHomeEnv.isBlank()) {
+                settingsFolder = new File(configHomeEnv);
+                if (!settingsFolder.exists()) {
+                    settingsFolder = null;  // don't use non-existent folder
+                }
+            }
+            String snapUserCommon = System.getenv("SNAP_USER_COMMON");
+            if (snapUserCommon != null && !snapUserCommon.isBlank()) {
+                settingsFolder = new File(snapUserCommon);
+            }
+            if (settingsFolder == null) {
+                settingsFolder = new File(System.getProperty("user.home"), ".config");
+            }
         }
         return settingsFolder;
     }
diff --git a/java/preprocessor/src/main/java/processing/app/Preferences.java b/java/preprocessor/src/main/java/processing/app/Preferences.java
index 7ce476fdea..eab3a23974 100644
--- a/java/preprocessor/src/main/java/processing/app/Preferences.java
+++ b/java/preprocessor/src/main/java/processing/app/Preferences.java
@@ -58,7 +58,7 @@ static public String get(String attribute /*, String defaultValue */) {
         }
     }
     static public boolean getBoolean(String attribute) {
-        String value = get(attribute); //, null);
+        String value = get(attribute);
         return Boolean.parseBoolean(value);
     }
     static public int getInteger(String attribute /*, int defaultValue*/) {
diff --git a/java/src/processing/mode/java/preproc/PdeParseTreeListener.java b/java/src/processing/mode/java/preproc/PdeParseTreeListener.java
index cb4fd00010..c3edc810ad 100644
--- a/java/src/processing/mode/java/preproc/PdeParseTreeListener.java
+++ b/java/src/processing/mode/java/preproc/PdeParseTreeListener.java
@@ -32,7 +32,6 @@
 
 import processing.app.Base;
 import processing.app.Preferences;
-import processing.core.PApplet;
 import processing.mode.java.preproc.PdePreprocessor.Mode;
 
 /**
@@ -1234,19 +1233,35 @@ protected void writeMain(PrintWriterWithEditGen footerWriter,
     { // assemble line with applet args
       StringJoiner argsJoiner = new StringJoiner(", ");
 
-      boolean shouldFullScreen = Preferences.getBoolean("export.application.present");
-      shouldFullScreen = shouldFullScreen || Preferences.getBoolean("export.application.fullscreen");
+      boolean shouldFullScreen;
+      String presentProp = System.getProperty("processing.fullscreen");
+
+      if (presentProp != null) {
+        shouldFullScreen = presentProp.equals("true");
+      } else {
+        boolean isExportedApp = Preferences.getBoolean("export.application.present");
+        boolean isFullscreenPref = Preferences.getBoolean("export.application.fullscreen");
+        shouldFullScreen = isExportedApp || isFullscreenPref;
+      }
+
       if (shouldFullScreen) {
-        argsJoiner.add("\"" + PApplet.ARGS_FULL_SCREEN + "\"");
+        argsJoiner.add("\"--full-screen\"");
 
-        String bgColor = Preferences.get("run.present.bgcolor");
-        argsJoiner.add("\"" + PApplet.ARGS_BGCOLOR + "=" + bgColor + "\"");
+        String bgColor = System.getProperty("processing.window.color", Preferences.get("run.present.bgcolor"));
+        argsJoiner.add("\"--bgcolor=" + bgColor + "\"");
 
-        if (Preferences.getBoolean("export.application.stop")) {
+        boolean showStop;
+        var hideStop = System.getProperty("processing.stop.hide");
+        if(hideStop != null){
+          showStop = hideStop.equals("false");
+        }else{
+          showStop = Preferences.getBoolean("export.application.stop");
+        }
+        if(showStop) {
           String stopColor = Preferences.get("run.present.stop.color");
-          argsJoiner.add("\"" + PApplet.ARGS_STOP_COLOR + "=" + stopColor + "\"");
+          argsJoiner.add("\"--stop-color=" + stopColor + "\"");
         } else {
-          argsJoiner.add("\"" + PApplet.ARGS_HIDE_STOP + "\"");
+          argsJoiner.add("\"--hide-stop\"");
         }
       }
       
diff --git a/java/src/processing/mode/java/preproc/TextTransform.java b/java/src/processing/mode/java/preproc/TextTransform.java
index 77ae022f19..19ba8f3e53 100644
--- a/java/src/processing/mode/java/preproc/TextTransform.java
+++ b/java/src/processing/mode/java/preproc/TextTransform.java
@@ -8,8 +8,6 @@
 import java.util.ListIterator;
 import java.util.stream.Collectors;
 
-import processing.core.PApplet;
-
 
 public class TextTransform {
 
@@ -256,7 +254,7 @@ public int getInputOffset(int outputOffset) {
         i = -(i + 1);
         i -= 1;
       }
-      i = PApplet.constrain(i, 0, outMap.size()-1);
+      i = constrain(i, 0, outMap.size()-1);
       Edit edit = outMap.get(i);
       int diff = outputOffset - edit.toOffset;
       return edit.fromOffset + Math.min(diff, Math.max(0, edit.fromLength - 1));
@@ -271,7 +269,7 @@ public int getOutputOffset(int inputOffset) {
         i = -(i + 1);
         i -= 1;
       }
-      i = PApplet.constrain(i, 0, inMap.size()-1);
+      i = constrain(i, 0, inMap.size()-1);
       Edit edit = inMap.get(i);
       int diff = inputOffset - edit.fromOffset;
       return edit.toOffset + Math.min(diff, Math.max(0, edit.toLength - 1));
@@ -283,6 +281,10 @@ public OffsetMapper thenMapping(OffsetMapper mapper) {
     }
   }
 
+  static public final int constrain(int amt, int low, int high) {
+    return (amt < low) ? low : ((amt > high) ? high : amt);
+  }
+
 
   private static class CompositeOffsetMapper implements OffsetMapper {
     private List<OffsetMapper> mappers = new ArrayList<>();

From 9f7be0c0c2cedb9709d028bf49297a4e1883e4dc Mon Sep 17 00:00:00 2001
From: Stef Tervelde <stef@steftervelde.nl>
Date: Mon, 8 Sep 2025 19:03:58 +0200
Subject: [PATCH 32/34] Squashed commit of the following:

commit 046a216be25ee63690be773f8d6fca1f42ddfb6f
Merge: 570e9db45 198f59397
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Mon Sep 8 18:27:48 2025 +0200

    Merge branch 'main' into gradle-runner

commit 570e9db45767a5cd0368c819cc46eb2280462404
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Fri Jul 18 21:42:08 2025 +0200

    Automatically download jdk

commit 578c2876066d07a0df415f8581a45d60cb092984
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Fri Jul 18 10:43:33 2025 +0200

    Build on save

commit fdc43dc7d284fabd405acdce859e95cd3382b32d
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Thu Jul 17 15:49:40 2025 +0200

    Hot Reloading plugin

commit 0c674adc54adbe1b420c844989d198764086a351
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Thu Jul 17 12:13:56 2025 +0200

    Initial Gradle Plugin configuration

commit f916d272acbd5297cf4865948a0500eefae99bd4
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Wed Jul 16 11:26:37 2025 +0200

    Adding a settings panel to the editor

    For upcoming plugin support we need a way to enable plugins based on each sketch

commit 550200cc7437e5e3538878440b929b83de02fb50
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Wed Jul 9 09:41:40 2025 +0200

    Comments and planning

commit c55e2864280013045ed0a8dbe784d022f07617d6
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Tue Jul 8 12:23:05 2025 +0200

    Speed up gradle compilations

commit b7123906b4b1e698a4532da560911b7e3d6e9801
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Tue Jul 8 11:59:28 2025 +0200

    Fixed rename Windres task

commit a36c8a353b4bdfef31a3089a8a1d9115e228be6a
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Tue Jul 8 10:31:12 2025 +0200

    Plugin tests bugfixes

commit 7379166bc482f3d17c59eeafbe272e9f6d647a32
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Tue Jul 8 10:26:16 2025 +0200

    Processing Plugin tests & Refactor

commit b64505d47662419e9332a41cdf7a883b60fb2fba
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Mon Jul 7 16:21:59 2025 +0200

    Gradle Service refactor

commit a11d2ffabec8a1d18d1541eb1efb1d4cfd2220d7
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Mon Jul 7 15:22:21 2025 +0200

    Logging sketches to separate stream & small refactor

commit 5729e8811882754e51868b7d443223870a001f3f
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Mon Jul 7 11:01:58 2025 +0200

    Show error logs to the user

commit b709fe3a9d0d1b40db0a970b5b728ed481e859fd
Merge: cebc352db d7c6aeba9
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Fri Jul 4 07:36:32 2025 +0200

    Merge branch 'gradle-runner' of https://github.com/Stefterv/processing4 into gradle-runner

commit cebc352db9fc863f12e8c3798073d27a84ab6594
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Fri Jul 4 07:36:31 2025 +0200

    Snap support

commit d7c6aeba90d452727cb970b39cbdcf1b635538e0
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Fri Jul 4 06:54:50 2025 +0200

    Also copy Untitled sketches

commit 24cb4f4f9b1161ec10472c11b86aee9481124162
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Fri Jul 4 06:23:00 2025 +0200

    Improved Error reporting

commit e727dbf59654462b015d38cf06161d6c40a5f02a
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Wed Jul 2 21:33:12 2025 +0200

    Support for readonly sketches

commit b165d0a511b8e7b81327744daaf0efec7ce3c3f1
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Wed Jul 2 21:25:52 2025 +0200

    Add all library jars

commit 772567c54074c59485e0c19a8ba0ffddf7c4252f
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Wed Jul 2 20:34:37 2025 +0200

    Build system indicators, Language keys and filtering SLF4J warnings

commit efd03dba54654775cb6c481f688776774ffe7602
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Wed Jul 2 15:58:02 2025 +0200

    Fixed gradle runner issues

commit 5409912c38f2740dd165f04aa025a97dc36ff0d7
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Wed Jul 2 13:42:41 2025 +0200

    Improved Gradle Error logging

commit 1762b74c90cb98d6cf28e15b944c5474882780e8
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Wed Jul 2 11:56:34 2025 +0200

    Simplified Gradle Service, improved sketch logging, fixed toolbar state

commit e6474e189fa47bdffcd3cb8198095427188b3cd7
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Wed Jul 2 10:29:20 2025 +0200

    Small tweaks and wrote motivation for Gradle Build system

commit 67de82f18d564555796f8184f5fddafd4b8102b5
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Wed Jul 2 09:53:14 2025 +0200

    Removed error & out streams, has been piped directly into System

commit bd5aba46e8103d1546b213dabf127023b0fcabb2
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Wed Jul 2 09:50:39 2025 +0200

    Allowing libraries folder to not exist, but log instead

commit fcb554a50c186a7c12e604cfe56df0bad8e2f7b1
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Wed Jul 2 09:42:19 2025 +0200

    Rename gradle plugin and further planning

commit 1c429618dfc903f7050fc71bd3fbad20e9899f38
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Tue Jul 1 17:35:32 2025 +0200

    Gradle Task error printing

commit 4cca647724a265d01084580676d5eb7eeeace08f
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Tue Jul 1 17:02:03 2025 +0200

    Updated error reporting

commit 0d1fcc45a94198a8663e8edf7986a49908a8bcf7
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Tue Jul 1 14:40:30 2025 +0200

    Added documentation and todo's

commit 029920924527c6ec93614dfc397db99b3a265d2a
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Tue Jul 1 12:59:34 2025 +0200

    Squashed commit of the following:

    commit 3a1aa8e712fa7e26c6fd4f61f11c25c3d63dd1b4
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Tue Jul 1 12:53:59 2025 +0200

        Restore welcome & Cleanup

    commit 7d94b30f60b3b2a685734d945693ab6f2c7abe55
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Tue Jul 1 12:20:17 2025 +0200

        PR Cleanup

    commit 27764e95cbab9b59ff6a714fe82236416b0f4f6f
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Mon Jun 23 13:33:50 2025 +0200

        Update Toolbar.kt

    commit 97fc4c2ec9dea5c8bd21caefa7e5d08b49529232
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Mon Jun 23 13:30:47 2025 +0200

        Removed background job differentiation

    commit 85566c8434f3ded9b54377104fe374d3bfd5826d
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Mon Jun 23 13:09:11 2025 +0200

        CLI Compatibility

    commit 7f2f2b667c63e8c255d615481355cb1878dbe9b5
    Merge: 1c8581e5c bf34adee0
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Mon Jun 23 11:14:57 2025 +0200

        Merge branch 'main' into runner

    commit 1c8581e5cd51ecde11a5915035f143a0dcf31709
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Thu May 15 13:39:21 2025 +0200

        Move Gradle connection into GradleJob

    commit d7420021ceb2dc368860e1954f9f21a5a238e665
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Thu May 15 10:10:33 2025 +0200

        Exclude jnilib from sources

    commit 2c9ee1c77aac0e872e9ae124148d331e2dd1a6e0
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Thu May 15 09:51:08 2025 +0200

        Linux Platform addition

    commit 49988e9b022dcb28d23a43d134301e24072a4ae8
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Thu May 15 09:34:44 2025 +0200

        Use forward slashes on Windows

    commit da5092ef4c788ee3dd0b00463d9cbd0b698b9e0e
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Thu May 15 09:10:11 2025 +0200

        Add support for .java files & Cleanup

    commit ab7c216272444d16931bf980db25698045c178c4
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Thu May 15 08:15:11 2025 +0200

        Preferences in the PDE will now be read from system before looking at files

    commit 7775d016dc7b79fba3830a087b97f344dfe81658
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Wed May 14 18:07:50 2025 +0200

        Identified Bugs

    commit 80c48f2fc584057bb7ce8a340dbd9f7b87855597
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Wed May 14 17:59:07 2025 +0200

        Windows Bugfix

    commit 5ad43e0b49125f2313fa602ff1ef2038f891c64f
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Wed May 14 17:51:57 2025 +0200

        Set a default tab size

    commit 2f99a69a69b80d77166f17d25449e1974f20d495
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Wed May 14 16:14:59 2025 +0200

        Bundle necessary plugins

    commit f9b94c57018a0c0084c851a44c78d78ec73e052f
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Wed May 14 15:17:55 2025 +0200

        Only make parent dirs

    commit 982c1113070a944890cf9dec92d4bcde9a5fe664
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Wed May 14 15:11:54 2025 +0200

        Show debug on gradle tests

    commit 917d0d321356c43c247e9d7b711935802dbe88b8
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Wed May 14 15:08:47 2025 +0200

        Listen for folder changes

    commit 12ce4422e1bc0cd5abf7173d7a001ea0a26cb35f
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Wed May 14 14:25:06 2025 +0200

        Fix saved files using an old version

    commit 04ac9f2678d6308c6c8dffb68cd98bc2973e7863
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Wed May 14 13:47:21 2025 +0200

        Plugin rework for caching heavy work

    commit e31d37d64df6aa9ba29ecc0e5529cf91600a3b28
    Merge: df1277e58 540d299cf
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Wed May 14 10:43:43 2025 +0200

        Merge branch 'main' into runner

    commit df1277e58c5665acb901a3ea81088eafeccdf283
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Wed May 14 10:39:22 2025 +0200

        Disabled modern UI for now. Added preference instead

    commit c5c3b2f570cabdd1163405057bf8204d1a707336
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Mon Apr 21 14:04:39 2025 +0200

        Added todos

    commit 612126a11f690ab7ec7feb7b86c9f9a786cc10cd
    Merge: 3e89bfe9a ecd219b03
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Thu Apr 17 12:37:06 2025 +0200

        Merge branch 'main' into runner

    commit 3e89bfe9abef46ee456fabf4d7e054a8d593855f
    Merge: efa77bb8d 7489870dd
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Thu Apr 17 12:34:57 2025 +0200

        Merge branch 'runner' of https://github.com/Stefterv/processing4 into runner

    commit efa77bb8d2b46680f13bba14b949e84586c81635
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Tue Apr 1 18:19:58 2025 +0200

        Cleanup

        [skip ci]

    commit 7489870ddf4287adaea4b02fdc3a22b54ba3a941
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Tue Apr 1 18:19:58 2025 +0200

        Cleanup

        [skip ci]

    commit 97ec5e4cb49eb980e87f37155fa3d8a96477e34c
    Merge: 221ee28a0 3d6a6ce1d
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Tue Apr 1 17:54:41 2025 +0200

        Merge branch 'gradle-welcome-screen' into runner

    commit 221ee28a0fcb516b6e0d129ad1028ca4ff7a51ac
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Tue Apr 1 17:53:48 2025 +0200

        Toolbar UI design start

    commit a870cd03fca9113952dc34bc26db5f134ce76b1c
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Tue Apr 1 10:14:22 2025 +0200

        GradleJob Refactor

    commit 2269fd35d9f91b971a163f6b63fb288adb6f9156
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Tue Apr 1 09:15:47 2025 +0200

        Gradle Runner, build script management

    commit 6758d684e7863c887c3b559b7b07eeb8eab32080
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Mon Mar 31 18:40:19 2025 +0200

        Richer console output and richer exception output

    commit 15114a192e36296796f5640874fd816c05e944b5
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Mon Mar 31 15:00:12 2025 +0200

        Retry vm debug connection

    commit 36ce0ab1e3853eb22a28fcd84c560123aa82ae33
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Mon Mar 31 12:05:58 2025 +0200

        Runner: Fixing build errors

    commit 701f9f5db84eb114721c033cd2111d16e3320147
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Sun Mar 30 23:58:36 2025 +0200

        Gradle Runner PoC Refactor

    commit 947a90ea0c204ccd9c5b0139da5eba201dcf2320
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Sun Mar 30 14:51:48 2025 +0200

        Toolbar functionality PoC

    commit 3d6a6ce1dfbb11650eeaa65de7a985f9d23f49d2
    Merge: f7f22c5f7 2222331c9
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Sun Mar 30 08:52:37 2025 +0200

        Merge branch 'processing:main' into gradle-welcome-screen

    commit 4602ef179ea92133ca5d264d8f40aea4f40d4024
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Sat Mar 29 22:50:35 2025 +0100

        Fixes for windows

    commit 0d3795f89343c98ed23d9cadffd1445df25da7ba
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Sat Mar 29 22:31:47 2025 +0100

        Gradle Runner, more variables

    commit ab38e5f44b5e72cbace4551ecdeddc80b70b75a1
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Sat Mar 29 20:54:02 2025 +0100

        Arguments refactor

    commit 17acb01cbe30b1949c5ff60d35f5f8c59d6b567f
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Sat Mar 29 20:10:15 2025 +0100

        Copy running JDK rather than download

    commit b534c26bca8737513f9808f4e737d96a173ce7ce
    Merge: d6cb3eec4 2222331c9
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Sat Mar 29 18:17:20 2025 +0100

        Merge branch 'main' into runner

    commit d6cb3eec45cdfeac944d5bb271ebd5733f2c36fe
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Sat Mar 29 10:20:17 2025 +0100

        Fix for signing release

    commit bf82d5327f2368114e499ade3a5eb18b681a4717
    Merge: 73dfa0a6e dd823a7d6
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Sat Mar 29 10:17:06 2025 +0100

        Merge branch 'runner' of https://github.com/Stefterv/processing4 into runner

    commit 73dfa0a6e19c9318504c5a80d7295e495902041b
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Sat Mar 29 10:17:04 2025 +0100

        Only sign with signing set up

    commit 41ef1cc9813ac6638c85ef0cabfe2121129b363c
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Fri Mar 28 09:00:23 2025 +0100

        Fix plugin name in tests

    commit dd823a7d6cf0f9100a3a8ee803a38e8f2c7718cd
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Fri Mar 28 09:00:23 2025 +0100

        Fix plugin name in tests

    commit 3a14ff40a41979ff7ad25a144f34629c0405e3a0
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Fri Mar 28 08:18:53 2025 +0100

        Added Stubs

    commit 00f8afaa7cd179b720bbd1246c78876295939a2a
    Merge: 700599ed8 1ab2359ca
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Fri Mar 28 08:13:11 2025 +0100

        Merge branch 'schema-threading' into runner

    commit 700599ed8abf775379a6d14c83d4da9b1b9a05a5
    Merge: 1fae4618c 499d200ef
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Fri Mar 28 08:13:06 2025 +0100

        Merge branch 'main' into runner

    commit 1fae4618c926cd27044ae1ed734930943fb8723f
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Thu Mar 27 21:37:55 2025 +0100

        UI Cleanup

    commit f762a3ee12842bea96cee8b011c3bdcb716d2d21
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Thu Mar 27 20:05:01 2025 +0100

        Added debugging

    commit c2071a0c2624dde91f70aac1be5d60955dab624c
    Merge: f453eca87 8fb9ef57b
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Thu Mar 27 18:23:23 2025 +0100

        Merge branch 'hide-scrollbars' into runner

    commit f453eca87fd77d4b2b8fc96bcc9a5574a99099c0
    Merge: 8f47d2110 694eb0cbe
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Thu Mar 27 18:03:34 2025 +0100

        Merge remote-tracking branch 'upstream/fix-jdk-requirement' into runner

    commit 8f47d211093bbd2bd41146a113b77931cb20ebf5
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Thu Mar 27 18:00:15 2025 +0100

        Scan libaries for dependencies

    commit 5d71244e0555d3d079e5b2149ba1381e524caa55
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Thu Mar 27 14:58:11 2025 +0100

        Plugin rework

    commit e164fe48bc1f7ee92029ba7a85ab6a8188fea501
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Thu Mar 27 13:01:33 2025 +0100

        Gradle variables from Processing, Group resolution

    commit 672c2ac479e6874965fac03a0398b6f68dc79f2d
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Thu Mar 27 11:51:08 2025 +0100

        Removed the need for settings.gradle.kts & Embedding maven repo

    commit cdec594cdd57bd71b4bf0c9525af5c2921edbef0
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Wed Mar 26 18:39:04 2025 +0100

        Added export support

    commit 3ad36547296ed0bfa2f457cf822c2105e90ef8d7
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Wed Mar 26 17:25:51 2025 +0100

        Gradle Runner visual styling

    commit bc063e80dbda0c8f78f86b36227948954382528a
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Wed Mar 26 14:17:25 2025 +0100

        Gradle Runner PoC

    commit 47d3428e6298f26aa8b6b951caaddc0d679a811e
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Sun Mar 23 18:18:54 2025 +0100

        More todo's

    commit 29d76eb1d1406b81cd276ffd4ccd325edb86b930
    Merge: ba496569d 9760a63b9
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Sun Mar 23 17:58:39 2025 +0100

        Merge branch 'processing:main' into gradle-plugin

    commit ba496569d8f048448dd6e8e92b2faaf443cf27a7
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Tue Mar 18 10:15:40 2025 +0100

        Adding tests and direct linking

    commit e01d02a8af6aa7ddc53e5a1900561473a2ed6a99
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Mon Mar 17 15:31:25 2025 +0100

        Update settings.gradle.kts

    commit b0b12ddad6676e81c2981c76b270ed745ac681bd
    Merge: 7e6c97add ad5c27ec4
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Mon Mar 17 15:14:35 2025 +0100

        Merge branch 'gradle-preprocessor' into gradle-plugin

    commit ad5c27ec42dc6f479c1c4cee2b119568ba8fa252
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Mon Mar 17 15:11:24 2025 +0100

        Apply same parser & lexer fixes from before

    commit 743ea141904c0d37127c4de6b52ed7d35ece3f32
    Merge: c28a2676b 8e8f7dc5a
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Mon Mar 17 13:53:40 2025 +0100

        Merge branch 'main' into gradle-preprocessor

    commit 7e6c97add90a4eb8f3ebc49faf40dcd0e61b9951
    Merge: f126d4b62 8e8f7dc5a
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Mon Mar 17 13:43:21 2025 +0100

        Merge branch 'main' into gradle-plugin

    commit f7f22c5f7ce8434a058d3cc5411f541777cc637e
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Mon Mar 17 10:40:37 2025 +0100

        Create Directory as well

    commit d17ca0cdcda2080cf458c0352fc89e80ef4f57a7
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Mon Mar 17 10:36:35 2025 +0100

        Removed PlatformStart and create new file if doesn't exist

    commit b0e7f96bddafc1a40c59d47cd81ef9919632ce84
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Mon Mar 17 10:28:12 2025 +0100

        Added initial tests

    commit 0df4dc076ac6d50730e09348b941a39451197b33
    Merge: 6974811be 8e8f7dc5a
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Sun Mar 16 21:18:22 2025 +0100

        Merge branch 'main' into gradle-welcome-screen

    commit 6974811beb562c7c3bd6fb3ae4d94bf9831d6d3c
    Merge: 7452d658c 145551246
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Tue Mar 11 20:42:46 2025 +0100

        Merge branch 'test-schema' into gradle-welcome-screen

    commit 7452d658c8fdb53815d7e5f3ed7ddcaecef302aa
    Merge: babf54e04 fe152b752
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Fri Mar 7 15:07:56 2025 +0100

        Merge branch 'main' into gradle-welcome-screen

    commit c28a2676bd9439106800d502c856b798bd1cfc34
    Merge: e18833608 fe152b752
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Fri Mar 7 15:06:27 2025 +0100

        Merge branch 'processing:main' into gradle-preprocessor

    commit f126d4b6286c3f7363d13cab8797702f8cadb66c
    Merge: da852b45a fe152b752
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Fri Mar 7 15:06:08 2025 +0100

        Merge branch 'processing:main' into gradle-plugin

    commit babf54e04dde6ba972139c8e5744d4a6f9b449f4
    Merge: 0e56f895b 00c57607d
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Mon Feb 10 17:58:35 2025 +0100

        Merge branch 'gradle-loggin' into gradle-welcome-screen

    commit 0e56f895bdaac2c7597d9870eba440cd6fad0997
    Merge: 54944afc2 29b557a7c
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Sun Feb 9 21:15:36 2025 +0100

        Merge branch 'main-gradle' into gradle-welcome-screen

    commit 54944afc24a1058bf6fcc5a9899bfdeaa1283229
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Sun Feb 9 14:36:37 2025 +0100

        Welcome Screen: JDK Module

    commit 8d8bd01d806257367b1a006f0da23b926b8f8ae3
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Sun Feb 9 13:54:07 2025 +0100

        Welcome Screen: Close Functionality

    commit 3df4da94618ed66d9a2b48a601b0ce7bac9a2d4e
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Sun Feb 9 12:57:55 2025 +0100

        Welcome Screen: Bugfixes

    commit cb184fb104ac9c4ead2e6352573f726189da7b70
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Sun Feb 9 12:19:33 2025 +0100

        Welcome Screen: Layout fixes

    commit 3d81b02ffed2c28560bc2067f1584e05db0bad51
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Sat Feb 8 22:47:28 2025 +0100

        Welcome Screen: Language selection

    commit b0c61a4467e8c9f5d02bcc8c84e47908fad22d95
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Sat Feb 8 11:10:33 2025 +0100

        Welcome Screen: Load & Display examples

    commit 2f12d13422c0359562663d93202fe7ce80c3c949
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Fri Feb 7 21:53:49 2025 +0100

        Saveable/Reactive Preferences

    commit 8ed2d1b40acdc38e0ecde7a5831ef47a9ad1559b
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Fri Feb 7 16:34:23 2025 +0100

        Welcome Screen: WIP

    commit 5c020dd0170153bd1a31ffaeed853966e66c5175
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Fri Feb 7 15:49:25 2025 +0100

        Welcome Screen: Initial Layout

    commit bd3a77ef17a456aa2ceb281cc2cf293f8be9d685
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Fri Feb 7 12:09:58 2025 +0100

        Welcome Screen: Window Abstraction

    commit b1910de2e61f6b8b2492b9847ba7f35eec67317a
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Fri Feb 7 11:24:30 2025 +0100

        Welcome Screen: Initial Frame

    commit da852b45a109e27b3b3226fd78a0efd41b695fad
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Wed Feb 5 20:54:32 2025 +0100

        Fullscreen support

    commit 44ab816ca9fe2113f1868c3bda3372afaa9fec5d
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Wed Feb 5 20:38:27 2025 +0100

        disable full screen from settings and fixed a few bugs

    commit e18833608b1f66866d17dbf8f75708e409fe6022
    Merge: df745bb09 3f3e7d785
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Wed Feb 5 13:03:51 2025 +0100

        Merge branch 'main-gradle' into gradle/preprocessor

    commit 031d304dbd6aa73998e07fa696b691e85dd9c2b1
    Merge: 25e147eaf 3f3e7d785
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Wed Feb 5 13:03:12 2025 +0100

        Merge branch 'main-gradle' into gradle/plugin

    commit 25e147eaf1bdfa8b245e86447d2066bded147b44
    Merge: 7f00d5b02 3b9aea1f4
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Wed Feb 5 12:56:55 2025 +0100

        Merge branch 'main-gradle' into gradle/plugin

    commit df745bb09c080929bc64d70bf90d27e9da807d8f
    Merge: f016cc474 3b9aea1f4
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Wed Feb 5 12:56:38 2025 +0100

        Merge branch 'main-gradle' into gradle/preprocessor

    commit 7f00d5b0289dda41d92b126149a81f20d1ccdc31
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Wed Feb 5 12:36:18 2025 +0100

        added example of plugin usage

    commit f4d7fbf99b399889de6b6d0bbafa0148dcb84782
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Wed Feb 5 09:19:08 2025 +0100

        Changed naming

    commit 1b8a8ed461cb39eb0489564589e144178fb1bef5
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Wed Feb 5 09:10:42 2025 +0100

        Gradle Plugin from PoC

    commit 5468da0fd6b42f790340acb3e2d00472ae5f42af
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Tue Feb 4 16:18:29 2025 +0100

        Removed outdated ant backwards compatibility marks

    commit 23c8a4626ac370b560169df130d86d4b58d859e2
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Mon Feb 3 12:07:01 2025 +0100

        - Imports cleanup
        - Disable system look & feel on macOS for readability
        - Cleaned unnecessary space
        - Cleaned finished TODO

    commit f016cc474caa637f982c8dd21078801974aabb69
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Wed Feb 5 12:01:47 2025 +0100

        Removed core dependency from the pre-processor

    commit 971d98bba0a8acf24a9430015a7c1508e2c9d2a3
    Author: Stef Tervelde <stef@steftervelde.nl>
    Date:   Thu Jan 30 22:59:16 2025 +0100

        Preprocessor with antlr Plugin
---
 .gitignore                                    |  25 +++
 java/README.md                                |  32 ++-
 java/gradle/build.gradle.kts                  |  41 ++++
 java/gradle/example/.idea/.gitignore          |   5 +
 java/gradle/example/.idea/.name               |   1 +
 java/gradle/example/.idea/compiler.xml        |   6 +
 java/gradle/example/.idea/gradle.xml          |  56 +++++
 java/gradle/example/.idea/kotlinc.xml         |   6 +
 java/gradle/example/.idea/vcs.xml             |   6 +
 java/gradle/example/brightness.pde            |  34 +++
 java/gradle/example/build.gradle.kts          |   3 +
 java/gradle/example/settings.gradle.kts       |   5 +
 java/gradle/hotreload/build.gradle.kts        |  33 +++
 .../java/gradle/ProcessingHotReloadPlugin.kt  |  29 +++
 .../src/main/kotlin/DependenciesTask.kt       |  79 +++++++
 java/gradle/src/main/kotlin/LibrariesTask.kt  |  84 +++++++
 java/gradle/src/main/kotlin/PDETask.kt        |  83 +++++++
 .../src/main/kotlin/ProcessingPlugin.kt       | 207 ++++++++++++++++++
 .../src/test/kotlin/ProcessingPluginTest.kt   | 203 +++++++++++++++++
 java/preprocessor/build.gradle.kts            |   1 -
 settings.gradle.kts                           |   1 +
 21 files changed, 932 insertions(+), 8 deletions(-)
 create mode 100644 java/gradle/build.gradle.kts
 create mode 100644 java/gradle/example/.idea/.gitignore
 create mode 100644 java/gradle/example/.idea/.name
 create mode 100644 java/gradle/example/.idea/compiler.xml
 create mode 100644 java/gradle/example/.idea/gradle.xml
 create mode 100644 java/gradle/example/.idea/kotlinc.xml
 create mode 100644 java/gradle/example/.idea/vcs.xml
 create mode 100644 java/gradle/example/brightness.pde
 create mode 100644 java/gradle/example/build.gradle.kts
 create mode 100644 java/gradle/example/settings.gradle.kts
 create mode 100644 java/gradle/hotreload/build.gradle.kts
 create mode 100644 java/gradle/hotreload/src/main/kotlin/org/processing/java/gradle/ProcessingHotReloadPlugin.kt
 create mode 100644 java/gradle/src/main/kotlin/DependenciesTask.kt
 create mode 100644 java/gradle/src/main/kotlin/LibrariesTask.kt
 create mode 100644 java/gradle/src/main/kotlin/PDETask.kt
 create mode 100644 java/gradle/src/main/kotlin/ProcessingPlugin.kt
 create mode 100644 java/gradle/src/test/kotlin/ProcessingPluginTest.kt

diff --git a/.gitignore b/.gitignore
index 67057f9425..4532993a0d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -66,6 +66,19 @@ gen-external-apklibs
 hs_err_pid*
 replay_pid*
 
+# Maven ignores
+.kotlin
+.gradle
+.build/
+/core/build/
+/build/publish/
+/app/build
+/java/build/
+/build/reports
+/java/bin
+/java/libraries/svg/bin
+/java/preprocessor/build
+/java/lsp/build
 ### Gradle ###
 .gradle
 **/build/
@@ -123,4 +136,16 @@ generated/
 !java/libraries/serial/library/jssc.jar
 /app/windows/obj
 /java/gradle/build
+/core/examples/build
 /java/gradle/example/.processing
+/app/windows/obj
+/java/android/example/build
+/java/android/example/.processing
+/java/gradle/example/build
+/java/gradle/example/gradle/wrapper/gradle-wrapper.jar
+/java/gradle/example/gradle/wrapper/gradle-wrapper.properties
+/java/gradle/example/gradlew
+/java/gradle/example/gradlew.bat
+/java/gradle/example/.kotlin/errors
+/java/gradle/hotreload/build
+*.iml
diff --git a/java/README.md b/java/README.md
index a4be6e9a87..0a905208d0 100644
--- a/java/README.md
+++ b/java/README.md
@@ -3,8 +3,9 @@
 This the Java Mode in Processing. It compiles your sketches and runs them. It is the primary mode of Processing.
 
 ## Folders
-- `application` assets for exporting applications within the mode
-- `generated` generated antlr code for the mode, should be moved to a proper `antlr` plugin within gradle
+- `application` assets for exporting applications within the mode (Deprecated)
+- `generated` generated antlr code for the mode, should be moved to a proper `antlr` plugin within gradle (Deprecated)
+- `gradle` the Processing java gradle plugin
 - `libraries` libraries that are available within the mode
 - `lsp` gradle build system for the language server protocol, in the future we should decouple the lsp from the java mode and pde and move all relevant code here. For now it can be found in `src/.../lsp`
 - `mode` legacy files for `Ant`
@@ -13,8 +14,25 @@ This the Java Mode in Processing. It compiles your sketches and runs them. It is
 - `test` tests for the mode
 - `theme` assets for the mode, related to autocomplete and syntax highlighting
 
-## Future plans
-- Decouple the `lsp` and `preprocessor` from the mode and move them to their own repositories
-- Move the `antlr` code to a proper plugin within gradle
-- Create a gradle plugin to convert `.pde` file to `.java` files
-- Create a gradle based version of Java mode.
\ No newline at end of file
+## The Modern Build system
+
+Since 2025 work has started on creating a new internal build system for the Java Mode based on Gradle.
+The goal is to simplify by leaning more on Gradle, which provides a lot of the functionality that was build before out of the box and a lot more.
+
+### How it used to work
+
+The build system used to be based on some parts Ant, some parts eclipse (org.eclipse.jdt.core) and a lot of custom work build up over the years.
+
+### How it will work going forward
+
+The modern build system is based around Gradle, the main service (GradleService) for building a sketch with Gradle is included in `app` instead of into the Java mode as future modes are most likely also based on Gradle if they use `core` in some way. Most _Modes_ should/could probably be a Gradle plugin going forward.
+Breaking the build system away from the java mode will mean that we create an island of isolation when it comes to the build system, allowing contributors to work on the build system without running the editor.
+Another upside is that when we publish the Gradle plugin to the Gradle Plugin repository, it will become trivial to run Processing sketches outside the PDE and improvements made to the build system will be usable for everyone. 
+There is now also an opportunity for creating contributions that modify the build system in more subtle ways rather than having to make a complete new mode, e.g. a compilation step for shaders or some setup tweaks to make JavaFX work out of the box.
+Furthermore, this change will embed Processing more into the wider Java ecosystem, if users want to upgrade from using Processing to Java whilst still using `core` that will become possible and won't  need a rewrite of what they already created. 
+
+### How to work on the modern build system
+
+If you want to work on the build system without the PDE, open `/java/gradle/example` into a new intellij IDEA window, this is set up to compile the Processing Java plugin and run sketches standalone.
+
+Within the editor, the gradle plugin is embedded in Processing's embedded maven repository so that Gradle can find it.  
\ No newline at end of file
diff --git a/java/gradle/build.gradle.kts b/java/gradle/build.gradle.kts
new file mode 100644
index 0000000000..0171384f44
--- /dev/null
+++ b/java/gradle/build.gradle.kts
@@ -0,0 +1,41 @@
+plugins{
+    `java-gradle-plugin`
+    alias(libs.plugins.gradlePublish)
+
+    kotlin("jvm") version libs.versions.kotlin
+}
+
+repositories {
+    mavenCentral()
+    maven("https://jogamp.org/deployment/maven")
+}
+
+dependencies{
+    implementation(project(":java:preprocessor"))
+
+    implementation(libs.composeGradlePlugin)
+    implementation(libs.kotlinGradlePlugin)
+    implementation(libs.kotlinComposePlugin)
+
+    testImplementation(project(":core"))
+    testImplementation(libs.junit)
+}
+
+// TODO: CI/CD for publishing the plugin to the Gradle Plugin Portal
+gradlePlugin{
+    plugins{
+        create("processing.java"){
+            id = "org.processing.java"
+            implementationClass = "org.processing.java.gradle.ProcessingPlugin"
+        }
+    }
+}
+publishing{
+    repositories{
+        mavenLocal()
+        maven {
+            name = "App"
+            url = uri(project(":app").layout.buildDirectory.dir("resources-bundled/common/repository").get().asFile.absolutePath)
+        }
+    }
+}
\ No newline at end of file
diff --git a/java/gradle/example/.idea/.gitignore b/java/gradle/example/.idea/.gitignore
new file mode 100644
index 0000000000..a0ccf77bc5
--- /dev/null
+++ b/java/gradle/example/.idea/.gitignore
@@ -0,0 +1,5 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+# Environment-dependent path to Maven home directory
+/mavenHomeManager.xml
diff --git a/java/gradle/example/.idea/.name b/java/gradle/example/.idea/.name
new file mode 100644
index 0000000000..fb61c9d808
--- /dev/null
+++ b/java/gradle/example/.idea/.name
@@ -0,0 +1 @@
+processing-gradle-plugin-demo
\ No newline at end of file
diff --git a/java/gradle/example/.idea/compiler.xml b/java/gradle/example/.idea/compiler.xml
new file mode 100644
index 0000000000..b589d56e9f
--- /dev/null
+++ b/java/gradle/example/.idea/compiler.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CompilerConfiguration">
+    <bytecodeTargetLevel target="17" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/java/gradle/example/.idea/gradle.xml b/java/gradle/example/.idea/gradle.xml
new file mode 100644
index 0000000000..e1f15111a0
--- /dev/null
+++ b/java/gradle/example/.idea/gradle.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="GradleMigrationSettings" migrationVersion="1" />
+  <component name="GradleSettings">
+    <option name="linkedExternalProjectsSettings">
+      <GradleProjectSettings>
+        <compositeConfiguration>
+          <compositeBuild compositeDefinitionSource="SCRIPT">
+            <builds>
+              <build path="$PROJECT_DIR$/../../.." name="processing">
+                <projects>
+                  <project path="$PROJECT_DIR$/../../.." />
+                  <project path="$PROJECT_DIR$/../../../app" />
+                  <project path="$PROJECT_DIR$/../../../app/utils" />
+                  <project path="$PROJECT_DIR$/../../../core" />
+                  <project path="$PROJECT_DIR$/../../../core/examples" />
+                  <project path="$PROJECT_DIR$/../.." />
+                  <project path="$PROJECT_DIR$/.." />
+                  <project path="$PROJECT_DIR$/../../libraries" />
+                  <project path="$PROJECT_DIR$/../../libraries/dxf" />
+                  <project path="$PROJECT_DIR$/../../libraries/io" />
+                  <project path="$PROJECT_DIR$/../../libraries/net" />
+                  <project path="$PROJECT_DIR$/../../libraries/pdf" />
+                  <project path="$PROJECT_DIR$/../../libraries/serial" />
+                  <project path="$PROJECT_DIR$/../../libraries/svg" />
+                  <project path="$PROJECT_DIR$/../../preprocessor" />
+                </projects>
+              </build>
+            </builds>
+          </compositeBuild>
+        </compositeConfiguration>
+        <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="modules">
+          <set>
+            <option value="$PROJECT_DIR$/../../.." />
+            <option value="$PROJECT_DIR$/../../../app" />
+            <option value="$PROJECT_DIR$/../../../app/utils" />
+            <option value="$PROJECT_DIR$/../../../core" />
+            <option value="$PROJECT_DIR$/../../../core/examples" />
+            <option value="$PROJECT_DIR$/../.." />
+            <option value="$PROJECT_DIR$/.." />
+            <option value="$PROJECT_DIR$" />
+            <option value="$PROJECT_DIR$/../../libraries" />
+            <option value="$PROJECT_DIR$/../../libraries/dxf" />
+            <option value="$PROJECT_DIR$/../../libraries/io" />
+            <option value="$PROJECT_DIR$/../../libraries/net" />
+            <option value="$PROJECT_DIR$/../../libraries/pdf" />
+            <option value="$PROJECT_DIR$/../../libraries/serial" />
+            <option value="$PROJECT_DIR$/../../libraries/svg" />
+            <option value="$PROJECT_DIR$/../../preprocessor" />
+          </set>
+        </option>
+      </GradleProjectSettings>
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/java/gradle/example/.idea/kotlinc.xml b/java/gradle/example/.idea/kotlinc.xml
new file mode 100644
index 0000000000..d4b7accbaa
--- /dev/null
+++ b/java/gradle/example/.idea/kotlinc.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="KotlinJpsPluginSettings">
+    <option name="version" value="2.0.20" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/java/gradle/example/.idea/vcs.xml b/java/gradle/example/.idea/vcs.xml
new file mode 100644
index 0000000000..c2365ab11f
--- /dev/null
+++ b/java/gradle/example/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$/../../.." vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/java/gradle/example/brightness.pde b/java/gradle/example/brightness.pde
new file mode 100644
index 0000000000..17e3141d9c
--- /dev/null
+++ b/java/gradle/example/brightness.pde
@@ -0,0 +1,34 @@
+/**
+ * Brightness
+ * by Rusty Robison.
+ *
+ * Brightness is the relative lightness or darkness of a color.
+ * Move the cursor vertically over each bar to alter its brightness.
+ */
+
+int barWidth = 20;
+int lastBar = -1;
+
+/*
+import controlP5.*;
+
+ControlP5 cp5;
+*/
+
+
+void setup() {
+  size(640, 360, P2D);
+  colorMode(HSB, width, 100, height);
+  noStroke();
+  background(0);
+}
+
+void draw() {
+  int whichBar = mouseX / barWidth;
+  if (whichBar != lastBar) {
+    int barX = whichBar * barWidth;
+    fill(barX, 100, mouseY);
+    rect(barX, 0, barWidth, height);
+    lastBar = whichBar;
+  }
+}
diff --git a/java/gradle/example/build.gradle.kts b/java/gradle/example/build.gradle.kts
new file mode 100644
index 0000000000..b476d51bba
--- /dev/null
+++ b/java/gradle/example/build.gradle.kts
@@ -0,0 +1,3 @@
+plugins{
+    id("org.processing.java")
+}
\ No newline at end of file
diff --git a/java/gradle/example/settings.gradle.kts b/java/gradle/example/settings.gradle.kts
new file mode 100644
index 0000000000..ee9c97e155
--- /dev/null
+++ b/java/gradle/example/settings.gradle.kts
@@ -0,0 +1,5 @@
+rootProject.name = "processing-gradle-plugin-demo"
+
+pluginManagement {
+    includeBuild("../../../")
+}
\ No newline at end of file
diff --git a/java/gradle/hotreload/build.gradle.kts b/java/gradle/hotreload/build.gradle.kts
new file mode 100644
index 0000000000..e4873a8c31
--- /dev/null
+++ b/java/gradle/hotreload/build.gradle.kts
@@ -0,0 +1,33 @@
+plugins {
+    `java-gradle-plugin`
+    kotlin("jvm") version libs.versions.kotlin
+    alias(libs.plugins.gradlePublish)
+
+}
+
+
+repositories {
+    mavenCentral()
+}
+
+dependencies{
+    implementation("org.jetbrains.compose.hot-reload:hot-reload-gradle-plugin:1.0.0-beta03")
+}
+
+gradlePlugin{
+    plugins{
+        create("processing.java.hotreload"){
+            id = "org.processing.java.hotreload"
+            implementationClass = "org.processing.java.gradle.ProcessingHotReloadPlugin"
+        }
+    }
+}
+publishing{
+    repositories{
+        mavenLocal()
+        maven {
+            name = "App"
+            url = uri(project(":app").layout.buildDirectory.dir("resources-bundled/common/repository").get().asFile.absolutePath)
+        }
+    }
+}
\ No newline at end of file
diff --git a/java/gradle/hotreload/src/main/kotlin/org/processing/java/gradle/ProcessingHotReloadPlugin.kt b/java/gradle/hotreload/src/main/kotlin/org/processing/java/gradle/ProcessingHotReloadPlugin.kt
new file mode 100644
index 0000000000..4776d4ebce
--- /dev/null
+++ b/java/gradle/hotreload/src/main/kotlin/org/processing/java/gradle/ProcessingHotReloadPlugin.kt
@@ -0,0 +1,29 @@
+package org.processing.java.gradle
+
+import org.gradle.api.Plugin
+import org.gradle.api.Project
+import org.gradle.api.plugins.JavaPluginExtension
+import org.gradle.jvm.toolchain.JavaLanguageVersion
+import org.gradle.jvm.toolchain.JvmVendorSpec
+import org.jetbrains.compose.reload.gradle.ComposeHotReloadPlugin
+
+class ProcessingHotReloadPlugin: Plugin<Project> {
+    override fun apply(project: Project) {
+        project.plugins.apply(ComposeHotReloadPlugin::class.java)
+
+        project.repositories.google()
+        project.extensions.getByType(JavaPluginExtension::class.java).toolchain {
+            it.languageVersion.set(JavaLanguageVersion.of(21))
+            it.vendor.set(JvmVendorSpec.JETBRAINS)
+        }
+
+        project.afterEvaluate {
+            project.tasks.named("build").configure { task ->
+                task.finalizedBy("reload")
+            }
+            project.tasks.named("run").configure { task ->
+                task.dependsOn("hotRun")
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/java/gradle/src/main/kotlin/DependenciesTask.kt b/java/gradle/src/main/kotlin/DependenciesTask.kt
new file mode 100644
index 0000000000..8e2cb9bca3
--- /dev/null
+++ b/java/gradle/src/main/kotlin/DependenciesTask.kt
@@ -0,0 +1,79 @@
+package org.processing.java.gradle
+
+import org.gradle.api.DefaultTask
+import org.gradle.api.GradleException
+import org.gradle.api.file.RegularFileProperty
+import org.gradle.api.tasks.InputFile
+import org.gradle.api.tasks.TaskAction
+import java.io.File
+import java.io.ObjectInputStream
+
+/*
+* The DependenciesTask resolves the dependencies for the sketch based on the libraries used
+ */
+abstract class DependenciesTask: DefaultTask() {
+    @InputFile
+    val librariesMetaData: RegularFileProperty = project.objects.fileProperty()
+
+    @InputFile
+    val sketchMetaData: RegularFileProperty = project.objects.fileProperty()
+
+    init{
+        librariesMetaData.convention(project.layout.buildDirectory.file("processing/libraries"))
+        sketchMetaData.convention(project.layout.buildDirectory.file("processing/sketch"))
+    }
+
+    @TaskAction
+    fun execute() {
+        val sketchMetaFile = sketchMetaData.get().asFile
+        val librariesMetaFile = librariesMetaData.get().asFile
+
+        val libraries = librariesMetaFile.inputStream().use { input ->
+            ObjectInputStream(input).readObject() as ArrayList<LibrariesTask.Library>
+        }
+
+        val sketch = sketchMetaFile.inputStream().use { input ->
+            ObjectInputStream(input).readObject() as PDETask.SketchMeta
+        }
+
+        val dependencies = mutableSetOf<File>()
+
+        // Loop over the import statements in the sketch and import the relevant jars from the libraries
+        sketch.importStatements.forEach import@{ statement ->
+            libraries.forEach { library ->
+                library.jars.forEach { jar ->
+                    jar.classes.forEach { className ->
+                        if (className.startsWith(statement)) {
+                            dependencies.addAll(library.jars.map { it.path } )
+                            return@import
+                        }
+                    }
+                }
+            }
+        }
+        project.dependencies.add("implementation",  project.files(dependencies) )
+
+        // TODO: Mutating the dependencies of configuration ':implementation' after it has been resolved or consumed. This
+
+        // TODO: Add only if user is compiling for P2D or P3D
+        // Add JOGL and Gluegen dependencies
+        project.dependencies.add("runtimeOnly", "org.jogamp.jogl:jogl-all-main:2.5.0")
+        project.dependencies.add("runtimeOnly", "org.jogamp.gluegen:gluegen-rt:2.5.0")
+
+        val os = System.getProperty("os.name").lowercase()
+        val arch = System.getProperty("os.arch").lowercase()
+
+        val variant = when {
+            os.contains("mac") -> "macosx-universal"
+            os.contains("win") && arch.contains("64") -> "windows-amd64"
+            os.contains("linux") && arch.contains("aarch64") -> "linux-aarch64"
+            os.contains("linux") && arch.contains("arm") -> "linux-arm"
+            os.contains("linux") && arch.contains("amd64") -> "linux-amd64"
+            else -> throw GradleException("Unsupported OS/architecture: $os / $arch")
+        }
+
+        project.dependencies.add("runtimeOnly", "org.jogamp.gluegen:gluegen-rt:2.5.0:natives-$variant")
+        project.dependencies.add("runtimeOnly", "org.jogamp.jogl:nativewindow:2.5.0:natives-$variant")
+        project.dependencies.add("runtimeOnly", "org.jogamp.jogl:newt:2.5.0:natives-$variant")
+    }
+}
\ No newline at end of file
diff --git a/java/gradle/src/main/kotlin/LibrariesTask.kt b/java/gradle/src/main/kotlin/LibrariesTask.kt
new file mode 100644
index 0000000000..472d9e3b77
--- /dev/null
+++ b/java/gradle/src/main/kotlin/LibrariesTask.kt
@@ -0,0 +1,84 @@
+package org.processing.java.gradle
+
+import org.gradle.api.DefaultTask
+import org.gradle.api.file.DirectoryProperty
+import org.gradle.api.file.RegularFileProperty
+import org.gradle.api.tasks.InputDirectory
+import org.gradle.api.tasks.Optional
+import org.gradle.api.tasks.OutputFile
+import org.gradle.api.tasks.TaskAction
+import java.io.File
+import java.io.ObjectOutputStream
+import java.util.jar.JarFile
+
+/*
+The libraries task scans the sketchbook libraries folder for all the libraries
+This task stores the resulting information in a file that can be used later to resolve dependencies
+ */
+abstract class LibrariesTask : DefaultTask() {
+
+    // TODO: Allow multiple directories
+    @InputDirectory
+    @Optional
+    val librariesDirectory: DirectoryProperty = project.objects.directoryProperty()
+
+    @OutputFile
+    val librariesMetaData: RegularFileProperty = project.objects.fileProperty()
+
+    init{
+        librariesMetaData.convention(project.layout.buildDirectory.file("processing/libraries"))
+    }
+
+    data class Jar(
+        val path: File,
+        val classes: List<String>
+    ) : java.io.Serializable
+
+    data class Library(
+        val jars: List<Jar>
+    ) : java.io.Serializable
+
+    @TaskAction
+    fun execute() {
+        if (!librariesDirectory.isPresent) {
+            logger.error("Libraries directory is not set. Libraries will not be imported.")
+            val meta = ObjectOutputStream(librariesMetaData.get().asFile.outputStream())
+            meta.writeObject(arrayListOf<Library>())
+            meta.close()
+            return
+        }
+        val libraries = librariesDirectory.get().asFile
+            .listFiles { file -> file.isDirectory }
+            ?.map { folder ->
+                // Find all the jars in the sketchbook
+                val jars = folder.resolve("library")
+                    .listFiles{ file -> file.extension == "jar" }
+                    ?.map{ file ->
+
+                        // Inside of each jar, look for the defined classes
+                        val jar = JarFile(file)
+                        val classes = jar.entries().asSequence()
+                            .filter { entry -> entry.name.endsWith(".class") }
+                            .map { entry -> entry.name }
+                            .map { it.substringBeforeLast('/').replace('/', '.') }
+                            .distinct()
+                            .toList()
+
+                        // Return a reference to the jar and its classes
+                        return@map Jar(
+                            path = file,
+                            classes = classes
+                        )
+                    }?: emptyList()
+
+                // Save the parsed jars and which folder
+                return@map Library(
+                    jars = jars
+                )
+            }?: emptyList()
+
+        val meta = ObjectOutputStream(librariesMetaData.get().asFile.outputStream())
+        meta.writeObject(libraries)
+        meta.close()
+    }
+}
\ No newline at end of file
diff --git a/java/gradle/src/main/kotlin/PDETask.kt b/java/gradle/src/main/kotlin/PDETask.kt
new file mode 100644
index 0000000000..76ac195e53
--- /dev/null
+++ b/java/gradle/src/main/kotlin/PDETask.kt
@@ -0,0 +1,83 @@
+package org.processing.java.gradle
+
+import org.gradle.api.file.*
+import org.gradle.api.tasks.*
+import org.gradle.internal.file.Deleter
+import org.gradle.work.InputChanges
+import processing.mode.java.preproc.PdePreprocessor
+import java.io.File
+import java.io.ObjectOutputStream
+import java.io.Serializable
+import java.util.concurrent.Callable
+import java.util.jar.JarFile
+import javax.inject.Inject
+
+
+// TODO: Generate sourcemaps
+/*
+* The PDETask is the main task that processes the .pde files and generates the Java source code through the PdePreprocessor.
+ */
+abstract class PDETask : SourceTask() {
+    @get:InputFiles
+    @get:PathSensitive(PathSensitivity.RELATIVE)
+    @get:IgnoreEmptyDirectories
+    @get:SkipWhenEmpty
+    open val stableSources: FileCollection = project.files(Callable<Any> { this.source })
+
+    @OutputDirectory
+    val outputDirectory: DirectoryProperty = project.objects.directoryProperty()
+
+    @get:Input
+    var sketchName: String = "processing"
+
+    @OutputFile
+    val sketchMetaData: RegularFileProperty = project.objects.fileProperty()
+
+    init{
+        outputDirectory.convention(project.layout.buildDirectory.dir("generated/pde"))
+        sketchMetaData.convention(project.layout.buildDirectory.file("processing/sketch"))
+    }
+
+    data class SketchMeta(
+        val sketchName: String,
+        val sketchRenderer: String?,
+        val importStatements: List<String>
+    ) : Serializable
+
+    @TaskAction
+    fun execute() {
+        // Using stableSources since we can only run the pre-processor on the full set of sources
+        val combined = stableSources
+            .files
+            .groupBy { it.name }
+            .map { entry ->
+                entry.value.firstOrNull { it.parentFile?.name == "unsaved" }
+                    ?: entry.value.first()
+            }
+            .joinToString("\n"){
+                 it.readText()
+         }
+        val javaFile = File(outputDirectory.get().asFile, "$sketchName.java").bufferedWriter()
+
+        val meta = PdePreprocessor
+            .builderFor(sketchName)
+            .setTabSize(4)
+            .build()
+            .write(javaFile, combined)
+
+        // TODO: Save the edits to meta files
+
+        javaFile.flush()
+        javaFile.close()
+
+        val sketchMeta = SketchMeta(
+            sketchName = sketchName,
+            sketchRenderer = meta.sketchRenderer,
+            importStatements = meta.importStatements.map { importStatement -> importStatement.packageName }
+        )
+
+        val metaFile = ObjectOutputStream(sketchMetaData.get().asFile.outputStream())
+        metaFile.writeObject(sketchMeta)
+        metaFile.close()
+    }
+}
\ No newline at end of file
diff --git a/java/gradle/src/main/kotlin/ProcessingPlugin.kt b/java/gradle/src/main/kotlin/ProcessingPlugin.kt
new file mode 100644
index 0000000000..a45f2ff84b
--- /dev/null
+++ b/java/gradle/src/main/kotlin/ProcessingPlugin.kt
@@ -0,0 +1,207 @@
+package org.processing.java.gradle
+
+import org.gradle.api.Plugin
+import org.gradle.api.Project
+import org.gradle.api.file.SourceDirectorySet
+import org.gradle.api.internal.file.DefaultSourceDirectorySet
+import org.gradle.api.internal.tasks.TaskDependencyFactory
+import org.gradle.api.model.ObjectFactory
+import org.gradle.api.plugins.JavaPlugin
+import org.gradle.api.plugins.JavaPluginExtension
+import org.gradle.api.tasks.JavaExec
+import org.jetbrains.compose.ComposeExtension
+import org.jetbrains.compose.desktop.DesktopExtension
+import java.io.File
+import java.net.Socket
+import java.util.Properties
+import javax.inject.Inject
+
+class ProcessingPlugin @Inject constructor(private val objectFactory: ObjectFactory) : Plugin<Project> {
+    override fun apply(project: Project) {
+        val sketchName = project.layout.projectDirectory.asFile.name.replace(Regex("[^a-zA-Z0-9_]"), "_")
+
+        val isProcessing = project.findProperty("processing.version") != null
+        val processingVersion = project.findProperty("processing.version") as String? ?: "4.3.4"
+        val processingGroup = project.findProperty("processing.group") as String? ?: "org.processing"
+        val workingDir = project.findProperty("processing.workingDir") as String?
+        val debugPort = project.findProperty("processing.debugPort") as String?
+        val logPort = project.findProperty("processing.logPort") as String?
+        val errPort = project.findProperty("processing.errPort") as String?
+
+        // TODO: Setup sketchbook when using as a standalone plugin, use the Java Preferences
+        val sketchbook = project.findProperty("processing.sketchbook") as String?
+        val settings = project.findProperty("processing.settings") as String?
+
+        // Apply the Java plugin to the Project, equivalent of
+        // plugins {
+        //     java
+        // }
+        project.plugins.apply(JavaPlugin::class.java)
+
+        if(isProcessing){
+            // Set the build directory to a temp file so it doesn't clutter up the sketch folder
+            // Only if the build directory doesn't exist, otherwise proceed as normal
+            if(!project.layout.buildDirectory.asFile.get().exists()) {
+                project.layout.buildDirectory.set(File(project.findProperty("processing.workingDir") as String))
+            }
+            // Disable the wrapper in the sketch to keep it cleaner
+            project.tasks.findByName("wrapper")?.enabled = false
+        }
+
+        // Add kotlin support, equivalent of
+        // plugins {
+        //     kotlin("jvm") version "1.8.0"
+        //     kotlin("plugin.compose") version "1.8.0"
+        // }
+        project.plugins.apply("org.jetbrains.kotlin.jvm")
+        // Add jetpack compose support
+        project.plugins.apply("org.jetbrains.kotlin.plugin.compose")
+        // Add the compose plugin to wrap the sketch in an executable
+        project.plugins.apply("org.jetbrains.compose")
+
+        // Add the Processing core library (within Processing from the internal maven repo and outside from the internet), equivalent of
+        // dependencies {
+        //     implementation("org.processing:core:4.3.4")
+        // }
+        project.dependencies.add("implementation", "$processingGroup:core:${processingVersion}")
+
+        // Add the jars in the code folder, equivalent of
+        // dependencies {
+        //     implementation(fileTree("src") { include("**/code/*.jar") })
+        // }
+        project.dependencies.add("implementation", project.fileTree("src").apply { include("**/code/*.jar") })
+
+        // Add the repositories necessary for building the sketch, equivalent of
+        // repositories {
+        //     maven("https://jogamp.org/deployment/maven")
+        //     mavenCentral()
+        //     mavenLocal()
+        // }
+        project.repositories.add(project.repositories.maven { it.setUrl("https://jogamp.org/deployment/maven") })
+        project.repositories.add(project.repositories.mavenCentral())
+        project.repositories.add(project.repositories.mavenLocal())
+
+        // Configure the compose Plugin, equivalent of
+        // compose {
+        //     application {
+        //         mainClass.set(sketchName)
+        //         nativeDistributions {
+        //             includeAllModules()
+        //         }
+        //     }
+        // }
+        project.extensions.configure(ComposeExtension::class.java) { extension ->
+            extension.extensions.getByType(DesktopExtension::class.java).application { application ->
+                // Set the class to be executed initially
+                application.mainClass = sketchName
+                application.nativeDistributions.includeAllModules = true
+                if(debugPort != null) {
+                    application.jvmArgs("-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=$debugPort")
+                }
+            }
+        }
+
+        // TODO: Add support for customizing distributables
+        // TODO: Setup sensible defaults for the distributables
+
+        // Add convenience tasks for running, presenting, and exporting the sketch outside of Processing
+        if(!isProcessing) {
+            project.tasks.create("sketch").apply {
+                group = "processing"
+                description = "Runs the Processing sketch"
+                dependsOn("run")
+            }
+            project.tasks.create("present").apply {
+                group = "processing"
+                description = "Presents the Processing sketch"
+                doFirst {
+                    project.tasks.withType(JavaExec::class.java).configureEach { task ->
+                        task.systemProperty("processing.fullscreen", "true")
+                    }
+                }
+                finalizedBy("run")
+            }
+            project.tasks.create("export").apply {
+                group = "processing"
+                description = "Creates a distributable version of the Processing sketch"
+
+                dependsOn("createDistributable")
+
+            }
+        }
+
+        project.afterEvaluate {
+            // Copy the result of create distributable to the project directory
+            project.tasks.named("createDistributable") { task ->
+                task.doLast {
+                    project.copy {
+                        it.from(project.tasks.named("createDistributable").get().outputs.files)
+                        it.into(project.layout.projectDirectory)
+                    }
+                }
+            }
+        }
+
+        // Move the processing variables into javaexec tasks so they can be used in the sketch as well
+        project.tasks.withType(JavaExec::class.java).configureEach { task ->
+            project.properties
+                .filterKeys { it.startsWith("processing") }
+                .forEach { (key, value) -> task.systemProperty(key, value) }
+
+            if(logPort != null) task.standardOutput =  Socket("localhost", logPort.toInt()).outputStream
+            if(errPort != null) task.errorOutput = Socket("localhost", errPort.toInt()).outputStream
+
+        }
+
+        project.extensions.getByType(JavaPluginExtension::class.java).sourceSets.first().let{ sourceSet ->
+            val pdeSourceSet = objectFactory.newInstance(
+                DefaultPDESourceDirectorySet::class.java,
+                objectFactory.sourceDirectorySet("${sourceSet.name}.pde", "${sourceSet.name} Processing Source")
+            ).apply {
+                filter.include("**/*.pde")
+                filter.exclude("${project.layout.buildDirectory.asFile.get().name}/**")
+
+                srcDir("./")
+                srcDir("$workingDir/unsaved")
+            }
+            sourceSet.allSource.source(pdeSourceSet)
+//            sourceSet.java.srcDir(project.layout.projectDirectory).apply {
+//                include("*.java")
+//            }
+
+            val librariesTaskName = sourceSet.getTaskName("scanLibraries", "PDE")
+            val librariesScan = project.tasks.register(librariesTaskName, LibrariesTask::class.java) { task ->
+                task.description = "Scans the libraries in the sketchbook"
+                task.librariesDirectory.set(sketchbook?.let { File(it, "libraries") })
+                // TODO: Save the libraries metadata to settings folder to share between sketches
+            }
+
+            val pdeTaskName = sourceSet.getTaskName("preprocess", "PDE")
+            val pdeTask = project.tasks.register(pdeTaskName, PDETask::class.java) { task ->
+                task.description = "Processes the ${sourceSet.name} PDE"
+                task.source = pdeSourceSet
+                task.sketchName = sketchName
+
+                // Set the output of the pre-processor as the input for the java compiler
+                sourceSet.java.srcDir(task.outputDirectory)
+            }
+
+            val depsTaskName = sourceSet.getTaskName("addLegacyDependencies", "PDE")
+            project.tasks.register(depsTaskName, DependenciesTask::class.java){ task ->
+                task.librariesMetaData
+                task.dependsOn(pdeTask, librariesScan)
+                // TODO: Save the libraries metadata to settings folder to share between sketches
+            }
+
+            // Make sure that the PDE task runs before the java compilation task
+            project.tasks.named(sourceSet.compileJavaTaskName) { task ->
+                task.dependsOn(pdeTaskName, depsTaskName)
+            }
+        }
+    }
+    abstract class DefaultPDESourceDirectorySet @Inject constructor(
+        sourceDirectorySet: SourceDirectorySet,
+        taskDependencyFactory: TaskDependencyFactory
+    ) : DefaultSourceDirectorySet(sourceDirectorySet, taskDependencyFactory), SourceDirectorySet
+}
+
diff --git a/java/gradle/src/test/kotlin/ProcessingPluginTest.kt b/java/gradle/src/test/kotlin/ProcessingPluginTest.kt
new file mode 100644
index 0000000000..190e0e7362
--- /dev/null
+++ b/java/gradle/src/test/kotlin/ProcessingPluginTest.kt
@@ -0,0 +1,203 @@
+import org.gradle.testkit.runner.BuildResult
+import org.gradle.testkit.runner.GradleRunner
+import org.junit.Test
+import org.junit.rules.TemporaryFolder
+import java.io.File
+import java.lang.management.ManagementFactory
+import java.net.URLClassLoader
+
+class ProcessingPluginTest{
+    // TODO: Test on multiple platforms since there are meaningful differences between the platforms
+    data class TemporaryProcessingSketchResult(
+        val buildResult: BuildResult,
+        val sketchFolder: File,
+        val classLoader: ClassLoader
+    )
+
+    fun createTemporaryProcessingSketch(vararg arguments: String, configure: (sketchFolder: File) -> Unit): TemporaryProcessingSketchResult{
+        val directory = TemporaryFolder()
+        directory.create()
+        val sketchFolder = directory.newFolder("sketch")
+        directory.newFile("sketch/build.gradle.kts").writeText("""
+            plugins {
+                id("org.processing.java")
+            }
+        """.trimIndent())
+        directory.newFile("sketch/settings.gradle.kts")
+        configure(sketchFolder)
+
+        val buildResult = GradleRunner.create()
+            .withProjectDir(sketchFolder)
+            .withArguments(*arguments)
+            .withPluginClasspath()
+            .withDebug(true)
+            .build()
+
+        val classDir = sketchFolder.resolve("build/classes/java/main")
+        val classLoader = URLClassLoader(arrayOf(classDir.toURI().toURL()), this::class.java.classLoader)
+
+        return TemporaryProcessingSketchResult(
+            buildResult,
+            sketchFolder,
+            classLoader
+        )
+    }
+
+    @Test
+    fun testSinglePDE(){
+        val (buildResult, sketchFolder, classLoader) = createTemporaryProcessingSketch("build"){ sketchFolder ->
+            sketchFolder.resolve("sketch.pde").writeText("""
+                void setup(){
+                    size(100, 100);
+                }
+                
+                void draw(){
+                    println("Hello World");
+                }
+            """.trimIndent())
+        }
+
+        val sketchClass = classLoader.loadClass("sketch")
+
+        assert(sketchClass != null) {
+            "Class sketch not found"
+        }
+
+        assert(sketchClass?.methods?.find { method -> method.name == "setup" } != null) {
+            "Method setup not found in class sketch"
+        }
+
+        assert(sketchClass?.methods?.find { method -> method.name == "draw" } != null) {
+            "Method draw not found in class sketch"
+        }
+    }
+
+    @Test
+    fun testMultiplePDE(){
+        val (buildResult, sketchFolder, classLoader) = createTemporaryProcessingSketch("build"){ sketchFolder ->
+            sketchFolder.resolve("sketch.pde").writeText("""
+                void setup(){
+                    size(100, 100);
+                }
+                
+                void draw(){
+                    otherFunction();
+                }
+            """.trimIndent())
+            sketchFolder.resolve("sketch2.pde").writeText("""
+                void otherFunction(){
+                    println("Hi");
+                }
+            """.trimIndent())
+        }
+
+        val sketchClass = classLoader.loadClass("sketch")
+
+        assert(sketchClass != null) {
+            "Class sketch not found"
+        }
+
+        assert(sketchClass?.methods?.find { method -> method.name == "otherFunction" } != null) {
+            "Method otherFunction not found in class sketch"
+        }
+
+    }
+
+    @Test
+    fun testJavaSourceFile(){
+        val (buildResult, sketchFolder, classLoader) = createTemporaryProcessingSketch("build"){ sketchFolder ->
+            sketchFolder.resolve("sketch.pde").writeText("""
+                void setup(){
+                    size(100, 100);
+                }
+                
+                void draw(){
+                    println("Hello World");
+                }
+            """.trimIndent())
+            sketchFolder.resolve("extra.java").writeText("""
+                class SketchJava {
+                    public void javaMethod() {
+                        System.out.println("Hello from Java");
+                    }
+                }
+            """.trimIndent())
+        }
+        val sketchJavaClass = classLoader.loadClass("SketchJava")
+
+        assert(sketchJavaClass != null) {
+            "Class SketchJava not found"
+        }
+
+        assert(sketchJavaClass?.methods?.find { method -> method.name == "javaMethod" } != null) {
+            "Method javaMethod not found in class SketchJava"
+        }
+    }
+
+    @Test
+    fun testWithUnsavedSource(){
+        val (buildResult, sketchFolder, classLoader) = createTemporaryProcessingSketch("build"){ sketchFolder ->
+            sketchFolder.resolve("sketch.pde").writeText("""
+                void setup(){
+                    size(100, 100);
+                }
+                
+                void draw(){
+                    println("Hello World");
+                }
+            """.trimIndent())
+            sketchFolder.resolve("../unsaved").mkdirs()
+            sketchFolder.resolve("../unsaved/sketch.pde").writeText("""
+                void setup(){
+                    size(100, 100);
+                }
+                
+                void draw(){
+                    println("Hello World");
+                }
+                
+                void newMethod(){
+                    println("This is an unsaved method");
+                }
+            """.trimIndent())
+            sketchFolder.resolve("gradle.properties").writeText(""")
+                processing.workingDir = ${sketchFolder.parentFile.absolutePath}
+            """.trimIndent())
+        }
+        val sketchClass = classLoader.loadClass("sketch")
+
+        assert(sketchClass != null) {
+            "Class sketch not found"
+        }
+
+        assert(sketchClass?.methods?.find { method -> method.name == "newMethod" } != null) {
+            "Method otherFunction not found in class sketch"
+        }
+    }
+
+    @Test
+    fun testImportingLibrary(){
+        // TODO: Implement a test that imports a Processing library and uses it in the sketch
+    }
+
+    fun isDebuggerAttached(): Boolean {
+        val runtimeMxBean = ManagementFactory.getRuntimeMXBean()
+        val inputArguments = runtimeMxBean.inputArguments
+        return inputArguments.any {
+            it.contains("-agentlib:jdwp")
+        }
+    }
+    fun openFolderInFinder(folder: File) {
+        if (!folder.exists() || !folder.isDirectory) {
+            println("Invalid directory: ${folder.absolutePath}")
+            return
+        }
+
+        val process = ProcessBuilder("open", folder.absolutePath)
+            .inheritIO()
+            .start()
+        process.waitFor()
+    }
+}
+
+
diff --git a/java/preprocessor/build.gradle.kts b/java/preprocessor/build.gradle.kts
index 8e4300d311..e108b58a4a 100644
--- a/java/preprocessor/build.gradle.kts
+++ b/java/preprocessor/build.gradle.kts
@@ -28,7 +28,6 @@ afterEvaluate{
 }
 
 dependencies{
-    implementation(project(":core"))
     implementation(project(":app:utils"))
 
     implementation(libs.antlr)
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 8f8cb74c7f..a2be58c694 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -5,6 +5,7 @@ include(
     "app",
     "java",
     "java:preprocessor",
+    "java:gradle",
     "java:libraries:dxf",
     "java:libraries:io",
     "java:libraries:net",

From e0cfc9177928df0c430b7ace32a0dd1c1fa7fad9 Mon Sep 17 00:00:00 2001
From: Stef Tervelde <stef@steftervelde.nl>
Date: Mon, 8 Sep 2025 19:16:51 +0200
Subject: [PATCH 33/34] remove the hot-reload from this plugin for now

---
 java/gradle/hotreload/build.gradle.kts        | 33 -------------------
 .../java/gradle/ProcessingHotReloadPlugin.kt  | 29 ----------------
 2 files changed, 62 deletions(-)
 delete mode 100644 java/gradle/hotreload/build.gradle.kts
 delete mode 100644 java/gradle/hotreload/src/main/kotlin/org/processing/java/gradle/ProcessingHotReloadPlugin.kt

diff --git a/java/gradle/hotreload/build.gradle.kts b/java/gradle/hotreload/build.gradle.kts
deleted file mode 100644
index e4873a8c31..0000000000
--- a/java/gradle/hotreload/build.gradle.kts
+++ /dev/null
@@ -1,33 +0,0 @@
-plugins {
-    `java-gradle-plugin`
-    kotlin("jvm") version libs.versions.kotlin
-    alias(libs.plugins.gradlePublish)
-
-}
-
-
-repositories {
-    mavenCentral()
-}
-
-dependencies{
-    implementation("org.jetbrains.compose.hot-reload:hot-reload-gradle-plugin:1.0.0-beta03")
-}
-
-gradlePlugin{
-    plugins{
-        create("processing.java.hotreload"){
-            id = "org.processing.java.hotreload"
-            implementationClass = "org.processing.java.gradle.ProcessingHotReloadPlugin"
-        }
-    }
-}
-publishing{
-    repositories{
-        mavenLocal()
-        maven {
-            name = "App"
-            url = uri(project(":app").layout.buildDirectory.dir("resources-bundled/common/repository").get().asFile.absolutePath)
-        }
-    }
-}
\ No newline at end of file
diff --git a/java/gradle/hotreload/src/main/kotlin/org/processing/java/gradle/ProcessingHotReloadPlugin.kt b/java/gradle/hotreload/src/main/kotlin/org/processing/java/gradle/ProcessingHotReloadPlugin.kt
deleted file mode 100644
index 4776d4ebce..0000000000
--- a/java/gradle/hotreload/src/main/kotlin/org/processing/java/gradle/ProcessingHotReloadPlugin.kt
+++ /dev/null
@@ -1,29 +0,0 @@
-package org.processing.java.gradle
-
-import org.gradle.api.Plugin
-import org.gradle.api.Project
-import org.gradle.api.plugins.JavaPluginExtension
-import org.gradle.jvm.toolchain.JavaLanguageVersion
-import org.gradle.jvm.toolchain.JvmVendorSpec
-import org.jetbrains.compose.reload.gradle.ComposeHotReloadPlugin
-
-class ProcessingHotReloadPlugin: Plugin<Project> {
-    override fun apply(project: Project) {
-        project.plugins.apply(ComposeHotReloadPlugin::class.java)
-
-        project.repositories.google()
-        project.extensions.getByType(JavaPluginExtension::class.java).toolchain {
-            it.languageVersion.set(JavaLanguageVersion.of(21))
-            it.vendor.set(JvmVendorSpec.JETBRAINS)
-        }
-
-        project.afterEvaluate {
-            project.tasks.named("build").configure { task ->
-                task.finalizedBy("reload")
-            }
-            project.tasks.named("run").configure { task ->
-                task.dependsOn("hotRun")
-            }
-        }
-    }
-}
\ No newline at end of file

From bae65337992d828a5f048ca330f1304d2e00b199 Mon Sep 17 00:00:00 2001
From: Stef Tervelde <stef@steftervelde.nl>
Date: Mon, 22 Sep 2025 14:27:33 +0200
Subject: [PATCH 34/34] Squashed commit of the following:
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

commit b2f79f6776f16c5863eb526922fc8184f0f34c9b
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Mon Sep 22 14:21:27 2025 +0200

    Include root-level Java files in source set

    Uncommented and updated the configuration to include all .java files at the project root in the source set. This ensures that Java files located directly in the project directory are recognized and compiled.

commit 4aeff012f802958be94ff545e52859dce2fa625c
Merge: 046a216be 72db9b7db
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Mon Sep 22 14:07:25 2025 +0200

    Merge branch 'main' into gradle-runner

commit 72db9b7db6d63aab48bdf5ed63cb0889f37c19d1
Merge: 0c43ebfd9 aa9fd934f
Author: Moon <catilac@users.noreply.github.com>
Date:   Fri Sep 19 08:24:30 2025 -0400

    Merge pull request #1251 from Stefterv/lsp-libraries-fix

    Make sure LSP recognises contributed libraries

commit aa9fd934f26283a3bda06ccbda6c1a7a87c80a7f
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Fri Sep 19 11:19:37 2025 +0200

    Make sure contributions are loaded in the lsp

    Trigger locating the sketchbook folder so contributed libraries are loaded

commit 0c43ebfd9548f8ba18cf310871399e48ce9692a0
Merge: 9ca92bc50 5a108da68
Author: Moon <catilac@users.noreply.github.com>
Date:   Thu Sep 18 09:01:09 2025 -0400

    Merge pull request #1248 from processing/all-contributors/add-SuganthiThomas

    docs: add SuganthiThomas as a contributor for code

commit 5a108da6863bd42c78f58af6c6f9edec476e960b
Author: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com>
Date:   Thu Sep 18 13:00:49 2025 +0000

    docs: update .all-contributorsrc [skip ci]

commit f3198d76f0e0265dd82387d582193876d6927eab
Author: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com>
Date:   Thu Sep 18 13:00:48 2025 +0000

    docs: update README.md [skip ci]

commit 9ca92bc50f7b541aa6c0cbafdb3020e9273f538e
Merge: 13e697760 88b9e048e
Author: Moon <catilac@users.noreply.github.com>
Date:   Thu Sep 18 08:54:28 2025 -0400

    Default DEBUG env value to false, or read actual value instead of only checking for existence

commit 88b9e048efa9456ec4bb0068fda2011a9f83f7e1
Author: Suganthi Thomas <sugan.mercy@gmail.com>
Date:   Wed Sep 17 22:12:07 2025 -0500

    Removed commented lines

commit 014fd93cd1b9039d4a2327bd6a4d643ed9d2e685
Author: Suganthi Thomas <sugan.mercy@gmail.com>
Date:   Tue Sep 16 17:43:01 2025 -0500

    DEBUG should be set to the actual value.

commit 13e6977601d4f9d823ce1016d4d5f72ef5895cbe
Merge: bdbd0254c a741775b2
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Tue Sep 16 09:12:10 2025 +0200

    Merge pull request #1239 from Stefterv/develop-menu

    Add 'Develop' menu for debug mode with update check

commit a741775b25e7e153cb19712c483c0c758c305208
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Fri Sep 12 21:51:13 2025 +0200

    Added Language key for `menu.develop.check_for_updates`

commit bdbd0254c75e7b809bf649c5042c9b7e5dd98bee
Merge: 354e5600f 9b4403506
Author: Moon <catilac@users.noreply.github.com>
Date:   Fri Sep 12 14:30:06 2025 -0400

    Merge pull request #1242 from processing/all-contributors/add-npNSU

    docs: add npNSU as a contributor for code

commit 9b44035061a5094833e893245a31ca177e6e43a0
Author: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com>
Date:   Fri Sep 12 18:26:32 2025 +0000

    docs: update .all-contributorsrc [skip ci]

commit 2800725e82337529bbad9244b5e3554c92a32f99
Author: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com>
Date:   Fri Sep 12 18:26:31 2025 +0000

    docs: update README.md [skip ci]

commit c3b2c6b95cfe50c2b6f0f440373b0edb93b0f60d
Merge: d3f3611d3 354e5600f
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Fri Sep 12 17:54:13 2025 +0200

    Merge branch 'processing:main' into develop-menu

commit 354e5600fd7a7e969cf0e5e93ef3aeb2ad2b298c
Merge: 2c94b3855 950724172
Author: Moon <catilac@users.noreply.github.com>
Date:   Fri Sep 12 11:50:16 2025 -0400

    Merge pull request #1236 from Stefterv/main

    Fix the issue with the pre-processor test

commit 2c94b3855fde12f322daca86dfa57b239ffa2a9f
Merge: 34a85dfb3 4495cc550
Author: Moon <catilac@users.noreply.github.com>
Date:   Fri Sep 12 10:54:55 2025 -0400

    Merge pull request #1192 from npNSU/dxfMigration

    Migration of the `dxf` library from Ant to Gradle

commit 4495cc5508a7f2b1c239846e9dd0e7a4c8e506b6
Merge: 20425fd0e 34a85dfb3
Author: Moon <catilac@users.noreply.github.com>
Date:   Fri Sep 12 10:39:45 2025 -0400

    Merge branch 'main' into dxfMigration

commit 34a85dfb355e84ce0fcc1870af013104a6b45092
Merge: 2e855a1c7 3fbfddb3b
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Fri Sep 12 15:34:22 2025 +0200

    Merge pull request #1222 from hamoid/addDependencyUpdates

    Add Gradle task to check for dependency updates

commit 2e855a1c7320460a3083cd663048455e589d8f22
Merge: 275d789c6 38143079c
Author: Raphaël de Courville <raphael@processingfoundation.org>
Date:   Fri Sep 12 14:43:31 2025 +0200

    Merge pull request #1226 from Stefterv/pixel-density-warning

    Add warning for default pixelDensity behavior

commit 38143079c1e57cd88beed50d373cd19603bc58cf
Author: Raphaël de Courville <raphael@processingfoundation.org>
Date:   Fri Sep 12 14:42:36 2025 +0200

    Update the warning message for pixelDensity

    Made the warning message more helpful

commit 950724172319b2db234e21464eb67c6b32d8e3c2
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Fri Sep 12 07:46:40 2025 +0200

    Update bug1532 test and resource file

    Adjusted expected exception position in ParserTests for bug1532 and removed QuickTime session initialization from bug1532.pde to reflect updated test requirements.

commit 3fbfddb3b557e3598d36317f3498fbc51fd45f14
Merge: 0e185021b 275d789c6
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Thu Sep 11 16:09:43 2025 +0200

    Merge branch 'main' into addDependencyUpdates

commit d3f3611d386cd8034a3dc5eb2cfd4d1459f819dc
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Thu Sep 11 16:02:49 2025 +0200

    Add 'Develop' menu for debug mode with update check

    Introduces a new 'Develop' menu that appears when debug mode is enabled.

commit 0e185021b3bc66677d4b55a1eedd297019b494c6
Author: Abe Pazos <abe@hamoid.com>
Date:   Thu Sep 11 14:09:19 2025 +0200

    Gradle libs.versions.toml: inline "versions" version

commit 275d789c6480f97d0aa66ed53f6a747843ec298f
Merge: 11ba3b4d2 faf59979b
Author: Moon <catilac@users.noreply.github.com>
Date:   Tue Sep 9 15:03:41 2025 -0400

    Merge pull request #1189 from Stefterv/fix-pdf-library

    Migration of the `pdf` library to Gradle

commit 11ba3b4d22838f977655d0577c79615cbb795c70
Merge: 43ba46bd3 00e424337
Author: Moon <catilac@users.noreply.github.com>
Date:   Tue Sep 9 15:02:51 2025 -0400

    Merge pull request #1232 from Stefterv/gradle-runner-preproc

    Moving the `java:preprocessor` to be fully Gradle native

commit 43ba46bd3ea0539100702f77eb159504c5b1c3dc
Merge: c570b6d9d 7e109bd39
Author: Moon <catilac@users.noreply.github.com>
Date:   Tue Sep 9 15:01:52 2025 -0400

    Merge pull request #1228 from Stefterv/format-cli

    Adding the sketch format command

commit c570b6d9d05168c7df42bd63a4fff5e44c7f359f
Merge: e56e281dc 8f418a2a8
Author: Moon <catilac@users.noreply.github.com>
Date:   Mon Sep 8 14:41:47 2025 -0400

    Merge pull request #1227 from awood0727/debugFixUpdate

    Updated fix for the debugger issue

commit 8f418a2a823bfae2a761087208312d24b44b0ca7
Author: Amante' Woodley <awood0727@gmail.com>
Date:   Fri Sep 5 09:53:39 2025 -0400

    Updated fix for the dubugger issue

    Signed-off-by: Amante' Woodley <awood0727@gmail.com>

    Co-authored-by: Nia Perez <nia.perez.506@gmail.com>
    Co-authored-by: Kayla Bobo <kay3583@gmail.com>
    Co-authored-by: Silas Morgan <victorsmorgan@gmail.com>

commit 7e109bd399efd939f0ac5602b3a10b878c8a07b4
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Fri Sep 5 14:28:03 2025 +0200

    Adding the sketch format command

commit 906ab17264d41e279428078c6f27772424e10d76
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Thu Sep 4 10:34:45 2025 +0200

    Add warning for default pixelDensity behavior

    Introduces a warning message when pixelDensity defaults to 2x to match the display's pixel density. The warning prompts users to explicitly set pixelDensity in settings() to avoid the message.

commit 452fbcea8e6c7edf89c5db4fa78282fbd4257bf9
Author: Abe Pazos <abe@hamoid.com>
Date:   Sat Aug 30 00:15:17 2025 +0200

    Add Gradle task to check for dependency updates

commit 20425fd0e58f66b55c3e15449fe45d50be104354
Author: [Nia Perez] <nia.perez.506@gmail.com>
Date:   Mon Jul 28 14:30:12 2025 -0400

    Worked on migration of the dxf library from Ant to Gradle

    Signed-off-by: [Nia Perez] <nia.perez.506@gmail.com>

    Co-authored-by: Amante' Woodley <awood0727@gmail.com>
    Co-authored-by: Kayla Bobo <kay3583@gmail.com>
    Co-authored-by: Silas Morgan <victorsmorgan@gmail.com>

commit faf59979b7a8eeca7a618d410f7dcb08f379dc85
Author: Stef Tervelde <stef@steftervelde.nl>
Date:   Wed Jul 23 06:58:14 2025 +0200

    Migration of the `pdf` library to Gradle
---
 .all-contributorsrc                           | 18 ++++++
 README.md                                     |  4 ++
 app/src/processing/app/Base.java              |  4 +-
 app/src/processing/app/Processing.kt          | 50 ++++++++-------
 app/src/processing/app/api/SketchCommand.kt   | 62 +++++++++++++++++++
 app/src/processing/app/ui/Editor.java         | 45 ++++++++++----
 app/src/processing/app/ui/EditorFooter.java   |  1 +
 build.gradle.kts                              | 20 +++++-
 build/shared/lib/languages/PDE.properties     |  2 +
 core/src/processing/core/PApplet.java         |  9 +++
 gradle/libs.versions.toml                     |  3 +-
 java/build.gradle.kts                         | 60 +++++++++++-------
 .../src/main/kotlin/ProcessingPlugin.kt       |  6 +-
 java/libraries/dxf/build.gradle.kts           | 40 +++++++++++-
 java/libraries/pdf/build.gradle.kts           | 40 +++++++++++-
 .../mode/java/debug/LineBreakpoint.java       |  4 +-
 .../processing/mode/java/lsp/PdeAdapter.java  |  2 +
 .../processing/mode/java/ParserTests.java     |  2 +-
 java/test/resources/bug1532.pde               |  7 ---
 19 files changed, 302 insertions(+), 77 deletions(-)
 create mode 100644 app/src/processing/app/api/SketchCommand.kt

diff --git a/.all-contributorsrc b/.all-contributorsrc
index 5ba97fcdeb..d60fb8c632 100644
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@@ -1651,6 +1651,24 @@
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "npNSU",
+      "name": "Nia Perez",
+      "avatar_url": "https://avatars.githubusercontent.com/u/179620963?v=4",
+      "profile": "https://github.com/npNSU",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "SuganthiThomas",
+      "name": "SuganthiThomas",
+      "avatar_url": "https://avatars.githubusercontent.com/u/150956406?v=4",
+      "profile": "https://github.com/SuganthiThomas",
+      "contributions": [
+        "code"
+      ]
     }
   ],
   "repoType": "github",
diff --git a/README.md b/README.md
index 18920086fa..7abe540901 100644
--- a/README.md
+++ b/README.md
@@ -315,6 +315,10 @@ _Note: due to GitHub's limitations, this repository's [Contributors](https://git
       <td align="center" valign="top" width="16.66%"><a href="https://github.com/manoellribeiro"><img src="https://avatars.githubusercontent.com/u/59377764?v=4?s=120" width="120px;" alt="Manoel Ribeiro"/><br /><sub><b>Manoel Ribeiro</b></sub></a><br /><a href="https://github.com/processing/processing4/commits?author=manoellribeiro" title="Documentation">📖</a></td>
       <td align="center" valign="top" width="16.66%"><a href="https://softmoon.world"><img src="https://avatars.githubusercontent.com/u/15107?v=4?s=120" width="120px;" alt="Moon"/><br /><sub><b>Moon</b></sub></a><br /><a href="https://github.com/processing/processing4/commits?author=catilac" title="Code">💻</a></td>
     </tr>
+    <tr>
+      <td align="center" valign="top" width="16.66%"><a href="https://github.com/npNSU"><img src="https://avatars.githubusercontent.com/u/179620963?v=4?s=120" width="120px;" alt="Nia Perez"/><br /><sub><b>Nia Perez</b></sub></a><br /><a href="https://github.com/processing/processing4/commits?author=npNSU" title="Code">💻</a></td>
+      <td align="center" valign="top" width="16.66%"><a href="https://github.com/SuganthiThomas"><img src="https://avatars.githubusercontent.com/u/150956406?v=4?s=120" width="120px;" alt="SuganthiThomas"/><br /><sub><b>SuganthiThomas</b></sub></a><br /><a href="https://github.com/processing/processing4/commits?author=SuganthiThomas" title="Code">💻</a></td>
+    </tr>
   </tbody>
 </table>
 
diff --git a/app/src/processing/app/Base.java b/app/src/processing/app/Base.java
index 06e6458fc0..2551a54d64 100644
--- a/app/src/processing/app/Base.java
+++ b/app/src/processing/app/Base.java
@@ -65,7 +65,9 @@ public class Base {
    * if an empty file named 'debug' is found in the settings folder.
    * See implementation in createAndShowGUI().
    */
-  static public boolean DEBUG = System.getenv().containsKey("DEBUG");
+  
+  static public boolean DEBUG = Boolean.parseBoolean(System.getenv().getOrDefault("DEBUG", "false"));
+
 
   /** True if running via Commander. */
   static private boolean commandLine;
diff --git a/app/src/processing/app/Processing.kt b/app/src/processing/app/Processing.kt
index 7f7e82a09d..912f427213 100644
--- a/app/src/processing/app/Processing.kt
+++ b/app/src/processing/app/Processing.kt
@@ -12,14 +12,28 @@ import com.github.ajalt.clikt.parameters.options.help
 import com.github.ajalt.clikt.parameters.options.option
 import processing.app.gradle.api.Sketch
 import processing.app.api.Contributions
+import processing.app.api.SketchCommand
 import processing.app.api.Sketchbook
 import processing.app.ui.Start
 import java.io.File
 import java.util.prefs.Preferences
 import kotlin.concurrent.thread
 
-class Processing: SuspendingCliktCommand("processing"){
-    val version by option("-v","--version")
+
+suspend fun main(args: Array<String>) {
+    Processing()
+        .subcommands(
+            LSP(),
+            LegacyCLI(args),
+            Contributions(),
+            Sketchbook(),
+            SketchCommand()
+        )
+        .main(args)
+}
+
+class Processing : SuspendingCliktCommand("processing") {
+    val version by option("-v", "--version")
         .flag()
         .help("Print version information")
 
@@ -30,7 +44,7 @@ class Processing: SuspendingCliktCommand("processing"){
     override fun help(context: Context) = "Start the Processing IDE"
     override val invokeWithoutSubcommand = true
     override suspend fun run() {
-        if(version){
+        if (version) {
             println("processing-${Base.getVersionName()}-${Base.getRevision()}")
             return
         }
@@ -47,21 +61,10 @@ class Processing: SuspendingCliktCommand("processing"){
     }
 }
 
-suspend fun main(args: Array<String>){
-   Processing()
-        .subcommands(
-            LSP(),
-            LegacyCLI(args),
-            Sketch(),
-            Contributions(),
-            Sketchbook()
-        )
-        .main(args)
-}
 
-class LSP: SuspendingCliktCommand("lsp"){
+class LSP : SuspendingCliktCommand("lsp") {
     override fun help(context: Context) = "Start the Processing Language Server"
-    override suspend fun run(){
+    override suspend fun run() {
         try {
             // run in headless mode
             System.setProperty("java.awt.headless", "true")
@@ -76,8 +79,7 @@ class LSP: SuspendingCliktCommand("lsp"){
     }
 }
 
-
-class LegacyCLI(val args: Array<String>): SuspendingCliktCommand("cli") {
+class LegacyCLI(val args: Array<String>) : SuspendingCliktCommand("cli") {
     override val treatUnknownOptionsAsArgs = true
 
     val help by option("--help").flag()
@@ -97,16 +99,16 @@ class LegacyCLI(val args: Array<String>): SuspendingCliktCommand("cli") {
     }
 }
 
-fun updateInstallLocations(){
+fun updateInstallLocations() {
     val preferences = Preferences.userRoot().node("org/processing/app")
     val installLocations = preferences.get("installLocations", "")
         .split(",")
         .dropLastWhile { it.isEmpty() }
         .filter { install ->
-            try{
+            try {
                 val (path, version) = install.split("^")
                 val file = File(path)
-                if(!file.exists() || file.isDirectory){
+                if (!file.exists() || file.isDirectory) {
                     return@filter false
                 }
                 // call the path to check if it is a valid install location
@@ -114,18 +116,18 @@ fun updateInstallLocations(){
                     .redirectErrorStream(true)
                     .start()
                 val exitCode = process.waitFor()
-                if(exitCode != 0){
+                if (exitCode != 0) {
                     return@filter false
                 }
                 val output = process.inputStream.bufferedReader().readText()
                 return@filter output.contains(version)
-            } catch (e: Exception){
+            } catch (e: Exception) {
                 false
             }
         }
         .toMutableList()
     val command = ProcessHandle.current().info().command()
-    if(command.isEmpty) {
+    if (command.isEmpty) {
         return
     }
     val installLocation = "${command.get()}^${Base.getVersionName()}"
diff --git a/app/src/processing/app/api/SketchCommand.kt b/app/src/processing/app/api/SketchCommand.kt
new file mode 100644
index 0000000000..2a06efe824
--- /dev/null
+++ b/app/src/processing/app/api/SketchCommand.kt
@@ -0,0 +1,62 @@
+package processing.app.api
+
+import com.github.ajalt.clikt.command.SuspendingCliktCommand
+import com.github.ajalt.clikt.core.Context
+import com.github.ajalt.clikt.core.subcommands
+import com.github.ajalt.clikt.parameters.arguments.argument
+import com.github.ajalt.clikt.parameters.arguments.help
+import com.github.ajalt.clikt.parameters.options.flag
+import com.github.ajalt.clikt.parameters.options.help
+import com.github.ajalt.clikt.parameters.options.option
+import processing.app.Language
+import processing.app.Platform
+import processing.app.Preferences
+import java.io.File
+
+class SketchCommand: SuspendingCliktCommand("sketch"){
+    override fun help(context: Context) = "Manage a Processing sketch"
+    override suspend fun run() {
+
+    }
+    init {
+        subcommands(Format())
+    }
+
+    class Format: SuspendingCliktCommand("format"){
+        override fun help(context: Context) = "Format a Processing sketch"
+        val file by argument("file")
+            .help("Path to the sketch file to format")
+        val inPlace by option("-i","--inplace")
+            .flag()
+            .help("Format the file in place, otherwise prints to stdout")
+
+        override suspend fun run(){
+            try {
+                Platform.init()
+                Language.init()
+                Preferences.init()
+
+                // run in headless mode
+                System.setProperty("java.awt.headless", "true")
+
+                val clazz = Class.forName("processing.mode.java.AutoFormat")
+                // Indirect invocation since app does not depend on java mode
+                val formatter = clazz
+                    .getDeclaredConstructor()
+                    .newInstance()
+
+                val method = clazz.getMethod("format", String::class.java)
+                val code = File(file).readText()
+
+                val formatted = method.invoke(formatter, code) as String
+                if(inPlace) {
+                    File(file).writeText(formatted)
+                    return
+                }
+                println(formatted)
+            } catch (e: Exception) {
+                throw InternalError("Failed to invoke main method", e)
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/processing/app/ui/Editor.java b/app/src/processing/app/ui/Editor.java
index 1cbb5f1319..73aa2ef40a 100644
--- a/app/src/processing/app/ui/Editor.java
+++ b/app/src/processing/app/ui/Editor.java
@@ -49,17 +49,7 @@
 import javax.swing.undo.*;
 
 import com.formdev.flatlaf.util.SystemInfo;
-import processing.app.Base;
-import processing.app.Formatter;
-import processing.app.Language;
-import processing.app.Messages;
-import processing.app.Mode;
-import processing.app.Platform;
-import processing.app.Preferences;
-import processing.app.Problem;
-import processing.app.RunnerListener;
-import processing.app.Sketch;
-import processing.app.SketchCode;
+import processing.app.*;
 import processing.utils.SketchException;
 import processing.app.contrib.ContributionManager;
 import processing.app.gradle.GradleService;
@@ -148,6 +138,7 @@ public abstract class Editor extends JFrame implements RunnerListener {
   private FindReplace find;
   JMenu toolsMenu;
   JMenu modePopup;
+  JMenu developMenu;
 
   protected List<Problem> problems = Collections.emptyList();
 
@@ -689,6 +680,7 @@ protected void buildMenuBar() {
       helpMenu.setText(helpMenu.getText() + " ");
     }
     menubar.add(helpMenu);
+    updateDevelopMenu(menubar);
 
     Toolkit.setMenuMnemonics(menubar);
     setJMenuBar(menubar);
@@ -1069,6 +1061,37 @@ public JMenu buildModeMenu() {
 
   abstract public JMenu buildHelpMenu();
 
+  public void buildDevelopMenu(){
+    developMenu = new JMenu(Language.text("menu.develop"));
+
+    var updateTrigger = new JMenuItem(Language.text("menu.develop.check_for_updates"));
+    updateTrigger.addActionListener(e -> {
+        Preferences.unset("update.last");
+        new UpdateCheck(base);
+    });
+    developMenu.add(updateTrigger);
+
+  }
+
+  public void updateDevelopMenu(){
+    updateDevelopMenu(null);
+  }
+
+  void updateDevelopMenu(JMenuBar menu){
+      if(menu == null){
+          menu = getJMenuBar();
+      }
+      if(developMenu == null){
+          buildDevelopMenu();
+      }
+      if(Base.DEBUG){
+        menu.add(developMenu);
+      }else{
+        menu.remove(developMenu);
+      }
+
+  }
+
 
   public void showReference(String filename) {
     File file = new File(mode.getReferenceFolder(), filename);
diff --git a/app/src/processing/app/ui/EditorFooter.java b/app/src/processing/app/ui/EditorFooter.java
index b1d710cb52..945c5ffd04 100644
--- a/app/src/processing/app/ui/EditorFooter.java
+++ b/app/src/processing/app/ui/EditorFooter.java
@@ -116,6 +116,7 @@ public EditorFooter(Editor eddie) {
       public void mousePressed(MouseEvent e) {
         if(e.getClickCount() == 5){
           Base.DEBUG = !Base.DEBUG;
+          editor.updateDevelopMenu();
         }
         var debugInformation = String.join("\n",
             "Version: " + Base.getVersionName(),
diff --git a/build.gradle.kts b/build.gradle.kts
index bc23e286b0..dcd3080aca 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -4,6 +4,8 @@ plugins {
 
     alias(libs.plugins.compose.compiler) apply false
     alias(libs.plugins.jetbrainsCompose) apply false
+
+    alias(libs.plugins.versions)
 }
 
 // Set the build directory to not /build to prevent accidental deletion through the clean action
@@ -17,4 +19,20 @@ allprojects{
     tasks.withType<Javadoc> {
         options.encoding = "UTF-8"
     }
-}
\ No newline at end of file
+}
+// Configure the dependencyUpdates task
+tasks {
+    dependencyUpdates {
+        gradleReleaseChannel = "current"
+
+        val nonStableKeywords = listOf("alpha", "beta", "rc")
+
+        fun isNonStable(version: String) = nonStableKeywords.any {
+            version.lowercase().contains(it)
+        }
+
+        rejectVersionIf {
+            isNonStable(candidate.version) && !isNonStable(currentVersion)
+        }
+    }
+}
diff --git a/build/shared/lib/languages/PDE.properties b/build/shared/lib/languages/PDE.properties
index 6e101f402a..11d31c603a 100644
--- a/build/shared/lib/languages/PDE.properties
+++ b/build/shared/lib/languages/PDE.properties
@@ -172,6 +172,8 @@ menu.help.visit.url = https://processing.org/
 menu.help.report.url = https://github.com/processing/processing4/issues
 menu.help.ask.url = https://discourse.processing.org
 
+menu.develop = Develop
+menu.develop.check_for_updates = Force Check for updates
 
 # ---------------------------------------
 # Basics
diff --git a/core/src/processing/core/PApplet.java b/core/src/processing/core/PApplet.java
index 5187ff5c0a..d9df211eb7 100644
--- a/core/src/processing/core/PApplet.java
+++ b/core/src/processing/core/PApplet.java
@@ -802,6 +802,7 @@ public PSurface getSurface() {
   // Unlike the others above, needs to be public to support
   // the pixelWidth and pixelHeight fields.
   public int pixelDensity = 1;
+  boolean pixelDensityWarning = false;
 
   boolean present;
 
@@ -1082,6 +1083,9 @@ public int displayDensity(int display) {
   */
   public void pixelDensity(int density) {
     //println(density + " " + this.pixelDensity);
+
+
+    this.pixelDensityWarning = false;
     if (density != this.pixelDensity) {
       if (insideSettings("pixelDensity", density)) {
         if (density != 1 && density != 2) {
@@ -2050,6 +2054,10 @@ public void handleDraw() {
     if (frameCount == 0) {
       setup();
 
+      if(pixelDensityWarning){
+        System.err.println("Warning: Processing now sets pixelDensity(2) by default on high-density screens. This may change how your sketch looks. To revert to the old behavior, set pixelDensity(1) in setup().");
+      }
+
     } else {  // frameCount > 0, meaning an actual draw()
       // update the current frameRate
 
@@ -10108,6 +10116,7 @@ static public void runSketch(final String[] args,
     sketch.fullScreen = fullScreen;
 
     sketch.pixelDensity = sketch.displayDensity();
+    sketch.pixelDensityWarning = sketch.pixelDensity > 1;
 
     // For 3.0.1, moved this above handleSettings() so that loadImage() can be
     // used inside settings(). Sets a terrible precedent, but the alternative
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 236949d8c7..050502f4ca 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -43,4 +43,5 @@ compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "
 serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
 download = { id = "de.undercouch.download", version = "5.6.0" }
 mavenPublish = { id = "com.vanniktech.maven.publish", version = "0.30.0" }
-gradlePublish = { id = "com.gradle.plugin-publish", version = "1.2.1" }
\ No newline at end of file
+versions = { id = "com.github.ben-manes.versions", version = "0.52.0" }
+gradlePublish = { id = "com.gradle.plugin-publish", version = "1.2.1" }
diff --git a/java/build.gradle.kts b/java/build.gradle.kts
index 69877d5fce..161f36769f 100644
--- a/java/build.gradle.kts
+++ b/java/build.gradle.kts
@@ -1,13 +1,13 @@
 import org.gradle.nativeplatform.platform.internal.DefaultNativePlatform
 
 plugins {
-    id("java")
+    java
 }
 
 repositories{
     mavenCentral()
     google()
-    maven { url = uri("https://jogamp.org/deployment/maven") }
+    maven("https://jogamp.org/deployment/maven")
 }
 
 sourceSets{
@@ -50,25 +50,15 @@ tasks.compileJava{
 // LEGACY TASKS
 // Most of these are shims to be compatible with the old build system
 // They should be removed in the future, as we work towards making things more Gradle-native
-tasks.register<Copy>("extraResources"){
+val javaMode = { path : String -> layout.buildDirectory.dir("resources-bundled/common/modes/java/$path") }
+
+val bundle = tasks.register<Copy>("extraResources"){
     dependsOn("copyCore")
-    val os = DefaultNativePlatform.getCurrentOperatingSystem()
-    val platform = when {
-        os.isWindows -> "windows"
-        os.isMacOsX -> "macos"
-        else -> "linux"
-    }
-    from(layout.projectDirectory){
-        include("keywords.txt")
-        include("theme/**/*")
-        include("application/**/*")
-        exclude("application/launch4j/bin/*")
-    }
-    from(layout.projectDirectory){
-        include ("application/launch4j/bin/*$platform")
-        rename("(.*)-$platform(.*)", "$1$2")
-    }
-    into(layout.buildDirectory.dir("resources-bundled/common/modes/java"))
+    from(".")
+    include("keywords.txt")
+    include("theme/**/*")
+    include("application/**/*")
+    into(javaMode(""))
 }
 tasks.register<Copy>("copyCore"){
     val coreProject = project(":core")
@@ -78,8 +68,9 @@ tasks.register<Copy>("copyCore"){
     rename("core.+\\.jar", "core.jar")
     into(coreProject.layout.projectDirectory.dir("library"))
 }
-val libraries = arrayOf("dxf","io","net","pdf","serial","svg")
-libraries.forEach { library ->
+
+val legacyLibraries = arrayOf("dxf","io","net","serial","svg")
+legacyLibraries.forEach { library ->
     tasks.register<Copy>("library-$library-extraResources"){
         val build = project(":java:libraries:$library").tasks.named("build")
         build.configure {
@@ -90,10 +81,31 @@ libraries.forEach { library ->
         include("*.properties")
         include("library/**/*")
         include("examples/**/*")
-        into(layout.buildDirectory.dir("resources-bundled/common/modes/java/libraries/$library"))
+        into( javaMode("/libraries/$library"))
+    }
+    bundle.configure {
+        dependsOn("library-$library-extraResources")
     }
-    tasks.named("extraResources"){ dependsOn("library-$library-extraResources") }
 }
+
+val libraries = arrayOf("dxf", "pdf")
+
+libraries.forEach { library ->
+    val name = "create-$library-library"
+    tasks.register<Copy>(name) {
+        group = "libraries"
+        val project = project(":java:libraries:$library")
+        val libraryTask = project.tasks.named("createLibrary")
+        dependsOn(libraryTask)
+
+        from(project.layout.buildDirectory.dir("library"))
+        into(javaMode("/libraries/$library"))
+    }
+    bundle.configure {
+        dependsOn(name)
+    }
+}
+
 tasks.jar { dependsOn("extraResources") }
 tasks.processResources{ finalizedBy("extraResources") }
 tasks.compileTestJava{ finalizedBy("extraResources") }
diff --git a/java/gradle/src/main/kotlin/ProcessingPlugin.kt b/java/gradle/src/main/kotlin/ProcessingPlugin.kt
index a45f2ff84b..d3979b746a 100644
--- a/java/gradle/src/main/kotlin/ProcessingPlugin.kt
+++ b/java/gradle/src/main/kotlin/ProcessingPlugin.kt
@@ -165,9 +165,9 @@ class ProcessingPlugin @Inject constructor(private val objectFactory: ObjectFact
                 srcDir("$workingDir/unsaved")
             }
             sourceSet.allSource.source(pdeSourceSet)
-//            sourceSet.java.srcDir(project.layout.projectDirectory).apply {
-//                include("*.java")
-//            }
+            sourceSet.java.srcDir(project.layout.projectDirectory).apply {
+                include("/*.java")
+            }
 
             val librariesTaskName = sourceSet.getTaskName("scanLibraries", "PDE")
             val librariesScan = project.tasks.register(librariesTaskName, LibrariesTask::class.java) { task ->
diff --git a/java/libraries/dxf/build.gradle.kts b/java/libraries/dxf/build.gradle.kts
index a176f03df7..cf4e3f5074 100644
--- a/java/libraries/dxf/build.gradle.kts
+++ b/java/libraries/dxf/build.gradle.kts
@@ -1 +1,39 @@
-ant.importBuild("build.xml")
\ No newline at end of file
+plugins{
+    java
+}
+
+sourceSets {
+    main {
+        java {
+            srcDirs("src")
+        }
+    }
+}
+repositories{
+    mavenCentral()
+    maven("https://jogamp.org/deployment/maven/")
+}
+
+dependencies{
+    compileOnly(project(":core"))
+
+    implementation("com.lowagie:itext:2.1.7")
+}
+
+tasks.register<Copy>("createLibrary"){
+    dependsOn("jar")
+    into(layout.buildDirectory.dir("library"))
+
+    from(layout.projectDirectory){
+        include ("library.properties")
+        include("examples/**")
+    }
+
+    from(configurations.runtimeClasspath){
+        into("library")
+    }
+
+    from(tasks.jar) {
+        into("library")
+    }
+}
\ No newline at end of file
diff --git a/java/libraries/pdf/build.gradle.kts b/java/libraries/pdf/build.gradle.kts
index a176f03df7..cf4e3f5074 100644
--- a/java/libraries/pdf/build.gradle.kts
+++ b/java/libraries/pdf/build.gradle.kts
@@ -1 +1,39 @@
-ant.importBuild("build.xml")
\ No newline at end of file
+plugins{
+    java
+}
+
+sourceSets {
+    main {
+        java {
+            srcDirs("src")
+        }
+    }
+}
+repositories{
+    mavenCentral()
+    maven("https://jogamp.org/deployment/maven/")
+}
+
+dependencies{
+    compileOnly(project(":core"))
+
+    implementation("com.lowagie:itext:2.1.7")
+}
+
+tasks.register<Copy>("createLibrary"){
+    dependsOn("jar")
+    into(layout.buildDirectory.dir("library"))
+
+    from(layout.projectDirectory){
+        include ("library.properties")
+        include("examples/**")
+    }
+
+    from(configurations.runtimeClasspath){
+        into("library")
+    }
+
+    from(tasks.jar) {
+        into("library")
+    }
+}
\ No newline at end of file
diff --git a/java/src/processing/mode/java/debug/LineBreakpoint.java b/java/src/processing/mode/java/debug/LineBreakpoint.java
index e7327446f5..a2ae4d2350 100644
--- a/java/src/processing/mode/java/debug/LineBreakpoint.java
+++ b/java/src/processing/mode/java/debug/LineBreakpoint.java
@@ -207,8 +207,8 @@ public String toString() {
    */
   protected String className() {
     if (line.fileName().endsWith(".pde")) {
-      // standard tab
-      return dbg.getEditor().getSketch().getName();
+      // pure pde tab
+        return line.fileName().substring(0, line.fileName().lastIndexOf(".pde"));
     }
 
     if (line.fileName().endsWith(".java")) {
diff --git a/java/src/processing/mode/java/lsp/PdeAdapter.java b/java/src/processing/mode/java/lsp/PdeAdapter.java
index f4f1f450d2..1cd2f6ef3b 100644
--- a/java/src/processing/mode/java/lsp/PdeAdapter.java
+++ b/java/src/processing/mode/java/lsp/PdeAdapter.java
@@ -66,6 +66,8 @@ class PdeAdapter {
     this.rootPath = rootPath;
     this.client = client;
 
+    Base.locateSketchbookFolder();
+
     File location = Platform.getContentFile("modes/java");
     ModeContribution mc =
       ModeContribution.load(null, location, JavaMode.class.getName());
diff --git a/java/test/processing/mode/java/ParserTests.java b/java/test/processing/mode/java/ParserTests.java
index df34795f06..9d589caaf8 100644
--- a/java/test/processing/mode/java/ParserTests.java
+++ b/java/test/processing/mode/java/ParserTests.java
@@ -280,7 +280,7 @@ public void bug1525() {
 
   @Test
   public void bug1532() {
-    expectRecognitionException("bug1532", 50);
+    expectRecognitionException("bug1532", 43);
   }
 
   @Test
diff --git a/java/test/resources/bug1532.pde b/java/test/resources/bug1532.pde
index ae8ecdbf8b..21f9c55cf2 100644
--- a/java/test/resources/bug1532.pde
+++ b/java/test/resources/bug1532.pde
@@ -19,13 +19,6 @@ Capture cam;
 flatCube[][] grid;
 
 void setup() {
-  try {
-    // quicktime.QTSession.open();
-  }
-  catch (quicktime.QTException qte) {
-    qte.printStackTrace();
-  }
-
   size (dx,dy,OPENGL);
   int d=day();
   int m=month();