diff --git a/code_samples/_gradleCompositeBuild/gradle/wrapper/gradle-wrapper.jar b/code_samples/_gradleCompositeBuild/gradle/wrapper/gradle-wrapper.jar
index e6441136f..2c3521197 100644
Binary files a/code_samples/_gradleCompositeBuild/gradle/wrapper/gradle-wrapper.jar and b/code_samples/_gradleCompositeBuild/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/code_samples/_gradleCompositeBuild/gradle/wrapper/gradle-wrapper.properties b/code_samples/_gradleCompositeBuild/gradle/wrapper/gradle-wrapper.properties
index a4413138c..09523c0e5 100644
--- a/code_samples/_gradleCompositeBuild/gradle/wrapper/gradle-wrapper.properties
+++ b/code_samples/_gradleCompositeBuild/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/code_samples/_gradleCompositeBuild/gradlew b/code_samples/_gradleCompositeBuild/gradlew
index b740cf133..f5feea6d6 100755
--- a/code_samples/_gradleCompositeBuild/gradlew
+++ b/code_samples/_gradleCompositeBuild/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
+#
 
 ##############################################################################
 #
@@ -84,7 +86,8 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+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
diff --git a/code_samples/_gradleCompositeBuild/gradlew.bat b/code_samples/_gradleCompositeBuild/gradlew.bat
index 25da30dbd..9d21a2183 100644
--- a/code_samples/_gradleCompositeBuild/gradlew.bat
+++ b/code_samples/_gradleCompositeBuild/gradlew.bat
@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
diff --git a/code_samples/action_basics/gradle/wrapper/gradle-wrapper.jar b/code_samples/action_basics/gradle/wrapper/gradle-wrapper.jar
index e6441136f..2c3521197 100644
Binary files a/code_samples/action_basics/gradle/wrapper/gradle-wrapper.jar and b/code_samples/action_basics/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/code_samples/action_basics/gradle/wrapper/gradle-wrapper.properties b/code_samples/action_basics/gradle/wrapper/gradle-wrapper.properties
index a4413138c..09523c0e5 100644
--- a/code_samples/action_basics/gradle/wrapper/gradle-wrapper.properties
+++ b/code_samples/action_basics/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/code_samples/action_basics/gradlew b/code_samples/action_basics/gradlew
index b740cf133..f5feea6d6 100755
--- a/code_samples/action_basics/gradlew
+++ b/code_samples/action_basics/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
+#
 
 ##############################################################################
 #
@@ -84,7 +86,8 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+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
diff --git a/code_samples/action_basics/gradlew.bat b/code_samples/action_basics/gradlew.bat
index 25da30dbd..9d21a2183 100644
--- a/code_samples/action_basics/gradlew.bat
+++ b/code_samples/action_basics/gradlew.bat
@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
diff --git a/code_samples/comparing_string_references_inspection/gradle/wrapper/gradle-wrapper.jar b/code_samples/comparing_string_references_inspection/gradle/wrapper/gradle-wrapper.jar
index e6441136f..2c3521197 100644
Binary files a/code_samples/comparing_string_references_inspection/gradle/wrapper/gradle-wrapper.jar and b/code_samples/comparing_string_references_inspection/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/code_samples/comparing_string_references_inspection/gradle/wrapper/gradle-wrapper.properties b/code_samples/comparing_string_references_inspection/gradle/wrapper/gradle-wrapper.properties
index a4413138c..09523c0e5 100644
--- a/code_samples/comparing_string_references_inspection/gradle/wrapper/gradle-wrapper.properties
+++ b/code_samples/comparing_string_references_inspection/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/code_samples/comparing_string_references_inspection/gradlew b/code_samples/comparing_string_references_inspection/gradlew
index b740cf133..f5feea6d6 100755
--- a/code_samples/comparing_string_references_inspection/gradlew
+++ b/code_samples/comparing_string_references_inspection/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
+#
 
 ##############################################################################
 #
