From db9726383106ba14d5d6211099d8ee3f22259f1d Mon Sep 17 00:00:00 2001 From: Stef Tervelde Date: Tue, 23 Sep 2025 14:24:10 +0200 Subject: [PATCH] Squashed commit of the following: commit 96ce6118cdfc0db0b3e47951ad7cab23751e430e Author: Stef Tervelde Date: Tue Sep 23 14:14:56 2025 +0200 Add Processing build in libraries commit 374ba2c354d656adbf559a6a8ec87dc2689c94d4 Author: Stef Tervelde Date: Tue Sep 23 13:58:22 2025 +0200 Support multiple library directories in LibrariesTask Refactored LibrariesTask to accept multiple input directories via ConfigurableFileCollection instead of a single DirectoryProperty. commit e097d687c38989f28df1377de6553d2cec67e1c5 Author: Stef Tervelde Date: Tue Sep 23 13:34:44 2025 +0200 Enhance PDE source set and preprocessing in ProcessingPlugin Added comments and structure for improved clarity. Also added a placeholder test for internal libraries in ProcessingPluginTest. commit 2b8b1511677e5633f9ada1c8dde29c54b21204bb Author: Stef Tervelde Date: Tue Sep 23 12:38:11 2025 +0200 Add stdio connection to PDE and stub test for code jars commit d5e48e4356242711217ec998aac4cceb7aa7be57 Author: Stef Tervelde Date: Tue Sep 23 12:27:17 2025 +0200 Add test for importing and using Processing libraries Introduces a helper to create temporary Processing libraries and implements a test that imports and uses a custom library in a Processing sketch. This enhances test coverage for library integration in the Processing Gradle plugin. commit 6b873ce40572c1bc11e078f26a4f92c45ff32dd6 Author: Stef Tervelde Date: Tue Sep 23 12:01:56 2025 +0200 Publishing app:utils to internal library commit b2f79f6776f16c5863eb526922fc8184f0f34c9b Author: Stef Tervelde 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 Date: Mon Sep 22 14:07:25 2025 +0200 Merge branch 'main' into gradle-runner commit 046a216be25ee63690be773f8d6fca1f42ddfb6f Merge: 570e9db45 198f59397 Author: Stef Tervelde Date: Mon Sep 8 18:27:48 2025 +0200 Merge branch 'main' into gradle-runner commit 570e9db45767a5cd0368c819cc46eb2280462404 Author: Stef Tervelde Date: Fri Jul 18 21:42:08 2025 +0200 Automatically download jdk commit 578c2876066d07a0df415f8581a45d60cb092984 Author: Stef Tervelde Date: Fri Jul 18 10:43:33 2025 +0200 Build on save commit fdc43dc7d284fabd405acdce859e95cd3382b32d Author: Stef Tervelde Date: Thu Jul 17 15:49:40 2025 +0200 Hot Reloading plugin commit 0c674adc54adbe1b420c844989d198764086a351 Author: Stef Tervelde Date: Thu Jul 17 12:13:56 2025 +0200 Initial Gradle Plugin configuration commit f916d272acbd5297cf4865948a0500eefae99bd4 Author: Stef Tervelde 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 Date: Wed Jul 9 09:41:40 2025 +0200 Comments and planning commit c55e2864280013045ed0a8dbe784d022f07617d6 Author: Stef Tervelde Date: Tue Jul 8 12:23:05 2025 +0200 Speed up gradle compilations commit b7123906b4b1e698a4532da560911b7e3d6e9801 Author: Stef Tervelde Date: Tue Jul 8 11:59:28 2025 +0200 Fixed rename Windres task commit a36c8a353b4bdfef31a3089a8a1d9115e228be6a Author: Stef Tervelde Date: Tue Jul 8 10:31:12 2025 +0200 Plugin tests bugfixes commit 7379166bc482f3d17c59eeafbe272e9f6d647a32 Author: Stef Tervelde Date: Tue Jul 8 10:26:16 2025 +0200 Processing Plugin tests & Refactor commit b64505d47662419e9332a41cdf7a883b60fb2fba Author: Stef Tervelde Date: Mon Jul 7 16:21:59 2025 +0200 Gradle Service refactor commit a11d2ffabec8a1d18d1541eb1efb1d4cfd2220d7 Author: Stef Tervelde Date: Mon Jul 7 15:22:21 2025 +0200 Logging sketches to separate stream & small refactor commit 5729e8811882754e51868b7d443223870a001f3f Author: Stef Tervelde Date: Mon Jul 7 11:01:58 2025 +0200 Show error logs to the user commit b709fe3a9d0d1b40db0a970b5b728ed481e859fd Merge: cebc352db d7c6aeba9 Author: Stef Tervelde 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 Date: Fri Jul 4 07:36:31 2025 +0200 Snap support commit d7c6aeba90d452727cb970b39cbdcf1b635538e0 Author: Stef Tervelde Date: Fri Jul 4 06:54:50 2025 +0200 Also copy Untitled sketches commit 24cb4f4f9b1161ec10472c11b86aee9481124162 Author: Stef Tervelde Date: Fri Jul 4 06:23:00 2025 +0200 Improved Error reporting commit e727dbf59654462b015d38cf06161d6c40a5f02a Author: Stef Tervelde Date: Wed Jul 2 21:33:12 2025 +0200 Support for readonly sketches commit b165d0a511b8e7b81327744daaf0efec7ce3c3f1 Author: Stef Tervelde Date: Wed Jul 2 21:25:52 2025 +0200 Add all library jars commit 772567c54074c59485e0c19a8ba0ffddf7c4252f Author: Stef Tervelde Date: Wed Jul 2 20:34:37 2025 +0200 Build system indicators, Language keys and filtering SLF4J warnings commit efd03dba54654775cb6c481f688776774ffe7602 Author: Stef Tervelde Date: Wed Jul 2 15:58:02 2025 +0200 Fixed gradle runner issues commit 5409912c38f2740dd165f04aa025a97dc36ff0d7 Author: Stef Tervelde Date: Wed Jul 2 13:42:41 2025 +0200 Improved Gradle Error logging commit 1762b74c90cb98d6cf28e15b944c5474882780e8 Author: Stef Tervelde Date: Wed Jul 2 11:56:34 2025 +0200 Simplified Gradle Service, improved sketch logging, fixed toolbar state commit e6474e189fa47bdffcd3cb8198095427188b3cd7 Author: Stef Tervelde Date: Wed Jul 2 10:29:20 2025 +0200 Small tweaks and wrote motivation for Gradle Build system commit 67de82f18d564555796f8184f5fddafd4b8102b5 Author: Stef Tervelde Date: Wed Jul 2 09:53:14 2025 +0200 Removed error & out streams, has been piped directly into System commit bd5aba46e8103d1546b213dabf127023b0fcabb2 Author: Stef Tervelde Date: Wed Jul 2 09:50:39 2025 +0200 Allowing libraries folder to not exist, but log instead commit fcb554a50c186a7c12e604cfe56df0bad8e2f7b1 Author: Stef Tervelde Date: Wed Jul 2 09:42:19 2025 +0200 Rename gradle plugin and further planning commit 1c429618dfc903f7050fc71bd3fbad20e9899f38 Author: Stef Tervelde Date: Tue Jul 1 17:35:32 2025 +0200 Gradle Task error printing commit 4cca647724a265d01084580676d5eb7eeeace08f Author: Stef Tervelde Date: Tue Jul 1 17:02:03 2025 +0200 Updated error reporting commit 0d1fcc45a94198a8663e8edf7986a49908a8bcf7 Author: Stef Tervelde Date: Tue Jul 1 14:40:30 2025 +0200 Added documentation and todo's commit 029920924527c6ec93614dfc397db99b3a265d2a Author: Stef Tervelde Date: Tue Jul 1 12:59:34 2025 +0200 Squashed commit of the following: commit 3a1aa8e712fa7e26c6fd4f61f11c25c3d63dd1b4 Author: Stef Tervelde Date: Tue Jul 1 12:53:59 2025 +0200 Restore welcome & Cleanup commit 7d94b30f60b3b2a685734d945693ab6f2c7abe55 Author: Stef Tervelde Date: Tue Jul 1 12:20:17 2025 +0200 PR Cleanup commit 27764e95cbab9b59ff6a714fe82236416b0f4f6f Author: Stef Tervelde Date: Mon Jun 23 13:33:50 2025 +0200 Update Toolbar.kt commit 97fc4c2ec9dea5c8bd21caefa7e5d08b49529232 Author: Stef Tervelde Date: Mon Jun 23 13:30:47 2025 +0200 Removed background job differentiation commit 85566c8434f3ded9b54377104fe374d3bfd5826d Author: Stef Tervelde Date: Mon Jun 23 13:09:11 2025 +0200 CLI Compatibility commit 7f2f2b667c63e8c255d615481355cb1878dbe9b5 Merge: 1c8581e5c bf34adee0 Author: Stef Tervelde Date: Mon Jun 23 11:14:57 2025 +0200 Merge branch 'main' into runner commit 1c8581e5cd51ecde11a5915035f143a0dcf31709 Author: Stef Tervelde Date: Thu May 15 13:39:21 2025 +0200 Move Gradle connection into GradleJob commit d7420021ceb2dc368860e1954f9f21a5a238e665 Author: Stef Tervelde Date: Thu May 15 10:10:33 2025 +0200 Exclude jnilib from sources commit 2c9ee1c77aac0e872e9ae124148d331e2dd1a6e0 Author: Stef Tervelde Date: Thu May 15 09:51:08 2025 +0200 Linux Platform addition commit 49988e9b022dcb28d23a43d134301e24072a4ae8 Author: Stef Tervelde Date: Thu May 15 09:34:44 2025 +0200 Use forward slashes on Windows commit da5092ef4c788ee3dd0b00463d9cbd0b698b9e0e Author: Stef Tervelde Date: Thu May 15 09:10:11 2025 +0200 Add support for .java files & Cleanup commit ab7c216272444d16931bf980db25698045c178c4 Author: Stef Tervelde 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 Date: Wed May 14 18:07:50 2025 +0200 Identified Bugs commit 80c48f2fc584057bb7ce8a340dbd9f7b87855597 Author: Stef Tervelde Date: Wed May 14 17:59:07 2025 +0200 Windows Bugfix commit 5ad43e0b49125f2313fa602ff1ef2038f891c64f Author: Stef Tervelde Date: Wed May 14 17:51:57 2025 +0200 Set a default tab size commit 2f99a69a69b80d77166f17d25449e1974f20d495 Author: Stef Tervelde Date: Wed May 14 16:14:59 2025 +0200 Bundle necessary plugins commit f9b94c57018a0c0084c851a44c78d78ec73e052f Author: Stef Tervelde Date: Wed May 14 15:17:55 2025 +0200 Only make parent dirs commit 982c1113070a944890cf9dec92d4bcde9a5fe664 Author: Stef Tervelde Date: Wed May 14 15:11:54 2025 +0200 Show debug on gradle tests commit 917d0d321356c43c247e9d7b711935802dbe88b8 Author: Stef Tervelde Date: Wed May 14 15:08:47 2025 +0200 Listen for folder changes commit 12ce4422e1bc0cd5abf7173d7a001ea0a26cb35f Author: Stef Tervelde Date: Wed May 14 14:25:06 2025 +0200 Fix saved files using an old version commit 04ac9f2678d6308c6c8dffb68cd98bc2973e7863 Author: Stef Tervelde Date: Wed May 14 13:47:21 2025 +0200 Plugin rework for caching heavy work commit e31d37d64df6aa9ba29ecc0e5529cf91600a3b28 Merge: df1277e58 540d299cf Author: Stef Tervelde Date: Wed May 14 10:43:43 2025 +0200 Merge branch 'main' into runner commit df1277e58c5665acb901a3ea81088eafeccdf283 Author: Stef Tervelde Date: Wed May 14 10:39:22 2025 +0200 Disabled modern UI for now. Added preference instead commit c5c3b2f570cabdd1163405057bf8204d1a707336 Author: Stef Tervelde Date: Mon Apr 21 14:04:39 2025 +0200 Added todos commit 612126a11f690ab7ec7feb7b86c9f9a786cc10cd Merge: 3e89bfe9a ecd219b03 Author: Stef Tervelde Date: Thu Apr 17 12:37:06 2025 +0200 Merge branch 'main' into runner commit 3e89bfe9abef46ee456fabf4d7e054a8d593855f Merge: efa77bb8d 7489870dd Author: Stef Tervelde 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 Date: Tue Apr 1 18:19:58 2025 +0200 Cleanup [skip ci] commit 7489870ddf4287adaea4b02fdc3a22b54ba3a941 Author: Stef Tervelde Date: Tue Apr 1 18:19:58 2025 +0200 Cleanup [skip ci] commit 97ec5e4cb49eb980e87f37155fa3d8a96477e34c Merge: 221ee28a0 3d6a6ce1d Author: Stef Tervelde Date: Tue Apr 1 17:54:41 2025 +0200 Merge branch 'gradle-welcome-screen' into runner commit 221ee28a0fcb516b6e0d129ad1028ca4ff7a51ac Author: Stef Tervelde Date: Tue Apr 1 17:53:48 2025 +0200 Toolbar UI design start commit a870cd03fca9113952dc34bc26db5f134ce76b1c Author: Stef Tervelde Date: Tue Apr 1 10:14:22 2025 +0200 GradleJob Refactor commit 2269fd35d9f91b971a163f6b63fb288adb6f9156 Author: Stef Tervelde Date: Tue Apr 1 09:15:47 2025 +0200 Gradle Runner, build script management commit 6758d684e7863c887c3b559b7b07eeb8eab32080 Author: Stef Tervelde Date: Mon Mar 31 18:40:19 2025 +0200 Richer console output and richer exception output commit 15114a192e36296796f5640874fd816c05e944b5 Author: Stef Tervelde Date: Mon Mar 31 15:00:12 2025 +0200 Retry vm debug connection commit 36ce0ab1e3853eb22a28fcd84c560123aa82ae33 Author: Stef Tervelde Date: Mon Mar 31 12:05:58 2025 +0200 Runner: Fixing build errors commit 701f9f5db84eb114721c033cd2111d16e3320147 Author: Stef Tervelde Date: Sun Mar 30 23:58:36 2025 +0200 Gradle Runner PoC Refactor commit 947a90ea0c204ccd9c5b0139da5eba201dcf2320 Author: Stef Tervelde Date: Sun Mar 30 14:51:48 2025 +0200 Toolbar functionality PoC commit 3d6a6ce1dfbb11650eeaa65de7a985f9d23f49d2 Merge: f7f22c5f7 2222331c9 Author: Stef Tervelde Date: Sun Mar 30 08:52:37 2025 +0200 Merge branch 'processing:main' into gradle-welcome-screen commit 4602ef179ea92133ca5d264d8f40aea4f40d4024 Author: Stef Tervelde Date: Sat Mar 29 22:50:35 2025 +0100 Fixes for windows commit 0d3795f89343c98ed23d9cadffd1445df25da7ba Author: Stef Tervelde Date: Sat Mar 29 22:31:47 2025 +0100 Gradle Runner, more variables commit ab38e5f44b5e72cbace4551ecdeddc80b70b75a1 Author: Stef Tervelde Date: Sat Mar 29 20:54:02 2025 +0100 Arguments refactor commit 17acb01cbe30b1949c5ff60d35f5f8c59d6b567f Author: Stef Tervelde Date: Sat Mar 29 20:10:15 2025 +0100 Copy running JDK rather than download commit b534c26bca8737513f9808f4e737d96a173ce7ce Merge: d6cb3eec4 2222331c9 Author: Stef Tervelde Date: Sat Mar 29 18:17:20 2025 +0100 Merge branch 'main' into runner commit d6cb3eec45cdfeac944d5bb271ebd5733f2c36fe Author: Stef Tervelde Date: Sat Mar 29 10:20:17 2025 +0100 Fix for signing release commit bf82d5327f2368114e499ade3a5eb18b681a4717 Merge: 73dfa0a6e dd823a7d6 Author: Stef Tervelde 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 Date: Sat Mar 29 10:17:04 2025 +0100 Only sign with signing set up commit 41ef1cc9813ac6638c85ef0cabfe2121129b363c Author: Stef Tervelde Date: Fri Mar 28 09:00:23 2025 +0100 Fix plugin name in tests commit dd823a7d6cf0f9100a3a8ee803a38e8f2c7718cd Author: Stef Tervelde Date: Fri Mar 28 09:00:23 2025 +0100 Fix plugin name in tests commit 3a14ff40a41979ff7ad25a144f34629c0405e3a0 Author: Stef Tervelde Date: Fri Mar 28 08:18:53 2025 +0100 Added Stubs commit 00f8afaa7cd179b720bbd1246c78876295939a2a Merge: 700599ed8 1ab2359ca Author: Stef Tervelde Date: Fri Mar 28 08:13:11 2025 +0100 Merge branch 'schema-threading' into runner commit 700599ed8abf775379a6d14c83d4da9b1b9a05a5 Merge: 1fae4618c 499d200ef Author: Stef Tervelde Date: Fri Mar 28 08:13:06 2025 +0100 Merge branch 'main' into runner commit 1fae4618c926cd27044ae1ed734930943fb8723f Author: Stef Tervelde Date: Thu Mar 27 21:37:55 2025 +0100 UI Cleanup commit f762a3ee12842bea96cee8b011c3bdcb716d2d21 Author: Stef Tervelde Date: Thu Mar 27 20:05:01 2025 +0100 Added debugging commit c2071a0c2624dde91f70aac1be5d60955dab624c Merge: f453eca87 8fb9ef57b Author: Stef Tervelde Date: Thu Mar 27 18:23:23 2025 +0100 Merge branch 'hide-scrollbars' into runner commit f453eca87fd77d4b2b8fc96bcc9a5574a99099c0 Merge: 8f47d2110 694eb0cbe Author: Stef Tervelde Date: Thu Mar 27 18:03:34 2025 +0100 Merge remote-tracking branch 'upstream/fix-jdk-requirement' into runner commit 8f47d211093bbd2bd41146a113b77931cb20ebf5 Author: Stef Tervelde Date: Thu Mar 27 18:00:15 2025 +0100 Scan libaries for dependencies commit 5d71244e0555d3d079e5b2149ba1381e524caa55 Author: Stef Tervelde Date: Thu Mar 27 14:58:11 2025 +0100 Plugin rework commit e164fe48bc1f7ee92029ba7a85ab6a8188fea501 Author: Stef Tervelde Date: Thu Mar 27 13:01:33 2025 +0100 Gradle variables from Processing, Group resolution commit 672c2ac479e6874965fac03a0398b6f68dc79f2d Author: Stef Tervelde Date: Thu Mar 27 11:51:08 2025 +0100 Removed the need for settings.gradle.kts & Embedding maven repo commit cdec594cdd57bd71b4bf0c9525af5c2921edbef0 Author: Stef Tervelde Date: Wed Mar 26 18:39:04 2025 +0100 Added export support commit 3ad36547296ed0bfa2f457cf822c2105e90ef8d7 Author: Stef Tervelde Date: Wed Mar 26 17:25:51 2025 +0100 Gradle Runner visual styling commit bc063e80dbda0c8f78f86b36227948954382528a Author: Stef Tervelde Date: Wed Mar 26 14:17:25 2025 +0100 Gradle Runner PoC commit 47d3428e6298f26aa8b6b951caaddc0d679a811e Author: Stef Tervelde Date: Sun Mar 23 18:18:54 2025 +0100 More todo's commit 29d76eb1d1406b81cd276ffd4ccd325edb86b930 Merge: ba496569d 9760a63b9 Author: Stef Tervelde Date: Sun Mar 23 17:58:39 2025 +0100 Merge branch 'processing:main' into gradle-plugin commit ba496569d8f048448dd6e8e92b2faaf443cf27a7 Author: Stef Tervelde Date: Tue Mar 18 10:15:40 2025 +0100 Adding tests and direct linking commit e01d02a8af6aa7ddc53e5a1900561473a2ed6a99 Author: Stef Tervelde Date: Mon Mar 17 15:31:25 2025 +0100 Update settings.gradle.kts commit b0b12ddad6676e81c2981c76b270ed745ac681bd Merge: 7e6c97add ad5c27ec4 Author: Stef Tervelde Date: Mon Mar 17 15:14:35 2025 +0100 Merge branch 'gradle-preprocessor' into gradle-plugin commit ad5c27ec42dc6f479c1c4cee2b119568ba8fa252 Author: Stef Tervelde Date: Mon Mar 17 15:11:24 2025 +0100 Apply same parser & lexer fixes from before commit 743ea141904c0d37127c4de6b52ed7d35ece3f32 Merge: c28a2676b 8e8f7dc5a Author: Stef Tervelde Date: Mon Mar 17 13:53:40 2025 +0100 Merge branch 'main' into gradle-preprocessor commit 7e6c97add90a4eb8f3ebc49faf40dcd0e61b9951 Merge: f126d4b62 8e8f7dc5a Author: Stef Tervelde Date: Mon Mar 17 13:43:21 2025 +0100 Merge branch 'main' into gradle-plugin commit f7f22c5f7ce8434a058d3cc5411f541777cc637e Author: Stef Tervelde Date: Mon Mar 17 10:40:37 2025 +0100 Create Directory as well commit d17ca0cdcda2080cf458c0352fc89e80ef4f57a7 Author: Stef Tervelde Date: Mon Mar 17 10:36:35 2025 +0100 Removed PlatformStart and create new file if doesn't exist commit b0e7f96bddafc1a40c59d47cd81ef9919632ce84 Author: Stef Tervelde Date: Mon Mar 17 10:28:12 2025 +0100 Added initial tests commit 0df4dc076ac6d50730e09348b941a39451197b33 Merge: 6974811be 8e8f7dc5a Author: Stef Tervelde Date: Sun Mar 16 21:18:22 2025 +0100 Merge branch 'main' into gradle-welcome-screen commit 6974811beb562c7c3bd6fb3ae4d94bf9831d6d3c Merge: 7452d658c 145551246 Author: Stef Tervelde 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 Date: Fri Mar 7 15:07:56 2025 +0100 Merge branch 'main' into gradle-welcome-screen commit c28a2676bd9439106800d502c856b798bd1cfc34 Merge: e18833608 fe152b752 Author: Stef Tervelde Date: Fri Mar 7 15:06:27 2025 +0100 Merge branch 'processing:main' into gradle-preprocessor commit f126d4b6286c3f7363d13cab8797702f8cadb66c Merge: da852b45a fe152b752 Author: Stef Tervelde Date: Fri Mar 7 15:06:08 2025 +0100 Merge branch 'processing:main' into gradle-plugin commit babf54e04dde6ba972139c8e5744d4a6f9b449f4 Merge: 0e56f895b 00c57607d Author: Stef Tervelde 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 Date: Sun Feb 9 21:15:36 2025 +0100 Merge branch 'main-gradle' into gradle-welcome-screen commit 54944afc24a1058bf6fcc5a9899bfdeaa1283229 Author: Stef Tervelde Date: Sun Feb 9 14:36:37 2025 +0100 Welcome Screen: JDK Module commit 8d8bd01d806257367b1a006f0da23b926b8f8ae3 Author: Stef Tervelde Date: Sun Feb 9 13:54:07 2025 +0100 Welcome Screen: Close Functionality commit 3df4da94618ed66d9a2b48a601b0ce7bac9a2d4e Author: Stef Tervelde Date: Sun Feb 9 12:57:55 2025 +0100 Welcome Screen: Bugfixes commit cb184fb104ac9c4ead2e6352573f726189da7b70 Author: Stef Tervelde Date: Sun Feb 9 12:19:33 2025 +0100 Welcome Screen: Layout fixes commit 3d81b02ffed2c28560bc2067f1584e05db0bad51 Author: Stef Tervelde Date: Sat Feb 8 22:47:28 2025 +0100 Welcome Screen: Language selection commit b0c61a4467e8c9f5d02bcc8c84e47908fad22d95 Author: Stef Tervelde Date: Sat Feb 8 11:10:33 2025 +0100 Welcome Screen: Load & Display examples commit 2f12d13422c0359562663d93202fe7ce80c3c949 Author: Stef Tervelde Date: Fri Feb 7 21:53:49 2025 +0100 Saveable/Reactive Preferences commit 8ed2d1b40acdc38e0ecde7a5831ef47a9ad1559b Author: Stef Tervelde Date: Fri Feb 7 16:34:23 2025 +0100 Welcome Screen: WIP commit 5c020dd0170153bd1a31ffaeed853966e66c5175 Author: Stef Tervelde Date: Fri Feb 7 15:49:25 2025 +0100 Welcome Screen: Initial Layout commit bd3a77ef17a456aa2ceb281cc2cf293f8be9d685 Author: Stef Tervelde Date: Fri Feb 7 12:09:58 2025 +0100 Welcome Screen: Window Abstraction commit b1910de2e61f6b8b2492b9847ba7f35eec67317a Author: Stef Tervelde Date: Fri Feb 7 11:24:30 2025 +0100 Welcome Screen: Initial Frame commit da852b45a109e27b3b3226fd78a0efd41b695fad Author: Stef Tervelde Date: Wed Feb 5 20:54:32 2025 +0100 Fullscreen support commit 44ab816ca9fe2113f1868c3bda3372afaa9fec5d Author: Stef Tervelde 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 Date: Wed Feb 5 13:03:51 2025 +0100 Merge branch 'main-gradle' into gradle/preprocessor commit 031d304dbd6aa73998e07fa696b691e85dd9c2b1 Merge: 25e147eaf 3f3e7d785 Author: Stef Tervelde Date: Wed Feb 5 13:03:12 2025 +0100 Merge branch 'main-gradle' into gradle/plugin commit 25e147eaf1bdfa8b245e86447d2066bded147b44 Merge: 7f00d5b02 3b9aea1f4 Author: Stef Tervelde Date: Wed Feb 5 12:56:55 2025 +0100 Merge branch 'main-gradle' into gradle/plugin commit df745bb09c080929bc64d70bf90d27e9da807d8f Merge: f016cc474 3b9aea1f4 Author: Stef Tervelde Date: Wed Feb 5 12:56:38 2025 +0100 Merge branch 'main-gradle' into gradle/preprocessor commit 7f00d5b0289dda41d92b126149a81f20d1ccdc31 Author: Stef Tervelde Date: Wed Feb 5 12:36:18 2025 +0100 added example of plugin usage commit f4d7fbf99b399889de6b6d0bbafa0148dcb84782 Author: Stef Tervelde Date: Wed Feb 5 09:19:08 2025 +0100 Changed naming commit 1b8a8ed461cb39eb0489564589e144178fb1bef5 Author: Stef Tervelde Date: Wed Feb 5 09:10:42 2025 +0100 Gradle Plugin from PoC commit 5468da0fd6b42f790340acb3e2d00472ae5f42af Author: Stef Tervelde Date: Tue Feb 4 16:18:29 2025 +0100 Removed outdated ant backwards compatibility marks commit 23c8a4626ac370b560169df130d86d4b58d859e2 Author: Stef Tervelde 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 Date: Wed Feb 5 12:01:47 2025 +0100 Removed core dependency from the pre-processor commit 971d98bba0a8acf24a9430015a7c1508e2c9d2a3 Author: Stef Tervelde Date: Thu Jan 30 22:59:16 2025 +0100 Preprocessor with antlr Plugin --- .gitignore | 25 ++ app/utils/build.gradle.kts | 10 + core/build.gradle.kts | 17 +- core/src/processing/core/PApplet.java | 18 +- java/gradle/build.gradle.kts | 41 +++ java/gradle/example/brightness.pde | 28 ++ java/gradle/example/build.gradle.kts | 3 + java/gradle/example/settings.gradle.kts | 5 + .../src/main/kotlin/DependenciesTask.kt | 79 +++++ java/gradle/src/main/kotlin/LibrariesTask.kt | 81 +++++ java/gradle/src/main/kotlin/PDETask.kt | 83 +++++ .../src/main/kotlin/ProcessingPlugin.kt | 216 +++++++++++++ .../src/test/kotlin/ProcessingPluginTest.kt | 303 ++++++++++++++++++ java/preprocessor/build.gradle.kts | 1 - settings.gradle.kts | 1 + 15 files changed, 901 insertions(+), 10 deletions(-) create mode 100644 java/gradle/build.gradle.kts 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 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/app/utils/build.gradle.kts b/app/utils/build.gradle.kts index 193188f956..1618e1706b 100644 --- a/app/utils/build.gradle.kts +++ b/app/utils/build.gradle.kts @@ -1,5 +1,6 @@ plugins { id("java") + alias(libs.plugins.mavenPublish) } repositories { @@ -11,6 +12,15 @@ dependencies { testImplementation("org.junit.jupiter:junit-jupiter") } +publishing{ + repositories{ + maven { + name = "App" + url = uri(project(":app").layout.buildDirectory.dir("resources-bundled/common/repository").get().asFile.absolutePath) + } + } +} + tasks.test { useJUnitPlatform() } \ No newline at end of file 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 { 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 4fccd1a535..d9df211eb7 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 @@ -9940,19 +9940,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/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/brightness.pde b/java/gradle/example/brightness.pde new file mode 100644 index 0000000000..dad7885af3 --- /dev/null +++ b/java/gradle/example/brightness.pde @@ -0,0 +1,28 @@ +/** + * 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; + + +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/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 + } + + val sketch = sketchMetaFile.inputStream().use { input -> + ObjectInputStream(input).readObject() as PDETask.SketchMeta + } + + val dependencies = mutableSetOf() + + // 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..2ccca5cde7 --- /dev/null +++ b/java/gradle/src/main/kotlin/LibrariesTask.kt @@ -0,0 +1,81 @@ +package org.processing.java.gradle + +import org.gradle.api.DefaultTask +import org.gradle.api.file.ConfigurableFileCollection +import org.gradle.api.file.RegularFileProperty +import org.gradle.api.tasks.InputFiles +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() { + + @InputFiles + val libraryDirectories: ConfigurableFileCollection = project.files() + + @OutputFile + val librariesMetaData: RegularFileProperty = project.objects.fileProperty() + + init{ + librariesMetaData.convention { project.gradle.gradleUserHomeDir.resolve("common/processing/libraries") } + } + + data class Jar( + val path: File, + val classes: List + ) : java.io.Serializable + + data class Library( + val jars: List + ) : java.io.Serializable + + @TaskAction + fun execute() { + val output = libraryDirectories.flatMap { librariesDirectory -> + if (!librariesDirectory.exists()) { + logger.error("Libraries directory (${librariesDirectory.path}) does not exist. Libraries will not be imported.") + return@flatMap emptyList() + } + val libraries = librariesDirectory + .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 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() + + return@flatMap libraries + } + val meta = ObjectOutputStream(librariesMetaData.get().asFile.outputStream()) + meta.writeObject(output) + 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 { 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 + ) : 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..df558710f3 --- /dev/null +++ b/java/gradle/src/main/kotlin/ProcessingPlugin.kt @@ -0,0 +1,216 @@ +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 javax.inject.Inject + +class ProcessingPlugin @Inject constructor(private val objectFactory: ObjectFactory) : Plugin { + 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? + val root = project.findProperty("processing.root") 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) } + + // Connect the stdio to the PDE if ports are specified + if(logPort != null) task.standardOutput = Socket("localhost", logPort.toInt()).outputStream + if(errPort != null) task.errorOutput = Socket("localhost", errPort.toInt()).outputStream + + } + + // For every Java Source Set (main, test, etc) add a PDE source set that includes .pde files + // and a task to process them before compilation + 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") + ) + + // Configure the PDE source set to include all .pde files in the sketch folder except those in the build directory + pdeSourceSet.apply { + srcDir("./") + srcDir("$workingDir/unsaved") + + filter.include("**/*.pde") + filter.exclude("${project.layout.buildDirectory.asFile.get().name}/**") + } + sourceSet.allSource.source(pdeSourceSet) + + // Add top level java source files + sourceSet.java.srcDir(project.layout.projectDirectory).apply { + include("/*.java") + } + + // Scan the libraries before compiling the sketches + 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.libraryDirectories.from(sketchbook?.let { File(it, "libraries") }, root?.let { File(it).resolve("modes/java/libraries") }) + } + + // Create a task to process the .pde files before compiling the java sources + 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 -> + // Link the output of the libraries task to the dependencies task + task.librariesMetaData.set(librariesScan.get().librariesMetaData) + task.dependsOn(pdeTask, librariesScan) + } + + // Make sure that the PDE tasks 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..7ffeeecb58 --- /dev/null +++ b/java/gradle/src/test/kotlin/ProcessingPluginTest.kt @@ -0,0 +1,303 @@ +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 + ) + } + + data class TemporaryProcessingLibraryResult( + val buildResult: BuildResult, + val libraryFolder: File + ) + + fun createTemporaryProcessingLibrary(name: String): TemporaryProcessingLibraryResult{ + val directory = TemporaryFolder() + directory.create() + val libraryFolder = directory.newFolder("libraries",name) + directory.newFile("libraries/$name/build.gradle.kts").writeText(""" + plugins { + java + } + tasks.jar{ + destinationDirectory.set(file("library")) + } + """.trimIndent()) + val srcDirectory = directory.newFolder("libraries", name,"src", "main", "java") + directory.newFile("libraries/$name/src/main/java/Example.java").writeText(""" + package testing.example; + + public class Example { + public void exampleMethod() { + System.out.println("Hello from Example library"); + } + } + """.trimIndent()) + directory.newFile("libraries/$name/settings.gradle.kts") + directory.newFile("libraries/$name/library.properties").writeText(""" + name=$name + author=Test Author + version=1.0.0 + sentence=An example library + paragraph=This is a longer description of the example library. + category=Examples + url=http://example.com + """.trimIndent()) + + if(isDebuggerAttached()){ + openFolderInFinder(libraryFolder) + } + + val buildResult = GradleRunner.create() + .withProjectDir(libraryFolder) + .withArguments("jar") + .withPluginClasspath() + .withDebug(true) + .build() + + + return TemporaryProcessingLibraryResult( + buildResult, + libraryFolder + ) + } + + @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(){ + val libraryResult = createTemporaryProcessingLibrary("ExampleLibrary") + val (buildResult, sketchFolder, classLoader) = createTemporaryProcessingSketch("build") { sketchFolder -> + sketchFolder.resolve("sketch.pde").writeText(""" + import testing.example.*; + + Example example; + + void setup(){ + size(100, 100); + example = new Example(); + example.exampleMethod(); + } + + void draw(){ + println("Hello World"); + } + """.trimIndent()) + sketchFolder.resolve("gradle.properties").writeText(""") + processing.sketchbook = ${libraryResult.libraryFolder.parentFile.parentFile.absolutePath} + """.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 testUseInternalLibraries(){ + + } + + @Test + fun testUseCodeJar(){ + // TODO: test if adding jars to the code folder works + } + + 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",