diff --git a/java/gradle/src/main/kotlin/PDETask.kt b/java/gradle/src/main/kotlin/PDETask.kt index ccde2bec8..76ac195e5 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 a58e16b60..91f50a29c 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 } - val process = ProcessBuilder("open", folder.absolutePath) - .inheritIO() - .start() - process.waitFor() -} \ No newline at end of file + 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() + } +} + +