@@ -84,7 +86,8 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+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
diff --git a/code_samples/comparing_string_references_inspection/gradlew.bat b/code_samples/comparing_string_references_inspection/gradlew.bat
index 25da30dbd..9d21a2183 100644
--- a/code_samples/comparing_string_references_inspection/gradlew.bat
+++ b/code_samples/comparing_string_references_inspection/gradlew.bat
@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
diff --git a/code_samples/conditional_operator_intention/gradle/wrapper/gradle-wrapper.jar b/code_samples/conditional_operator_intention/gradle/wrapper/gradle-wrapper.jar
index e6441136f..2c3521197 100644
Binary files a/code_samples/conditional_operator_intention/gradle/wrapper/gradle-wrapper.jar and b/code_samples/conditional_operator_intention/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/code_samples/conditional_operator_intention/gradle/wrapper/gradle-wrapper.properties b/code_samples/conditional_operator_intention/gradle/wrapper/gradle-wrapper.properties
index a4413138c..09523c0e5 100644
--- a/code_samples/conditional_operator_intention/gradle/wrapper/gradle-wrapper.properties
+++ b/code_samples/conditional_operator_intention/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/code_samples/conditional_operator_intention/gradlew b/code_samples/conditional_operator_intention/gradlew
index b740cf133..f5feea6d6 100755
--- a/code_samples/conditional_operator_intention/gradlew
+++ b/code_samples/conditional_operator_intention/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
+#
 
 ##############################################################################
 #
@@ -84,7 +86,8 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+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
diff --git a/code_samples/conditional_operator_intention/gradlew.bat b/code_samples/conditional_operator_intention/gradlew.bat
index 25da30dbd..9d21a2183 100644
--- a/code_samples/conditional_operator_intention/gradlew.bat
+++ b/code_samples/conditional_operator_intention/gradlew.bat
@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
diff --git a/code_samples/editor_basics/gradle/wrapper/gradle-wrapper.jar b/code_samples/editor_basics/gradle/wrapper/gradle-wrapper.jar
index e6441136f..2c3521197 100644
Binary files a/code_samples/editor_basics/gradle/wrapper/gradle-wrapper.jar and b/code_samples/editor_basics/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/code_samples/editor_basics/gradle/wrapper/gradle-wrapper.properties b/code_samples/editor_basics/gradle/wrapper/gradle-wrapper.properties
index a4413138c..09523c0e5 100644
--- a/code_samples/editor_basics/gradle/wrapper/gradle-wrapper.properties
+++ b/code_samples/editor_basics/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/code_samples/editor_basics/gradlew b/code_samples/editor_basics/gradlew
index b740cf133..f5feea6d6 100755
--- a/code_samples/editor_basics/gradlew
+++ b/code_samples/editor_basics/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
+#
 
 ##############################################################################
 #
@@ -84,7 +86,8 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+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
diff --git a/code_samples/editor_basics/gradlew.bat b/code_samples/editor_basics/gradlew.bat
index 25da30dbd..9d21a2183 100644
--- a/code_samples/editor_basics/gradlew.bat
+++ b/code_samples/editor_basics/gradlew.bat
@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
diff --git a/code_samples/facet_basics/gradle/wrapper/gradle-wrapper.jar b/code_samples/facet_basics/gradle/wrapper/gradle-wrapper.jar
index e6441136f..2c3521197 100644
Binary files a/code_samples/facet_basics/gradle/wrapper/gradle-wrapper.jar and b/code_samples/facet_basics/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/code_samples/facet_basics/gradle/wrapper/gradle-wrapper.properties b/code_samples/facet_basics/gradle/wrapper/gradle-wrapper.properties
index a4413138c..09523c0e5 100644
--- a/code_samples/facet_basics/gradle/wrapper/gradle-wrapper.properties
+++ b/code_samples/facet_basics/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/code_samples/facet_basics/gradlew b/code_samples/facet_basics/gradlew
index b740cf133..f5feea6d6 100755
--- a/code_samples/facet_basics/gradlew
+++ b/code_samples/facet_basics/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
+#
 
 ##############################################################################
 #
