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
4
4
import org.gradle.api.file.DirectoryProperty
5
5
import org.gradle.api.file.RegularFileProperty
6
6
import org.gradle.api.tasks.InputDirectory
7
+ import org.gradle.api.tasks.Optional
7
8
import org.gradle.api.tasks.OutputFile
8
9
import org.gradle.api.tasks.TaskAction
9
10
import java.io.File
@@ -16,8 +17,8 @@ This task stores the resulting information in a file that can be used later to r
16
17
*/
17
18
abstract class LibrariesTask : DefaultTask () {
18
19
19
- // TODO: Allow this directory to not exist
20
20
@InputDirectory
21
+ @Optional
21
22
val librariesDirectory: DirectoryProperty = project.objects.directoryProperty()
22
23
23
24
@OutputFile
@@ -38,6 +39,10 @@ abstract class LibrariesTask : DefaultTask() {
38
39
39
40
@TaskAction
40
41
fun execute () {
42
+ if (! librariesDirectory.isPresent) {
43
+ logger.error(" Libraries directory is not set. Libraries will not be imported." )
44
+ return
45
+ }
41
46
val libraries = librariesDirectory.get().asFile
42
47
.listFiles { file -> file.isDirectory }
43
48
?.map { folder ->
Original file line number Diff line number Diff line change @@ -139,7 +139,7 @@ class ProcessingPlugin @Inject constructor(private val objectFactory: ObjectFact
139
139
val librariesTaskName = sourceSet.getTaskName(" scanLibraries" , " PDE" )
140
140
val librariesScan = project.tasks.register(librariesTaskName, LibrariesTask ::class .java) { task ->
141
141
task.description = " Scans the libraries in the sketchbook"
142
- task.librariesDirectory.set(File (sketchbook , " libraries" ))
142
+ task.librariesDirectory.set(sketchbook?. let { File (it , " libraries" ) } )
143
143
}
144
144
145
145
val pdeTaskName = sourceSet.getTaskName(" preprocess" , " PDE" )
You can’t perform that action at this time.
0 commit comments