fix test

palantir · May 2, 2024 · 8807780 · 8807780
1 parent 0d939b7
commit 8807780
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/build.gradle b/build.gradle
@@ -2,7 +2,6 @@ buildscript {
     repositories {
         mavenCentral() { metadataSources { mavenPom(); ignoreGradleMetadataRedirection() } }
         gradlePluginPortal() { metadataSources { mavenPom(); ignoreGradleMetadataRedirection() } }
-        mavenLocal()
     }
 
     dependencies {
@@ -40,7 +39,6 @@ allprojects {
     repositories {
         mavenCentral() { metadataSources { mavenPom(); ignoreGradleMetadataRedirection() } }
         gradlePluginPortal() { metadataSources { mavenPom(); ignoreGradleMetadataRedirection() } }
-        mavenLocal()
     }
 
     group 'com.palantir.gradle.jdks'

diff --git a/gradle-jdks/src/test/groovy/com/palantir/gradle/jdks/GradleJdkPatcherIntegrationTest.groovy b/gradle-jdks/src/test/groovy/com/palantir/gradle/jdks/GradleJdkPatcherIntegrationTest.groovy
@@ -165,7 +165,7 @@ class GradleJdkPatcherIntegrationTest extends IntegrationSpec {
 
         when:
         runTasksSuccessfully('wrapper').standardOutput
-        String output = runGradlewCommand(List.of("./gradlew", "javaToolchains", "compileJava", "--info"))
+        String output = runGradlewCommand(List.of("./gradlew", "javaToolchains", "compileJava", "--debug"))
         File compiledClass = new File(projectDir, "build/classes/java/main/Main.class")
 
         then:
@@ -183,7 +183,7 @@ class GradleJdkPatcherIntegrationTest extends IntegrationSpec {
         output.contains(String.format("Compiling with toolchain '%s'", expectedJdk11.toFile().getCanonicalPath()))
         Path expectedJdk17 = gradleJdksPath.resolve(getLocalFilename(JDK_17_VERSION).trim())
         output.contains(String.format("Compiling with toolchain '%s'", expectedJdk17.toFile().getCanonicalPath()))
-        output.contains("--enable-preview")
+        Pattern.compile("Compiler arguments: -source 17 .* --enable-preview").matcher(output).find()
         assertBytecodeVersion(compiledClass, JAVA_17_BYTECODE, ENABLE_PREVIEW_BYTECODE)
 
         when: