PR Cleanup

Author: Stefterv

.github/workflows/build-gradle.yml

@@ -21,7 +21,7 @@ jobs:
         uses: gradle/actions/setup-gradle@v4
 
       - name: Build with Gradle
-        run: ./gradlew test --info
+        run: ./gradlew test
   build:
     name: (${{ matrix.os_prefix }}/${{ matrix.arch }}) Create Processing Build
     runs-on: ${{ matrix.os }}

.github/workflows/pull_request-gradle.yml

@@ -22,7 +22,7 @@ jobs:
         uses: gradle/actions/setup-gradle@v4
 
       - name: Build with Gradle
-        run: ./gradlew test --info
+        run: ./gradlew test
   build:
     name: (${{ matrix.os_prefix }}/${{ matrix.arch }}) Create Processing Build
     runs-on: ${{ matrix.os }}

.gitignore

@@ -98,33 +98,27 @@ bin-test
 processing-examples
 
 # Maven ignores
-/.kotlin/sessions
+.kotlin
 .gradle
 .build/
-core/build/
-build/publish/
-app/build
-java/build/
+/core/build/
+/build/publish/
+/app/build
+/java/build/
 /build/reports
 /java/bin
 /java/libraries/svg/bin
 /java/preprocessor/build
 /java/lsp/build
 /java/gradle/build
-/.kotlin/sessions
 /core/examples/build
-/java/gradle/build
 /java/gradle/example/.processing
-
-.build/
 /app/windows/obj
-/java/gradle/build
-/java/gradle/example/.processing
 /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/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

app/build.gradle.kts

@@ -124,17 +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(gradleApi())
-    @OptIn(ExperimentalComposeLibrary::class)
-    testImplementation(compose.uiTest)
-
-    implementation(libs.clikt)
 }
 
 tasks.test {
@@ -416,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",
@@ -548,7 +527,7 @@ tasks.register("setExecutablePermissions") {
 afterEvaluate {
     tasks.named("prepareAppResources").configure {
         dependsOn("includeProcessingResources")
-        // Make sure all libraries are bundled
+        // 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 {

app/src/processing/app/Sketch.java

@@ -67,7 +67,6 @@ public class Sketch {
 
   /** folder that contains this sketch */
   private File folder;
-  public List<Runnable> onFolderChangeListeners = new ArrayList<Runnable>();
 
   /** data folder location for this sketch (may not exist yet) */
   private File dataFolder;
@@ -1241,7 +1240,6 @@ protected void updateInternal(File sketchFolder) {
 
     name = sketchFolder.getName();
     folder = sketchFolder;
-    onFolderChangeListeners.forEach(Runnable::run);
     disappearedWarning = false;
     codeFolder = new File(folder, "code");
     dataFolder = new File(folder, "data");

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

@@ -172,10 +172,6 @@ class GradleService(
                 .split("\n")
                 .joinToString("\n") { "// $it" }
 
-            // TODO: Move the current configuration to java mode
-            // TODO: Allow for other plugins to be registered
-            // TODO: Allow for the whole configuration to be overridden
-            // TODO: Define new plugin / mode schema
             val configuration =  """
                 plugins{
                     id("org.processing.gradle") version "${Base.getVersionName()}"

app/src/processing/app/gradle/ScreenshotService.kt

@@ -19,6 +19,10 @@ import kotlin.time.TimeSource
 // TODO: Record / Capture on the client and then transfer the file over the debugging connection
 // TODO: Create a video capture method for every platform / target
 // TODO: Support recording videos
+/*
+* This service is used to take screenshots of the sketch.
+* It uses the JDI to connect to the sketch and take a screenshot.
+ */
 class ScreenshotService {
     companion object{
         fun takeScreenshot(vm: VirtualMachine, onComplete: (Path) -> Unit) {

app/src/processing/app/gradle/ui/Toolbar.kt

@@ -39,6 +39,14 @@ import processing.app.ui.theme.toColorInt
 import java.io.File
 import javax.swing.JComponent
 
+// TODO: Split into multiple files and components
+// TODO: Make testable outside of Processing IDE
+
+/*
+The toolbar class is a Compose-based UI component that provides a toolbar for the Processing editor.
+It was originally developed together with the gradle runner but has been postponed to be used later.
+Can be deleted if the toolbar UI is not going to be refactored to use Compose.
+ */
 class Toolbar(val editor: Editor?) {
     companion object {
         @JvmStatic
@@ -61,8 +69,7 @@ class Toolbar(val editor: Editor?) {
         }
     }
 
-    // TODO: Split into multiple files
-    // TODO: Make runnable outside of Processing IDE
+
     @OptIn(ExperimentalMaterialApi::class, ExperimentalComposeUiApi::class, ExperimentalFoundationApi::class)
     @Composable
     fun display() {

app/src/processing/app/ui/Editor.java

@@ -223,7 +223,7 @@ public void windowDeactivated(WindowEvent e) {
 
     rebuildModePopup();
     toolbar = createToolbar();
-    // Wrapping the toolbar to be able to switch build systems dynamically
+    // Wrapping the toolbar to be able to use the new Compose base toolbar
     var wrapped = Toolbar.legacyWrapped(this, toolbar);
     upper.add(wrapped);
 

build.gradle.kts

@@ -6,11 +6,11 @@ plugins {
     alias(libs.plugins.jetbrainsCompose) apply false
 }
 
-allprojects{
-    repositories{
-        maven { url = uri("https://repo.gradle.org/gradle/libs-releases") }
-    }
-}
+//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