@@ -84,7 +86,8 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+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
diff --git a/code_samples/facet_basics/gradlew.bat b/code_samples/facet_basics/gradlew.bat
index 25da30dbd..9d21a2183 100644
--- a/code_samples/facet_basics/gradlew.bat
+++ b/code_samples/facet_basics/gradlew.bat
@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
diff --git a/code_samples/framework_basics/gradle/wrapper/gradle-wrapper.jar b/code_samples/framework_basics/gradle/wrapper/gradle-wrapper.jar
index e6441136f..2c3521197 100644
Binary files a/code_samples/framework_basics/gradle/wrapper/gradle-wrapper.jar and b/code_samples/framework_basics/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/code_samples/framework_basics/gradle/wrapper/gradle-wrapper.properties b/code_samples/framework_basics/gradle/wrapper/gradle-wrapper.properties
index a4413138c..09523c0e5 100644
--- a/code_samples/framework_basics/gradle/wrapper/gradle-wrapper.properties
+++ b/code_samples/framework_basics/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/code_samples/framework_basics/gradlew b/code_samples/framework_basics/gradlew
index b740cf133..f5feea6d6 100755
--- a/code_samples/framework_basics/gradlew
+++ b/code_samples/framework_basics/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
+#
 
 ##############################################################################
 #
@@ -84,7 +86,8 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+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
diff --git a/code_samples/framework_basics/gradlew.bat b/code_samples/framework_basics/gradlew.bat
index 25da30dbd..9d21a2183 100644
--- a/code_samples/framework_basics/gradlew.bat
+++ b/code_samples/framework_basics/gradlew.bat
@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
diff --git a/code_samples/kotlin_demo/gradle/wrapper/gradle-wrapper.jar b/code_samples/kotlin_demo/gradle/wrapper/gradle-wrapper.jar
index e6441136f..2c3521197 100644
Binary files a/code_samples/kotlin_demo/gradle/wrapper/gradle-wrapper.jar and b/code_samples/kotlin_demo/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/code_samples/kotlin_demo/gradle/wrapper/gradle-wrapper.properties b/code_samples/kotlin_demo/gradle/wrapper/gradle-wrapper.properties
index a4413138c..09523c0e5 100644
--- a/code_samples/kotlin_demo/gradle/wrapper/gradle-wrapper.properties
+++ b/code_samples/kotlin_demo/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/code_samples/kotlin_demo/gradlew b/code_samples/kotlin_demo/gradlew
index b740cf133..f5feea6d6 100755
--- a/code_samples/kotlin_demo/gradlew
+++ b/code_samples/kotlin_demo/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
+#
 
 ##############################################################################
 #
@@ -84,7 +86,8 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+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
diff --git a/code_samples/kotlin_demo/gradlew.bat b/code_samples/kotlin_demo/gradlew.bat
index 25da30dbd..9d21a2183 100644
--- a/code_samples/kotlin_demo/gradlew.bat
+++ b/code_samples/kotlin_demo/gradlew.bat
@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
diff --git a/code_samples/live_templates/gradle/wrapper/gradle-wrapper.jar b/code_samples/live_templates/gradle/wrapper/gradle-wrapper.jar
index e6441136f..2c3521197 100644
Binary files a/code_samples/live_templates/gradle/wrapper/gradle-wrapper.jar and b/code_samples/live_templates/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/code_samples/live_templates/gradle/wrapper/gradle-wrapper.properties b/code_samples/live_templates/gradle/wrapper/gradle-wrapper.properties
index a4413138c..09523c0e5 100644
--- a/code_samples/live_templates/gradle/wrapper/gradle-wrapper.properties
+++ b/code_samples/live_templates/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/code_samples/live_templates/gradlew b/code_samples/live_templates/gradlew
index b740cf133..f5feea6d6 100755
--- a/code_samples/live_templates/gradlew
+++ b/code_samples/live_templates/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
+#
 
 ##############################################################################
 #
