Skip to content

Commit bd5aba4

Browse files
committed
Allowing libraries folder to not exist, but log instead
1 parent fcb554a commit bd5aba4

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import org.gradle.api.DefaultTask
44
import org.gradle.api.file.DirectoryProperty
55
import org.gradle.api.file.RegularFileProperty
66
import org.gradle.api.tasks.InputDirectory
7+
import org.gradle.api.tasks.Optional
78
import org.gradle.api.tasks.OutputFile
89
import org.gradle.api.tasks.TaskAction
910
import java.io.File
@@ -16,8 +17,8 @@ This task stores the resulting information in a file that can be used later to r
1617
*/
1718
abstract class LibrariesTask : DefaultTask() {
1819

19-
// TODO: Allow this directory to not exist
2020
@InputDirectory
21+
@Optional
2122
val librariesDirectory: DirectoryProperty = project.objects.directoryProperty()
2223

2324
@OutputFile
@@ -38,6 +39,10 @@ abstract class LibrariesTask : DefaultTask() {
3839

3940
@TaskAction
4041
fun execute() {
42+
if (!librariesDirectory.isPresent) {
43+
logger.error("Libraries directory is not set. Libraries will not be imported.")
44+
return
45+
}
4146
val libraries = librariesDirectory.get().asFile
4247
.listFiles { file -> file.isDirectory }
4348
?.map { folder ->

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ class ProcessingPlugin @Inject constructor(private val objectFactory: ObjectFact
139139
val librariesTaskName = sourceSet.getTaskName("scanLibraries", "PDE")
140140
val librariesScan = project.tasks.register(librariesTaskName, LibrariesTask::class.java) { task ->
141141
task.description = "Scans the libraries in the sketchbook"
142-
task.librariesDirectory.set(File(sketchbook, "libraries"))
142+
task.librariesDirectory.set(sketchbook?.let { File(it, "libraries") })
143143
}
144144

145145
val pdeTaskName = sourceSet.getTaskName("preprocess", "PDE")

0 commit comments

Comments
 (0)