File tree Expand file tree Collapse file tree 2 files changed +7
-2
lines changed
java/gradle/src/main/kotlin Expand file tree Collapse file tree 2 files changed +7
-2
lines changed Original file line number Diff line number Diff line change @@ -4,6 +4,7 @@ import org.gradle.api.DefaultTask
44import org.gradle.api.file.DirectoryProperty
55import org.gradle.api.file.RegularFileProperty
66import org.gradle.api.tasks.InputDirectory
7+ import org.gradle.api.tasks.Optional
78import org.gradle.api.tasks.OutputFile
89import org.gradle.api.tasks.TaskAction
910import java.io.File
@@ -16,8 +17,8 @@ This task stores the resulting information in a file that can be used later to r
1617 */
1718abstract 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 ->
Original file line number Diff line number Diff 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" )
You can’t perform that action at this time.
0 commit comments