@@ -84,7 +86,8 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+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
diff --git a/code_samples/live_templates/gradlew.bat b/code_samples/live_templates/gradlew.bat
index 25da30dbd..9d21a2183 100644
--- a/code_samples/live_templates/gradlew.bat
+++ b/code_samples/live_templates/gradlew.bat
@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
diff --git a/code_samples/max_opened_projects/gradle/wrapper/gradle-wrapper.jar b/code_samples/max_opened_projects/gradle/wrapper/gradle-wrapper.jar
index e6441136f..2c3521197 100644
Binary files a/code_samples/max_opened_projects/gradle/wrapper/gradle-wrapper.jar and b/code_samples/max_opened_projects/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/code_samples/max_opened_projects/gradle/wrapper/gradle-wrapper.properties b/code_samples/max_opened_projects/gradle/wrapper/gradle-wrapper.properties
index a4413138c..09523c0e5 100644
--- a/code_samples/max_opened_projects/gradle/wrapper/gradle-wrapper.properties
+++ b/code_samples/max_opened_projects/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/code_samples/max_opened_projects/gradlew b/code_samples/max_opened_projects/gradlew
index b740cf133..f5feea6d6 100755
--- a/code_samples/max_opened_projects/gradlew
+++ b/code_samples/max_opened_projects/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
+#
 
 ##############################################################################
 #
@@ -84,7 +86,8 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+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
diff --git a/code_samples/max_opened_projects/gradlew.bat b/code_samples/max_opened_projects/gradlew.bat
index 25da30dbd..9d21a2183 100644
--- a/code_samples/max_opened_projects/gradlew.bat
+++ b/code_samples/max_opened_projects/gradlew.bat
@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
diff --git a/code_samples/module/gradle/wrapper/gradle-wrapper.jar b/code_samples/module/gradle/wrapper/gradle-wrapper.jar
index e6441136f..2c3521197 100644
Binary files a/code_samples/module/gradle/wrapper/gradle-wrapper.jar and b/code_samples/module/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/code_samples/module/gradle/wrapper/gradle-wrapper.properties b/code_samples/module/gradle/wrapper/gradle-wrapper.properties
index a4413138c..09523c0e5 100644
--- a/code_samples/module/gradle/wrapper/gradle-wrapper.properties
+++ b/code_samples/module/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/code_samples/module/gradlew b/code_samples/module/gradlew
index b740cf133..f5feea6d6 100755
--- a/code_samples/module/gradlew
+++ b/code_samples/module/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
+#
 
 ##############################################################################
 #
@@ -84,7 +86,8 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+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
diff --git a/code_samples/module/gradlew.bat b/code_samples/module/gradlew.bat
index 25da30dbd..9d21a2183 100644
--- a/code_samples/module/gradlew.bat
+++ b/code_samples/module/gradlew.bat
@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
diff --git a/code_samples/product_specific/pycharm_basics/gradle/wrapper/gradle-wrapper.jar b/code_samples/product_specific/pycharm_basics/gradle/wrapper/gradle-wrapper.jar
index e6441136f..2c3521197 100644
Binary files a/code_samples/product_specific/pycharm_basics/gradle/wrapper/gradle-wrapper.jar and b/code_samples/product_specific/pycharm_basics/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/code_samples/product_specific/pycharm_basics/gradle/wrapper/gradle-wrapper.properties b/code_samples/product_specific/pycharm_basics/gradle/wrapper/gradle-wrapper.properties
index a4413138c..09523c0e5 100644
--- a/code_samples/product_specific/pycharm_basics/gradle/wrapper/gradle-wrapper.properties
+++ b/code_samples/product_specific/pycharm_basics/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/code_samples/product_specific/pycharm_basics/gradlew b/code_samples/product_specific/pycharm_basics/gradlew
index b740cf133..f5feea6d6 100755
--- a/code_samples/product_specific/pycharm_basics/gradlew
+++ b/code_samples/product_specific/pycharm_basics/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
+#
 
 ##############################################################################
 #
