@@ -36,7 +36,6 @@ abstract class BuildCustomGradleDistributionTask : DefaultTask() {
36
36
@get:InputDirectory
37
37
abstract val includeRootDir: DirectoryProperty
38
38
39
- @get:Optional
40
39
@get:InputDirectory
41
40
abstract val extensionsRootDir: DirectoryProperty
42
41
@@ -50,9 +49,9 @@ abstract class BuildCustomGradleDistributionTask : DefaultTask() {
50
49
project.layout.projectDirectory.dir(" src/main/resources/include" ).let {
51
50
if (it.asFile.exists()) includeRootDir.convention(it)
52
51
}
53
- project.layout.projectDirectory.dir( " src/main/resources/init.d " ). let {
54
- if (it.asFile.exists()) extensionsRootDir.convention(it )
55
- }
52
+ extensionsRootDir.convention(
53
+ project.layout.projectDirectory.dir( " src/main/resources/init.d " )
54
+ )
56
55
customDistributionsRootDir.convention(
57
56
project.layout.buildDirectory.dir(" gradle-dist" )
58
57
)
@@ -150,8 +149,8 @@ abstract class BuildCustomGradleDistributionTask : DefaultTask() {
150
149
}
151
150
152
151
private fun getDistributions (): Collection <String > {
153
- val extensionsRootDir = this .extensionsRootDir.orNull? .asFile
154
- val childDirectories = extensionsRootDir? .listFiles(FileFilter { it.isDirectory })
152
+ val extensionsRootDir = this .extensionsRootDir.get() .asFile
153
+ val childDirectories = extensionsRootDir.listFiles(FileFilter { it.isDirectory })
155
154
return if (childDirectories == null || childDirectories.size < 2 ) {
156
155
project.logger.lifecycle(" using a single custom gradle distribution" )
157
156
emptyList()
@@ -388,7 +387,9 @@ abstract class BuildCustomGradleDistributionTask : DefaultTask() {
388
387
mapOf (" create" to " true" )
389
388
)
390
389
.use { zipFileSystem ->
391
- extensionsRootDir.orNull?.asFile?.let { extensionsRootDir ->
390
+ val extensionsRootDir = this .extensionsRootDir.get().asFile
391
+
392
+ extensionsRootDir.let { extensionsRootDir ->
392
393
addToZip(
393
394
zip = zipFileSystem,
394
395
includeRootDir = distribution?.let {
0 commit comments