all: bump to Gradle 8.5 (#239)

10 files changed, 35 insertions, 20 deletions

diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index 1fac01b..a937a01 100644
--- 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/api/src/main/java/io/perfmark/Impl.java b/api/src/main/java/io/perfmark/Impl.java
index 146fefa..7e33b6f 100644
--- a/api/src/main/java/io/perfmark/Impl.java
+++ b/api/src/main/java/io/perfmark/Impl.java
@@ -19,6 +19,7 @@ package io.perfmark;
 public class Impl {
   static final String NO_TAG_NAME = "";
   static final long NO_TAG_ID = Long.MIN_VALUE;
+
   /**
    * This value is current {@link Long#MIN_VALUE}, but it could also be {@code 0}. The invariant
    * {@code NO_LINK_ID == -NO_LINK_ID} must be maintained to work when PerfMark is disabled.
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index ccebba7..7f93135 100644
--- 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
index c30b486..1af9e09 100644
--- 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
index 79a61d4..0adc8e1 100755
--- 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
index 9601eea..96bd536 100644
--- a/java15/src/main/java/io/perfmark/java15/HiddenClassVarHandleMarkHolder.java
+++ b/java15/src/main/java/io/perfmark/java15/HiddenClassVarHandleMarkHolder.java
@@ -112,6 +112,7 @@ final class HiddenClassVarHandleMarkHolder extends MarkHolderRecorder {
     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 @@ final class HiddenClassVarHandleMarkHolder extends MarkHolderRecorder {
     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 @@ final class HiddenClassVarHandleMarkHolder extends MarkHolderRecorder {
     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 @@ final class HiddenClassVarHandleMarkHolder extends MarkHolderRecorder {
     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 @@ final class HiddenClassVarHandleMarkHolder extends MarkHolderRecorder {
     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 @@ final class HiddenClassVarHandleMarkHolder extends MarkHolderRecorder {
     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 @@ final class HiddenClassVarHandleMarkHolder extends MarkHolderRecorder {
     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 @@ final class HiddenClassVarHandleMarkHolder extends MarkHolderRecorder {
     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 @@ final class HiddenClassVarHandleMarkHolder extends MarkHolderRecorder {
     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 @@ final class HiddenClassVarHandleMarkHolder extends MarkHolderRecorder {
     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 @@ final class HiddenClassVarHandleMarkHolder extends MarkHolderRecorder {
     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 @@ final class HiddenClassVarHandleMarkHolder extends MarkHolderRecorder {
     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 @@ final class HiddenClassVarHandleMarkHolder extends MarkHolderRecorder {
     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 @@ final class HiddenClassVarHandleMarkHolder extends MarkHolderRecorder {
     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 @@ final class HiddenClassVarHandleMarkHolder extends MarkHolderRecorder {
     VarHandle.storeStoreFence();
   }
 
+  @Override
   void attachKeyedTag(long gen, String name, String value) {
     long localIdx = (long) IDX.get();
     int i = (int) (localIdx & MAX_EVENTS_MASK);
diff --git a/java19/build.gradle.kts b/java19/build.gradle.kts
index c23cb47..54d1db5 100644
--- a/java19/build.gradle.kts
+++ b/java19/build.gradle.kts
@@ -13,11 +13,11 @@ buildscript {
 }
 java {
     toolchain {
-        languageVersion.set(JavaLanguageVersion.of(19))
+        languageVersion.set(JavaLanguageVersion.of(21))
     }
 }
 
-val jdkVersion = JavaVersion.VERSION_19
+val jdkVersion = JavaVersion.VERSION_21
 
 description = "PerfMark Java19 API"
 
diff --git a/java19/src/jmh/java/io/perfmark/java19/VirtualExecutor.java b/java19/src/jmh/java/io/perfmark/java19/VirtualExecutor.java
index e70073a..4765a50 100644
--- a/java19/src/jmh/java/io/perfmark/java19/VirtualExecutor.java
+++ b/java19/src/jmh/java/io/perfmark/java19/VirtualExecutor.java
@@ -35,11 +35,9 @@ public final class VirtualExecutor implements ExecutorService {
   private final ExecutorService delegate;
 
   public VirtualExecutor(int maxThread, String prefix) {
-    boolean threadLocalsAllowed = !Boolean.getBoolean(THREAD_LOCALS_DISABLED_PROP);
     this.runnables = new LinkedBlockingQueue<>();
     this.delegate =
-        Executors.newThreadPerTaskExecutor(
-            Thread.ofVirtual().name(prefix, 1).allowSetThreadLocals(threadLocalsAllowed).factory());
+        Executors.newThreadPerTaskExecutor(Thread.ofVirtual().name(prefix, 1).factory());
     for (int i = 0; i < maxThread; i++) {
       delegate.execute(new Worker());
     }
diff --git a/java19/src/test/java/io/perfmark/java19/VirtualThreadTest.java b/java19/src/test/java/io/perfmark/java19/VirtualThreadTest.java
index b514a91..7dd75fc 100644
--- a/java19/src/test/java/io/perfmark/java19/VirtualThreadTest.java
+++ b/java19/src/test/java/io/perfmark/java19/VirtualThreadTest.java
@@ -36,12 +36,7 @@ public class VirtualThreadTest {
   public void run() throws Exception {
     Thread.currentThread().isVirtual();
 
-    var tf =
-        Thread.ofVirtual()
-            .allowSetThreadLocals(false)
-            .name("bla")
-            .inheritInheritableThreadLocals(false)
-            .factory();
+    var tf = Thread.ofVirtual().name("bla").factory();
     var exec = Executors.newThreadPerTaskExecutor(tf);
     PerfMark.setEnabled(true);
 
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 11f8ad4..682b090 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -39,7 +39,7 @@ dependencyResolutionManagement {
             library("jmhcore", "org.openjdk.jmh", "jmh-core").versionRef("jmh")
             library("jmhanno", "org.openjdk.jmh", "jmh-generator-annprocess").versionRef("jmh")
 
-            version("gjf", "1.15.0")
+            version("gjf", "1.18.1")
 
             plugin("spotless", "com.diffplug.spotless").version("6.15.0")
             plugin("errorprone", "net.ltgt.errorprone").version("3.0.1")