Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions .changes/66c32a01-7fa9-4af6-804c-19cf97e0ac20.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"id": "66c32a01-7fa9-4af6-804c-19cf97e0ac20",
"type": "misc",
"description": "Upgrade to Gradle 9.0.0"
}
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ private fun runCmake(project: Project, target: KotlinNativeTarget, cmakeArgs: Li
val useContainer = target.konanTarget in containerCompileTargets &&
target.konanTarget.name !in disableContainerTargets

project.exec {
project.providers.exec {
workingDir(project.rootDir)
val exeArgs = cmakeArgs.toMutableList()
val exeName = if (useContainer) {
Expand All @@ -259,7 +259,7 @@ private fun runCmake(project: Project, target: KotlinNativeTarget, cmakeArgs: Li
project.logger.info("$exeName ${exeArgs.joinToString(separator = " ")}")
executable(exeName)
args(exeArgs)
}
}.result.get() // providers.exec is lazy, so fetch the result here to ensure the command executes
}

private fun validateCrossCompileScriptsAvailable(project: Project, script: String) {
Expand Down
2 changes: 1 addition & 1 deletion crt/aws-lc
Submodule aws-lc updated 513 files
2 changes: 1 addition & 1 deletion crt/s2n
Submodule s2n updated 227 files
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[versions]
kotlin-version = "2.2.0"

aws-kotlin-repo-tools-version = "0.4.37"
aws-kotlin-repo-tools-version = "0.4.42"

# libs
crt-java-version = "0.38.1"
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https://services.gradle.org/distributions/gradle-8.14.2-bin.zip
distributionUrl=https://services.gradle.org/distributions/gradle-9.0.0-bin.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading