Skip to content

Commit ef81b38

Browse files
authored
misc: allow smithy-kotlin K/N publications (#139)
1 parent 97d5ac0 commit ef81b38

File tree

2 files changed

+11
-10
lines changed
  • build-plugins/build-support/src

2 files changed

+11
-10
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ internal val ALLOWED_KOTLIN_NATIVE_PUBLICATION_NAMES = setOf(
7272
// Group names which are allowed to publish K/N artifacts
7373
private val ALLOWED_KOTLIN_NATIVE_GROUP_NAMES = setOf(
7474
"aws.sdk.kotlin.crt",
75+
"aws.smithy.kotlin",
7576
)
7677

7778
// Optional override to the above set.

build-plugins/build-support/src/test/kotlin/aws/sdk/kotlin/gradle/dsl/PublishTest.kt

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ class PublishTest {
7575
}
7676

7777
@Test
78-
fun `smithy-kotlin cannot publish Kotlin Native artifacts`() = runTest {
78+
fun `smithy-kotlin can publish Kotlin Native artifacts`() = runTest {
7979
val project = ProjectBuilder.builder().withName("aws-smithy-kotlin").build()
8080
project.group = "aws.smithy.kotlin"
8181
project.version = "1.2.3"
@@ -99,25 +99,25 @@ class PublishTest {
9999
version = "1.2.3"
100100
artifactId = "runtime"
101101
}
102-
assertFalse(isAvailableForPublication(project, nativeRuntimePublication))
102+
assertTrue(isAvailableForPublication(project, nativeRuntimePublication))
103103
}
104104
}
105105
}
106106

107107
@Test
108108
fun `users can override smithy-kotlin publication`() = runTest {
109109
val project = ProjectBuilder.builder().withName("aws-smithy-kotlin").build()
110-
project.group = "aws.smithy.kotlin"
110+
project.group = "aws.sdk.kotlin"
111111
project.version = "1.2.3"
112112
project.extra.set(OVERRIDE_KOTLIN_NATIVE_GROUP_NAME_VALIDATION, "true")
113113

114-
project.configurePublishing("smithy-kotlin", "smithy-lang")
114+
project.configurePublishing("aws-sdk-kotlin", "aws")
115115

116116
val publishing = project.extensions.getByType(PublishingExtension::class.java)
117117
publishing.publications {
118118
ALLOWED_PUBLICATION_NAMES.forEach {
119119
val jvmRuntimePublication = create(it, MavenPublication::class.java).apply {
120-
groupId = "aws.smithy.kotlin"
120+
groupId = "aws.sdk.kotlin"
121121
version = "1.2.3"
122122
artifactId = "runtime"
123123
}
@@ -126,7 +126,7 @@ class PublishTest {
126126

127127
ALLOWED_KOTLIN_NATIVE_PUBLICATION_NAMES.forEach {
128128
val nativeRuntimePublication = create(it, MavenPublication::class.java).apply {
129-
groupId = "aws.smithy.kotlin"
129+
groupId = "aws.sdk.kotlin"
130130
version = "1.2.3"
131131
artifactId = "runtime"
132132
}
@@ -138,17 +138,17 @@ class PublishTest {
138138
@Test
139139
fun `override only works when set to true`() = runTest {
140140
val project = ProjectBuilder.builder().withName("aws-smithy-kotlin").build()
141-
project.group = "aws.smithy.kotlin"
141+
project.group = "aws.sdk.kotlin"
142142
project.version = "1.2.3"
143143
project.extra.set(OVERRIDE_KOTLIN_NATIVE_GROUP_NAME_VALIDATION, "this is not true")
144144

145-
project.configurePublishing("smithy-kotlin", "smithy-lang")
145+
project.configurePublishing("aws-sdk-kotlin", "aws")
146146

147147
val publishing = project.extensions.getByType(PublishingExtension::class.java)
148148
publishing.publications {
149149
ALLOWED_PUBLICATION_NAMES.forEach {
150150
val jvmRuntimePublication = create(it, MavenPublication::class.java).apply {
151-
groupId = "aws.smithy.kotlin"
151+
groupId = "aws.sdk.kotlin"
152152
version = "1.2.3"
153153
artifactId = "runtime"
154154
}
@@ -157,7 +157,7 @@ class PublishTest {
157157

158158
ALLOWED_KOTLIN_NATIVE_PUBLICATION_NAMES.forEach {
159159
val nativeRuntimePublication = create(it, MavenPublication::class.java).apply {
160-
groupId = "aws.smithy.kotlin"
160+
groupId = "aws.sdk.kotlin"
161161
version = "1.2.3"
162162
artifactId = "runtime"
163163
}

0 commit comments

Comments
 (0)