@@ -84,7 +86,8 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+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
diff --git a/code_samples/product_specific/pycharm_basics/gradlew.bat b/code_samples/product_specific/pycharm_basics/gradlew.bat
index 25da30dbd..9d21a2183 100644
--- a/code_samples/product_specific/pycharm_basics/gradlew.bat
+++ b/code_samples/product_specific/pycharm_basics/gradlew.bat
@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
diff --git a/code_samples/project_model/gradle/wrapper/gradle-wrapper.jar b/code_samples/project_model/gradle/wrapper/gradle-wrapper.jar
index e6441136f..2c3521197 100644
Binary files a/code_samples/project_model/gradle/wrapper/gradle-wrapper.jar and b/code_samples/project_model/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/code_samples/project_model/gradle/wrapper/gradle-wrapper.properties b/code_samples/project_model/gradle/wrapper/gradle-wrapper.properties
index a4413138c..09523c0e5 100644
--- a/code_samples/project_model/gradle/wrapper/gradle-wrapper.properties
+++ b/code_samples/project_model/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/code_samples/project_model/gradlew b/code_samples/project_model/gradlew
index b740cf133..f5feea6d6 100755
--- a/code_samples/project_model/gradlew
+++ b/code_samples/project_model/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
+#
 
 ##############################################################################
 #
@@ -84,7 +86,8 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+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
diff --git a/code_samples/project_model/gradlew.bat b/code_samples/project_model/gradlew.bat
index 25da30dbd..9d21a2183 100644
--- a/code_samples/project_model/gradlew.bat
+++ b/code_samples/project_model/gradlew.bat
@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
diff --git a/code_samples/project_view_pane/gradle/wrapper/gradle-wrapper.jar b/code_samples/project_view_pane/gradle/wrapper/gradle-wrapper.jar
index e6441136f..2c3521197 100644
Binary files a/code_samples/project_view_pane/gradle/wrapper/gradle-wrapper.jar and b/code_samples/project_view_pane/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/code_samples/project_view_pane/gradle/wrapper/gradle-wrapper.properties b/code_samples/project_view_pane/gradle/wrapper/gradle-wrapper.properties
index a4413138c..09523c0e5 100644
--- a/code_samples/project_view_pane/gradle/wrapper/gradle-wrapper.properties
+++ b/code_samples/project_view_pane/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/code_samples/project_view_pane/gradlew b/code_samples/project_view_pane/gradlew
index b740cf133..f5feea6d6 100755
--- a/code_samples/project_view_pane/gradlew
+++ b/code_samples/project_view_pane/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
+#
 
 ##############################################################################
 #
@@ -84,7 +86,8 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+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
diff --git a/code_samples/project_view_pane/gradlew.bat b/code_samples/project_view_pane/gradlew.bat
index 25da30dbd..9d21a2183 100644
--- a/code_samples/project_view_pane/gradlew.bat
+++ b/code_samples/project_view_pane/gradlew.bat
@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
diff --git a/code_samples/project_wizard/gradle/wrapper/gradle-wrapper.jar b/code_samples/project_wizard/gradle/wrapper/gradle-wrapper.jar
index e6441136f..2c3521197 100644
Binary files a/code_samples/project_wizard/gradle/wrapper/gradle-wrapper.jar and b/code_samples/project_wizard/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/code_samples/project_wizard/gradle/wrapper/gradle-wrapper.properties b/code_samples/project_wizard/gradle/wrapper/gradle-wrapper.properties
index a4413138c..09523c0e5 100644
--- a/code_samples/project_wizard/gradle/wrapper/gradle-wrapper.properties
+++ b/code_samples/project_wizard/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/code_samples/project_wizard/gradlew b/code_samples/project_wizard/gradlew
index b740cf133..f5feea6d6 100755
--- a/code_samples/project_wizard/gradlew
+++ b/code_samples/project_wizard/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
+#
 
 ##############################################################################
 #
