Fix DynamoDbMapper build

awslabs · Jan 27, 2025 · 9705cf4 · 9705cf4
1 parent c2aae85
commit 9705cf4
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 6 deletions.
diff --git a/hll/dynamodb-mapper/dynamodb-mapper-codegen/build.gradle.kts b/hll/dynamodb-mapper/dynamodb-mapper-codegen/build.gradle.kts
@@ -8,7 +8,7 @@ extra["displayName"] = "AWS :: SDK :: Kotlin :: HLL :: DynamoDbMapper :: Codegen
 extra["moduleName"] = "aws.sdk.kotlin.hll.dynamodbmapper.codegen"
 
 plugins {
-    alias(libs.plugins.kotlin.jvm)
+    id(libs.plugins.kotlin.jvm.get().pluginId)
     `maven-publish`
 }
 

diff --git a/hll/dynamodb-mapper/dynamodb-mapper-ops-codegen/build.gradle.kts b/hll/dynamodb-mapper/dynamodb-mapper-ops-codegen/build.gradle.kts
@@ -8,7 +8,7 @@ extra["displayName"] = "AWS :: SDK :: Kotlin :: HLL :: DynamoDbMapper :: Codegen
 extra["moduleName"] = "aws.sdk.kotlin.hll.dynamodbmapper.codegen.ops"
 
 plugins {
-    alias(libs.plugins.kotlin.jvm)
+    id(libs.plugins.kotlin.jvm.get().pluginId)
 }
 
 dependencies {

diff --git a/hll/dynamodb-mapper/dynamodb-mapper-schema-codegen/build.gradle.kts b/hll/dynamodb-mapper/dynamodb-mapper-schema-codegen/build.gradle.kts
@@ -8,7 +8,7 @@ extra["displayName"] = "AWS :: SDK :: Kotlin :: HLL :: DynamoDbMapper :: Codegen
 extra["moduleName"] = "aws.sdk.kotlin.hll.dynamodbmapper.codegen.schema"
 
 plugins {
-    alias(libs.plugins.kotlin.jvm)
+    id(libs.plugins.kotlin.jvm.get().pluginId)
     `maven-publish`
 }
 

diff --git a/hll/dynamodb-mapper/dynamodb-mapper-schema-generator-plugin/build.gradle.kts b/hll/dynamodb-mapper/dynamodb-mapper-schema-generator-plugin/build.gradle.kts
@@ -1,5 +1,3 @@
-import aws.smithy.kotlin.runtime.InternalApi
-import aws.smithy.kotlin.runtime.text.ensureSuffix
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 /*
@@ -90,7 +88,8 @@ tasks.test {
 // FIXME Commonize the following functions into the aws-kotlin-repo-tools build-support
 val sdkVersion: String by project
 
-@OptIn(InternalApi::class)
+private fun String.ensureSuffix(suffix: String): String = if (endsWith(suffix)) this else plus(suffix)
+
 val hllPreviewVersion = if (sdkVersion.contains("-SNAPSHOT")) { // e.g. 1.3.29-beta-SNAPSHOT
     sdkVersion
         .removeSuffix("-SNAPSHOT")