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

Author: lauzadis

README.md

@@ -3,7 +3,7 @@
 This repository contains shared tooling for AWS Kotlin repositories:
 
 * `awslabs/aws-sdk-kotlin`
-* `awslabs/smithy-kotlin`
+* `smithy-lang/smithy-kotlin`
 * `awslabs/aws-crt-kotlin`
 
 It contains shared custom Gradle plugins and build logic used to build and release those repositories.

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

@@ -59,14 +59,16 @@ fun Project.skipPublishing() {
  * Configure publishing for this project. This applies the `maven-publish` and `signing` plugins and configures
  * the publications.
  * @param repoName the repository name (e.g. `smithy-kotlin`, `aws-sdk-kotlin`, etc)
+ * @param githubOrganization the name of the GitHub organization that [repoName] is located in
  */
-fun Project.configurePublishing(repoName: String) {
+fun Project.configurePublishing(repoName: String, githubOrganization: String = "awslabs") {
     val project = this
     apply(plugin = "maven-publish")
 
     // FIXME: create a real "javadoc" JAR from Dokka output
     val javadocJar = tasks.register<Jar>("emptyJar") {
         archiveClassifier.set("javadoc")
+        destinationDirectory.set(layout.buildDirectory.dir("libs"))
         from()
     }
 
@@ -85,7 +87,7 @@ fun Project.configurePublishing(repoName: String) {
                 pom {
                     name.set(project.name)
                     description.set(project.description)
-                    url.set("https://github.com/awslabs/$repoName")
+                    url.set("https://github.com/$githubOrganization/$repoName")
                     licenses {
                         license {
                             name.set("The Apache License, Version 2.0")
@@ -99,9 +101,9 @@ fun Project.configurePublishing(repoName: String) {
                         }
                     }
                     scm {
-                        connection.set("scm:git:git://github.com/awslabs/$repoName.git")
-                        developerConnection.set("scm:git:ssh://github.com/awslabs/$repoName.git")
-                        url.set("https://github.com/awslabs/$repoName")
+                        connection.set("scm:git:git://github.com/$githubOrganization/$repoName.git")
+                        developerConnection.set("scm:git:ssh://github.com/$githubOrganization/$repoName.git")
+                        url.set("https://github.com/$githubOrganization/$repoName")
                     }
 
                     artifact(javadocJar)

build-plugins/smithy-build/src/main/kotlin/aws/sdk/kotlin/gradle/codegen/dsl/SmithyKotlinPluginSettings.kt

@@ -12,7 +12,7 @@ import java.util.*
 
 /**
  * Container for `smithy-kotlin` plugin settings
- * See https://github.com/awslabs/smithy-kotlin/blob/main/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/KotlinSettings.kt
+ * See https://github.com/smithy-lang/smithy-kotlin/blob/main/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/KotlinSettings.kt
  */
 open class SmithyKotlinApiSettings : ToNode {
     var visibility: String? = null