Merge pull request #8 from Commencis/bugfix/cmakelists-wrong-elseif

Fix Wrong "elseif" Code Generation instead of "if" in CMakeLists File
Commencis · Dec 13, 2024 · 8c20f9b · 8c20f9b
2 parents d8302f8 + 79361dc
commit 8c20f9b
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+# 0.1.2
+
+### Fixed
+- Replace wrong "elseif" with "if" in generated CMakeLists file
+
 # 0.1.1
 
 ### Fixed

diff --git a/secretsvaultplugin/build.gradle.kts b/secretsvaultplugin/build.gradle.kts
@@ -51,4 +51,4 @@ configure<DetektExtension> {
 }
 
 group = "com.commencis.secretsvaultplugin"
-version = "0.1.1"
+version = "0.1.2"
diff --git a/secretsvaultplugin/src/main/kotlin/com/commencis/secretsvaultplugin/KeepSecretsTask.kt b/secretsvaultplugin/src/main/kotlin/com/commencis/secretsvaultplugin/KeepSecretsTask.kt
@@ -347,19 +347,21 @@ internal abstract class KeepSecretsTask : DefaultTask() {
             }
             sourceSets.groupBy { getCmakeArgumentName(it) }.forEach { map ->
                 val (cMakeArgument, sourceSetList) = map
-                sourceSetList.forEachIndexed { index, sourceSet ->
+                var isFirstSourceSet = true
+                for (sourceSet in sourceSetList) {
                     if (sourceSet == mainSourceSet) {
-                        return@forEachIndexed
+                        continue
                     }
                     val fileName = getKotlinSecretsFileName(sourceSet).removeSuffix(KOTLIN_FILE_NAME_SUFFIX)
                     textBuilder.append(
                         codeGenerator.getCMakeListsCode(
                             sourceSet = sourceSet,
                             mappingFileName = fileName,
                             cmakeArgumentName = cMakeArgument,
-                            index == 0,
+                            isFirstSourceSet,
                         )
                     )
+                    isFirstSourceSet = false
                 }
                 if (sourceSetList.count { sourceSet -> sourceSet != mainSourceSet } > 1) {
                     textBuilder.append("\nendif()\n")