commit c32b7f30ef934c853a8733d697f36a811134a5d5
author Morten Krogh-Jespersen <mkroghj@google.com> Mon Aug 29 11:04:03 2022 +0200
committer Morten Krogh-Jespersen <mkroghj@google.com> Mon Aug 29 11:04:03 2022 +0200
tree f98138029401702a6187dcf7d1306f16079ccb62
parent 5aa4a6878b51e0149c530713bda215c48406d60d

Update jdk and old expectations after kotlin dev update

Change-Id: Iac37e1471bdb27ec395dc9dbe6f7d307de674f35

src/test/java/com/android/tools/r8/debug/KotlinStdLibCompilationTest.java

diff --git a/src/test/java/com/android/tools/r8/debug/KotlinStdLibCompilationTest.java b/src/test/java/com/android/tools/r8/debug/KotlinStdLibCompilationTest.java
index 503dafc..7c3bb9d 100644
--- a/src/test/java/com/android/tools/r8/debug/KotlinStdLibCompilationTest.java
+++ b/src/test/java/com/android/tools/r8/debug/KotlinStdLibCompilationTest.java
@@ -66,7 +66,7 @@
             kotlinTestParameters.isKotlinDev(),
             TestShrinkerBuilder::addDontWarnJavaLangReflectAnnotatedType)
         .applyIf(
-            parameters.isCfRuntime(),
+            parameters.isCfRuntime() && kotlinTestParameters.isKotlinDev(),
             TestShrinkerBuilder::addDontWarnJavaLangInvokeLambdaMetadataFactory)
         .compile()
         .assertAllWarningMessagesMatch(equalTo("Resource 'META-INF/MANIFEST.MF' already exists."));

src/test/java/com/android/tools/r8/kotlin/reflection/KotlinReflectTest.java

diff --git a/src/test/java/com/android/tools/r8/kotlin/reflection/KotlinReflectTest.java b/src/test/java/com/android/tools/r8/kotlin/reflection/KotlinReflectTest.java
index dc701c9..a5400d6 100644
--- a/src/test/java/com/android/tools/r8/kotlin/reflection/KotlinReflectTest.java
+++ b/src/test/java/com/android/tools/r8/kotlin/reflection/KotlinReflectTest.java
@@ -102,7 +102,9 @@
         .applyIf(
             parameters.isCfRuntime() && kotlinParameters.isKotlinDev(),
             TestShrinkerBuilder::addDontWarnJavaLangInvokeLambdaMetadataFactory)
-        .addDontWarnJavaLangReflectAnnotatedType()
+        .applyIf(
+            kotlinParameters.isKotlinDev(),
+            TestShrinkerBuilder::addDontWarnJavaLangReflectAnnotatedType)
         .compile()
         .assertNoErrorMessages()
         // -keepattributes Signature is added in kotlin-reflect from version 1.4.20.