KeepSecretsTask: Fix "elseif" instead of "if" in generated CMakeLists

burakaygun · burakaygun · commit 2146a28bbfdc · 2024-12-12T20:53:01.000+03:00
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")

Original file line number	Diff line number	Diff line change
`@@ -347,19 +347,21 @@ internal abstract class KeepSecretsTask : DefaultTask() {`
`347`	`347`	`}`
`348`	`348`	`sourceSets.groupBy { getCmakeArgumentName(it) }.forEach { map ->`
`349`	`349`	`val (cMakeArgument, sourceSetList) = map`
`350`		`- sourceSetList.forEachIndexed { index, sourceSet ->`
	`350`	`+ var isFirstSourceSet = true`
	`351`	`+ for (sourceSet in sourceSetList) {`
`351`	`352`	`if (sourceSet == mainSourceSet) {`
`352`		`- return@forEachIndexed`
	`353`	`+ continue`
`353`	`354`	`}`
`354`	`355`	`val fileName = getKotlinSecretsFileName(sourceSet).removeSuffix(KOTLIN_FILE_NAME_SUFFIX)`
`355`	`356`	`textBuilder.append(`
`356`	`357`	`codeGenerator.getCMakeListsCode(`
`357`	`358`	`sourceSet = sourceSet,`
`358`	`359`	`mappingFileName = fileName,`
`359`	`360`	`cmakeArgumentName = cMakeArgument,`
`360`		`- index == 0,`
	`361`	`+ isFirstSourceSet,`
`361`	`362`	`)`
`362`	`363`	`)`
	`364`	`+ isFirstSourceSet = false`
`363`	`365`	`}`
`364`	`366`	`if (sourceSetList.count { sourceSet -> sourceSet != mainSourceSet } > 1) {`
`365`	`367`	`textBuilder.append("\nendif()\n")`