Update project gradle to 8.4 and projectyear to 2024beta (#623)

sciencewhiz · web-flow · commit d564904be3b8 · 2023-10-08T20:03:46.000-07:00
diff --git a/vscode-wpilib/resources/gradle/c/.wpilib/wpilib_preferences.json b/vscode-wpilib/resources/gradle/c/.wpilib/wpilib_preferences.json
@@ -1,6 +1,6 @@
 {
     "enableCppIntellisense": true,
     "currentLanguage": "cpp",
-    "projectYear": "2024alpha",
+    "projectYear": "2024beta",
     "teamNumber": -1
 }
diff --git a/vscode-wpilib/resources/gradle/cpp/.wpilib/wpilib_preferences.json b/vscode-wpilib/resources/gradle/cpp/.wpilib/wpilib_preferences.json
@@ -1,6 +1,6 @@
 {
     "enableCppIntellisense": true,
     "currentLanguage": "cpp",
-    "projectYear": "2024alpha",
+    "projectYear": "2024beta",
     "teamNumber": -1
 }
diff --git a/vscode-wpilib/resources/gradle/cppdt/.wpilib/wpilib_preferences.json b/vscode-wpilib/resources/gradle/cppdt/.wpilib/wpilib_preferences.json
@@ -1,6 +1,6 @@
 {
     "enableCppIntellisense": true,
     "currentLanguage": "cpp",
-    "projectYear": "2024alpha",
+    "projectYear": "2024beta",
     "teamNumber": -1
 }
diff --git a/vscode-wpilib/resources/gradle/cppromi/.wpilib/wpilib_preferences.json b/vscode-wpilib/resources/gradle/cppromi/.wpilib/wpilib_preferences.json
@@ -1,6 +1,6 @@
 {
     "enableCppIntellisense": true,
     "currentLanguage": "cpp",
-    "projectYear": "2024alpha",
+    "projectYear": "2024beta",
     "teamNumber": -1
 }
diff --git a/vscode-wpilib/resources/gradle/cppxrp/.wpilib/wpilib_preferences.json b/vscode-wpilib/resources/gradle/cppxrp/.wpilib/wpilib_preferences.json
@@ -1,6 +1,6 @@
 {
     "enableCppIntellisense": true,
     "currentLanguage": "cpp",
-    "projectYear": "2024alpha",
+    "projectYear": "2024beta",
     "teamNumber": -1
 }
diff --git a/vscode-wpilib/resources/gradle/java/.wpilib/wpilib_preferences.json b/vscode-wpilib/resources/gradle/java/.wpilib/wpilib_preferences.json
@@ -1,6 +1,6 @@
 {
     "enableCppIntellisense": false,
     "currentLanguage": "java",
-    "projectYear": "2024alpha",
+    "projectYear": "2024beta",
     "teamNumber": -1
 }
diff --git a/vscode-wpilib/resources/gradle/javadt/.wpilib/wpilib_preferences.json b/vscode-wpilib/resources/gradle/javadt/.wpilib/wpilib_preferences.json
@@ -1,6 +1,6 @@
 {
     "enableCppIntellisense": false,
     "currentLanguage": "java",
-    "projectYear": "2024alpha",
+    "projectYear": "2024beta",
     "teamNumber": -1
 }
diff --git a/vscode-wpilib/resources/gradle/javaromi/.wpilib/wpilib_preferences.json b/vscode-wpilib/resources/gradle/javaromi/.wpilib/wpilib_preferences.json
@@ -1,6 +1,6 @@
 {
     "enableCppIntellisense": false,
     "currentLanguage": "java",
-    "projectYear": "2024alpha",
+    "projectYear": "2024beta",
     "teamNumber": -1
 }
diff --git a/vscode-wpilib/resources/gradle/javaxrp/.wpilib/wpilib_preferences.json b/vscode-wpilib/resources/gradle/javaxrp/.wpilib/wpilib_preferences.json
@@ -1,6 +1,6 @@
 {
     "enableCppIntellisense": false,
     "currentLanguage": "java",
-    "projectYear": "2024alpha",
+    "projectYear": "2024beta",
     "teamNumber": -1
 }
diff --git a/vscode-wpilib/resources/gradle/shared/gradle/wrapper/gradle-wrapper.jar b/vscode-wpilib/resources/gradle/shared/gradle/wrapper/gradle-wrapper.jar
diff --git a/vscode-wpilib/resources/gradle/shared/gradle/wrapper/gradle-wrapper.properties b/vscode-wpilib/resources/gradle/shared/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=permwrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=permwrapper/dists
diff --git a/vscode-wpilib/resources/gradle/shared/gradlew b/vscode-wpilib/resources/gradle/shared/gradlew
@@ -83,7 +83,8 @@ 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 "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -130,26 +131,29 @@ 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.
 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
@@ -198,11 +202,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" \
diff --git a/vscode-wpilib/src/extension.ts b/vscode-wpilib/src/extension.ts
@@ -189,7 +189,7 @@ async function handleAfterTrusted(externalApi: ExternalAPI, context: vscode.Exte
           continue;
         }
 
-        if (prefs.getProjectYear() !== '2024alpha') {
+        if (prefs.getProjectYear() !== '2024beta') {
           const importPersistantState = new PersistentFolderState('wpilib.2024Alphapersist', false, w.uri.fsPath);
           if (importPersistantState.Value === false) {
             const upgradeResult = await vscode.window.showInformationMessage(i18n('message',

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"enableCppIntellisense": true,`
`3`	`3`	`"currentLanguage": "cpp",`
`4`		`- "projectYear": "2024alpha",`
	`4`	`+ "projectYear": "2024beta",`
`5`	`5`	`"teamNumber": -1`
`6`	`6`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"enableCppIntellisense": false,`
`3`	`3`	`"currentLanguage": "java",`
`4`		`- "projectYear": "2024alpha",`
	`4`	`+ "projectYear": "2024beta",`
`5`	`5`	`"teamNumber": -1`
`6`	`6`	`}`