Skip to content

Commit 8c20f9b

Browse files
authored
Merge pull request #8 from Commencis/bugfix/cmakelists-wrong-elseif
Fix Wrong "elseif" Code Generation instead of "if" in CMakeLists File
2 parents d8302f8 + 79361dc commit 8c20f9b

3 files changed

Lines changed: 11 additions & 4 deletions

File tree

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
# 0.1.2
2+
3+
### Fixed
4+
- Replace wrong "elseif" with "if" in generated CMakeLists file
5+
16
# 0.1.1
27

38
### Fixed

secretsvaultplugin/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,4 +51,4 @@ configure<DetektExtension> {
5151
}
5252

5353
group = "com.commencis.secretsvaultplugin"
54-
version = "0.1.1"
54+
version = "0.1.2"

secretsvaultplugin/src/main/kotlin/com/commencis/secretsvaultplugin/KeepSecretsTask.kt

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -347,19 +347,21 @@ internal abstract class KeepSecretsTask : DefaultTask() {
347347
}
348348
sourceSets.groupBy { getCmakeArgumentName(it) }.forEach { map ->
349349
val (cMakeArgument, sourceSetList) = map
350-
sourceSetList.forEachIndexed { index, sourceSet ->
350+
var isFirstSourceSet = true
351+
for (sourceSet in sourceSetList) {
351352
if (sourceSet == mainSourceSet) {
352-
return@forEachIndexed
353+
continue
353354
}
354355
val fileName = getKotlinSecretsFileName(sourceSet).removeSuffix(KOTLIN_FILE_NAME_SUFFIX)
355356
textBuilder.append(
356357
codeGenerator.getCMakeListsCode(
357358
sourceSet = sourceSet,
358359
mappingFileName = fileName,
359360
cmakeArgumentName = cMakeArgument,
360-
index == 0,
361+
isFirstSourceSet,
361362
)
362363
)
364+
isFirstSourceSet = false
363365
}
364366
if (sourceSetList.count { sourceSet -> sourceSet != mainSourceSet } > 1) {
365367
textBuilder.append("\nendif()\n")

0 commit comments

Comments
 (0)