Fix Kotlin test with reference to java.lang.ClassValue
Always use the Android U android.jar, which has java.lang.ClassValue
to avoid dealing with -dontwarn.
Change-Id: I4705761f1e768cee9458f04bfb576ac9ecc9fa50
diff --git a/src/test/java/com/android/tools/r8/kotlin/optimize/switches/KotlinEnumSwitchTest.java b/src/test/java/com/android/tools/r8/kotlin/optimize/switches/KotlinEnumSwitchTest.java
index 4292c7b..55dffb8 100644
--- a/src/test/java/com/android/tools/r8/kotlin/optimize/switches/KotlinEnumSwitchTest.java
+++ b/src/test/java/com/android/tools/r8/kotlin/optimize/switches/KotlinEnumSwitchTest.java
@@ -10,10 +10,11 @@
import static org.junit.Assert.assertNotEquals;
import com.android.tools.r8.KotlinCompilerTool;
-import com.android.tools.r8.KotlinCompilerTool.KotlinCompilerVersion;
import com.android.tools.r8.KotlinTestBase;
import com.android.tools.r8.KotlinTestParameters;
import com.android.tools.r8.TestParameters;
+import com.android.tools.r8.ToolHelper;
+import com.android.tools.r8.utils.AndroidApiLevel;
import com.android.tools.r8.utils.BooleanUtils;
import com.android.tools.r8.utils.codeinspector.ClassSubject;
import java.util.List;
@@ -52,6 +53,8 @@
@Test
public void test() throws Exception {
testForR8(parameters.getBackend())
+ // Use android.jar with java.lang.ClassValue.
+ .addLibraryFiles(ToolHelper.getAndroidJar(AndroidApiLevel.U))
.addProgramFiles(
kotlinJars.getForConfiguration(kotlinParameters), kotlinc.getKotlinAnnotationJar())
.addKeepMainRule("enumswitch.EnumSwitchKt")
@@ -62,13 +65,6 @@
})
.setMinApi(parameters)
.addDontObfuscate()
- // This will probably start failing when the CL
- // https://github.com/JetBrains/kotlin/commit/79f6d4b590573e6adccd7e8899d3b15ddb42d185
- // is propagated to the build for kotlin-reflect.
- .applyIf(
- parameters.isDexRuntime()
- && kotlinParameters.isNewerThan(KotlinCompilerVersion.KOTLINC_1_8_0),
- b -> b.addDontWarn("java.lang.ClassValue"))
.allowDiagnosticWarningMessages()
.compile()
.assertAllWarningMessagesMatch(equalTo("Resource 'META-INF/MANIFEST.MF' already exists."))
