Merge pull request #1106 from sigstore/loosebazooka-patch-2

Fixes after java 21 update

Author: loosebazooka

.github/workflows/examples.yaml

@@ -10,7 +10,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, macos-latest] # TODO: add back in windows-latest after new release (v1.3.0 broken on windows)
+        os: [ubuntu-latest, macos-latest, windows-latest]
     name: Build and run release examples on ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     concurrency:
@@ -79,8 +79,8 @@ jobs:
       uses: gradle/actions/setup-gradle@748248ddd2a24f49513d8f472f81c3a07d4d50e1 # v4.4.4
 
     - name: install sigstore java development jars into mavenLocal
-      run: ./gradlew publishToMavenLocal -Prelease -PskipSigning -Porg.gradle.java.installations.auto-download=false
-s
+      run: ./gradlew publishToMavenLocal -Prelease -PskipSigning "-Porg.gradle.java.installations.auto-download=false"
+
     - name: calculate development version
       id: dev_version
       shell: bash

build.gradle.kts

@@ -1,3 +1,6 @@
+// codeql java version hint: languageVersion = JavaLanguageVersion.of(21)
+// https://github.com/github/codeql-action/issues/1855
+
 plugins {
     id("build-logic.root-build")
     id("com.gradleup.nmcp.aggregation") version "1.0.2"

sigstore-gradle/sigstore-gradle-sign-base-plugin/src/test/kotlin/dev/sigstore/gradle/SigstoreSignTest.kt

@@ -22,6 +22,7 @@ import dev.sigstore.testkit.TestedGradleAndSigstoreJava
 import dev.sigstore.testkit.TestedSigstoreJava
 import dev.sigstore.testkit.annotations.EnabledIfOidcExists
 import org.assertj.core.api.Assertions.assertThat
+import org.gradle.util.GradleVersion
 import org.junit.jupiter.params.ParameterizedTest
 import org.junit.jupiter.params.provider.MethodSource
 
@@ -30,6 +31,11 @@ class SigstoreSignTest: BaseGradleTest() {
     @ParameterizedTest
     @MethodSource("gradleAndSigstoreJavaVersions")
     fun `sign file`(case: TestedGradleAndSigstoreJava) {
+        val destLine =
+            if (case.gradle.version < GradleVersion.version("8.0"))
+                """outputFile = file("helloProps.txt")"""
+            else
+                """destinationFile = layout.buildDirectory.file("helloProps.txt")"""
         writeBuildGradle(
             """
             import dev.sigstore.sign.tasks.SigstoreSignFilesTask
@@ -40,11 +46,11 @@ class SigstoreSignTest: BaseGradleTest() {
             ${declareRepositoryAndDependency(case.sigstoreJava)}
             group = "dev.sigstore.test"
             def helloProps = tasks.register("helloProps", WriteProperties) {
-                outputFile = file("build/helloProps.txt")
+                ${destLine}
                 property("helloProps", "world")
             }
             def signFile = tasks.register("signFile", SigstoreSignFilesTask) {
-                signFile(helloProps.map { it.outputFile })
+                signFile(helloProps.map { it.outputs.files.singleFile })
                     .outputSignature.set(file("build/helloProps.txt.sigstore.json"))
             }
             """.trimIndent()

sigstore-testkit/src/main/kotlin/dev/sigstore/testkit/BaseGradleTest.kt

@@ -23,11 +23,8 @@ import org.gradle.testkit.runner.GradleRunner
 import org.gradle.testkit.runner.internal.DefaultGradleRunner
 import org.gradle.util.GradleVersion
 import org.intellij.lang.annotations.Language
-import org.junit.jupiter.api.Assertions
 import org.junit.jupiter.api.io.CleanupMode
 import org.junit.jupiter.api.io.TempDir
-import org.junit.jupiter.params.provider.Arguments
-import org.junit.jupiter.params.provider.Arguments.arguments
 import java.io.File
 import java.nio.file.Path
 import kotlin.io.path.appendText
@@ -36,20 +33,23 @@ open class BaseGradleTest {
     enum class ConfigurationCache {
         ON, OFF
     }
+
     enum class ProjectIsolation {
         ON, OFF
     }
 
-    // to debug these tests, add .withDebug(true) before running a test in debug mode
+    // when using withEnvironment, the system environment needs to be passed in because
+    // the runner forks into a new process. You cannot debug these tests with ".withDebug" and
+    // will have to remove "withEnvironment" to debug it.
     protected val gradleRunner = GradleRunner
         .create()
         .withPluginClasspath()
-        .withEnvironment(mapOf("JAVA_HOME" to TEST_JAVA_HOME))
+        .withEnvironment(System.getenv() + mapOf("JAVA_HOME" to TEST_JAVA_HOME))
 
     companion object {
         val isCI = System.getenv().containsKey("CI") || System.getProperties().containsKey("CI")
 
-        val EXTRA_LOCAL_REPOS  = System.getProperty("sigstore.test.local.maven.repo").split(File.pathSeparatorChar)
+        val EXTRA_LOCAL_REPOS = System.getProperty("sigstore.test.local.maven.repo").split(File.pathSeparatorChar)
 
         val TEST_JAVA_HOME = System.getProperty("sigstore-java.test.JAVA_HOME")
 
@@ -74,8 +74,8 @@ open class BaseGradleTest {
         ).map { GradleVersion.version(it) }
             .filter {
                 // See https://docs.gradle.org/current/userguide/compatibility.html
-                JavaVersion.current() <= JavaVersion.VERSION_21 && it <= GradleVersion.version("8.4") ||
-                    JavaVersion.current() <= JavaVersion.VERSION_25 && it <= GradleVersion.version("9.1.0")
+                (it >= GradleVersion.version("8.5") || JavaVersion.current() < JavaVersion.VERSION_21)
+                        && (it >= GradleVersion.version("9.1.0") || JavaVersion.current() < JavaVersion.VERSION_25)
             }
 
         @JvmStatic