Merge pull request #23942 Relax presence of Scala compiler warnings

This is needed following the changes around handling implicit toolchains. Issue #23905 Co-authored-by: Louis Jacomet <louis@gradle.com>
gradle · Feb 17, 2023 · 68959bf · 68959bf
2 parents 798eb1a + 9828b48
commit 68959bf
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 7 deletions.
diff --git a/...ts/scala/src/integTest/groovy/org/gradle/scala/compile/ScalaCompileIntegrationTest.groovy b/...ts/scala/src/integTest/groovy/org/gradle/scala/compile/ScalaCompileIntegrationTest.groovy
@@ -52,7 +52,6 @@ class ScalaCompileIntegrationTest extends MultiVersionIntegrationSpec implements
 
         then:
         executedAndNotSkipped(":compileScala")
-        outputDoesNotContain("[Warn]")
 
         JavaVersion.forClass(scalaClassFile("JavaThing.class").bytes) == currentJdk.javaVersion
         JavaVersion.forClass(scalaClassFile("ScalaHall.class").bytes) == JavaVersion.VERSION_1_8
@@ -88,7 +87,6 @@ class Person {
 
         then:
         executedAndNotSkipped(":compileScala")
-        outputDoesNotContain("[Warn]")
         JavaVersion.forClass(scalaClassFile("ScalaHall.class").bytes) == JavaVersion.VERSION_1_8
 
         where:

diff --git a/...integTest/groovy/org/gradle/scala/compile/ScalaCompileJavaToolchainIntegrationTest.groovy b/...integTest/groovy/org/gradle/scala/compile/ScalaCompileJavaToolchainIntegrationTest.groovy
@@ -78,7 +78,6 @@ class ScalaCompileJavaToolchainIntegrationTest extends MultiVersionIntegrationSp
 
         then:
         executedAndNotSkipped(":compileScala")
-        outputDoesNotContain("[Warn]")
 
         JavaVersion.forClass(scalaClassFile("JavaThing.class").bytes) == currentJdk.javaVersion
         JavaVersion.forClass(scalaClassFile("ScalaHall.class").bytes) == JavaVersion.VERSION_1_8
@@ -112,7 +111,6 @@ class ScalaCompileJavaToolchainIntegrationTest extends MultiVersionIntegrationSp
 
         then:
         executedAndNotSkipped(":compileScala")
-        outputDoesNotContain("[Warn]")
         outputContains("Compiling with Zinc Scala compiler")
 
         JavaVersion.forClass(scalaClassFile("JavaThing.class").bytes) == targetJdk.javaVersion
@@ -148,7 +146,6 @@ class ScalaCompileJavaToolchainIntegrationTest extends MultiVersionIntegrationSp
         withInstallations(currentJdk, otherJdk).run(":compileScala")
         then:
         executedAndNotSkipped(":compileScala")
-        outputDoesNotContain("[Warn]")
 
         when:
         withInstallations(currentJdk, otherJdk).run(":compileScala")
@@ -198,7 +195,6 @@ class ScalaCompileJavaToolchainIntegrationTest extends MultiVersionIntegrationSp
 
         then:
         executedAndNotSkipped(":compileScala")
-        outputDoesNotContain("[Warn]")
 
         outputContains("project.sourceCompatibility = 11")
         outputContains("project.targetCompatibility = 11")
@@ -248,7 +244,6 @@ class ScalaCompileJavaToolchainIntegrationTest extends MultiVersionIntegrationSp
 
         then:
         executedAndNotSkipped(":test")
-        outputDoesNotContain("[Warn]")
         outputContains("Running Scala test with Java version ${jdk.javaVersion}")
 
         JavaVersion.forClass(scalaClassFile("JavaThing.class").bytes) == javaVersion