all: bump to Gradle 8.5

carl-mastrangelo · Dec 10, 2023 · 8987ca7 · 8987ca7
1 parent b0018a3
commit 8987ca7
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 8 deletions.
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -16,10 +16,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-    - name: Set up JDK 19
+    - name: Set up JDK 21
       uses: actions/setup-java@v3
       with:
-        java-version: '19'
+        java-version: '21'
         distribution: 'temurin'
     - name: Grant execute permission for gradlew
       run: chmod +x gradlew

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
@@ -83,10 +83,8 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-# 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"'
+# 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
@@ -133,10 +131,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.
@@ -197,6 +198,10 @@ if "$cygwin" || "$msys" ; then
     done
 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

diff --git a/java15/src/main/java/io/perfmark/java15/HiddenClassVarHandleMarkHolder.java b/java15/src/main/java/io/perfmark/java15/HiddenClassVarHandleMarkHolder.java
@@ -112,6 +112,7 @@ private static long maxEventsMask() {
     this.ref = Objects.requireNonNull(ref);
   }
 
+  @Override
   void startAt(long gen, String taskName, String tagName, long tagId, long nanoTime) {
     long localIdx = (long) IDX.get();
     int i = (int) (localIdx & MAX_EVENTS_MASK);
@@ -124,6 +125,7 @@ void startAt(long gen, String taskName, String tagName, long tagId, long nanoTim
     VarHandle.storeStoreFence();
   }
 
+  @Override
   void startAt(long gen, String taskName, long nanoTime) {
     long localIdx = (long) IDX.get();
     int i = (int) (localIdx & MAX_EVENTS_MASK);
@@ -134,6 +136,7 @@ void startAt(long gen, String taskName, long nanoTime) {
     VarHandle.storeStoreFence();
   }
 
+  @Override
   void startAt(long gen, String taskName, String subTaskName, long nanoTime) {
     long localIdx = (long) IDX.get();
     int i = (int) (localIdx & MAX_EVENTS_MASK);
@@ -145,6 +148,7 @@ void startAt(long gen, String taskName, String subTaskName, long nanoTime) {
     VarHandle.storeStoreFence();
   }
 
+  @Override
   void link(long gen, long linkId) {
     long localIdx = (long) IDX.get();
     int i = (int) (localIdx & MAX_EVENTS_MASK);
@@ -154,6 +158,7 @@ void link(long gen, long linkId) {
     VarHandle.storeStoreFence();
   }
 
+  @Override
   void stopAt(long gen, long nanoTime) {
     long localIdx = (long) IDX.get();
     int i = (int) (localIdx & MAX_EVENTS_MASK);
@@ -163,6 +168,7 @@ void stopAt(long gen, long nanoTime) {
     VarHandle.storeStoreFence();
   }
 
+  @Override
   void stopAt(long gen, String taskName, String tagName, long tagId, long nanoTime) {
     long localIdx = (long) IDX.get();
     int i = (int) (localIdx & MAX_EVENTS_MASK);
@@ -175,6 +181,7 @@ void stopAt(long gen, String taskName, String tagName, long tagId, long nanoTime
     VarHandle.storeStoreFence();
   }
 
+  @Override
   void stopAt(long gen, String taskName, long nanoTime) {
     long localIdx = (long) IDX.get();
     int i = (int) (localIdx & MAX_EVENTS_MASK);
@@ -185,6 +192,7 @@ void stopAt(long gen, String taskName, long nanoTime) {
     VarHandle.storeStoreFence();
   }
 
+  @Override
   void stopAt(long gen, String taskName, String subTaskName, long nanoTime) {
     long localIdx = (long) IDX.get();
     int i = (int) (localIdx & MAX_EVENTS_MASK);
@@ -196,6 +204,7 @@ void stopAt(long gen, String taskName, String subTaskName, long nanoTime) {
     VarHandle.storeStoreFence();
   }
 
+  @Override
   void eventAt(long gen, String eventName, String tagName, long tagId, long nanoTime) {
     long localIdx = (long) IDX.get();
     int i = (int) (localIdx & MAX_EVENTS_MASK);
@@ -208,6 +217,7 @@ void eventAt(long gen, String eventName, String tagName, long tagId, long nanoTi
     VarHandle.storeStoreFence();
   }
 
+  @Override
   void eventAt(long gen, String eventName, long nanoTime) {
     long localIdx = (long) IDX.get();
     int i = (int) (localIdx & MAX_EVENTS_MASK);
@@ -218,6 +228,7 @@ void eventAt(long gen, String eventName, long nanoTime) {
     VarHandle.storeStoreFence();
   }
 
+  @Override
   void eventAt(long gen, String eventName, String subEventName, long nanoTime) {
     long localIdx = (long) IDX.get();
     int i = (int) (localIdx & MAX_EVENTS_MASK);
@@ -229,6 +240,7 @@ void eventAt(long gen, String eventName, String subEventName, long nanoTime) {
     VarHandle.storeStoreFence();
   }
 
+  @Override
   void attachTag(long gen, String tagName, long tagId) {
     long localIdx = (long) IDX.get();
     int i = (int) (localIdx & MAX_EVENTS_MASK);
@@ -239,6 +251,7 @@ void attachTag(long gen, String tagName, long tagId) {
     VarHandle.storeStoreFence();
   }
 
+  @Override
   void attachKeyedTag(long gen, String name, long value) {
     long localIdx = (long) IDX.get();
     int i = (int) (localIdx & MAX_EVENTS_MASK);
@@ -249,6 +262,7 @@ void attachKeyedTag(long gen, String name, long value) {
     VarHandle.storeStoreFence();
   }
 
+  @Override
   void attachKeyedTag(long gen, String name, long value0, long value1) {
     long localIdx = (long) IDX.get();
     int i = (int) (localIdx & MAX_EVENTS_MASK);
@@ -260,6 +274,7 @@ void attachKeyedTag(long gen, String name, long value0, long value1) {
     VarHandle.storeStoreFence();
   }
 
+  @Override
   void attachKeyedTag(long gen, String name, String value) {
     long localIdx = (long) IDX.get();
     int i = (int) (localIdx & MAX_EVENTS_MASK);