Skip to content

Commit f059811

Browse files
authored
kn: lift build logic into aws-kotlin-repo-tools (#120)
1 parent 6eaf028 commit f059811

File tree

3 files changed

+4
-26
lines changed

3 files changed

+4
-26
lines changed

aws-crt-kotlin/build.gradle.kts

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -33,17 +33,6 @@ configureKmpTargets()
3333
kotlin {
3434
explicitApi()
3535

36-
// FIXME - move to repo-tools plugin
37-
macosX64()
38-
macosArm64()
39-
iosSimulatorArm64()
40-
iosArm64()
41-
iosX64()
42-
linuxX64()
43-
linuxArm64()
44-
// FIXME - setup docker files and cmake tasks appropriately
45-
// mingwX64()
46-
4736
sourceSets {
4837
val commonMain by getting {
4938
dependencies {

build-support/src/main/kotlin/aws/sdk/kotlin/gradle/crt/CMakeTasks.kt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -156,8 +156,9 @@ private fun Project.registerCmakeBuildTask(
156156
relativeBuildDir,
157157
"--config",
158158
buildType.toString(),
159-
"--parallel",
160-
System.getProperty("org.gradle.workers.max", "16"),
159+
// FIXME There is a parallelism issue between linuxx64 and linuxarm64 causing flaky builds
160+
// "--parallel",
161+
// System.getProperty("org.gradle.workers.max", "16"),
161162
)
162163

163164
val osxSdk = knTarget.konanTarget.osxDeviceSdkName

gradle/libs.versions.toml

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,32 @@
11
[versions]
22
kotlin-version = "2.0.21"
33

4-
aws-kotlin-repo-tools-version = "0.4.13"
4+
aws-kotlin-repo-tools-version = "0.4.14-kn"
55

66
# libs
77
crt-java-version = "0.31.3"
88
coroutines-version = "1.9.0"
99

1010
# testing
1111
junit-version = "5.10.1"
12-
kotest-version = "5.8.0"
1312
mock-server-version = "5.15.0"
14-
# fixme - remove in favor of clikt
15-
kotlinx-cli-version = "0.3.6"
16-
kotlinx-io-version = "0.3.1"
17-
1813

1914
[libraries]
2015
aws-kotlin-repo-tools-build-support = { module="aws.sdk.kotlin.gradle:build-support", version.ref = "aws-kotlin-repo-tools-version" }
2116
crt-java = { module = "software.amazon.awssdk.crt:aws-crt", version.ref = "crt-java-version" }
2217

2318
kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlin-version"}
24-
kotlin-stdlib-jdk8 = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk8", version.ref = "kotlin-version"}
25-
kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlin-version" }
2619
kotlin-test-junit5 = { module = "org.jetbrains.kotlin:kotlin-test-junit5", version.ref = "kotlin-version" }
2720

2821

2922
kotlinx-coroutines-debug = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-debug", version.ref = "coroutines-version" }
3023
kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "coroutines-version" }
3124
kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutines-version" }
3225
kotlinx-coroutines-jdk8 = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-jdk8", version.ref = "coroutines-version" }
33-
kotlinx-cli = { module = "org.jetbrains.kotlinx:kotlinx-cli", version.ref = "kotlinx-cli-version" }
34-
kotlinx-io = { module = "org.jetbrains.kotlinx:kotlinx-io-core", version.ref = "kotlinx-io-version"}
3526

3627
junit-jupiter = { module = "org.junit.jupiter:junit-jupiter", version.ref = "junit-version" }
3728
junit-jupiter-params = { module = "org.junit.jupiter:junit-jupiter-params", version.ref = "junit-version" }
3829

39-
kotest-assertions-core = { module = "io.kotest:kotest-assertions-core", version.ref = "kotest-version" }
40-
kotest-assertions-core-jvm = { module = "io.kotest:kotest-assertions-core-jvm", version.ref = "kotest-version" }
41-
4230
mockserver-netty = { module = "org.mock-server:mockserver-netty", version.ref = "mock-server-version" }
4331

4432
[plugins]

0 commit comments

Comments
 (0)