Skip to content

Commit e44a9b8

Browse files
committed
Update desktop targets
1 parent 0e62a5a commit e44a9b8

File tree

2 files changed

+20
-5
lines changed
  • build-plugins

2 files changed

+20
-5
lines changed

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

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,16 @@ private const val SONATYPE_PASSWORD_PROP = "sonatypePassword"
2727
private val ALLOWED_PUBLICATIONS = listOf(
2828
"common",
2929
"jvm",
30-
"metadata",
3130
"kotlinMultiplatform",
31+
"iosX64",
32+
"linuxArm64",
33+
"linuxX64",
34+
"macosArm64",
35+
"macosX64",
36+
37+
"metadata",
3238
"bom",
3339
"versionCatalog",
34-
"android", // aws-crt-kotlin
3540
"codegen",
3641
"codegen-testutils",
3742

build-plugins/kmp-conventions/src/main/kotlin/aws/sdk/kotlin/gradle/kmp/ConfigureTargets.kt

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,11 @@ fun Project.configureKmpTargets() {
117117
kmpExt.apply { configureLinux() }
118118
}
119119
if (hasDesktop) {
120-
kmpExt.apply { configureWindows() }
120+
kmpExt.apply {
121+
configureLinux()
122+
configureMacos()
123+
configureWindows()
124+
}
121125
}
122126
}
123127

@@ -168,14 +172,20 @@ fun Project.configureLinux() {
168172

169173
fun Project.configureApple() {
170174
kotlin {
171-
macosX64()
172-
macosArm64()
175+
configureMacos()
173176
iosSimulatorArm64()
174177
iosArm64()
175178
iosX64()
176179
}
177180
}
178181

182+
fun Project.configureMacos() {
183+
kotlin {
184+
macosX64()
185+
macosArm64()
186+
}
187+
}
188+
179189
fun Project.configureWindows() {
180190
kotlin {
181191
// FIXME Set up Docker files and CMake tasks for Windows

0 commit comments

Comments
 (0)