diff --git a/.changes/66c32a01-7fa9-4af6-804c-19cf97e0ac20.json b/.changes/66c32a01-7fa9-4af6-804c-19cf97e0ac20.json new file mode 100644 index 00000000..b49e82ef --- /dev/null +++ b/.changes/66c32a01-7fa9-4af6-804c-19cf97e0ac20.json @@ -0,0 +1,5 @@ +{ + "id": "66c32a01-7fa9-4af6-804c-19cf97e0ac20", + "type": "misc", + "description": "Upgrade to Gradle 9.0.0" +} \ No newline at end of file diff --git a/build-support/src/main/kotlin/aws/sdk/kotlin/gradle/crt/CMakeTasks.kt b/build-support/src/main/kotlin/aws/sdk/kotlin/gradle/crt/CMakeTasks.kt index b35e600f..19f3699a 100644 --- a/build-support/src/main/kotlin/aws/sdk/kotlin/gradle/crt/CMakeTasks.kt +++ b/build-support/src/main/kotlin/aws/sdk/kotlin/gradle/crt/CMakeTasks.kt @@ -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) { @@ -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) { diff --git a/crt/aws-c-io b/crt/aws-c-io index 4ff79c23..8d7a201d 160000 --- a/crt/aws-c-io +++ b/crt/aws-c-io @@ -1 +1 @@ -Subproject commit 4ff79c23f6e356a66faeee494995a13d71d6b4cb +Subproject commit 8d7a201d50f932a56b9f52c173d10c39e55a32d0 diff --git a/crt/aws-lc b/crt/aws-lc index bbf9ff61..2980c1ba 160000 --- a/crt/aws-lc +++ b/crt/aws-lc @@ -1 +1 @@ -Subproject commit bbf9ff6176b056bfbeab9d46f719fc724fc5edb8 +Subproject commit 2980c1ba66cba65162c9092e232858125e063ff4 diff --git a/crt/s2n b/crt/s2n index 10e68433..2d254b0c 160000 --- a/crt/s2n +++ b/crt/s2n @@ -1 +1 @@ -Subproject commit 10e684339305e65e9a301c09816fca002031a900 +Subproject commit 2d254b0c6d8ebe037730d23097f72a4cbc1f2218 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index d342905b..f49531a1 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -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" diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index bf3beeb7..4ba2524e 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -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