Merge branch 'main' of github.com:awslabs/aws-kotlin-repo-tools into misc-bump-versions

Author: lauzadis

build-plugins/build-support/src/main/kotlin/aws/sdk/kotlin/gradle/dsl/Publish.kt

@@ -98,6 +98,7 @@ fun Project.configurePublishing(repoName: String, githubOrganization: String = "
 
         publications.all {
             if (this !is MavenPublication) return@all
+            val publication = this
 
             project.afterEvaluate {
                 pom {
@@ -123,6 +124,34 @@ fun Project.configurePublishing(repoName: String, githubOrganization: String = "
                     }
 
                     artifact(javadocJar)
+
+                    // Add <type>klib</type> for Native platform dependencies
+                    if (publication.name in ALLOWED_KOTLIN_NATIVE_PUBLICATION_NAMES) {
+                        withXml {
+                            val depsNode = asNode().get("dependencies") as? groovy.util.NodeList
+                            if (depsNode == null || depsNode.isEmpty()) {
+                                project.logger.info("No dependencies node found for native publication ${publication.name}")
+                                return@withXml
+                            }
+
+                            val deps = (depsNode.first() as groovy.util.Node).children()
+
+                            deps.forEach { dep ->
+                                val node = dep as groovy.util.Node
+                                val artifactId = (node.get("artifactId") as? groovy.util.NodeList)
+                                    ?.firstOrNull()
+                                    ?.let { (it as groovy.util.Node).text() }
+
+                                if (artifactId != null && ALLOWED_KOTLIN_NATIVE_PUBLICATION_NAMES.any { artifactId.endsWith("-$it", ignoreCase = true) }) {
+                                    val existingType = node.get("type") as? groovy.util.NodeList
+                                    if (existingType == null || existingType.isEmpty()) {
+                                        project.logger.info("Adding <type>klib</type> to dependency on $artifactId")
+                                        node.appendNode("type", "klib")
+                                    }
+                                }
+                            }
+                        }
+                    }
                 }
             }
         }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https://services.gradle.org/distributions/gradle-9.0.0-bin.zip
+distributionUrl=https://services.gradle.org/distributions/gradle-9.2.1-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists