From 95d44ff2c4b4c3dd489e6286f4c17dbba2c492f3 Mon Sep 17 00:00:00 2001
From: Fahad Zubair <fahadzubair@gmail.com>
Date: Mon, 13 Oct 2025 12:35:43 +0100
Subject: [PATCH 1/2] Set version for kotlin-jdk-8

---
 .../kotlin/smithy-rs.kotlin-conventions.gradle.kts  | 11 +++++++++++
 .../smithy-rs.publishing-conventions.gradle.kts     | 13 +++++++++++++
 2 files changed, 24 insertions(+)

diff --git a/buildSrc/src/main/kotlin/smithy-rs.kotlin-conventions.gradle.kts b/buildSrc/src/main/kotlin/smithy-rs.kotlin-conventions.gradle.kts
index 9211b2f034b..c45773459a3 100644
--- a/buildSrc/src/main/kotlin/smithy-rs.kotlin-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/smithy-rs.kotlin-conventions.gradle.kts
@@ -9,6 +9,17 @@ plugins {
 // Workaround per: https://github.com/gradle/gradle/issues/15383
 val Project.libs get() = the<org.gradle.accessors.dm.LibrariesForLibs>()
 
+// Ensure Kotlin stdlib dependencies have explicit versions in published POMs
+configurations.all {
+    resolutionStrategy {
+        eachDependency {
+            if (requested.group == "org.jetbrains.kotlin" && requested.name.startsWith("kotlin-stdlib")) {
+                useVersion(libs.versions.kotlin.version.get())
+            }
+        }
+    }
+}
+
 java {
     sourceCompatibility = JavaVersion.VERSION_11
     targetCompatibility = JavaVersion.VERSION_11
diff --git a/buildSrc/src/main/kotlin/smithy-rs.publishing-conventions.gradle.kts b/buildSrc/src/main/kotlin/smithy-rs.publishing-conventions.gradle.kts
index ea92236e33d..e2a47df310c 100644
--- a/buildSrc/src/main/kotlin/smithy-rs.publishing-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/smithy-rs.publishing-conventions.gradle.kts
@@ -2,6 +2,9 @@ plugins {
     `maven-publish`
     signing
 }
+
+// Workaround per: https://github.com/gradle/gradle/issues/15383
+val Project.libs get() = the<org.gradle.accessors.dm.LibrariesForLibs>()
 // FIXME(publishing): create a real "javadoc" JAR from Dokka output
 val javadocJar = tasks.register<Jar>("emptyJar") {
     archiveClassifier.set("javadoc")
@@ -15,6 +18,16 @@ publishing {
             from(components["java"])
             artifact(javadocJar)
 
+            // Fix Kotlin stdlib version in published POM
+            versionMapping {
+                usage("java-api") {
+                    fromResolutionOf("runtimeClasspath")
+                }
+                usage("java-runtime") {
+                    fromResolutionResult()
+                }
+            }
+
             afterEvaluate {
                 pom {
                     name.set(project.ext["displayName"].toString())

From 9b74d2e73f170fb3dd0c01028e787d76fc9d41e5 Mon Sep 17 00:00:00 2001
From: Fahad Zubair <fahadzub@amazon.com>
Date: Thu, 6 Nov 2025 17:29:28 +0000
Subject: [PATCH 2/2] Remove workaround comment

---
 .../src/main/kotlin/smithy-rs.publishing-conventions.gradle.kts  | 1 -
 1 file changed, 1 deletion(-)

diff --git a/buildSrc/src/main/kotlin/smithy-rs.publishing-conventions.gradle.kts b/buildSrc/src/main/kotlin/smithy-rs.publishing-conventions.gradle.kts
index e2a47df310c..8553e3ce87e 100644
--- a/buildSrc/src/main/kotlin/smithy-rs.publishing-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/smithy-rs.publishing-conventions.gradle.kts
@@ -3,7 +3,6 @@ plugins {
     signing
 }
 
-// Workaround per: https://github.com/gradle/gradle/issues/15383
 val Project.libs get() = the<org.gradle.accessors.dm.LibrariesForLibs>()
 // FIXME(publishing): create a real "javadoc" JAR from Dokka output
 val javadocJar = tasks.register<Jar>("emptyJar") {