Skip to content

docs: rename awslabs/smithy-kotlin to smithy-lang/smithy-kotlin #58

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Nov 21, 2024
Merged

docs: rename awslabs/smithy-kotlin to smithy-lang/smithy-kotlin #58

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
164e83c
awslabs/smithy-kotlin -> smithy-lang/smithy-kotlin
lauzadis Nov 20, 2024
83dec50
Correctly set publication metadata
lauzadis Nov 20, 2024
61bbff5
Add githubOrganization param to configurePublishing
lauzadis Nov 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
10 changes: 6 additions & 4 deletions build-plugins/build-support/src/main/kotlin/aws/sdk/kotlin/gradle/dsl/Publish.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,11 +77,13 @@ fun Project.configurePublishing(repoName: String) {
publications.all {
if (this !is MavenPublication) return@all

val githubOrganization = if (repoName.equals("smithy-kotlin", ignoreCase = true)) "smithy-lang" else "awslabs"

Copy link
Contributor

@ianbotsf ianbotsf Nov 20, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Correctness: This seems like the wrong location for the logic. Can't we just parameterize githubOrganization the same way we already do repoName?

Copy link
Member Author

@lauzadis lauzadis Nov 20, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure

project.afterEvaluate {
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")
Expand All @@ -95,9 +97,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)
Expand Down
2 changes: 1 addition & 1 deletion ...thy-build/src/main/kotlin/aws/sdk/kotlin/gradle/codegen/dsl/SmithyKotlinPluginSettings.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading