bump kotlin version to 2.1.0

DatL4g · Dec 1, 2024 · 32f8e90 · 32f8e90
1 parent bb7d60e
commit 32f8e90
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 14 deletions.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,9 +1,9 @@
 [versions]
-lib = "2.0.0-alpha-07"
+lib = "2.0.0-alpha-08-SNAPSHOT"
 android = "8.6.0"
 auto-service = "1.1.1"
-kotlin = "2.0.20"
-kotlinpoet = "1.18.1"
+kotlin = "2.1.0"
+kotlinpoet = "2.0.0"
 publish = "0.29.0"
 kase-change = "1.4.1"
 osdetector = "1.7.3"

diff --git a/sekret-gradle-plugin/src/main/java/dev/datlag/sekret/gradle/SekretPlugin.kt b/sekret-gradle-plugin/src/main/java/dev/datlag/sekret/gradle/SekretPlugin.kt
@@ -64,7 +64,7 @@ open class SekretPlugin : Plugin<Project> {
     }
 
     companion object {
-        private const val VERSION = "2.0.0-alpha-07"
+        private const val VERSION = "2.0.0-alpha-08-SNAPSHOT"
 
         internal fun getVersion(): String {
             return runCatching {

diff --git a/sekret-gradle-plugin/src/main/java/dev/datlag/sekret/gradle/common/ExtendProject.kt b/sekret-gradle-plugin/src/main/java/dev/datlag/sekret/gradle/common/ExtendProject.kt
@@ -29,23 +29,19 @@ internal fun Project.createSekretExtension(): SekretPluginExtension {
 
 internal val KotlinProjectExtension.allTargets: Iterable<KotlinTarget>
     get() = when (this) {
-        is KotlinSingleTargetExtension<*> -> listOf(this.target)
-        is KotlinMultiplatformExtension -> targets
+        is KotlinSingleTargetExtension<*> -> listOfNotNull(this.target)
+        is KotlinMultiplatformExtension -> this.targets
         else -> emptyList()
     }
 
 internal val KotlinProjectExtension.targetsMapped: Set<Target>
     get() {
         val usedTargets = this.allTargets
         val allFlatten = listOf(
-            usedTargets.map {
-                it.targetName
-            },
-            usedTargets.map {
-                it.name
-            },
-            this.sourceSets.map {
-                it.name
+            usedTargets.map { it.targetName },
+            usedTargets.map { it.name },
+            this.sourceSets.map { it.name }.also {
+                println("Used sourceSets: $it")
             },
             when (this) {
                 is KotlinJvmProjectExtension -> listOf("jvm")