Skip to content

kn: lift build logic into aws-kotlin-repo-tools #120

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 9 commits into from
Nov 6, 2024
Merged

kn: lift build logic into aws-kotlin-repo-tools #120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
a457e70
apiDump
lauzadis Oct 23, 2024
c1b5189
Delete elasticurl project
lauzadis Oct 23, 2024
6d11df5
Update gitignore
lauzadis Oct 23, 2024
55fadbb
ktlint
lauzadis Oct 23, 2024
3f35b7b
Disable parallelism
lauzadis Oct 29, 2024
3cfe328
Moved target enablement to aws-kotlin-repo-tools plugin
lauzadis Oct 29, 2024
6b459b8
Upgrade to 0.4.14-kn
lauzadis Nov 5, 2024
66d8cab
Merge branch 'kn-main' of github.com:awslabs/aws-crt-kotlin into kn-r…
lauzadis Nov 5, 2024
fcc13ef
Add FIXME for CMAKE parallelism
lauzadis Nov 5, 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
11 changes: 0 additions & 11 deletions aws-crt-kotlin/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,17 +33,6 @@ configureKmpTargets()
kotlin {
explicitApi()

// FIXME - move to repo-tools plugin
macosX64()
macosArm64()
iosSimulatorArm64()
iosArm64()
iosX64()
linuxX64()
linuxArm64()
// FIXME - setup docker files and cmake tasks appropriately
// mingwX64()

sourceSets {
val commonMain by getting {
dependencies {
Expand Down
5 changes: 3 additions & 2 deletions build-support/src/main/kotlin/aws/sdk/kotlin/gradle/crt/CMakeTasks.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,8 +156,9 @@ private fun Project.registerCmakeBuildTask(
relativeBuildDir,
"--config",
buildType.toString(),
"--parallel",
System.getProperty("org.gradle.workers.max", "16"),
// FIXME There is a parallelism issue between linuxx64 and linuxarm64 causing flaky builds
// "--parallel",
// System.getProperty("org.gradle.workers.max", "16"),
)

val osxSdk = knTarget.konanTarget.osxDeviceSdkName
Expand Down
14 changes: 1 addition & 13 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,44 +1,32 @@
[versions]
kotlin-version = "2.0.21"

aws-kotlin-repo-tools-version = "0.4.13"
aws-kotlin-repo-tools-version = "0.4.14-kn"

# libs
crt-java-version = "0.31.3"
coroutines-version = "1.9.0"

# testing
junit-version = "5.10.1"
kotest-version = "5.8.0"
mock-server-version = "5.15.0"
# fixme - remove in favor of clikt
kotlinx-cli-version = "0.3.6"
kotlinx-io-version = "0.3.1"


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

kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlin-version"}
kotlin-stdlib-jdk8 = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk8", version.ref = "kotlin-version"}
kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlin-version" }
kotlin-test-junit5 = { module = "org.jetbrains.kotlin:kotlin-test-junit5", version.ref = "kotlin-version" }


kotlinx-coroutines-debug = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-debug", version.ref = "coroutines-version" }
kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "coroutines-version" }
kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutines-version" }
kotlinx-coroutines-jdk8 = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-jdk8", version.ref = "coroutines-version" }
kotlinx-cli = { module = "org.jetbrains.kotlinx:kotlinx-cli", version.ref = "kotlinx-cli-version" }
kotlinx-io = { module = "org.jetbrains.kotlinx:kotlinx-io-core", version.ref = "kotlinx-io-version"}

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

kotest-assertions-core = { module = "io.kotest:kotest-assertions-core", version.ref = "kotest-version" }
kotest-assertions-core-jvm = { module = "io.kotest:kotest-assertions-core-jvm", version.ref = "kotest-version" }

mockserver-netty = { module = "org.mock-server:mockserver-netty", version.ref = "mock-server-version" }

[plugins]
Expand Down
Loading