Skip to content

Commit 525367c

Browse files
committed
Made extensionsRootDir required
1 parent 1418a95 commit 525367c

File tree

3 files changed

+8
-7
lines changed

3 files changed

+8
-7
lines changed

src/main/kotlin/tech/harmonysoft/oss/gradle/dist/BuildCustomGradleDistributionTask.kt

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ abstract class BuildCustomGradleDistributionTask : DefaultTask() {
3636
@get:InputDirectory
3737
abstract val includeRootDir: DirectoryProperty
3838

39-
@get:Optional
4039
@get:InputDirectory
4140
abstract val extensionsRootDir: DirectoryProperty
4241

@@ -50,9 +49,9 @@ abstract class BuildCustomGradleDistributionTask : DefaultTask() {
5049
project.layout.projectDirectory.dir("src/main/resources/include").let {
5150
if (it.asFile.exists()) includeRootDir.convention(it)
5251
}
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+
)
5655
customDistributionsRootDir.convention(
5756
project.layout.buildDirectory.dir("gradle-dist")
5857
)
@@ -150,8 +149,8 @@ abstract class BuildCustomGradleDistributionTask : DefaultTask() {
150149
}
151150

152151
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 })
155154
return if (childDirectories == null || childDirectories.size < 2) {
156155
project.logger.lifecycle("using a single custom gradle distribution")
157156
emptyList()
@@ -388,7 +387,9 @@ abstract class BuildCustomGradleDistributionTask : DefaultTask() {
388387
mapOf("create" to "true")
389388
)
390389
.use { zipFileSystem ->
391-
extensionsRootDir.orNull?.asFile?.let { extensionsRootDir ->
390+
val extensionsRootDir = this.extensionsRootDir.get().asFile
391+
392+
extensionsRootDir.let { extensionsRootDir ->
392393
addToZip(
393394
zip = zipFileSystem,
394395
includeRootDir = distribution?.let {

src/test/resources/cyclic-expansion-in-include-files/input/init.d/.gitkeep

Whitespace-only changes.

src/test/resources/cyclic-expansion-key-in-replacements-file-and-include-files/input/init.d/.gitkeep

Whitespace-only changes.

0 commit comments

Comments
 (0)