update gradle to 8.10.2

ClusterlessHQ · Jan 13, 2025 · 7a0afb7 · 7a0afb7
1 parent 6420693
commit 7a0afb7
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 36 deletions.
diff --git a/clusterless-main/build.gradle.kts b/clusterless-main/build.gradle.kts
@@ -34,7 +34,7 @@ tasks.getAt("installDist").dependsOn(awsKernelInstall)
 
 tasks.named<ProcessResources>("processResources") {
     doFirst {
-        file("${buildDir}/resources/main/version.properties")
+        file(layout.buildDirectory.file("resources/main/version.properties"))
             .writeText("clusterless.release.full=${version}")
     }
 }
@@ -125,7 +125,7 @@ tasks.register<Exec>("generateComponentModels") {
         "component",
         "--model-all",
         "--output-path",
-        "${buildDir}/generated-docs/modules/components"
+        layout.buildDirectory.dir("generated-docs/modules/components").toString()
     )
 }
 
@@ -140,7 +140,7 @@ tasks.register<Exec>("generateComponentModelsRequired") {
         "--model-all",
         "--required",
         "--output-path",
-        "${buildDir}/generated-docs/modules/components"
+        layout.buildDirectory.dir("generated-docs/modules/components").toString()
     )
 }
 
@@ -154,7 +154,7 @@ tasks.register<Exec>("generateModelModels") {
         "model",
         "--model-all",
         "--output-path",
-        "${buildDir}/generated-docs/modules/models"
+        layout.buildDirectory.dir("generated-docs/modules/models").toString()
     )
 }
 
@@ -169,7 +169,7 @@ tasks.register<Exec>("generateModelModelsRequired") {
         "--model-all",
         "--required",
         "--output-path",
-        "${buildDir}/generated-docs/modules/models"
+        layout.buildDirectory.dir("generated-docs/modules/models").toString()
     )
 }
 
@@ -183,7 +183,7 @@ tasks.register<Exec>("generateComponentDocs") {
         "component",
         "--describe-all",
         "--output-path",
-        "${buildDir}/generated-docs/modules/components"
+        layout.buildDirectory.dir("generated-docs/modules/components").toString()
     )
 }
 
@@ -197,7 +197,7 @@ tasks.register<Exec>("generateResourceIndex") {
         "resource",
         "--list",
         "--output-path",
-        "${buildDir}/generated-docs/modules/components/",
+        layout.buildDirectory.dir("generated-docs/modules/components/").toString(),
         "--append=false"
     )
 }
@@ -212,7 +212,7 @@ tasks.register<Exec>("generateArcIndex") {
         "arc",
         "--list",
         "--output-path",
-        "${buildDir}/generated-docs/modules/components/",
+        layout.buildDirectory.dir("generated-docs/modules/components/").toString(),
         "--append=true"
     )
     mustRunAfter("generateBoundariesIndex")
@@ -228,7 +228,7 @@ tasks.register<Exec>("generateBarriersIndex") {
         "barrier",
         "--list",
         "--output-path",
-        "${buildDir}/generated-docs/modules/components/",
+        layout.buildDirectory.dir("generated-docs/modules/components/").toString(),
         "--append=true"
     )
     mustRunAfter("generateArcIndex")
@@ -244,7 +244,7 @@ tasks.register<Exec>("generateBoundariesIndex") {
         "boundary",
         "--list",
         "--output-path",
-        "${buildDir}/generated-docs/modules/components/",
+        layout.buildDirectory.dir("generated-docs/modules/components/").toString(),
         "--append=true"
     )
     mustRunAfter("generateResourceIndex")
@@ -260,7 +260,7 @@ tasks.register<Exec>("generateActivitiesIndex") {
         "activity",
         "--list",
         "--output-path",
-        "${buildDir}/generated-docs/modules/components/",
+        layout.buildDirectory.dir("generated-docs/modules/components/").toString(),
         "--append=true"
     )
     mustRunAfter("generateBoundariesIndex")
@@ -276,7 +276,7 @@ tasks.register<Exec>("generateComponentPartial") {
         "component",
         "--list",
         "--output-path",
-        "${buildDir}/generated-docs/modules/components/partials",
+        layout.buildDirectory.dir("generated-docs/modules/components/partials").toString(),
         "--name",
         "components.adoc",
         "--template",
@@ -294,7 +294,7 @@ tasks.register<Exec>("generateModelDocs") {
         "model",
         "--describe-all",
         "--output-path",
-        "${buildDir}/generated-docs/modules/models"
+        layout.buildDirectory.dir("generated-docs/modules/models").toString()
     )
 }
 