@@ -84,7 +86,8 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+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
diff --git a/code_samples/project_wizard/gradlew.bat b/code_samples/project_wizard/gradlew.bat
index 25da30dbd..9d21a2183 100644
--- a/code_samples/project_wizard/gradlew.bat
+++ b/code_samples/project_wizard/gradlew.bat
@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
diff --git a/code_samples/psi_demo/gradle/wrapper/gradle-wrapper.jar b/code_samples/psi_demo/gradle/wrapper/gradle-wrapper.jar
index e6441136f..2c3521197 100644
Binary files a/code_samples/psi_demo/gradle/wrapper/gradle-wrapper.jar and b/code_samples/psi_demo/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/code_samples/psi_demo/gradle/wrapper/gradle-wrapper.properties b/code_samples/psi_demo/gradle/wrapper/gradle-wrapper.properties
index a4413138c..09523c0e5 100644
--- a/code_samples/psi_demo/gradle/wrapper/gradle-wrapper.properties
+++ b/code_samples/psi_demo/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/code_samples/psi_demo/gradlew b/code_samples/psi_demo/gradlew
index b740cf133..f5feea6d6 100755
--- a/code_samples/psi_demo/gradlew
+++ b/code_samples/psi_demo/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
+#
 
 ##############################################################################
 #
@@ -84,7 +86,8 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+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
diff --git a/code_samples/psi_demo/gradlew.bat b/code_samples/psi_demo/gradlew.bat
index 25da30dbd..9d21a2183 100644
--- a/code_samples/psi_demo/gradlew.bat
+++ b/code_samples/psi_demo/gradlew.bat
@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
diff --git a/code_samples/run_configuration/gradle/wrapper/gradle-wrapper.jar b/code_samples/run_configuration/gradle/wrapper/gradle-wrapper.jar
index e6441136f..2c3521197 100644
Binary files a/code_samples/run_configuration/gradle/wrapper/gradle-wrapper.jar and b/code_samples/run_configuration/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/code_samples/run_configuration/gradle/wrapper/gradle-wrapper.properties b/code_samples/run_configuration/gradle/wrapper/gradle-wrapper.properties
index a4413138c..09523c0e5 100644
--- a/code_samples/run_configuration/gradle/wrapper/gradle-wrapper.properties
+++ b/code_samples/run_configuration/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/code_samples/run_configuration/gradlew b/code_samples/run_configuration/gradlew
index b740cf133..f5feea6d6 100755
--- a/code_samples/run_configuration/gradlew
+++ b/code_samples/run_configuration/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
+#
 
 ##############################################################################
 #
@@ -84,7 +86,8 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+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
diff --git a/code_samples/run_configuration/gradlew.bat b/code_samples/run_configuration/gradlew.bat
index 25da30dbd..9d21a2183 100644
--- a/code_samples/run_configuration/gradlew.bat
+++ b/code_samples/run_configuration/gradlew.bat
@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
diff --git a/code_samples/settings/gradle/wrapper/gradle-wrapper.jar b/code_samples/settings/gradle/wrapper/gradle-wrapper.jar
index e6441136f..2c3521197 100644
Binary files a/code_samples/settings/gradle/wrapper/gradle-wrapper.jar and b/code_samples/settings/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/code_samples/settings/gradle/wrapper/gradle-wrapper.properties b/code_samples/settings/gradle/wrapper/gradle-wrapper.properties
index a4413138c..09523c0e5 100644
--- a/code_samples/settings/gradle/wrapper/gradle-wrapper.properties
+++ b/code_samples/settings/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/code_samples/settings/gradlew b/code_samples/settings/gradlew
index b740cf133..f5feea6d6 100755
--- a/code_samples/settings/gradlew
+++ b/code_samples/settings/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
+#
 
 ##############################################################################
 #
