Merge branch 'bobbylight:master' into ToggleCommentAction-whitespace-fix

.github/workflows/gradle.yml

@@ -21,6 +21,10 @@ jobs:
     steps:
     - uses: actions/checkout@v4
 
+    - name: Verify gradle wrapper
+      uses: gradle/actions/wrapper-validation@v3
+      if: matrix.java == '8'
+
     - name: Set up JDK ${{ matrix.java }}
       uses: actions/setup-java@v4
       with:
@@ -30,12 +34,10 @@ jobs:
     - name: Grant execute permission for gradlew
       run: chmod +x gradlew
 
+    # Note: Assumes we're running on Ubuntu
+    # https://github.com/actions/runner-images/blob/main/images/ubuntu/Ubuntu2404-Readme.md
     - name: Build with Gradle
-      #run: ./gradlew build --warning-mode all
-      uses: hankolsen/xvfb-action@master
-      with:
-        run: ./gradlew build jacocoTestReport -xsign -xpublish --warning-mode all
-        working-directory: ./ #optional
+      run: xvfb-run ./gradlew build jacocoTestReport -xsign -xpublish --warning-mode all
 
     - name: Submit coverage data to codecov
       uses: codecov/codecov-action@v4

build.gradle

@@ -24,7 +24,7 @@ allprojects {
     }
 
     wrapper {
-        gradleVersion = '8.10'
+        gradleVersion = '8.10.2'
     }
 }
 
@@ -74,10 +74,10 @@ subprojects {
     }
 
     dependencies {
-        testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.2'
-        testImplementation 'org.junit.jupiter:junit-jupiter-params:5.10.2'
+        testImplementation 'org.junit.jupiter:junit-jupiter-api:5.11.3'
+        testImplementation 'org.junit.jupiter:junit-jupiter-params:5.11.3'
         testImplementation 'org.mockito:mockito-inline:4.11.0'
-        testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.10.2'
+        testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.11.3'
     }
 
     compileJava {

gradle.properties

@@ -1,6 +1,6 @@
 # Note that Maven- and signing-related properties are in <maven-home>/gradle.properties
 javaVersion=1.8
-version=3.5.2-SNAPSHOT
+version=3.5.3-SNAPSHOT
 
 # Ugh, see https://github.com/gradle/gradle/issues/11308
 systemProp.org.gradle.internal.publish.checksums.insecure=true

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME