Skip to content

Commit 6ab9603

Browse files
committed
Fix PropertyKey annotation placement for Kotlin 2.1 compatibility
1 parent 443252b commit 6ab9603

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

buildSrc/src/main/kotlin/software/aws/toolkits/gradle/BuildScriptUtils.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,7 @@ fun Project.kotlinTarget(): Provider<String> = withCurrentProfileName {
3030
when (it) {
3131
"2024.2" -> KotlinVersionEnum.KOTLIN_1_9
3232
"2024.3" -> KotlinVersionEnum.KOTLIN_2_0
33-
"2025.1" -> KotlinVersionEnum.KOTLIN_2_1
34-
"2025.2" -> KotlinVersionEnum.KOTLIN_2_1
33+
"2025.1", "2025.2" -> KotlinVersionEnum.KOTLIN_2_1
3534
else -> error("not set")
3635
}.version
3736
}

plugins/core/jetbrains-community/src/software/aws/toolkits/resources/AwsCoreBundle.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ internal const val BUNDLE_FQN: String = "software.aws.toolkits.resources.Message
1111
object AwsCoreBundle {
1212
private val BUNDLE = DynamicBundle(AwsCoreBundle::class.java, BUNDLE_FQN)
1313

14-
fun message(key: @PropertyKey(resourceBundle = BUNDLE_FQN) String, vararg params: Any) =
14+
fun message(@PropertyKey(resourceBundle = BUNDLE_FQN) key: String, vararg params: Any) =
1515
BUNDLE.getMessage(key, *params)
1616

17-
fun messagePointer(key: @PropertyKey(resourceBundle = BUNDLE_FQN) String, vararg params: Any) =
17+
fun messagePointer(@PropertyKey(resourceBundle = BUNDLE_FQN) key: String, vararg params: Any) =
1818
BUNDLE.getLazyMessage(key, *params)
1919
}

0 commit comments

Comments
 (0)