@@ -308,7 +308,7 @@ tasks.register<Exec>("generateModelIndex") {
         "model",
         "--list",
         "--output-path",
-        "${buildDir}/generated-docs/modules/models/"
+        layout.buildDirectory.dir("generated-docs/modules/models/").toString()
     )
 }
 
@@ -322,7 +322,7 @@ tasks.register<Exec>("generateModelPartial") {
         "model",
         "--list",
         "--output-path",
-        "${buildDir}/generated-docs/modules/models/partials",
+        layout.buildDirectory.dir("generated-docs/modules/models/partials").toString(),
         "--name",
         "models.adoc",
         "--template",
@@ -356,15 +356,15 @@ tasks.register<Copy>("generateDocs") {
             it.replace(".adoc.template", ".adoc")
         }
     }
-    from("${buildDir}/generated-docs/") {
+    from(layout.buildDirectory.dir("generated-docs/")) {
         filter {
             it.lineSequence().filterNot { line ->
                 line.startsWith("// ") ||
                         line.startsWith(":doctype:")
             }.joinToString("\n")
         }
     }
-    into("${buildDir}/docs/")
+    into(layout.buildDirectory.dir("docs/"))
 }
 
 val picoliExecution by configurations.creating() {

diff --git a/clusterless-substrate-aws-lambda-transform/build.gradle.kts b/clusterless-substrate-aws-lambda-transform/build.gradle.kts
@@ -11,8 +11,8 @@ plugins {
     id("org.openapi.generator") version "6.6.0"
 }
 
-val generatedRoot = "$buildDir/generated/openapi"
-val generatedSource = "$generatedRoot/src/main/java"
+val generatedRoot = layout.buildDirectory.dir("generated/openapi")
+val generatedSource = generatedRoot.get().dir("src/main/java")
 
 sourceSets {
     getByName("main") {
@@ -25,7 +25,7 @@ sourceSets {
 idea {
     module {
         sourceDirs.add(file("src/main/json"))
-        generatedSourceDirs.add(file(generatedSource))
+        generatedSourceDirs.add(generatedSource.asFile)
     }
 }
 
@@ -50,8 +50,8 @@ dependencies {
 val openApiGenerateObjectCreated =
     tasks.register<org.openapitools.generator.gradle.plugin.tasks.GenerateTask>("openApiGenerateObjectCreated") {
         generatorName.set("java")
-        inputSpec.set("$projectDir/src/main/json/ObjectCreated.json")
-        outputDir.set(generatedRoot)
+        inputSpec.set(layout.projectDirectory.file("src/main/json/ObjectCreated.json").toString())
+        outputDir.set(generatedRoot.get().toString())
         modelPackage.set("clusterless.aws.lambda.transform.json.object")
 
         configOptions.put("library", "native")
@@ -73,8 +73,8 @@ val openApiGenerateObjectCreated =
 val openApiGenerateScheduledEvent =
     tasks.register<org.openapitools.generator.gradle.plugin.tasks.GenerateTask>("openApiGenerateScheduledEvent") {
         generatorName.set("java")
-        inputSpec.set("$projectDir/src/main/json/ScheduledJson.json")
-        outputDir.set(generatedRoot)
+        inputSpec.set(layout.projectDirectory.file("src/main/json/ScheduledJson.json").toString())
+        outputDir.set(generatedRoot.get().toString())
         modelPackage.set("clusterless.aws.lambda.transform.json.event")
 
         configOptions.put("library", "native")
@@ -105,8 +105,12 @@ tasks.register<Zip>("packageAll") {
 
     into("lib") {
         from(configurations.runtimeClasspath)
-        dirMode = 755
-        fileMode = 755
+        dirPermissions {
+            unix("rwxr-xr-x")
+        }
+        filePermissions {
+            unix("rwxr-xr-x")
+        }
         isReproducibleFileOrder = true
         isPreserveFileTimestamps = false
     }

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git 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.2.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/gradlew b/gradlew
@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -55,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -83,7 +85,9 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -144,15 +148,15 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -201,11 +205,11 @@ fi
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \