Scan libaries for dependencies

Author: Stefterv

.gitignore

@@ -123,3 +123,7 @@ java/build/
 /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

app/build.gradle.kts

@@ -101,6 +101,7 @@ compose.desktop {
 
 dependencies {
     implementation(project(":core"))
+    runtimeOnly(project(":java"))
 
     implementation(libs.flatlaf)
 

app/src/processing/app/Base.java

@@ -67,6 +67,8 @@ public class Base {
    */
   static public boolean DEBUG = System.getenv().containsKey("DEBUG");
 
+  static public boolean GRADLE = false;
+
   /** True if running via Commander. */
   static private boolean commandLine;
 

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

@@ -22,6 +22,7 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.input.pointer.PointerEventType
 import androidx.compose.ui.input.pointer.onPointerEvent
 import androidx.compose.ui.unit.dp
+import processing.app.Base
 import processing.app.ui.Editor
 import processing.app.ui.EditorToolbar
 import processing.app.ui.Theme
@@ -38,7 +39,7 @@ class Toolbar(val editor: Editor) {
             val panel = ComposePanel().apply {
                 setContent {
                     // TODO: Dynamically switch between the toolbars
-                    val displayNew = true
+                    val displayNew = Base.GRADLE
                     if(displayNew){
                         bar.display()
                         return@setContent

java/gradle/example/brightness.pde

@@ -29,4 +29,4 @@ void draw() {
     rect(barX, 0, barWidth, height);
     lastBar = whichBar;
   }
-}
+}

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

@@ -161,27 +161,37 @@ class ProcessingPlugin @Inject constructor(private val objectFactory: ObjectFact
             val outputDirectory = project.layout.buildDirectory.asFile.get().resolve( "generated/pde/" + sourceSet.name)
             sourceSet.java.srcDir(outputDirectory)
 
-            val taskName = sourceSet.getTaskName("preprocess", "PDE")
-            project.tasks.register(taskName, ProcessingTask::class.java) { task ->
+            val pdeTaskName = sourceSet.getTaskName("preprocess", "PDE")
+            project.tasks.register(pdeTaskName, ProcessingTask::class.java) { task ->
                 task.description = "Processes the ${sourceSet.name} PDE"
                 task.source = pdeSourceSet
                 task.outputDirectory = outputDirectory
                 task.sketchName = sketchName
                 task.workingDir = workingDir
                 task.sketchBook = sketchbook
             }
+            val depsTaskName = sourceSet.getTaskName("addDependencies", "PDE")
+            project.tasks.register(depsTaskName){ task ->
+                task.dependsOn(pdeTaskName)
+                task.doLast {
+                    outputDirectory
+                        .listFiles()
+                        ?.filter { file -> file.name.endsWith(".dependencies") }
+                        ?.map { file ->
+                            val dependencies = file.readLines()
+                            dependencies.forEach { path ->
+                                project.dependencies.add("implementation", project.files(path))
+                            }
+                        }
+                }
+            }
 
             project.tasks.named(
                 sourceSet.compileJavaTaskName
             ) { task ->
-                task.dependsOn(taskName)
+                task.dependsOn(pdeTaskName, depsTaskName)
             }
         }
-
-        // TODO: Move to ProcessingTask after reading the libs from the sketch
-        File(sketchbook, "libraries").listFiles { file -> file.isDirectory }?.forEach{
-            project.dependencies.add("implementation", project.fileTree(it).apply { include("**/*.jar") })
-        }
     }
     abstract class DefaultPDESourceDirectorySet @Inject constructor(
         sourceDirectorySet: SourceDirectorySet,

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

@@ -7,6 +7,7 @@ import org.gradle.work.InputChanges
 import processing.mode.java.preproc.PdePreprocessor
 import java.io.File
 import java.util.concurrent.Callable
+import java.util.jar.JarFile
 import javax.inject.Inject
 
 abstract class ProcessingTask : SourceTask() {
@@ -45,22 +46,66 @@ abstract class ProcessingTask : SourceTask() {
         }.joinToString("\n"){
             it.readText()
         }
-        File(outputDirectory, "$sketchName.java")
-            .bufferedWriter()
-            .use { out ->
-                val meta = PdePreprocessor
-                    .builderFor(sketchName)
-                    .build()
-                    .write(out, combined)
+        val javaFile = File(outputDirectory, "$sketchName.java").bufferedWriter()
 
+        val meta = PdePreprocessor
+            .builderFor(sketchName)
+            .build()
+            .write(javaFile, combined)
 
-                val importStatement = meta.importStatements
-                println(sketchBook)
+        javaFile.flush()
+        javaFile.close()
 
-//                for (import in importStatement) {
-//                    project.dependencies.add("implementation", import)
-//                }
+        // Scan all the libaries in the sketchbook
+        val libraries = File(sketchBook, "libraries")
+            .listFiles { file -> file.isDirectory }
+            ?.map { folder ->
+                // Find all the jars in the sketch book
+                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 object {
+                            val name = file.name
+                            val path = file
+                            val classes = classes
+                        }
+                    }?: emptyList()
+
+                // Save the parsed jars and which folder
+                return@map object {
+                    val name = folder.name
+                    val path = folder
+                    val jars = jars
+                }
             }
+
+        // Loop over the import statements and find the library jars that provide those imports
+        val dependencies = mutableSetOf<File>()
+        meta.importStatements.map { import ->
+            libraries?.map { library ->
+                library.jars.map { jar ->
+                    jar.classes
+                        .filter { className -> className.startsWith(import.packageName) }
+                        .map { _ ->
+                            dependencies.add(jar.path)
+                        }
+                }
+            }
+        }
+        // Write the dependencies to a file
+        val deps = File(outputDirectory, "$sketchName.dependencies")
+        deps.writeText(dependencies.joinToString("\n") { it.absolutePath })
     }
 
     @get:Inject

java/src/processing/mode/java/JavaEditor.java

@@ -488,7 +488,7 @@ public String getCommentPrefix() {
    * Handler for Sketch → Export Application
    */
   public void handleExportApplication() {
-    if(true){
+    if(Base.GRADLE){
         this.service.export();
         return;
     }
@@ -640,7 +640,7 @@ public void handleTweak() {
   }
 
   protected void handleLaunch(boolean present, boolean tweak) {
-    if(true){
+    if(Base.GRADLE){
       this.service.run();
       return;
     }