Move Gradle connection into GradleJob

Author: Stefterv

app/src/processing/app/gradle/GradleJob.kt

@@ -46,12 +46,15 @@ abstract class GradleJob{
 
     fun start() {
         service?.jobs?.add(this)
-        val connection = service?.connection ?: return
+        val folder = service?.folder ?: return
         scope.launch {
             try {
                 state.value = State.BUILDING
 
-                connection.newBuild()
+                GradleConnector.newConnector()
+                    .forProjectDirectory(folder)
+                    .connect()
+                    .newBuild()
                     .apply {
                         configure()
                         withCancellationToken(cancel.token())

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

@@ -23,15 +23,18 @@ import javax.swing.event.DocumentListener
 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: ---- FUTURE ----
 // TODO: Remove dependency on editor (editor is not mockable, or move editor away from JFrame)
 // TODO: Improve progress tracking
 // TODO: PoC new debugger/tweak mode
 // TODO: Allow for plugins to skip gradle entirely / new modes
 // TODO: Improve background building
 // TODO: Track build speed (for analytics?)
 
-// TODO: Support offline mode
-
 // 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
@@ -44,8 +47,6 @@ class GradleService(val editor: Editor) {
     val workingDir = kotlin.io.path.createTempDirectory()
     val debugPort = (30_000..60_000).random()
 
-    var connection: ProjectConnection? = null
-
     private val scope = CoroutineScope(Dispatchers.IO)
 
     // Hooks for java to check if the Gradle service is running since mutableStateOf is not accessible in java
@@ -56,57 +57,6 @@ class GradleService(val editor: Editor) {
         this.active.value = active
     }
 
-    fun startService(){
-        Messages.log("Starting Gradle service at $folder")
-        connection = GradleConnector.newConnector()
-            .forProjectDirectory(folder)
-            .connect()
-        editor.sketch.onFolderChangeListeners.add {
-            connection?.close()
-            connection = GradleConnector.newConnector()
-                .forProjectDirectory(folder)
-                .connect()
-        }
-
-        startListening()
-        startBuilding()
-    }
-
-
-    private fun startBuilding(){
-        scope.launch {
-            val job = BackgroundGradleJob()
-            job.service = this@GradleService
-            job.configure = {
-                setup()
-                forTasks("jar")
-                addArguments("--continuous")
-            }
-            job.start()
-        }
-    }
-
-    private fun startListening(){
-        SwingUtilities.invokeLater {
-            editor.sketch.code.forEach {
-                it.document.addDocumentListener(object : DocumentListener {
-                    override fun insertUpdate(e: DocumentEvent) {
-                        setupGradle()
-                    }
-
-                    override fun removeUpdate(e: DocumentEvent) {
-                        setupGradle()
-                    }
-
-                    override fun changedUpdate(e: DocumentEvent) {
-                        setupGradle()
-                    }
-                })
-            }
-
-            // TODO: Attach listener to new tab created, callback has to be added to the editor
-        }
-    }
     // TODO: Add support for present
     fun run(){
         stopActions()
@@ -136,7 +86,6 @@ class GradleService(val editor: Editor) {
 
     fun stop(){
         stopActions()
-        startBuilding()
     }
 
     fun stopActions(){
@@ -166,6 +115,7 @@ class GradleService(val editor: Editor) {
             "group" to group,
             "version" to Base.getVersionName(),
             "sketchFolder" to folder.absolutePath,
+            "sketchbook" to Base.getSketchbookFolder(),
             "workingDir" to workingDir.toAbsolutePath().toString(),
             "settings" to Platform.getSettingsFolder().absolutePath.toString(),
             "unsaved" to unsaved.joinToString(","),

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

@@ -2280,7 +2280,6 @@ protected void handleOpenInternal(String path) throws EditorException {
     } catch (IOException e) {
       throw new EditorException("Could not create the sketch.", e);
     }
-    service.startService();
 
     header.rebuild();
     updateTitle();

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

@@ -28,8 +28,6 @@ class ProcessingPlugin @Inject constructor(private val objectFactory: ObjectFact
         val debugPort = project.findProperty("processing.debugPort") as String?
 
         val sketchbook = project.findProperty("processing.sketchbook") as String?
-                                ?: Preferences.get("sketchbook.path.four")
-                                ?: ("${System.getProperty("user.home")}/.processing")
 
         // Apply the Java plugin to the Project
         project.plugins.apply(JavaPlugin::class.java)

java/gradle/src/test/kotlin/ProcessingPluginTest.kt

@@ -6,6 +6,8 @@ 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()