@@ -84,7 +86,8 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+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
diff --git a/code_samples/settings/gradlew.bat b/code_samples/settings/gradlew.bat
index 25da30dbd..9d21a2183 100644
--- a/code_samples/settings/gradlew.bat
+++ b/code_samples/settings/gradlew.bat
@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
diff --git a/code_samples/simple_language_plugin/gradle/wrapper/gradle-wrapper.jar b/code_samples/simple_language_plugin/gradle/wrapper/gradle-wrapper.jar
index e6441136f..2c3521197 100644
Binary files a/code_samples/simple_language_plugin/gradle/wrapper/gradle-wrapper.jar and b/code_samples/simple_language_plugin/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/code_samples/simple_language_plugin/gradle/wrapper/gradle-wrapper.properties b/code_samples/simple_language_plugin/gradle/wrapper/gradle-wrapper.properties
index a4413138c..09523c0e5 100644
--- a/code_samples/simple_language_plugin/gradle/wrapper/gradle-wrapper.properties
+++ b/code_samples/simple_language_plugin/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/code_samples/simple_language_plugin/gradlew b/code_samples/simple_language_plugin/gradlew
index b740cf133..f5feea6d6 100755
--- a/code_samples/simple_language_plugin/gradlew
+++ b/code_samples/simple_language_plugin/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
+#
 
 ##############################################################################
 #
@@ -84,7 +86,8 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+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
diff --git a/code_samples/simple_language_plugin/gradlew.bat b/code_samples/simple_language_plugin/gradlew.bat
index 25da30dbd..9d21a2183 100644
--- a/code_samples/simple_language_plugin/gradlew.bat
+++ b/code_samples/simple_language_plugin/gradlew.bat
@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
diff --git a/code_samples/tool_window/gradle/wrapper/gradle-wrapper.jar b/code_samples/tool_window/gradle/wrapper/gradle-wrapper.jar
index e6441136f..2c3521197 100644
Binary files a/code_samples/tool_window/gradle/wrapper/gradle-wrapper.jar and b/code_samples/tool_window/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/code_samples/tool_window/gradle/wrapper/gradle-wrapper.properties b/code_samples/tool_window/gradle/wrapper/gradle-wrapper.properties
index a4413138c..09523c0e5 100644
--- a/code_samples/tool_window/gradle/wrapper/gradle-wrapper.properties
+++ b/code_samples/tool_window/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/code_samples/tool_window/gradlew b/code_samples/tool_window/gradlew
index b740cf133..f5feea6d6 100755
--- a/code_samples/tool_window/gradlew
+++ b/code_samples/tool_window/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
+#
 
 ##############################################################################
 #
@@ -84,7 +86,8 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+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
diff --git a/code_samples/tool_window/gradlew.bat b/code_samples/tool_window/gradlew.bat
index 25da30dbd..9d21a2183 100644
--- a/code_samples/tool_window/gradlew.bat
+++ b/code_samples/tool_window/gradlew.bat
@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
diff --git a/code_samples/tree_structure_provider/gradle/wrapper/gradle-wrapper.jar b/code_samples/tree_structure_provider/gradle/wrapper/gradle-wrapper.jar
index e6441136f..2c3521197 100644
Binary files a/code_samples/tree_structure_provider/gradle/wrapper/gradle-wrapper.jar and b/code_samples/tree_structure_provider/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/code_samples/tree_structure_provider/gradle/wrapper/gradle-wrapper.properties b/code_samples/tree_structure_provider/gradle/wrapper/gradle-wrapper.properties
index a4413138c..09523c0e5 100644
--- a/code_samples/tree_structure_provider/gradle/wrapper/gradle-wrapper.properties
+++ b/code_samples/tree_structure_provider/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/code_samples/tree_structure_provider/gradlew b/code_samples/tree_structure_provider/gradlew
index b740cf133..f5feea6d6 100755
--- a/code_samples/tree_structure_provider/gradlew
+++ b/code_samples/tree_structure_provider/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
+#
 
 ##############################################################################
 #
@@ -84,7 +86,8 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+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
diff --git a/code_samples/tree_structure_provider/gradlew.bat b/code_samples/tree_structure_provider/gradlew.bat
index 25da30dbd..9d21a2183 100644
--- a/code_samples/tree_structure_provider/gradlew.bat
+++ b/code_samples/tree_structure_provider/gradlew.bat
@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################