feat: setup DynamoDbMapper publication (#1419)

.brazil.json

@@ -1,19 +1,21 @@
 {
   "dependencies": {
+    "org.jetbrains.kotlin:kotlin-gradle-plugin:2.*": "KotlinGradlePlugin-2.x",
     "org.jetbrains.kotlin:kotlin-stdlib-common:2.*.*": "KotlinStdlibCommon-2.x",
     "org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.*.*": "KotlinStdlibJdk8-2.x",
     "org.jetbrains.kotlin:kotlin-stdlib:2.*.*": "KotlinStdlib-2.x",
     "org.jetbrains.kotlinx:atomicfu:0.*.*": "Atomicfu-0.x",
     "org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.*": "KotlinxCoroutinesCoreJvm-1.x",
-    "org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:1.*": "KotlinxCoroutinesJdk8-1.x"
+    "org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:1.*": "KotlinxCoroutinesJdk8-1.x",
+    "com.google.devtools.ksp:symbol-processing-api:2.*": "Maven-com-google-devtools-ksp_symbol-processing-api-2.x",
+    "com.google.devtools.ksp:symbol-processing-gradle-plugin:2.*": "Maven-com-google-devtools-ksp_symbol-processing-gradle-plugin-2.x"
   },
   "packageHandlingRules": {
     "versioning": {
       "defaultVersionLayout": "{MAJOR}.0.x"
     },
     "ignore": [
       "aws.sdk.kotlin:bom",
-      "aws.sdk.kotlin.crt:aws-crt-kotlin-android",
       "aws.sdk.kotlin:testing",
       "aws.sdk.kotlin:version-catalog"
     ],

gradle/libs.versions.toml

@@ -4,7 +4,7 @@ ksp-version = "2.0.10-1.0.24" # Keep in sync with kotlin-version
 
 dokka-version = "1.9.10"
 
-aws-kotlin-repo-tools-version = "0.4.10"
+aws-kotlin-repo-tools-version = "0.4.11"
 
 # libs
 coroutines-version = "1.9.0"

hll/build.gradle.kts

@@ -5,6 +5,8 @@
 
 import aws.sdk.kotlin.gradle.dsl.configurePublishing
 import aws.sdk.kotlin.gradle.kmp.*
+import aws.smithy.kotlin.runtime.InternalApi
+import aws.smithy.kotlin.runtime.text.ensureSuffix
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 description = "High-level libraries for the AWS SDK for Kotlin"
@@ -31,22 +33,32 @@ val optinAnnotations = listOf(
     "kotlin.RequiresOptIn",
 )
 
+@OptIn(InternalApi::class)
+val hllPreviewVersion = if (sdkVersion.contains("-SNAPSHOT")) { // e.g. 1.3.29-beta-SNAPSHOT
+    sdkVersion
+        .removeSuffix("-SNAPSHOT")
+        .ensureSuffix("-beta-SNAPSHOT")
+} else {
+    sdkVersion.ensureSuffix("-beta") // e.g. 1.3.29-beta
+}
+
+subprojects {
+    group = "aws.sdk.kotlin"
+    version = hllPreviewVersion
+    configurePublishing("aws-sdk-kotlin")
+}
+
 subprojects {
     if (!needsKmpConfigured) {
         return@subprojects
     }
 
-    group = "aws.sdk.kotlin"
-    version = sdkVersion
-
     apply {
         plugin("org.jetbrains.kotlin.multiplatform")
         plugin("org.jetbrains.dokka")
         plugin(libraries.plugins.aws.kotlin.repo.tools.kmp.get().pluginId)
     }
 
-    configurePublishing("aws-sdk-kotlin")
-
     kotlin {
         explicitApi()
 
@@ -94,7 +106,6 @@ apiValidation {
 
     ignoredProjects += listOf(
         "hll-codegen",
-        "dynamodb-mapper-annotation-processor-test",
         "dynamodb-mapper-codegen",
         "dynamodb-mapper-ops-codegen",
         "dynamodb-mapper-schema-codegen",

hll/dynamodb-mapper/dynamodb-mapper-codegen/build.gradle.kts

@@ -30,10 +30,6 @@ kotlin {
     }
 }
 
-val sdkVersion: String by project
-group = "aws.sdk.kotlin"
-version = sdkVersion
-
 val sourcesJar by tasks.creating(Jar::class) {
     group = "publishing"
     description = "Assembles Kotlin sources jar"

hll/dynamodb-mapper/dynamodb-mapper-schema-codegen/build.gradle.kts

@@ -49,10 +49,6 @@ tasks.test {
     }
 }
 
-val sdkVersion: String by project
-group = "aws.sdk.kotlin"
-version = sdkVersion
-
 val sourcesJar by tasks.creating(Jar::class) {
     group = "publishing"
     description = "Assembles Kotlin sources jar"

hll/dynamodb-mapper/dynamodb-mapper-schema-generator-plugin/build.gradle.kts

@@ -1,3 +1,5 @@
+import aws.smithy.kotlin.runtime.InternalApi
+import aws.smithy.kotlin.runtime.text.ensureSuffix
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 /*
@@ -45,10 +47,6 @@ gradlePlugin {
     }
 }
 
-val sdkVersion: String by project
-group = "aws.sdk.kotlin"
-version = sdkVersion
-
 publishing {
     publications {
         create<MavenPublication>("dynamodb-mapper-schema-generator-plugin") {
@@ -57,6 +55,27 @@ publishing {
     }
 }
 
+/**
+ * The `java-gradle-plugin` plugin creates a javadoc jar by default, conflicting with the empty javadoc jar (emptyJar)
+ * created in aws-kotlin-repo-tools. Configure dependencies and disable the emptyJar task to avoid conflicts.
+ */
+afterEvaluate {
+    tasks.withType<PublishToMavenRepository> {
+        dependsOn(tasks.named("javadocJar"))
+    }
+
+    tasks.named("publishDynamodb-mapper-schema-generatorPluginMarkerMavenPublicationToMavenLocal") {
+        dependsOn(tasks.named("javadocJar"))
+    }
+
+    tasks.findByName("signDynamodb-mapper-schema-generatorPluginMarkerMavenPublication")
+        ?.dependsOn(tasks.named("javadocJar"))
+
+    tasks.named("emptyJar") {
+        enabled = false
+    }
+}
+
 tasks.test {
     useJUnitPlatform()
     testLogging {
@@ -69,6 +88,17 @@ tasks.test {
 }
 
 // FIXME Commonize the following functions into the aws-kotlin-repo-tools build-support
+val sdkVersion: String by project
+
+@OptIn(InternalApi::class)
+val hllPreviewVersion = if (sdkVersion.contains("-SNAPSHOT")) { // e.g. 1.3.29-beta-SNAPSHOT
+    sdkVersion
+        .removeSuffix("-SNAPSHOT")
+        .ensureSuffix("-beta-SNAPSHOT")
+} else {
+    sdkVersion.ensureSuffix("-beta") // e.g. 1.3.29-beta
+}
+
 /**
  * Create a file containing the sdkVersion to use as a resource
  * This saves us from having to manually change version numbers in multiple places
@@ -81,7 +111,7 @@ val generateSdkVersionFile by tasks.registering {
     outputs.file(versionFile)
     sourceSets.main.get().output.dir(resourcesDir)
     doLast {
-        versionFile.writeText(sdkVersion)
+        versionFile.writeText(hllPreviewVersion)
     }
 }
 

hll/dynamodb-mapper/dynamodb-mapper/build.gradle.kts

@@ -12,6 +12,10 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompilationTask
 import java.nio.file.Files
 import java.nio.file.StandardCopyOption
 
+description = "High level DynamoDbMapper client"
+extra["displayName"] = "AWS :: SDK :: Kotlin :: HLL :: DynamoDbMapper"
+extra["moduleName"] = "aws.sdk.kotlin.hll.dynamodbmapper"
+
 buildscript {
     dependencies {
         classpath(libs.ddb.local)

hll/hll-codegen/build.gradle.kts

@@ -37,10 +37,6 @@ dependencies {
     testImplementation(libs.kotlin.test.junit5)
 }
 
-val sdkVersion: String by project
-group = "aws.sdk.kotlin"
-version = sdkVersion
-
 val sourcesJar by tasks.creating(Jar::class) {
     group = "publishing"
     description = "Assembles Kotlin sources jar"

settings.gradle.kts

@@ -75,7 +75,6 @@ if ("dynamodb".isBootstrappedService) {
     include(":hll:dynamodb-mapper:dynamodb-mapper-ops-codegen")
     include(":hll:dynamodb-mapper:dynamodb-mapper-schema-codegen")
     include(":hll:dynamodb-mapper:dynamodb-mapper-annotations")
-    include(":hll:dynamodb-mapper:tests:dynamodb-mapper-annotation-processor-test")
     include(":hll:dynamodb-mapper:dynamodb-mapper-schema-generator-plugin")
     include(":hll:dynamodb-mapper:tests:dynamodb-mapper-schema-generator-plugin-test")
 } else {