diff --git a/code_samples/_gradleCompositeBuild/gradle/wrapper/gradle-wrapper.jar b/code_samples/_gradleCompositeBuild/gradle/wrapper/gradle-wrapper.jar
index c1962a79e..033e24c4c 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 37aef8d3f..9f4197d5f 100644
--- a/code_samples/_gradleCompositeBuild/gradle/wrapper/gradle-wrapper.properties
+++ b/code_samples/_gradleCompositeBuild/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/code_samples/_gradleCompositeBuild/gradlew b/code_samples/_gradleCompositeBuild/gradlew
index aeb74cbb4..fcb6fca14 100755
--- a/code_samples/_gradleCompositeBuild/gradlew
+++ b/code_samples/_gradleCompositeBuild/gradlew
@@ -130,10 +130,13 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
diff --git a/code_samples/action_basics/gradle/wrapper/gradle-wrapper.jar b/code_samples/action_basics/gradle/wrapper/gradle-wrapper.jar
index c1962a79e..033e24c4c 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 37aef8d3f..9f4197d5f 100644
--- a/code_samples/action_basics/gradle/wrapper/gradle-wrapper.properties
+++ b/code_samples/action_basics/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/code_samples/action_basics/gradlew b/code_samples/action_basics/gradlew
index aeb74cbb4..fcb6fca14 100755
--- a/code_samples/action_basics/gradlew
+++ b/code_samples/action_basics/gradlew
@@ -130,10 +130,13 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
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 c1962a79e..033e24c4c 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 37aef8d3f..9f4197d5f 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,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/code_samples/comparing_string_references_inspection/gradlew b/code_samples/comparing_string_references_inspection/gradlew
index aeb74cbb4..fcb6fca14 100755
--- a/code_samples/comparing_string_references_inspection/gradlew
+++ b/code_samples/comparing_string_references_inspection/gradlew
@@ -130,10 +130,13 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
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 c1962a79e..033e24c4c 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 37aef8d3f..9f4197d5f 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,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/code_samples/conditional_operator_intention/gradlew b/code_samples/conditional_operator_intention/gradlew
index aeb74cbb4..fcb6fca14 100755
--- a/code_samples/conditional_operator_intention/gradlew
+++ b/code_samples/conditional_operator_intention/gradlew
@@ -130,10 +130,13 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
diff --git a/code_samples/editor_basics/gradle/wrapper/gradle-wrapper.jar b/code_samples/editor_basics/gradle/wrapper/gradle-wrapper.jar
index c1962a79e..033e24c4c 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 37aef8d3f..9f4197d5f 100644
--- a/code_samples/editor_basics/gradle/wrapper/gradle-wrapper.properties
+++ b/code_samples/editor_basics/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/code_samples/editor_basics/gradlew b/code_samples/editor_basics/gradlew
index aeb74cbb4..fcb6fca14 100755
--- a/code_samples/editor_basics/gradlew
+++ b/code_samples/editor_basics/gradlew
@@ -130,10 +130,13 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
diff --git a/code_samples/facet_basics/gradle/wrapper/gradle-wrapper.jar b/code_samples/facet_basics/gradle/wrapper/gradle-wrapper.jar
index c1962a79e..033e24c4c 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 37aef8d3f..9f4197d5f 100644
--- a/code_samples/facet_basics/gradle/wrapper/gradle-wrapper.properties
+++ b/code_samples/facet_basics/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/code_samples/facet_basics/gradlew b/code_samples/facet_basics/gradlew
index aeb74cbb4..fcb6fca14 100755
--- a/code_samples/facet_basics/gradlew
+++ b/code_samples/facet_basics/gradlew
@@ -130,10 +130,13 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
diff --git a/code_samples/framework_basics/gradle/wrapper/gradle-wrapper.jar b/code_samples/framework_basics/gradle/wrapper/gradle-wrapper.jar
index c1962a79e..033e24c4c 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 37aef8d3f..9f4197d5f 100644
--- a/code_samples/framework_basics/gradle/wrapper/gradle-wrapper.properties
+++ b/code_samples/framework_basics/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/code_samples/framework_basics/gradlew b/code_samples/framework_basics/gradlew
index aeb74cbb4..fcb6fca14 100755
--- a/code_samples/framework_basics/gradlew
+++ b/code_samples/framework_basics/gradlew
@@ -130,10 +130,13 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
diff --git a/code_samples/kotlin_demo/gradle/wrapper/gradle-wrapper.jar b/code_samples/kotlin_demo/gradle/wrapper/gradle-wrapper.jar
index c1962a79e..033e24c4c 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 37aef8d3f..9f4197d5f 100644
--- a/code_samples/kotlin_demo/gradle/wrapper/gradle-wrapper.properties
+++ b/code_samples/kotlin_demo/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/code_samples/kotlin_demo/gradlew b/code_samples/kotlin_demo/gradlew
index aeb74cbb4..fcb6fca14 100755
--- a/code_samples/kotlin_demo/gradlew
+++ b/code_samples/kotlin_demo/gradlew
@@ -130,10 +130,13 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
diff --git a/code_samples/live_templates/gradle/wrapper/gradle-wrapper.jar b/code_samples/live_templates/gradle/wrapper/gradle-wrapper.jar
index c1962a79e..033e24c4c 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 37aef8d3f..9f4197d5f 100644
--- a/code_samples/live_templates/gradle/wrapper/gradle-wrapper.properties
+++ b/code_samples/live_templates/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/code_samples/live_templates/gradlew b/code_samples/live_templates/gradlew
index aeb74cbb4..fcb6fca14 100755
--- a/code_samples/live_templates/gradlew
+++ b/code_samples/live_templates/gradlew
@@ -130,10 +130,13 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
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 c1962a79e..033e24c4c 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 37aef8d3f..9f4197d5f 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,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/code_samples/max_opened_projects/gradlew b/code_samples/max_opened_projects/gradlew
index aeb74cbb4..fcb6fca14 100755
--- a/code_samples/max_opened_projects/gradlew
+++ b/code_samples/max_opened_projects/gradlew
@@ -130,10 +130,13 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
diff --git a/code_samples/module/gradle/wrapper/gradle-wrapper.jar b/code_samples/module/gradle/wrapper/gradle-wrapper.jar
index c1962a79e..033e24c4c 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 37aef8d3f..9f4197d5f 100644
--- a/code_samples/module/gradle/wrapper/gradle-wrapper.properties
+++ b/code_samples/module/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/code_samples/module/gradlew b/code_samples/module/gradlew
index aeb74cbb4..fcb6fca14 100755
--- a/code_samples/module/gradlew
+++ b/code_samples/module/gradlew
@@ -130,10 +130,13 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
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 c1962a79e..033e24c4c 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 37aef8d3f..9f4197d5f 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,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/code_samples/product_specific/pycharm_basics/gradlew b/code_samples/product_specific/pycharm_basics/gradlew
index aeb74cbb4..fcb6fca14 100755
--- a/code_samples/product_specific/pycharm_basics/gradlew
+++ b/code_samples/product_specific/pycharm_basics/gradlew
@@ -130,10 +130,13 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
diff --git a/code_samples/project_model/gradle/wrapper/gradle-wrapper.jar b/code_samples/project_model/gradle/wrapper/gradle-wrapper.jar
index c1962a79e..033e24c4c 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 37aef8d3f..9f4197d5f 100644
--- a/code_samples/project_model/gradle/wrapper/gradle-wrapper.properties
+++ b/code_samples/project_model/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/code_samples/project_model/gradlew b/code_samples/project_model/gradlew
index aeb74cbb4..fcb6fca14 100755
--- a/code_samples/project_model/gradlew
+++ b/code_samples/project_model/gradlew
@@ -130,10 +130,13 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
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 c1962a79e..033e24c4c 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 37aef8d3f..9f4197d5f 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,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/code_samples/project_view_pane/gradlew b/code_samples/project_view_pane/gradlew
index aeb74cbb4..fcb6fca14 100755
--- a/code_samples/project_view_pane/gradlew
+++ b/code_samples/project_view_pane/gradlew
@@ -130,10 +130,13 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
diff --git a/code_samples/project_wizard/gradle/wrapper/gradle-wrapper.jar b/code_samples/project_wizard/gradle/wrapper/gradle-wrapper.jar
index c1962a79e..033e24c4c 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 37aef8d3f..9f4197d5f 100644
--- a/code_samples/project_wizard/gradle/wrapper/gradle-wrapper.properties
+++ b/code_samples/project_wizard/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/code_samples/project_wizard/gradlew b/code_samples/project_wizard/gradlew
index aeb74cbb4..fcb6fca14 100755
--- a/code_samples/project_wizard/gradlew
+++ b/code_samples/project_wizard/gradlew
@@ -130,10 +130,13 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
diff --git a/code_samples/psi_demo/gradle/wrapper/gradle-wrapper.jar b/code_samples/psi_demo/gradle/wrapper/gradle-wrapper.jar
index c1962a79e..033e24c4c 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 37aef8d3f..9f4197d5f 100644
--- a/code_samples/psi_demo/gradle/wrapper/gradle-wrapper.properties
+++ b/code_samples/psi_demo/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/code_samples/psi_demo/gradlew b/code_samples/psi_demo/gradlew
index aeb74cbb4..fcb6fca14 100755
--- a/code_samples/psi_demo/gradlew
+++ b/code_samples/psi_demo/gradlew
@@ -130,10 +130,13 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
diff --git a/code_samples/run_configuration/gradle/wrapper/gradle-wrapper.jar b/code_samples/run_configuration/gradle/wrapper/gradle-wrapper.jar
index c1962a79e..033e24c4c 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 37aef8d3f..9f4197d5f 100644
--- a/code_samples/run_configuration/gradle/wrapper/gradle-wrapper.properties
+++ b/code_samples/run_configuration/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/code_samples/run_configuration/gradlew b/code_samples/run_configuration/gradlew
index aeb74cbb4..fcb6fca14 100755
--- a/code_samples/run_configuration/gradlew
+++ b/code_samples/run_configuration/gradlew
@@ -130,10 +130,13 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
diff --git a/code_samples/settings/gradle/wrapper/gradle-wrapper.jar b/code_samples/settings/gradle/wrapper/gradle-wrapper.jar
index c1962a79e..033e24c4c 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 37aef8d3f..9f4197d5f 100644
--- a/code_samples/settings/gradle/wrapper/gradle-wrapper.properties
+++ b/code_samples/settings/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/code_samples/settings/gradlew b/code_samples/settings/gradlew
index aeb74cbb4..fcb6fca14 100755
--- a/code_samples/settings/gradlew
+++ b/code_samples/settings/gradlew
@@ -130,10 +130,13 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
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 c1962a79e..033e24c4c 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 37aef8d3f..9f4197d5f 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,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/code_samples/simple_language_plugin/gradlew b/code_samples/simple_language_plugin/gradlew
index aeb74cbb4..fcb6fca14 100755
--- a/code_samples/simple_language_plugin/gradlew
+++ b/code_samples/simple_language_plugin/gradlew
@@ -130,10 +130,13 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
diff --git a/code_samples/tool_window/gradle/wrapper/gradle-wrapper.jar b/code_samples/tool_window/gradle/wrapper/gradle-wrapper.jar
index c1962a79e..033e24c4c 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 37aef8d3f..9f4197d5f 100644
--- a/code_samples/tool_window/gradle/wrapper/gradle-wrapper.properties
+++ b/code_samples/tool_window/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/code_samples/tool_window/gradlew b/code_samples/tool_window/gradlew
index aeb74cbb4..fcb6fca14 100755
--- a/code_samples/tool_window/gradlew
+++ b/code_samples/tool_window/gradlew
@@ -130,10 +130,13 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
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 c1962a79e..033e24c4c 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 37aef8d3f..9f4197d5f 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,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/code_samples/tree_structure_provider/gradlew b/code_samples/tree_structure_provider/gradlew
index aeb74cbb4..fcb6fca14 100755
--- a/code_samples/tree_structure_provider/gradlew
+++ b/code_samples/tree_structure_provider/gradlew
@@ -130,10 +130,13 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.