Skip to content

Commit 16ca9e2

Browse files
authored
misc: upgrade to Gradle 9.0.0 (#180)
1 parent f930be4 commit 16ca9e2

File tree

7 files changed

+12
-7
lines changed

7 files changed

+12
-7
lines changed
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"id": "66c32a01-7fa9-4af6-804c-19cf97e0ac20",
3+
"type": "misc",
4+
"description": "Upgrade to Gradle 9.0.0"
5+
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ private fun runCmake(project: Project, target: KotlinNativeTarget, cmakeArgs: Li
236236
val useContainer = target.konanTarget in containerCompileTargets &&
237237
target.konanTarget.name !in disableContainerTargets
238238

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

265265
private fun validateCrossCompileScriptsAvailable(project: Project, script: String) {

crt/aws-lc

Submodule aws-lc updated 513 files

crt/s2n

Submodule s2n updated 227 files

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[versions]
22
kotlin-version = "2.2.0"
33

4-
aws-kotlin-repo-tools-version = "0.4.37"
4+
aws-kotlin-repo-tools-version = "0.4.42"
55

66
# libs
77
crt-java-version = "0.38.1"
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https://services.gradle.org/distributions/gradle-8.14.2-bin.zip
3+
distributionUrl=https://services.gradle.org/distributions/gradle-9.0.0-bin.zip
44
networkTimeout=10000
55
zipStoreBase=GRADLE_USER_HOME
66
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)