bump kotlin version to 2.1.0

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

Hide file tree

Showing 5 changed files with 10 additions and 4 deletions.
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-    `kotlin-dsl`
+    `kotlin-dsl` version "5.1.2"
     `kotlin-dsl-precompiled-script-plugins`
 }
 

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,6 +1,6 @@
 [versions]
 lib = "2.0.0-alpha-08-SNAPSHOT"
-android = "8.6.0"
+android = "8.7.2"
 auto-service = "1.1.1"
 kotlin = "2.1.0"
 kotlinpoet = "2.0.0"

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/sekret-gradle-plugin/build.gradle.kts b/sekret-gradle-plugin/build.gradle.kts
@@ -1,7 +1,7 @@
 import com.vanniktech.maven.publish.SonatypeHost
 
 plugins {
-    `kotlin-dsl`
+    `kotlin-dsl` version "5.1.2"
     kotlin("jvm")
     id("java-gradle-plugin")
     `maven-publish`

diff --git a/sekret-gradle-plugin/src/main/java/dev/datlag/sekret/gradle/Target.kt b/sekret-gradle-plugin/src/main/java/dev/datlag/sekret/gradle/Target.kt
@@ -153,6 +153,8 @@ sealed class Target(open val name: String, open val sourceSet: String = name) {
         private const val ENDING_TEST = "Test"
         private const val ENDING_DEBUG = "Debug"
         private const val ENDING_RELEASE = "Release"
+        private const val ENDING_STAGING = "Staging"
+        private const val ENDING_PRODUCTION = "Production"
 
         fun fromKotlinTargets(targets: Iterable<KotlinTarget>): Set<Target> {
             val sourceTargetMapped = targets.mapNotNull { target ->
@@ -190,6 +192,10 @@ sealed class Target(open val name: String, open val sourceSet: String = name) {
                     name.substringBeforeLast(ENDING_DEBUG)
                 } else if (name.endsWith(ENDING_RELEASE)) {
                     name.substringBeforeLast(ENDING_RELEASE)
+                } else if (name.endsWith(ENDING_STAGING)) {
+                    name.substringBeforeLast(ENDING_STAGING)
+                } else if (name.endsWith(ENDING_PRODUCTION)) {
+                    name.substringBeforeLast(ENDING_PRODUCTION)
                 } else {
                     name
                 }