Rewrite tests to use setMinApi(TestParameters)
Bug: b/270021825
Change-Id: I5a919859eab7829faab3c8d2a49de0f0ca308926
diff --git a/src/test/java/com/android/tools/r8/FailCompilationOnFutureVersionsTest.java b/src/test/java/com/android/tools/r8/FailCompilationOnFutureVersionsTest.java
index b6f5848..ba323ee 100644
--- a/src/test/java/com/android/tools/r8/FailCompilationOnFutureVersionsTest.java
+++ b/src/test/java/com/android/tools/r8/FailCompilationOnFutureVersionsTest.java
@@ -42,7 +42,7 @@
Path out =
testForD8()
.addProgramClasses(TestClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addOptionsModification(
options ->
options.testing.forceDexVersionBytes =
@@ -52,7 +52,7 @@
try {
testForD8()
.addProgramFiles(out)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compileWithExpectedDiagnostics(
diagnotics -> {
diagnotics.assertOnlyErrors();
@@ -73,7 +73,7 @@
Path out =
testForD8()
.addProgramClasses(TestClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addOptionsModification(
options ->
options.testing.forceDexVersionBytes =
@@ -83,7 +83,7 @@
try {
testForD8()
.addProgramFiles(out)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compileWithExpectedDiagnostics(
diagnotics -> {
diagnotics.assertOnlyErrors();
@@ -106,7 +106,7 @@
try {
testForD8()
.addProgramClassFileData(CfDump.dump())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compileWithExpectedDiagnostics(
diagnotics -> {
diagnotics.assertOnlyErrors();
diff --git a/src/test/java/com/android/tools/r8/R8ModeMarkerTest.java b/src/test/java/com/android/tools/r8/R8ModeMarkerTest.java
index c830c8a..32f0871 100644
--- a/src/test/java/com/android/tools/r8/R8ModeMarkerTest.java
+++ b/src/test/java/com/android/tools/r8/R8ModeMarkerTest.java
@@ -93,7 +93,7 @@
testForR8(parameters.getBackend())
.addProgramClasses(TestClass.class)
.addKeepMainRule(TestClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.setProgramConsumer(consumer)
.compile()
.run(parameters.getRuntime(), TestClass.class)
@@ -110,7 +110,7 @@
testForR8Compat(parameters.getBackend())
.addProgramClasses(TestClass.class)
.addKeepMainRule(TestClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.setProgramConsumer(consumer)
.compile()
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/R8RunSmaliTestsTest.java b/src/test/java/com/android/tools/r8/R8RunSmaliTestsTest.java
index e1064b0..a5d61e9 100644
--- a/src/test/java/com/android/tools/r8/R8RunSmaliTestsTest.java
+++ b/src/test/java/com/android/tools/r8/R8RunSmaliTestsTest.java
@@ -225,7 +225,7 @@
.addKeepAllClassesRule()
.addProgramDexFileData(Files.readAllBytes(originalDexFile))
.addDontWarn(missingClasses.getOrDefault(directoryName, Collections.emptySet()))
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), "Test")
.applyIf(
diff --git a/src/test/java/com/android/tools/r8/TestAppViewBuilder.java b/src/test/java/com/android/tools/r8/TestAppViewBuilder.java
index e8e75f5..b32344f 100644
--- a/src/test/java/com/android/tools/r8/TestAppViewBuilder.java
+++ b/src/test/java/com/android/tools/r8/TestAppViewBuilder.java
@@ -96,6 +96,11 @@
return this;
}
+ public TestAppViewBuilder setMinApi(TestParameters parameters) {
+ parameters.configureApiLevel(this);
+ return this;
+ }
+
public TestAppViewBuilder addClasspathClasses(Class<?>... classes) {
return addClasspathClasses(Arrays.asList(classes));
}
diff --git a/src/test/java/com/android/tools/r8/TestBase.java b/src/test/java/com/android/tools/r8/TestBase.java
index a29ae34..e3e84a0 100644
--- a/src/test/java/com/android/tools/r8/TestBase.java
+++ b/src/test/java/com/android/tools/r8/TestBase.java
@@ -1710,11 +1710,7 @@
return paths;
}
return Collections.singletonList(
- testForD8()
- .addProgramFiles(paths)
- .setMinApi(parameters.getApiLevel())
- .compile()
- .writeToZip());
+ testForD8().addProgramFiles(paths).setMinApi(parameters).compile().writeToZip());
}
public List<Path> buildOnDexRuntime(TestParameters parameters, Path... paths)
@@ -1725,11 +1721,7 @@
public Path buildOnDexRuntime(TestParameters parameters, Class<?>... classes)
throws IOException, CompilationFailedException {
if (parameters.isDexRuntime()) {
- return testForD8()
- .addProgramClasses(classes)
- .setMinApi(parameters.getApiLevel())
- .compile()
- .writeToZip();
+ return testForD8().addProgramClasses(classes).setMinApi(parameters).compile().writeToZip();
}
Path path = temp.newFolder().toPath().resolve("classes.jar");
ArchiveConsumer consumer = new ArchiveConsumer(path);
@@ -1748,7 +1740,7 @@
if (parameters.isDexRuntime()) {
return testForD8()
.addProgramClassFileData(classes)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.writeToZip();
}
@@ -1886,7 +1878,7 @@
return out;
}
return testForD8()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addProgramClasses(compilationUnit)
.addClasspathClasses(classpath)
.compile()
diff --git a/src/test/java/com/android/tools/r8/TestBuilderMinAndroidJarTest.java b/src/test/java/com/android/tools/r8/TestBuilderMinAndroidJarTest.java
index d917ab6..a2c5897 100644
--- a/src/test/java/com/android/tools/r8/TestBuilderMinAndroidJarTest.java
+++ b/src/test/java/com/android/tools/r8/TestBuilderMinAndroidJarTest.java
@@ -45,7 +45,7 @@
assumeTrue(parameters.getRuntime().asDex().getVm().isOlderThanOrEqual(DexVm.ART_6_0_1_HOST));
testForD8()
.addProgramClasses(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertFailureWithErrorThatMatches(containsString("NoClassDefFoundError"));
}
@@ -64,7 +64,7 @@
.addProgramClasses(Main.class)
.allowDiagnosticWarningMessages(
parameters.isDexRuntime() && parameters.getApiLevel().isLessThan(AndroidApiLevel.O))
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(Main.class)
.compile()
.assertAllWarningMessagesMatch(
@@ -83,7 +83,7 @@
assumeTrue(parameters.getRuntime().asDex().getVm().isNewerThan(DexVm.ART_6_0_1_HOST));
testForD8()
.addProgramClasses(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("Hello World!");
}
@@ -96,7 +96,7 @@
|| parameters.getApiLevel().getLevel() >= AndroidApiLevel.N.getLevel());
testForR8(parameters.getBackend())
.addProgramClasses(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(Main.class)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("Hello World!");
diff --git a/src/test/java/com/android/tools/r8/TestParameters.java b/src/test/java/com/android/tools/r8/TestParameters.java
index b1c88fd..5149f5e 100644
--- a/src/test/java/com/android/tools/r8/TestParameters.java
+++ b/src/test/java/com/android/tools/r8/TestParameters.java
@@ -134,6 +134,10 @@
return runtime == NoneRuntime.getInstance();
}
+ public void configureApiLevel(TestAppViewBuilder testAppViewBuilder) {
+ testAppViewBuilder.setMinApi(apiLevel);
+ }
+
public void configureApiLevel(TestCompilerBuilder<?, ?, ?, ?, ?> testCompilerBuilder) {
testCompilerBuilder.setMinApi(apiLevel);
}
@@ -222,6 +226,14 @@
return this;
}
+ public TestParameters assumeRuntimeTestParameters() {
+ assertFalse(
+ "No need to use assumeRuntimeTestParameters() when not using api levels for CF",
+ apiLevel == null);
+ assumeTrue(isDexRuntime() || representativeApiLevelForRuntime);
+ return this;
+ }
+
public DexVm.Version getDexRuntimeVersion() {
assertTrue(isDexRuntime());
return getRuntime().asDex().getVm().getVersion();
diff --git a/src/test/java/com/android/tools/r8/accessrelaxation/EffectiveFinalFieldMarkedFinalTest.java b/src/test/java/com/android/tools/r8/accessrelaxation/EffectiveFinalFieldMarkedFinalTest.java
index ce4dc72..83d80c8 100644
--- a/src/test/java/com/android/tools/r8/accessrelaxation/EffectiveFinalFieldMarkedFinalTest.java
+++ b/src/test/java/com/android/tools/r8/accessrelaxation/EffectiveFinalFieldMarkedFinalTest.java
@@ -42,7 +42,7 @@
.addInnerClasses(getClass())
.addKeepMainRule(Main.class)
.allowAccessModification(allowAccessModification)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector -> {
diff --git a/src/test/java/com/android/tools/r8/accessrelaxation/InnerClassAttributePublicizerTest.java b/src/test/java/com/android/tools/r8/accessrelaxation/InnerClassAttributePublicizerTest.java
index 9b24e0a..41c73cf 100644
--- a/src/test/java/com/android/tools/r8/accessrelaxation/InnerClassAttributePublicizerTest.java
+++ b/src/test/java/com/android/tools/r8/accessrelaxation/InnerClassAttributePublicizerTest.java
@@ -42,7 +42,7 @@
.addKeepMainRule(TestClass.class)
.addKeepAttributeInnerClassesAndEnclosingMethod()
.allowAccessModification()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/accessrelaxation/InvokeTypeConversionTest.java b/src/test/java/com/android/tools/r8/accessrelaxation/InvokeTypeConversionTest.java
index c80de82..f29440c 100644
--- a/src/test/java/com/android/tools/r8/accessrelaxation/InvokeTypeConversionTest.java
+++ b/src/test/java/com/android/tools/r8/accessrelaxation/InvokeTypeConversionTest.java
@@ -80,7 +80,7 @@
// We're testing lens-based invocation type conversions.
"-dontoptimize", "-dontobfuscate", "-allowaccessmodification")
.addOptionsModification(o -> o.inlinerOptions().enableInlining = false)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), CLASS_NAME);
if (expectedException == null) {
result.assertSuccessWithOutput("0");
diff --git a/src/test/java/com/android/tools/r8/accessrelaxation/NoRelaxationForSerializableTest.java b/src/test/java/com/android/tools/r8/accessrelaxation/NoRelaxationForSerializableTest.java
index 339361b..8fcc3f7 100644
--- a/src/test/java/com/android/tools/r8/accessrelaxation/NoRelaxationForSerializableTest.java
+++ b/src/test/java/com/android/tools/r8/accessrelaxation/NoRelaxationForSerializableTest.java
@@ -151,7 +151,7 @@
.enableInliningAnnotations()
.addKeepRuleFiles(configuration)
.addKeepRules(KEEPMEMBER_RULES)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect);
// TODO(b/117302947): Need to update ART binary.
@@ -185,7 +185,7 @@
.enableInliningAnnotations()
.enableMemberValuePropagationAnnotations()
.addKeepRuleFiles(configuration)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile();
// TODO(b/117302947): Need to update ART binary.
if (parameters.isCfRuntime()) {
diff --git a/src/test/java/com/android/tools/r8/accessrelaxation/NonConstructorRelaxationTest.java b/src/test/java/com/android/tools/r8/accessrelaxation/NonConstructorRelaxationTest.java
index aff91c6..07fa59b 100644
--- a/src/test/java/com/android/tools/r8/accessrelaxation/NonConstructorRelaxationTest.java
+++ b/src/test/java/com/android/tools/r8/accessrelaxation/NonConstructorRelaxationTest.java
@@ -104,7 +104,7 @@
" *** pBlah1();",
"}")
.allowAccessModification()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), mainClass);
assertEquals(expectedOutput, result.getStdOut());
@@ -184,7 +184,7 @@
" *** p*();",
"}")
.allowAccessModification()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), mainClass);
assertEquals(
diff --git a/src/test/java/com/android/tools/r8/accessrelaxation/NonPublicKeptClassPublicizerTest.java b/src/test/java/com/android/tools/r8/accessrelaxation/NonPublicKeptClassPublicizerTest.java
index bd4bf25..02d137a 100644
--- a/src/test/java/com/android/tools/r8/accessrelaxation/NonPublicKeptClassPublicizerTest.java
+++ b/src/test/java/com/android/tools/r8/accessrelaxation/NonPublicKeptClassPublicizerTest.java
@@ -37,7 +37,7 @@
.addInnerClasses(getClass())
.addKeepMainRule(Main.class)
.allowAccessModification()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector -> {
diff --git a/src/test/java/com/android/tools/r8/accessrelaxation/PackagePrivateNonOverridePublicizerTest.java b/src/test/java/com/android/tools/r8/accessrelaxation/PackagePrivateNonOverridePublicizerTest.java
index fa7e479..f253c40 100644
--- a/src/test/java/com/android/tools/r8/accessrelaxation/PackagePrivateNonOverridePublicizerTest.java
+++ b/src/test/java/com/android/tools/r8/accessrelaxation/PackagePrivateNonOverridePublicizerTest.java
@@ -56,7 +56,7 @@
testForR8(parameters.getBackend())
.addProgramClasses(ViewModel.class, SubViewModel.class, Main.class)
.addKeepMainRule(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
.enableNoVerticalClassMergingAnnotations()
diff --git a/src/test/java/com/android/tools/r8/accessrelaxation/PackagePrivateOverridePublicizerBottomTest.java b/src/test/java/com/android/tools/r8/accessrelaxation/PackagePrivateOverridePublicizerBottomTest.java
index 3358771..8ba0042 100644
--- a/src/test/java/com/android/tools/r8/accessrelaxation/PackagePrivateOverridePublicizerBottomTest.java
+++ b/src/test/java/com/android/tools/r8/accessrelaxation/PackagePrivateOverridePublicizerBottomTest.java
@@ -58,7 +58,7 @@
.addProgramClassFileData(
getSubViewModelInAnotherPackage(), getRewrittenSubViewModelInMain())
.addKeepMainRule(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.enableInliningAnnotations()
.enableNoVerticalClassMergingAnnotations()
.enableNeverClassInliningAnnotations()
diff --git a/src/test/java/com/android/tools/r8/accessrelaxation/PackagePrivateOverridePublicizerTest.java b/src/test/java/com/android/tools/r8/accessrelaxation/PackagePrivateOverridePublicizerTest.java
index ccd0b21..56cd1ac 100644
--- a/src/test/java/com/android/tools/r8/accessrelaxation/PackagePrivateOverridePublicizerTest.java
+++ b/src/test/java/com/android/tools/r8/accessrelaxation/PackagePrivateOverridePublicizerTest.java
@@ -46,7 +46,7 @@
testForR8(parameters.getBackend())
.addProgramClasses(ViewModel.class, SubViewModel.class, Main.class)
.addKeepMainRule(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
.allowAccessModification()
diff --git a/src/test/java/com/android/tools/r8/accessrelaxation/PrivateKeptMembersPublicizerTest.java b/src/test/java/com/android/tools/r8/accessrelaxation/PrivateKeptMembersPublicizerTest.java
index 3aeeb72..ba8e675 100644
--- a/src/test/java/com/android/tools/r8/accessrelaxation/PrivateKeptMembersPublicizerTest.java
+++ b/src/test/java/com/android/tools/r8/accessrelaxation/PrivateKeptMembersPublicizerTest.java
@@ -60,7 +60,7 @@
" private static void greet(java.lang.String);",
"}")
.allowAccessModification()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/androidapi/AndroidJarMasterTest.java b/src/test/java/com/android/tools/r8/androidapi/AndroidJarMasterTest.java
index 9edc6d5..0792863 100644
--- a/src/test/java/com/android/tools/r8/androidapi/AndroidJarMasterTest.java
+++ b/src/test/java/com/android/tools/r8/androidapi/AndroidJarMasterTest.java
@@ -33,7 +33,7 @@
testForD8(parameters.getBackend())
.addLibraryFiles(ToolHelper.getAndroidJar(AndroidApiLevel.MASTER))
.addInnerClasses(getClass())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutput(EXPECTED_OUTPUT);
}
@@ -45,7 +45,7 @@
.addLibraryFiles(ToolHelper.getAndroidJar(AndroidApiLevel.MASTER))
.addInnerClasses(getClass())
.addKeepMainRule(TestClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutput(EXPECTED_OUTPUT);
}
diff --git a/src/test/java/com/android/tools/r8/androidapi/AndroidJarSv2Test.java b/src/test/java/com/android/tools/r8/androidapi/AndroidJarSv2Test.java
index 03dff7d..902f127 100644
--- a/src/test/java/com/android/tools/r8/androidapi/AndroidJarSv2Test.java
+++ b/src/test/java/com/android/tools/r8/androidapi/AndroidJarSv2Test.java
@@ -33,7 +33,7 @@
testForD8(parameters.getBackend())
.addLibraryFiles(ToolHelper.getAndroidJar(AndroidApiLevel.Sv2))
.addInnerClasses(getClass())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutput(EXPECTED_OUTPUT);
}
@@ -45,7 +45,7 @@
.addLibraryFiles(ToolHelper.getAndroidJar(AndroidApiLevel.Sv2))
.addInnerClasses(getClass())
.addKeepMainRule(TestClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutput(EXPECTED_OUTPUT);
}
diff --git a/src/test/java/com/android/tools/r8/androidapi/AndroidJarTTest.java b/src/test/java/com/android/tools/r8/androidapi/AndroidJarTTest.java
index 9865119..cc71d87 100644
--- a/src/test/java/com/android/tools/r8/androidapi/AndroidJarTTest.java
+++ b/src/test/java/com/android/tools/r8/androidapi/AndroidJarTTest.java
@@ -33,7 +33,7 @@
testForD8(parameters.getBackend())
.addLibraryFiles(ToolHelper.getAndroidJar(AndroidApiLevel.T))
.addInnerClasses(getClass())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutput(EXPECTED_OUTPUT);
}
@@ -45,7 +45,7 @@
.addLibraryFiles(ToolHelper.getAndroidJar(AndroidApiLevel.T))
.addInnerClasses(getClass())
.addKeepMainRule(TestClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutput(EXPECTED_OUTPUT);
}
diff --git a/src/test/java/com/android/tools/r8/annotations/AnnotationWithInjectedMethodsTest.java b/src/test/java/com/android/tools/r8/annotations/AnnotationWithInjectedMethodsTest.java
index da34ea7..77f22c9 100644
--- a/src/test/java/com/android/tools/r8/annotations/AnnotationWithInjectedMethodsTest.java
+++ b/src/test/java/com/android/tools/r8/annotations/AnnotationWithInjectedMethodsTest.java
@@ -55,7 +55,7 @@
.addKeepRuntimeVisibleAnnotations()
.addOptionsModification(options -> options.testing.allowInjectedAnnotationMethods = true)
.addDontObfuscate()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutput(getExpectedOutput());
diff --git a/src/test/java/com/android/tools/r8/annotations/DalvikAnnotationOptimizationTest.java b/src/test/java/com/android/tools/r8/annotations/DalvikAnnotationOptimizationTest.java
index af2e5df..f904840 100644
--- a/src/test/java/com/android/tools/r8/annotations/DalvikAnnotationOptimizationTest.java
+++ b/src/test/java/com/android/tools/r8/annotations/DalvikAnnotationOptimizationTest.java
@@ -92,7 +92,7 @@
testForD8(parameters.getBackend())
.addProgramClassFileData(
transformer(TestClass.class).addMethodTransformer(getMethodTransformer()).transform())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.applyIf(
addAnnotationsOnLibraryPath,
b -> {
@@ -131,7 +131,7 @@
optimizationPackage
? "dalvik.annotation.optimization.*"
: "dalvik.annotation.codegen.*"))
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(TestClass.class)
.compile()
.inspect(this::checkExpectedAnnotations);
diff --git a/src/test/java/com/android/tools/r8/annotations/DefaultAnnotationTest.java b/src/test/java/com/android/tools/r8/annotations/DefaultAnnotationTest.java
index a35b813..b02af88 100644
--- a/src/test/java/com/android/tools/r8/annotations/DefaultAnnotationTest.java
+++ b/src/test/java/com/android/tools/r8/annotations/DefaultAnnotationTest.java
@@ -60,7 +60,7 @@
.apply(modification)
.addKeepAllAttributes()
.addKeepRules("-keep class * { *; }")
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutput(getExpected());
}
diff --git a/src/test/java/com/android/tools/r8/annotations/SourceDebugExtensionTest.java b/src/test/java/com/android/tools/r8/annotations/SourceDebugExtensionTest.java
index 814e454..dc8dee7 100644
--- a/src/test/java/com/android/tools/r8/annotations/SourceDebugExtensionTest.java
+++ b/src/test/java/com/android/tools/r8/annotations/SourceDebugExtensionTest.java
@@ -70,7 +70,7 @@
.addKeepAttributes(ProguardKeepAttributes.SOURCE_DEBUG_EXTENSION)
.addKeepAllClassesRule()
.setMode(CompilationMode.RELEASE)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspectSourceDebugExtension);
}
diff --git a/src/test/java/com/android/tools/r8/apimodel/ApiModelBackportTest.java b/src/test/java/com/android/tools/r8/apimodel/ApiModelBackportTest.java
index e32a62e..69e4dbe 100644
--- a/src/test/java/com/android/tools/r8/apimodel/ApiModelBackportTest.java
+++ b/src/test/java/com/android/tools/r8/apimodel/ApiModelBackportTest.java
@@ -44,7 +44,7 @@
Method callBackport = ApiCaller.class.getDeclaredMethod("callBackport", int.class);
testForR8(parameters.getBackend())
.addProgramClasses(ApiCaller.class, ApiCallerCaller.class, Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(Main.class)
.apply(ApiModelingTestHelper::enableApiCallerIdentification)
.apply(
diff --git a/src/test/java/com/android/tools/r8/apimodel/ApiModelBridgeToLibraryMethodTest.java b/src/test/java/com/android/tools/r8/apimodel/ApiModelBridgeToLibraryMethodTest.java
index 374b190..28d5037 100644
--- a/src/test/java/com/android/tools/r8/apimodel/ApiModelBridgeToLibraryMethodTest.java
+++ b/src/test/java/com/android/tools/r8/apimodel/ApiModelBridgeToLibraryMethodTest.java
@@ -36,7 +36,7 @@
testForR8(parameters.getBackend())
.addInnerClasses(getClass())
.addLibraryFiles(ToolHelper.getAndroidJar(AndroidApiLevel.T))
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(TestClassWithApiLevelCheck.class)
.addAndroidBuildVersion()
.run(parameters.getRuntime(), TestClassWithApiLevelCheck.class)
diff --git a/src/test/java/com/android/tools/r8/apimodel/ApiModelClassMergingPackagePrivateTest.java b/src/test/java/com/android/tools/r8/apimodel/ApiModelClassMergingPackagePrivateTest.java
index c4df40d..fe88045 100644
--- a/src/test/java/com/android/tools/r8/apimodel/ApiModelClassMergingPackagePrivateTest.java
+++ b/src/test/java/com/android/tools/r8/apimodel/ApiModelClassMergingPackagePrivateTest.java
@@ -66,7 +66,7 @@
.transform())
.addLibraryClasses(Api1.class, Api2.class)
.addDefaultRuntimeLibrary(parameters)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.apply(ApiModelingTestHelper::enableOutliningOfMethods)
.apply(b -> setApiLevels(b, Api1.class))
.apply(b -> setApiLevels(b, Api2.class));
diff --git a/src/test/java/com/android/tools/r8/apimodel/ApiModelClassMergingWithDifferentApiFieldsTest.java b/src/test/java/com/android/tools/r8/apimodel/ApiModelClassMergingWithDifferentApiFieldsTest.java
index 4b94e1c..b723882 100644
--- a/src/test/java/com/android/tools/r8/apimodel/ApiModelClassMergingWithDifferentApiFieldsTest.java
+++ b/src/test/java/com/android/tools/r8/apimodel/ApiModelClassMergingWithDifferentApiFieldsTest.java
@@ -39,7 +39,7 @@
.addProgramClasses(A.class, B.class, ApiSetter.class, Main.class)
.addLibraryClasses(Api.class)
.addDefaultRuntimeLibrary(parameters)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(Main.class)
.enableInliningAnnotations()
.enableNoHorizontalClassMergingAnnotations()
diff --git a/src/test/java/com/android/tools/r8/apimodel/ApiModelClassMergingWithDifferentApiMethodsTest.java b/src/test/java/com/android/tools/r8/apimodel/ApiModelClassMergingWithDifferentApiMethodsTest.java
index 5730230c..69061f3 100644
--- a/src/test/java/com/android/tools/r8/apimodel/ApiModelClassMergingWithDifferentApiMethodsTest.java
+++ b/src/test/java/com/android/tools/r8/apimodel/ApiModelClassMergingWithDifferentApiMethodsTest.java
@@ -39,7 +39,7 @@
.addProgramClasses(A.class, B.class, Main.class)
.addLibraryClasses(Api.class)
.addDefaultRuntimeLibrary(parameters)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(Main.class)
.enableInliningAnnotations()
.addHorizontallyMergedClassesInspector(
diff --git a/src/test/java/com/android/tools/r8/apimodel/ApiModelCovariantReturnTypeTest.java b/src/test/java/com/android/tools/r8/apimodel/ApiModelCovariantReturnTypeTest.java
index 353c709..1f74451 100644
--- a/src/test/java/com/android/tools/r8/apimodel/ApiModelCovariantReturnTypeTest.java
+++ b/src/test/java/com/android/tools/r8/apimodel/ApiModelCovariantReturnTypeTest.java
@@ -39,7 +39,7 @@
Method main = Main.class.getDeclaredMethod("main", String[].class);
testForR8(parameters.getBackend())
.addProgramClasses(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(Main.class)
.apply(ApiModelingTestHelper::enableApiCallerIdentification)
.apply(ApiModelingTestHelper::disableOutliningAndStubbing)
diff --git a/src/test/java/com/android/tools/r8/apimodel/ApiModelD8GradleSetupTest.java b/src/test/java/com/android/tools/r8/apimodel/ApiModelD8GradleSetupTest.java
index f0b5d28..c7e150d 100644
--- a/src/test/java/com/android/tools/r8/apimodel/ApiModelD8GradleSetupTest.java
+++ b/src/test/java/com/android/tools/r8/apimodel/ApiModelD8GradleSetupTest.java
@@ -58,7 +58,7 @@
testBuilder
.addLibraryClasses(LibraryClassOne.class, LibraryClassTwo.class, LibraryClassThree.class)
.addDefaultRuntimeLibrary(parameters)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.apply(setMockApiLevelForClass(LibraryClassOne.class, mockApiLevelOne))
.apply(
setMockApiLevelForMethod(
@@ -181,7 +181,7 @@
compileResultProgramClass.writeToZip(),
compileResultProgramClassTwo.writeToZip(),
compileResultMain.writeToZip())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addAndroidBuildVersion(getApiLevelForRuntime())
.addHorizontallyMergedClassesInspector(horizontallyMergingConsumer)
.compile()
diff --git a/src/test/java/com/android/tools/r8/apimodel/ApiModelFieldSuperTypeTest.java b/src/test/java/com/android/tools/r8/apimodel/ApiModelFieldSuperTypeTest.java
index 5b47c79..cc2d47e 100644
--- a/src/test/java/com/android/tools/r8/apimodel/ApiModelFieldSuperTypeTest.java
+++ b/src/test/java/com/android/tools/r8/apimodel/ApiModelFieldSuperTypeTest.java
@@ -46,7 +46,7 @@
.addLibraryFiles(
ToolHelper.getFirstSupportedAndroidJar(
parameters.isCfRuntime() ? AndroidApiLevel.B : parameters.getApiLevel()))
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(Main.class)
.apply(ApiModelingTestHelper::enableApiCallerIdentification)
.apply(
diff --git a/src/test/java/com/android/tools/r8/apimodel/ApiModelFieldTypeReferenceTest.java b/src/test/java/com/android/tools/r8/apimodel/ApiModelFieldTypeReferenceTest.java
index 75e1da7..d28b660 100644
--- a/src/test/java/com/android/tools/r8/apimodel/ApiModelFieldTypeReferenceTest.java
+++ b/src/test/java/com/android/tools/r8/apimodel/ApiModelFieldTypeReferenceTest.java
@@ -42,7 +42,7 @@
.addProgramClasses(A.class, B.class, Main.class)
.addLibraryClasses(Api.class)
.addDefaultRuntimeLibrary(parameters)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(Main.class)
.apply(setMockApiLevelForClass(Api.class, AndroidApiLevel.L_MR1))
.apply(setMockApiLevelForDefaultInstanceInitializer(Api.class, AndroidApiLevel.L_MR1))
diff --git a/src/test/java/com/android/tools/r8/apimodel/ApiModelHorizontalMergeAndD8MergeTest.java b/src/test/java/com/android/tools/r8/apimodel/ApiModelHorizontalMergeAndD8MergeTest.java
index 774de69..aee8d30 100644
--- a/src/test/java/com/android/tools/r8/apimodel/ApiModelHorizontalMergeAndD8MergeTest.java
+++ b/src/test/java/com/android/tools/r8/apimodel/ApiModelHorizontalMergeAndD8MergeTest.java
@@ -53,7 +53,7 @@
testBuilder
.addLibraryClasses(LibraryClass.class)
.addDefaultRuntimeLibrary(parameters)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.apply(ApiModelingTestHelper::enableApiCallerIdentification)
.apply(ApiModelingTestHelper::enableOutliningOfMethods)
.apply(setMockApiLevelForClass(LibraryClass.class, mockLevel))
diff --git a/src/test/java/com/android/tools/r8/apimodel/ApiModelIndirectTargetWithDifferentApiLevelTest.java b/src/test/java/com/android/tools/r8/apimodel/ApiModelIndirectTargetWithDifferentApiLevelTest.java
index b41dea1..533eab1 100644
--- a/src/test/java/com/android/tools/r8/apimodel/ApiModelIndirectTargetWithDifferentApiLevelTest.java
+++ b/src/test/java/com/android/tools/r8/apimodel/ApiModelIndirectTargetWithDifferentApiLevelTest.java
@@ -59,7 +59,7 @@
.addProgramClasses(Main.class, ProgramJoiner.class)
.addLibraryClasses(LibraryClass.class, LibraryInterface.class)
.addDefaultRuntimeLibrary(parameters)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addAndroidBuildVersion(parameters.getApiLevel())
.apply(ApiModelingTestHelper::enableStubbingOfClasses)
.apply(setMockApiLevelForDefaultInstanceInitializer(LibraryClass.class, classApiLevel))
diff --git a/src/test/java/com/android/tools/r8/apimodel/ApiModelIndirectTargetWithSameApiLevelTest.java b/src/test/java/com/android/tools/r8/apimodel/ApiModelIndirectTargetWithSameApiLevelTest.java
index 69c33cb..e8e8f2f 100644
--- a/src/test/java/com/android/tools/r8/apimodel/ApiModelIndirectTargetWithSameApiLevelTest.java
+++ b/src/test/java/com/android/tools/r8/apimodel/ApiModelIndirectTargetWithSameApiLevelTest.java
@@ -56,7 +56,7 @@
.addProgramClasses(Main.class, ProgramJoiner.class)
.addLibraryClasses(LibraryClass.class, LibraryInterface.class)
.addDefaultRuntimeLibrary(parameters)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addAndroidBuildVersion(parameters.getApiLevel())
.apply(ApiModelingTestHelper::enableStubbingOfClasses)
.apply(setMockApiLevelForDefaultInstanceInitializer(LibraryClass.class, mockApiLevel))
diff --git a/src/test/java/com/android/tools/r8/apimodel/ApiModelInlineInSameClassDifferentApiLevelTest.java b/src/test/java/com/android/tools/r8/apimodel/ApiModelInlineInSameClassDifferentApiLevelTest.java
index fc29914..f035742 100644
--- a/src/test/java/com/android/tools/r8/apimodel/ApiModelInlineInSameClassDifferentApiLevelTest.java
+++ b/src/test/java/com/android/tools/r8/apimodel/ApiModelInlineInSameClassDifferentApiLevelTest.java
@@ -41,7 +41,7 @@
.addProgramClasses(ApiCaller.class, Main.class)
.addLibraryClasses(Api.class)
.addDefaultRuntimeLibrary(parameters)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(Main.class)
.apply(setMockApiLevelForMethod(apiLevel22, AndroidApiLevel.L_MR1))
.apply(ApiModelingTestHelper::enableApiCallerIdentification)
diff --git a/src/test/java/com/android/tools/r8/apimodel/ApiModelInlineInSameClassTest.java b/src/test/java/com/android/tools/r8/apimodel/ApiModelInlineInSameClassTest.java
index 284fbd5..962f638 100644
--- a/src/test/java/com/android/tools/r8/apimodel/ApiModelInlineInSameClassTest.java
+++ b/src/test/java/com/android/tools/r8/apimodel/ApiModelInlineInSameClassTest.java
@@ -48,7 +48,7 @@
.addProgramClasses(ApiCaller.class, ApiCallerCaller.class, Main.class)
.addLibraryClasses(Api.class)
.addDefaultRuntimeLibrary(parameters)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(Main.class)
.apply(setMockApiLevelForMethod(apiMethod, AndroidApiLevel.L_MR1))
.apply(ApiModelingTestHelper::enableApiCallerIdentification)
diff --git a/src/test/java/com/android/tools/r8/apimodel/ApiModelInlineMethodWithApiTypeTest.java b/src/test/java/com/android/tools/r8/apimodel/ApiModelInlineMethodWithApiTypeTest.java
index 2a0d763..20cde1c 100644
--- a/src/test/java/com/android/tools/r8/apimodel/ApiModelInlineMethodWithApiTypeTest.java
+++ b/src/test/java/com/android/tools/r8/apimodel/ApiModelInlineMethodWithApiTypeTest.java
@@ -42,7 +42,7 @@
.addProgramClasses(ApiCaller.class, ApiCallerCaller.class, OtherCaller.class, Main.class)
.addLibraryClasses(ApiType.class)
.addDefaultRuntimeLibrary(parameters)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(Main.class)
.enableNoHorizontalClassMergingAnnotations()
.apply(setMockApiLevelForClass(ApiType.class, AndroidApiLevel.L_MR1))
diff --git a/src/test/java/com/android/tools/r8/apimodel/ApiModelInlineMissingInterfaceTest.java b/src/test/java/com/android/tools/r8/apimodel/ApiModelInlineMissingInterfaceTest.java
index 4f89220..f97ae54 100644
--- a/src/test/java/com/android/tools/r8/apimodel/ApiModelInlineMissingInterfaceTest.java
+++ b/src/test/java/com/android/tools/r8/apimodel/ApiModelInlineMissingInterfaceTest.java
@@ -47,7 +47,7 @@
.apply(
setMockApiLevelForDefaultInstanceInitializer(
LibraryClass.class, libraryAdditionApiLevel))
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(Main.class)
.enableInliningAnnotations()
.compile()
diff --git a/src/test/java/com/android/tools/r8/apimodel/ApiModelInlineMissingSuperTypeTest.java b/src/test/java/com/android/tools/r8/apimodel/ApiModelInlineMissingSuperTypeTest.java
index 4e05ffb..67f9f6e 100644
--- a/src/test/java/com/android/tools/r8/apimodel/ApiModelInlineMissingSuperTypeTest.java
+++ b/src/test/java/com/android/tools/r8/apimodel/ApiModelInlineMissingSuperTypeTest.java
@@ -47,7 +47,7 @@
.apply(
setMockApiLevelForDefaultInstanceInitializer(
LibraryClass.class, libraryAdditionApiLevel))
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(Main.class)
.enableInliningAnnotations()
.compile()
diff --git a/src/test/java/com/android/tools/r8/apimodel/ApiModelMethodTypeReferenceTest.java b/src/test/java/com/android/tools/r8/apimodel/ApiModelMethodTypeReferenceTest.java
index 5df420d..3f9c9c8 100644
--- a/src/test/java/com/android/tools/r8/apimodel/ApiModelMethodTypeReferenceTest.java
+++ b/src/test/java/com/android/tools/r8/apimodel/ApiModelMethodTypeReferenceTest.java
@@ -42,7 +42,7 @@
.addProgramClasses(A.class, B.class, Main.class)
.addLibraryClasses(Api.class)
.addDefaultRuntimeLibrary(parameters)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(Main.class)
.apply(setMockApiLevelForClass(Api.class, AndroidApiLevel.L_MR1))
.apply(setMockApiLevelForDefaultInstanceInitializer(Api.class, AndroidApiLevel.L_MR1))
diff --git a/src/test/java/com/android/tools/r8/apimodel/ApiModelMockAbstractMethodOnBaseToOutlineTest.java b/src/test/java/com/android/tools/r8/apimodel/ApiModelMockAbstractMethodOnBaseToOutlineTest.java
index 940e956..bc50b66 100644
--- a/src/test/java/com/android/tools/r8/apimodel/ApiModelMockAbstractMethodOnBaseToOutlineTest.java
+++ b/src/test/java/com/android/tools/r8/apimodel/ApiModelMockAbstractMethodOnBaseToOutlineTest.java
@@ -52,7 +52,7 @@
.addLibraryClasses(
LibraryClass.class, OtherLibraryClass.class, SubLibraryClassAtLaterApiLevel.class)
.addDefaultRuntimeLibrary(parameters)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addAndroidBuildVersion()
.apply(ApiModelingTestHelper::enableStubbingOfClasses)
.apply(ApiModelingTestHelper::enableOutliningOfMethods)
diff --git a/src/test/java/com/android/tools/r8/apimodel/ApiModelMockClassCheckCastTest.java b/src/test/java/com/android/tools/r8/apimodel/ApiModelMockClassCheckCastTest.java
index 7544818..6810dcd 100644
--- a/src/test/java/com/android/tools/r8/apimodel/ApiModelMockClassCheckCastTest.java
+++ b/src/test/java/com/android/tools/r8/apimodel/ApiModelMockClassCheckCastTest.java
@@ -48,7 +48,7 @@
.addProgramClasses(Main.class, TestClass.class)
.addLibraryClasses(LibraryClass.class)
.addDefaultRuntimeLibrary(parameters)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.apply(ApiModelingTestHelper::enableStubbingOfClasses)
.apply(setMockApiLevelForClass(LibraryClass.class, mockLevel));
}
diff --git a/src/test/java/com/android/tools/r8/apimodel/ApiModelMockClassLoadingByClassForNameTest.java b/src/test/java/com/android/tools/r8/apimodel/ApiModelMockClassLoadingByClassForNameTest.java
index 10b3ea2..f6a4d4e 100644
--- a/src/test/java/com/android/tools/r8/apimodel/ApiModelMockClassLoadingByClassForNameTest.java
+++ b/src/test/java/com/android/tools/r8/apimodel/ApiModelMockClassLoadingByClassForNameTest.java
@@ -48,7 +48,7 @@
.addProgramClasses(Main.class, TestClass.class)
.addLibraryClasses(LibraryClass.class)
.addDefaultRuntimeLibrary(parameters)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.apply(ApiModelingTestHelper::enableStubbingOfClasses)
.apply(setMockApiLevelForClass(LibraryClass.class, mockLevel));
}
diff --git a/src/test/java/com/android/tools/r8/apimodel/ApiModelMockClassLoadingByClassReferenceTest.java b/src/test/java/com/android/tools/r8/apimodel/ApiModelMockClassLoadingByClassReferenceTest.java
index 4850849..3226262 100644
--- a/src/test/java/com/android/tools/r8/apimodel/ApiModelMockClassLoadingByClassReferenceTest.java
+++ b/src/test/java/com/android/tools/r8/apimodel/ApiModelMockClassLoadingByClassReferenceTest.java
@@ -48,7 +48,7 @@
.addProgramClasses(Main.class, TestClass.class)
.addLibraryClasses(LibraryClass.class)
.addDefaultRuntimeLibrary(parameters)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.apply(ApiModelingTestHelper::enableStubbingOfClasses)
.apply(setMockApiLevelForClass(LibraryClass.class, mockLevel));
}
diff --git a/src/test/java/com/android/tools/r8/apimodel/ApiModelMockClassTest.java b/src/test/java/com/android/tools/r8/apimodel/ApiModelMockClassTest.java
index ac98967..9fc0985 100644
--- a/src/test/java/com/android/tools/r8/apimodel/ApiModelMockClassTest.java
+++ b/src/test/java/com/android/tools/r8/apimodel/ApiModelMockClassTest.java
@@ -51,7 +51,7 @@
.addProgramClasses(Main.class, TestClass.class)
.addLibraryClasses(LibraryClass.class)
.addDefaultRuntimeLibrary(parameters)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.apply(ApiModelingTestHelper::enableStubbingOfClasses)
.apply(ApiModelingTestHelper::disableOutlining)
.apply(setMockApiLevelForClass(LibraryClass.class, mockLevel))
@@ -59,7 +59,7 @@
}
private void setupTestRuntimeBuilder(TestCompilerBuilder<?, ?, ?, ?, ?> testBuilder) {
- testBuilder.setMinApi(parameters.getApiLevel()).addAndroidBuildVersion();
+ testBuilder.setMinApi(parameters).addAndroidBuildVersion();
}
private void setupTestBuilder(TestCompilerBuilder<?, ?, ?, ?, ?> testBuilder) {
diff --git a/src/test/java/com/android/tools/r8/apimodel/ApiModelMockDalvikVerifyErrorTest.java b/src/test/java/com/android/tools/r8/apimodel/ApiModelMockDalvikVerifyErrorTest.java
index 1a5cd80..74e7ef0 100644
--- a/src/test/java/com/android/tools/r8/apimodel/ApiModelMockDalvikVerifyErrorTest.java
+++ b/src/test/java/com/android/tools/r8/apimodel/ApiModelMockDalvikVerifyErrorTest.java
@@ -48,7 +48,7 @@
.addProgramClasses(Main.class)
.addLibraryClasses(LibraryClass.class, LibrarySub.class)
.addDefaultRuntimeLibrary(parameters)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addAndroidBuildVersion()
.apply(ApiModelingTestHelper::enableStubbingOfClasses)
.apply(setMockApiLevelForClass(LibraryClass.class, mockLevel))
diff --git a/src/test/java/com/android/tools/r8/apimodel/ApiModelMockExceptionAndroidApiTest.java b/src/test/java/com/android/tools/r8/apimodel/ApiModelMockExceptionAndroidApiTest.java
index 5e0516a..2a7ebee 100644
--- a/src/test/java/com/android/tools/r8/apimodel/ApiModelMockExceptionAndroidApiTest.java
+++ b/src/test/java/com/android/tools/r8/apimodel/ApiModelMockExceptionAndroidApiTest.java
@@ -70,12 +70,12 @@
DescriptorUtils.javaTypeToDescriptor(illFormedLocaleException))
.transform())
.addLibraryFiles(ToolHelper.getAndroidJar(AndroidApiLevel.LATEST))
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.apply(ApiModelingTestHelper::enableStubbingOfClasses);
}
private void setupTestRuntimeBuilder(TestCompilerBuilder<?, ?, ?, ?, ?> testBuilder) {
- testBuilder.setMinApi(parameters.getApiLevel()).addAndroidBuildVersion();
+ testBuilder.setMinApi(parameters).addAndroidBuildVersion();
}
private void setupTestBuilder(TestCompilerBuilder<?, ?, ?, ?, ?> testBuilder) throws Exception {
diff --git a/src/test/java/com/android/tools/r8/apimodel/ApiModelMockExceptionTest.java b/src/test/java/com/android/tools/r8/apimodel/ApiModelMockExceptionTest.java
index 4012ad7..ea43cbb 100644
--- a/src/test/java/com/android/tools/r8/apimodel/ApiModelMockExceptionTest.java
+++ b/src/test/java/com/android/tools/r8/apimodel/ApiModelMockExceptionTest.java
@@ -58,14 +58,14 @@
.addProgramClasses(Main.class)
.addLibraryClasses(LibrarySuperException.class, LibrarySubException.class, Thrower.class)
.addDefaultRuntimeLibrary(parameters)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.apply(ApiModelingTestHelper::enableStubbingOfClasses)
.apply(setMockApiLevelForClass(LibrarySuperException.class, mockSuperExceptionLevel))
.apply(setMockApiLevelForClass(LibrarySubException.class, mockSubExceptionLevel));
}
private void setupTestRuntimeBuilder(TestCompilerBuilder<?, ?, ?, ?, ?> testBuilder) {
- testBuilder.setMinApi(parameters.getApiLevel()).addAndroidBuildVersion();
+ testBuilder.setMinApi(parameters).addAndroidBuildVersion();
}
private void setupTestBuilder(TestCompilerBuilder<?, ?, ?, ?, ?> testBuilder) {
diff --git a/src/test/java/com/android/tools/r8/apimodel/ApiModelMockInheritedClassTest.java b/src/test/java/com/android/tools/r8/apimodel/ApiModelMockInheritedClassTest.java
index 322b30f..c7a2674 100644
--- a/src/test/java/com/android/tools/r8/apimodel/ApiModelMockInheritedClassTest.java
+++ b/src/test/java/com/android/tools/r8/apimodel/ApiModelMockInheritedClassTest.java
@@ -45,7 +45,7 @@
.addProgramClasses(Main.class, ProgramClass.class)
.addLibraryClasses(LibraryClass.class)
.addDefaultRuntimeLibrary(parameters)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addAndroidBuildVersion()
.apply(ApiModelingTestHelper::enableStubbingOfClasses)
.apply(setMockApiLevelForClass(LibraryClass.class, mockLevel))
diff --git a/src/test/java/com/android/tools/r8/apimodel/ApiModelMockMergeProgramDefinedDuplicateTest.java b/src/test/java/com/android/tools/r8/apimodel/ApiModelMockMergeProgramDefinedDuplicateTest.java
index 0ca565f..8e974f1 100644
--- a/src/test/java/com/android/tools/r8/apimodel/ApiModelMockMergeProgramDefinedDuplicateTest.java
+++ b/src/test/java/com/android/tools/r8/apimodel/ApiModelMockMergeProgramDefinedDuplicateTest.java
@@ -54,7 +54,7 @@
.addProgramClasses(programClass)
.addLibraryClasses(LibraryClass.class)
.addDefaultRuntimeLibrary(parameters)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.apply(ApiModelingTestHelper::enableApiCallerIdentification)
.apply(ApiModelingTestHelper::enableStubbingOfClasses)
.apply(ApiModelingTestHelper::disableOutlining)
@@ -108,7 +108,7 @@
// Add the actual LibraryClass definition to the code, thus the globals will need to merge
// the synthetic stubs but also disregard them due to a program definition being present.
.addProgramClasses(LibraryClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.apply(
b ->
b.getBuilder()
diff --git a/src/test/java/com/android/tools/r8/apimodel/ApiModelMockMergeTest.java b/src/test/java/com/android/tools/r8/apimodel/ApiModelMockMergeTest.java
index 01681c4..ab6e2148 100644
--- a/src/test/java/com/android/tools/r8/apimodel/ApiModelMockMergeTest.java
+++ b/src/test/java/com/android/tools/r8/apimodel/ApiModelMockMergeTest.java
@@ -54,7 +54,7 @@
.addProgramClasses(programClass)
.addLibraryClasses(LibraryClass.class)
.addDefaultRuntimeLibrary(parameters)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.apply(ApiModelingTestHelper::enableApiCallerIdentification)
.apply(ApiModelingTestHelper::enableStubbingOfClasses)
.apply(ApiModelingTestHelper::disableOutlining)
@@ -105,7 +105,7 @@
testForD8()
.setMode(mode)
.addProgramFiles(paths)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.apply(
b ->
b.getBuilder()
diff --git a/src/test/java/com/android/tools/r8/apimodel/ApiModelMockRetraceTest.java b/src/test/java/com/android/tools/r8/apimodel/ApiModelMockRetraceTest.java
index edd4d27..9394280 100644
--- a/src/test/java/com/android/tools/r8/apimodel/ApiModelMockRetraceTest.java
+++ b/src/test/java/com/android/tools/r8/apimodel/ApiModelMockRetraceTest.java
@@ -46,7 +46,7 @@
.addProgramClasses(Main.class, ProgramClass.class)
.addLibraryClasses(LibraryClass.class)
.addDefaultRuntimeLibrary(parameters)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addAndroidBuildVersion()
.apply(ApiModelingTestHelper::enableStubbingOfClasses)
.apply(setMockApiLevelForClass(LibraryClass.class, mockLevel))
diff --git a/src/test/java/com/android/tools/r8/apimodel/ApiModelMockSuperChainClassTest.java b/src/test/java/com/android/tools/r8/apimodel/ApiModelMockSuperChainClassTest.java
index 5d4fc8f..3d31170 100644
--- a/src/test/java/com/android/tools/r8/apimodel/ApiModelMockSuperChainClassTest.java
+++ b/src/test/java/com/android/tools/r8/apimodel/ApiModelMockSuperChainClassTest.java
@@ -47,7 +47,7 @@
.addProgramClasses(Main.class, ProgramClass.class)
.addLibraryClasses(LibraryClass.class, OtherLibraryClass.class, LibraryInterface.class)
.addDefaultRuntimeLibrary(parameters)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addAndroidBuildVersion()
.apply(ApiModelingTestHelper::enableStubbingOfClasses)
.apply(setMockApiLevelForClass(LibraryClass.class, lowerMockApiLevel))
diff --git a/src/test/java/com/android/tools/r8/apimodel/ApiModelNoClassInliningFieldTest.java b/src/test/java/com/android/tools/r8/apimodel/ApiModelNoClassInliningFieldTest.java
index 27ba7ed..7c24a41 100644
--- a/src/test/java/com/android/tools/r8/apimodel/ApiModelNoClassInliningFieldTest.java
+++ b/src/test/java/com/android/tools/r8/apimodel/ApiModelNoClassInliningFieldTest.java
@@ -44,7 +44,7 @@
.addProgramClasses(ApiCallerCaller.class, ApiBuilder.class, Main.class)
.addLibraryClasses(Api.class)
.addDefaultRuntimeLibrary(parameters)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(Main.class)
.enableInliningAnnotations()
.enableNoHorizontalClassMergingAnnotations()
diff --git a/src/test/java/com/android/tools/r8/apimodel/ApiModelNoClassInliningMethodTest.java b/src/test/java/com/android/tools/r8/apimodel/ApiModelNoClassInliningMethodTest.java
index 013d98f..aea13f1 100644
--- a/src/test/java/com/android/tools/r8/apimodel/ApiModelNoClassInliningMethodTest.java
+++ b/src/test/java/com/android/tools/r8/apimodel/ApiModelNoClassInliningMethodTest.java
@@ -42,7 +42,7 @@
.addProgramClasses(ApiCaller.class, ApiCallerCaller.class, Main.class)
.addLibraryClasses(Api.class)
.addDefaultRuntimeLibrary(parameters)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(Main.class)
.enableInliningAnnotations()
.enableNoHorizontalClassMergingAnnotations()
diff --git a/src/test/java/com/android/tools/r8/apimodel/ApiModelNoHorizontalMergeAndD8MergeTest.java b/src/test/java/com/android/tools/r8/apimodel/ApiModelNoHorizontalMergeAndD8MergeTest.java
index e241455..880360d 100644
--- a/src/test/java/com/android/tools/r8/apimodel/ApiModelNoHorizontalMergeAndD8MergeTest.java
+++ b/src/test/java/com/android/tools/r8/apimodel/ApiModelNoHorizontalMergeAndD8MergeTest.java
@@ -55,7 +55,7 @@
testBuilder
.addLibraryClasses(LibraryClass.class)
.addDefaultRuntimeLibrary(parameters)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.apply(ApiModelingTestHelper::enableApiCallerIdentification)
.apply(ApiModelingTestHelper::enableOutliningOfMethods)
.apply(setMockApiLevelForClass(LibraryClass.class, oneMockLevel))
diff --git a/src/test/java/com/android/tools/r8/apimodel/ApiModelNoInliningOfDefaultInterfaceMethodsTest.java b/src/test/java/com/android/tools/r8/apimodel/ApiModelNoInliningOfDefaultInterfaceMethodsTest.java
index c69756a..f627979 100644
--- a/src/test/java/com/android/tools/r8/apimodel/ApiModelNoInliningOfDefaultInterfaceMethodsTest.java
+++ b/src/test/java/com/android/tools/r8/apimodel/ApiModelNoInliningOfDefaultInterfaceMethodsTest.java
@@ -45,7 +45,7 @@
.addProgramClasses(Main.class, A.class, ApiCaller.class)
.addLibraryClasses(Api.class)
.addDefaultRuntimeLibrary(parameters)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(Main.class)
.apply(setMockApiLevelForMethod(apiMethod, L_MR1))
.apply(ApiModelingTestHelper::enableApiCallerIdentification)
diff --git a/src/test/java/com/android/tools/r8/apimodel/ApiModelNoInliningOfHigherApiLevelInstanceFieldTest.java b/src/test/java/com/android/tools/r8/apimodel/ApiModelNoInliningOfHigherApiLevelInstanceFieldTest.java
index 8ef728e..d78b8f2 100644
--- a/src/test/java/com/android/tools/r8/apimodel/ApiModelNoInliningOfHigherApiLevelInstanceFieldTest.java
+++ b/src/test/java/com/android/tools/r8/apimodel/ApiModelNoInliningOfHigherApiLevelInstanceFieldTest.java
@@ -45,7 +45,7 @@
.addProgramClasses(ApiCaller.class, ApiCallerCaller.class, Main.class)
.addLibraryClasses(Api.class)
.addDefaultRuntimeLibrary(parameters)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(Main.class)
.enableInliningAnnotations()
.enableNoHorizontalClassMergingAnnotations()
diff --git a/src/test/java/com/android/tools/r8/apimodel/ApiModelNoInliningOfHigherApiLevelInterfaceTest.java b/src/test/java/com/android/tools/r8/apimodel/ApiModelNoInliningOfHigherApiLevelInterfaceTest.java
index dec0a00..668bea6 100644
--- a/src/test/java/com/android/tools/r8/apimodel/ApiModelNoInliningOfHigherApiLevelInterfaceTest.java
+++ b/src/test/java/com/android/tools/r8/apimodel/ApiModelNoInliningOfHigherApiLevelInterfaceTest.java
@@ -44,7 +44,7 @@
.addProgramClassesAndInnerClasses(Main.class, A.class, ApiCaller.class)
.addLibraryClasses(Api.class)
.addDefaultRuntimeLibrary(parameters)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(Main.class)
.enableConstantArgumentAnnotations()
.enableInliningAnnotations()
diff --git a/src/test/java/com/android/tools/r8/apimodel/ApiModelNoInliningOfHigherApiLevelIntoLowerDirectTest.java b/src/test/java/com/android/tools/r8/apimodel/ApiModelNoInliningOfHigherApiLevelIntoLowerDirectTest.java
index 84ce168..b0794bd 100644
--- a/src/test/java/com/android/tools/r8/apimodel/ApiModelNoInliningOfHigherApiLevelIntoLowerDirectTest.java
+++ b/src/test/java/com/android/tools/r8/apimodel/ApiModelNoInliningOfHigherApiLevelIntoLowerDirectTest.java
@@ -39,7 +39,7 @@
Method apiLevel22 = B.class.getDeclaredMethod("apiLevel22");
testForR8(parameters.getBackend())
.addInnerClasses(getClass())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(Main.class)
.enableInliningAnnotations()
.enableNoHorizontalClassMergingAnnotations()
diff --git a/src/test/java/com/android/tools/r8/apimodel/ApiModelNoInliningOfHigherApiLevelStaticFieldTest.java b/src/test/java/com/android/tools/r8/apimodel/ApiModelNoInliningOfHigherApiLevelStaticFieldTest.java
index 8a5904a..da35447 100644
--- a/src/test/java/com/android/tools/r8/apimodel/ApiModelNoInliningOfHigherApiLevelStaticFieldTest.java
+++ b/src/test/java/com/android/tools/r8/apimodel/ApiModelNoInliningOfHigherApiLevelStaticFieldTest.java
@@ -43,7 +43,7 @@
.addProgramClasses(ApiCaller.class, ApiCallerCaller.class, Main.class)
.addLibraryClasses(Api.class)
.addDefaultRuntimeLibrary(parameters)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(Main.class)
.enableInliningAnnotations()
.enableNoHorizontalClassMergingAnnotations()
diff --git a/src/test/java/com/android/tools/r8/apimodel/ApiModelNoInliningOfHigherApiLevelStaticMethodTest.java b/src/test/java/com/android/tools/r8/apimodel/ApiModelNoInliningOfHigherApiLevelStaticMethodTest.java
index 72ca50d..1701cbd 100644
--- a/src/test/java/com/android/tools/r8/apimodel/ApiModelNoInliningOfHigherApiLevelStaticMethodTest.java
+++ b/src/test/java/com/android/tools/r8/apimodel/ApiModelNoInliningOfHigherApiLevelStaticMethodTest.java
@@ -42,7 +42,7 @@
.addProgramClasses(Main.class, A.class, ApiCaller.class)
.addLibraryClasses(Api.class)
.addDefaultRuntimeLibrary(parameters)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(Main.class)
.enableInliningAnnotations()
.enableNoHorizontalClassMergingAnnotations()
diff --git a/src/test/java/com/android/tools/r8/apimodel/ApiModelNoInliningOfHigherApiLevelSuperTest.java b/src/test/java/com/android/tools/r8/apimodel/ApiModelNoInliningOfHigherApiLevelSuperTest.java
index b862c5e..5235d8f 100644
--- a/src/test/java/com/android/tools/r8/apimodel/ApiModelNoInliningOfHigherApiLevelSuperTest.java
+++ b/src/test/java/com/android/tools/r8/apimodel/ApiModelNoInliningOfHigherApiLevelSuperTest.java
@@ -45,7 +45,7 @@
.addProgramClasses(ApiCaller.class, A.class, Main.class)
.addLibraryClasses(Api.class)
.addDefaultRuntimeLibrary(parameters)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(Main.class)
.enableInliningAnnotations()
.enableNoHorizontalClassMergingAnnotations()
diff --git a/src/test/java/com/android/tools/r8/apimodel/ApiModelNoInliningOfHigherApiLevelVirtualTest.java b/src/test/java/com/android/tools/r8/apimodel/ApiModelNoInliningOfHigherApiLevelVirtualTest.java
index e16d9bc..e42aee6 100644
--- a/src/test/java/com/android/tools/r8/apimodel/ApiModelNoInliningOfHigherApiLevelVirtualTest.java
+++ b/src/test/java/com/android/tools/r8/apimodel/ApiModelNoInliningOfHigherApiLevelVirtualTest.java
@@ -43,7 +43,7 @@
.addProgramClasses(Main.class, A.class, ApiCaller.class)
.addLibraryClasses(Api.class)
.addDefaultRuntimeLibrary(parameters)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(Main.class)
.enableInliningAnnotations()
.enableNoHorizontalClassMergingAnnotations()
diff --git a/src/test/java/com/android/tools/r8/apimodel/ApiModelNoInliningOfLambdaTest.java b/src/test/java/com/android/tools/r8/apimodel/ApiModelNoInliningOfLambdaTest.java
index e5967cd..7c944fd 100644
--- a/src/test/java/com/android/tools/r8/apimodel/ApiModelNoInliningOfLambdaTest.java
+++ b/src/test/java/com/android/tools/r8/apimodel/ApiModelNoInliningOfLambdaTest.java
@@ -54,7 +54,7 @@
.addProgramClasses(ApiCaller.class, Action.class, Main.class)
.addLibraryClasses(Api.class)
.addDefaultRuntimeLibrary(parameters)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(Main.class)
.apply(setMockApiLevelForMethod(apiMethod, L_MR1))
.apply(ApiModelingTestHelper::enableApiCallerIdentification)
diff --git a/src/test/java/com/android/tools/r8/apimodel/ApiModelNoInliningOfStaticInterfaceMethodsTest.java b/src/test/java/com/android/tools/r8/apimodel/ApiModelNoInliningOfStaticInterfaceMethodsTest.java
index 9411c7d..1bf2720 100644
--- a/src/test/java/com/android/tools/r8/apimodel/ApiModelNoInliningOfStaticInterfaceMethodsTest.java
+++ b/src/test/java/com/android/tools/r8/apimodel/ApiModelNoInliningOfStaticInterfaceMethodsTest.java
@@ -45,7 +45,7 @@
.addProgramClasses(Main.class, A.class, ApiCaller.class)
.addLibraryClasses(Api.class)
.addDefaultRuntimeLibrary(parameters)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(Main.class)
.apply(setMockApiLevelForMethod(apiMethod22, L_MR1))
.apply(setMockApiLevelForMethod(apiMethod26, O))
diff --git a/src/test/java/com/android/tools/r8/apimodel/ApiModelNoInliningOfTryCatchReferenceTest.java b/src/test/java/com/android/tools/r8/apimodel/ApiModelNoInliningOfTryCatchReferenceTest.java
index 6bd30af..7007797 100644
--- a/src/test/java/com/android/tools/r8/apimodel/ApiModelNoInliningOfTryCatchReferenceTest.java
+++ b/src/test/java/com/android/tools/r8/apimodel/ApiModelNoInliningOfTryCatchReferenceTest.java
@@ -40,7 +40,7 @@
.addProgramClasses(Main.class, TestClass.class, Caller.class, KeptClass.class)
.addLibraryClasses(ApiException.class)
.addDefaultRuntimeLibrary(parameters)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMethodRules(
Reference.methodFromMethod(KeptClass.class.getDeclaredMethod("keptMethodThatMayThrow")))
.addKeepMainRule(Main.class)
diff --git a/src/test/java/com/android/tools/r8/apimodel/ApiModelNoLibraryReferenceTest.java b/src/test/java/com/android/tools/r8/apimodel/ApiModelNoLibraryReferenceTest.java
index f6800a3..04c1633 100644
--- a/src/test/java/com/android/tools/r8/apimodel/ApiModelNoLibraryReferenceTest.java
+++ b/src/test/java/com/android/tools/r8/apimodel/ApiModelNoLibraryReferenceTest.java
@@ -44,7 +44,7 @@
DescriptorUtils.javaTypeToDescriptor(API_TYPE_NAME))
.transform())
.addLibraryFiles(ToolHelper.getJava8RuntimeJar())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addDontWarn(API_TYPE_NAME)
.addKeepMainRule(Main.class)
.addAndroidBuildVersion()
diff --git a/src/test/java/com/android/tools/r8/apimodel/ApiModelNoOutlineForFullyMockedTest.java b/src/test/java/com/android/tools/r8/apimodel/ApiModelNoOutlineForFullyMockedTest.java
index 37e361c..ce84ddc 100644
--- a/src/test/java/com/android/tools/r8/apimodel/ApiModelNoOutlineForFullyMockedTest.java
+++ b/src/test/java/com/android/tools/r8/apimodel/ApiModelNoOutlineForFullyMockedTest.java
@@ -49,7 +49,7 @@
.addProgramClasses(Main.class)
.addLibraryClasses(LibraryClass.class)
.addDefaultRuntimeLibrary(parameters)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addAndroidBuildVersion()
.apply(setMockApiLevelForClass(LibraryClass.class, libraryApiLevel))
.apply(setMockApiLevelForDefaultInstanceInitializer(LibraryClass.class, libraryApiLevel))
diff --git a/src/test/java/com/android/tools/r8/apimodel/ApiModelNoUnknownMergeTest.java b/src/test/java/com/android/tools/r8/apimodel/ApiModelNoUnknownMergeTest.java
index 67082dc..b61eb9f 100644
--- a/src/test/java/com/android/tools/r8/apimodel/ApiModelNoUnknownMergeTest.java
+++ b/src/test/java/com/android/tools/r8/apimodel/ApiModelNoUnknownMergeTest.java
@@ -39,7 +39,7 @@
.addProgramClasses(Main.class, LibraryClassFooCaller.class, LibraryClassBarCaller.class)
.addLibraryClasses(LibraryClass.class)
.addDefaultRuntimeLibrary(parameters)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(Main.class)
.enableInliningAnnotations()
.addOptionsModification(
diff --git a/src/test/java/com/android/tools/r8/apimodel/ApiModelNoVerticalMergingSubReferenceApiTest.java b/src/test/java/com/android/tools/r8/apimodel/ApiModelNoVerticalMergingSubReferenceApiTest.java
index f49536b..aa584e4 100644
--- a/src/test/java/com/android/tools/r8/apimodel/ApiModelNoVerticalMergingSubReferenceApiTest.java
+++ b/src/test/java/com/android/tools/r8/apimodel/ApiModelNoVerticalMergingSubReferenceApiTest.java
@@ -47,7 +47,7 @@
.addProgramClasses(Main.class, Base.class, Sub.class)
.addLibraryClasses(Api.class)
.addDefaultRuntimeLibrary(parameters)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(Main.class)
.apply(setMockApiLevelForMethod(apiMethod, L_MR1))
.apply(ApiModelingTestHelper::enableApiCallerIdentification)
diff --git a/src/test/java/com/android/tools/r8/apimodel/ApiModelNoVerticalMergingTest.java b/src/test/java/com/android/tools/r8/apimodel/ApiModelNoVerticalMergingTest.java
index 352cd3a..3933284 100644
--- a/src/test/java/com/android/tools/r8/apimodel/ApiModelNoVerticalMergingTest.java
+++ b/src/test/java/com/android/tools/r8/apimodel/ApiModelNoVerticalMergingTest.java
@@ -47,7 +47,7 @@
.addProgramClasses(Main.class, Base.class, Sub.class)
.addLibraryClasses(Api.class)
.addDefaultRuntimeLibrary(parameters)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(Main.class)
.apply(setMockApiLevelForMethod(apiMethod, L_MR1))
.apply(ApiModelingTestHelper::enableApiCallerIdentification)
diff --git a/src/test/java/com/android/tools/r8/apimodel/ApiModelObjectInitTest.java b/src/test/java/com/android/tools/r8/apimodel/ApiModelObjectInitTest.java
index cffda67..8599a69 100644
--- a/src/test/java/com/android/tools/r8/apimodel/ApiModelObjectInitTest.java
+++ b/src/test/java/com/android/tools/r8/apimodel/ApiModelObjectInitTest.java
@@ -62,7 +62,7 @@
.transform())
.addLibraryClasses(LibraryClass.class)
.addDefaultRuntimeLibrary(parameters)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.apply(ApiModelingTestHelper::disableOutliningAndStubbing)
.apply(setMockApiLevelForClass(LibraryClass.class, AndroidApiLevel.L))
.apply(setMockApiLevelForMethod(declaredConstructor, AndroidApiLevel.L))
diff --git a/src/test/java/com/android/tools/r8/apimodel/ApiModelOutlineCheckCastTest.java b/src/test/java/com/android/tools/r8/apimodel/ApiModelOutlineCheckCastTest.java
index 208c0d1..c733fa8 100644
--- a/src/test/java/com/android/tools/r8/apimodel/ApiModelOutlineCheckCastTest.java
+++ b/src/test/java/com/android/tools/r8/apimodel/ApiModelOutlineCheckCastTest.java
@@ -43,7 +43,7 @@
.addLibraryClasses(LibraryClass.class, LibraryProvider.class)
.addDefaultRuntimeLibrary(parameters)
.addProgramClasses(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addAndroidBuildVersion(getApiLevelForRuntime())
.apply(setMockApiLevelForClass(LibraryProvider.class, AndroidApiLevel.B))
.apply(
diff --git a/src/test/java/com/android/tools/r8/apimodel/ApiModelOutlineConstClassTest.java b/src/test/java/com/android/tools/r8/apimodel/ApiModelOutlineConstClassTest.java
index 72157a0..23496d7 100644
--- a/src/test/java/com/android/tools/r8/apimodel/ApiModelOutlineConstClassTest.java
+++ b/src/test/java/com/android/tools/r8/apimodel/ApiModelOutlineConstClassTest.java
@@ -42,7 +42,7 @@
.addLibraryClasses(LibraryClass.class)
.addDefaultRuntimeLibrary(parameters)
.addProgramClasses(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addAndroidBuildVersion(getApiLevelForRuntime())
.apply(setMockApiLevelForClass(LibraryClass.class, classApiLevel))
.apply(ApiModelingTestHelper::enableApiCallerIdentification)
diff --git a/src/test/java/com/android/tools/r8/apimodel/ApiModelOutlineDuplicateMethodTest.java b/src/test/java/com/android/tools/r8/apimodel/ApiModelOutlineDuplicateMethodTest.java
index e826dd7..35bc4ed 100644
--- a/src/test/java/com/android/tools/r8/apimodel/ApiModelOutlineDuplicateMethodTest.java
+++ b/src/test/java/com/android/tools/r8/apimodel/ApiModelOutlineDuplicateMethodTest.java
@@ -56,7 +56,7 @@
.addProgramClasses(Main.class, TestClass.class)
.addLibraryClasses(LibraryClass.class)
.addDefaultRuntimeLibrary(parameters)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addAndroidBuildVersion()
.apply(setMockApiLevelForClass(LibraryClass.class, classApiLevel))
.apply(setMockApiLevelForMethod(addedOn23(), methodApiLevel))
diff --git a/src/test/java/com/android/tools/r8/apimodel/ApiModelOutlineHorizontalMergingTest.java b/src/test/java/com/android/tools/r8/apimodel/ApiModelOutlineHorizontalMergingTest.java
index 978d068..767c898 100644
--- a/src/test/java/com/android/tools/r8/apimodel/ApiModelOutlineHorizontalMergingTest.java
+++ b/src/test/java/com/android/tools/r8/apimodel/ApiModelOutlineHorizontalMergingTest.java
@@ -50,7 +50,7 @@
.addProgramClasses(Main.class, TestClass.class)
.addLibraryClasses(LibraryClass.class, OtherLibraryClass.class)
.addDefaultRuntimeLibrary(parameters)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addAndroidBuildVersion()
.apply(setMockApiLevelForClass(LibraryClass.class, libraryClassApiLevel))
.apply(
diff --git a/src/test/java/com/android/tools/r8/apimodel/ApiModelOutlineInstanceFieldTest.java b/src/test/java/com/android/tools/r8/apimodel/ApiModelOutlineInstanceFieldTest.java
index 2d9de46..9f19726 100644
--- a/src/test/java/com/android/tools/r8/apimodel/ApiModelOutlineInstanceFieldTest.java
+++ b/src/test/java/com/android/tools/r8/apimodel/ApiModelOutlineInstanceFieldTest.java
@@ -47,7 +47,7 @@
.addLibraryClasses(LibraryClass.class)
.addDefaultRuntimeLibrary(parameters)
.addProgramClasses(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addAndroidBuildVersion()
.apply(setMockApiLevelForClass(LibraryClass.class, classApiLevel))
.apply(setMockApiLevelForDefaultInstanceInitializer(LibraryClass.class, classApiLevel))
diff --git a/src/test/java/com/android/tools/r8/apimodel/ApiModelOutlineInstanceInitializerSuperTest.java b/src/test/java/com/android/tools/r8/apimodel/ApiModelOutlineInstanceInitializerSuperTest.java
index a362bd3..33c0e63 100644
--- a/src/test/java/com/android/tools/r8/apimodel/ApiModelOutlineInstanceInitializerSuperTest.java
+++ b/src/test/java/com/android/tools/r8/apimodel/ApiModelOutlineInstanceInitializerSuperTest.java
@@ -43,7 +43,7 @@
.addLibraryClasses(LibraryClass.class)
.addDefaultRuntimeLibrary(parameters)
.addProgramClasses(Main.class, ProgramExtendsLibraryClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addAndroidBuildVersion()
.apply(setMockApiLevelForClass(LibraryClass.class, classApiLevel))
.apply(
diff --git a/src/test/java/com/android/tools/r8/apimodel/ApiModelOutlineInstanceInitializerTest.java b/src/test/java/com/android/tools/r8/apimodel/ApiModelOutlineInstanceInitializerTest.java
index b0a5fb7..5bf1036 100644
--- a/src/test/java/com/android/tools/r8/apimodel/ApiModelOutlineInstanceInitializerTest.java
+++ b/src/test/java/com/android/tools/r8/apimodel/ApiModelOutlineInstanceInitializerTest.java
@@ -45,7 +45,7 @@
.addLibraryClasses(LibraryClass.class, Argument.class)
.addDefaultRuntimeLibrary(parameters)
.addProgramClasses(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addAndroidBuildVersion()
.apply(setMockApiLevelForClass(Argument.class, classApiLevel))
.apply(
diff --git a/src/test/java/com/android/tools/r8/apimodel/ApiModelOutlineInstanceOfTest.java b/src/test/java/com/android/tools/r8/apimodel/ApiModelOutlineInstanceOfTest.java
index 39b2125..f1a365e 100644
--- a/src/test/java/com/android/tools/r8/apimodel/ApiModelOutlineInstanceOfTest.java
+++ b/src/test/java/com/android/tools/r8/apimodel/ApiModelOutlineInstanceOfTest.java
@@ -43,7 +43,7 @@
.addLibraryClasses(LibraryClass.class, LibraryProvider.class)
.addDefaultRuntimeLibrary(parameters)
.addProgramClasses(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addAndroidBuildVersion(getApiLevelForRuntime())
.apply(setMockApiLevelForClass(LibraryProvider.class, AndroidApiLevel.B))
.apply(
diff --git a/src/test/java/com/android/tools/r8/apimodel/ApiModelOutlineMethodAndStubClassTest.java b/src/test/java/com/android/tools/r8/apimodel/ApiModelOutlineMethodAndStubClassTest.java
index 01894d1..4663607 100644
--- a/src/test/java/com/android/tools/r8/apimodel/ApiModelOutlineMethodAndStubClassTest.java
+++ b/src/test/java/com/android/tools/r8/apimodel/ApiModelOutlineMethodAndStubClassTest.java
@@ -50,7 +50,7 @@
.addProgramClasses(Main.class, TestClass.class)
.addLibraryClasses(LibraryClass.class)
.addDefaultRuntimeLibrary(parameters)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addAndroidBuildVersion()
// TODO(b/213552119): Remove when enabled by default.
.apply(ApiModelingTestHelper::enableApiCallerIdentification)
diff --git a/src/test/java/com/android/tools/r8/apimodel/ApiModelOutlineMethodMissingClassTest.java b/src/test/java/com/android/tools/r8/apimodel/ApiModelOutlineMethodMissingClassTest.java
index 22f79df..2866954 100644
--- a/src/test/java/com/android/tools/r8/apimodel/ApiModelOutlineMethodMissingClassTest.java
+++ b/src/test/java/com/android/tools/r8/apimodel/ApiModelOutlineMethodMissingClassTest.java
@@ -60,7 +60,7 @@
.addProgramClasses(Main.class, TestClass.class)
.addLibraryClasses(LibraryClass.class)
.addDefaultRuntimeLibrary(parameters)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addAndroidBuildVersion()
.apply(setMockApiLevelForClass(LibraryClass.class, initialLibraryMockLevel))
.apply(setMockApiLevelForMethod(addedOn23(), initialLibraryMockLevel))
diff --git a/src/test/java/com/android/tools/r8/apimodel/ApiModelOutlineMethodUnknownTest.java b/src/test/java/com/android/tools/r8/apimodel/ApiModelOutlineMethodUnknownTest.java
index fdd796b..de5ce66 100644
--- a/src/test/java/com/android/tools/r8/apimodel/ApiModelOutlineMethodUnknownTest.java
+++ b/src/test/java/com/android/tools/r8/apimodel/ApiModelOutlineMethodUnknownTest.java
@@ -38,7 +38,7 @@
.addLibraryClasses(LibraryClass.class)
.addDefaultRuntimeLibrary(parameters)
.addProgramClasses(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addAndroidBuildVersion()
.apply(setMockApiLevelForClass(LibraryClass.class, classApiLevel))
// TODO(b/213552119): Remove when enabled by default.
diff --git a/src/test/java/com/android/tools/r8/apimodel/ApiModelOutlinePackagePrivateTest.java b/src/test/java/com/android/tools/r8/apimodel/ApiModelOutlinePackagePrivateTest.java
index abf4efd..4810c56 100644
--- a/src/test/java/com/android/tools/r8/apimodel/ApiModelOutlinePackagePrivateTest.java
+++ b/src/test/java/com/android/tools/r8/apimodel/ApiModelOutlinePackagePrivateTest.java
@@ -65,7 +65,7 @@
.addLibraryClasses(LibraryClass.class)
.addProgramClasses(Main.class)
.addAndroidBuildVersion()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile();
}
@@ -74,7 +74,7 @@
.addLibraryClasses(LibraryClass.class)
.addDefaultRuntimeLibrary(parameters)
.addProgramClasses(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addAndroidBuildVersion()
.apply(setMockApiLevelForClass(LibraryClass.class, classApiLevel))
.apply(
diff --git a/src/test/java/com/android/tools/r8/apimodel/ApiModelOutlineStaticFieldTest.java b/src/test/java/com/android/tools/r8/apimodel/ApiModelOutlineStaticFieldTest.java
index 79b2cb8..6ec514c 100644
--- a/src/test/java/com/android/tools/r8/apimodel/ApiModelOutlineStaticFieldTest.java
+++ b/src/test/java/com/android/tools/r8/apimodel/ApiModelOutlineStaticFieldTest.java
@@ -46,7 +46,7 @@
.addLibraryClasses(LibraryClass.class)
.addDefaultRuntimeLibrary(parameters)
.addProgramClasses(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addAndroidBuildVersion()
.apply(setMockApiLevelForClass(LibraryClass.class, classApiLevel))
.apply(setMockApiLevelForField(LibraryClass.class.getField("getField"), fieldApiLevel))
diff --git a/src/test/java/com/android/tools/r8/apimodel/ApiModelOutlineSubTypeStaticReferenceTest.java b/src/test/java/com/android/tools/r8/apimodel/ApiModelOutlineSubTypeStaticReferenceTest.java
index 19971c3..675d28e 100644
--- a/src/test/java/com/android/tools/r8/apimodel/ApiModelOutlineSubTypeStaticReferenceTest.java
+++ b/src/test/java/com/android/tools/r8/apimodel/ApiModelOutlineSubTypeStaticReferenceTest.java
@@ -68,7 +68,7 @@
.addLibraryClasses(LibraryClass.class)
.addProgramClasses(Main.class, Sub.class)
.addAndroidBuildVersion()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile();
}
@@ -77,7 +77,7 @@
.addLibraryClasses(LibraryClass.class)
.addDefaultRuntimeLibrary(parameters)
.addProgramClasses(Main.class, Sub.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addAndroidBuildVersion()
.apply(setMockApiLevelForClass(LibraryClass.class, libraryApiLevel))
.apply(
diff --git a/src/test/java/com/android/tools/r8/apimodel/ApiModelTypeReferenceInvokeTest.java b/src/test/java/com/android/tools/r8/apimodel/ApiModelTypeReferenceInvokeTest.java
index 8d59924..3e21906 100644
--- a/src/test/java/com/android/tools/r8/apimodel/ApiModelTypeReferenceInvokeTest.java
+++ b/src/test/java/com/android/tools/r8/apimodel/ApiModelTypeReferenceInvokeTest.java
@@ -42,7 +42,7 @@
.addProgramClasses(Main.class, ApiHelper.class)
.addLibraryClasses(LibraryClass.class)
.addDefaultRuntimeLibrary(parameters)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.apply(setMockApiLevelForClass(LibraryClass.class, AndroidApiLevel.M))
.apply(setMockApiLevelForMethod(apiMethod, AndroidApiLevel.M))
.apply(ApiModelingTestHelper::enableApiCallerIdentification)
diff --git a/src/test/java/com/android/tools/r8/apimodel/ApiModelTypeStrengtheningAboveMinApiTest.java b/src/test/java/com/android/tools/r8/apimodel/ApiModelTypeStrengtheningAboveMinApiTest.java
index e2f517c..f72e4ac 100644
--- a/src/test/java/com/android/tools/r8/apimodel/ApiModelTypeStrengtheningAboveMinApiTest.java
+++ b/src/test/java/com/android/tools/r8/apimodel/ApiModelTypeStrengtheningAboveMinApiTest.java
@@ -47,7 +47,7 @@
.apply(setMockApiLevelForClass(ApiLevel23.class, AndroidApiLevel.M))
.apply(ApiModelingTestHelper::enableApiCallerIdentification)
.apply(ApiModelingTestHelper::disableOutliningAndStubbing)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector -> {
diff --git a/src/test/java/com/android/tools/r8/apimodel/ApiModelTypeStrengtheningTest.java b/src/test/java/com/android/tools/r8/apimodel/ApiModelTypeStrengtheningTest.java
index aea9a60..1f218a2 100644
--- a/src/test/java/com/android/tools/r8/apimodel/ApiModelTypeStrengtheningTest.java
+++ b/src/test/java/com/android/tools/r8/apimodel/ApiModelTypeStrengtheningTest.java
@@ -50,7 +50,7 @@
.apply(setMockApiLevelForClass(ApiLevel23.class, AndroidApiLevel.M))
.apply(ApiModelingTestHelper::enableApiCallerIdentification)
.apply(ApiModelingTestHelper::disableOutliningAndStubbing)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector -> {
diff --git a/src/test/java/com/android/tools/r8/apimodel/ApiModelVerticalMergingOfSuperClassTest.java b/src/test/java/com/android/tools/r8/apimodel/ApiModelVerticalMergingOfSuperClassTest.java
index 71a742e..d46edd4 100644
--- a/src/test/java/com/android/tools/r8/apimodel/ApiModelVerticalMergingOfSuperClassTest.java
+++ b/src/test/java/com/android/tools/r8/apimodel/ApiModelVerticalMergingOfSuperClassTest.java
@@ -45,7 +45,7 @@
.addProgramClasses(A.class, B.class, Main.class)
.addLibraryClasses(Api.class)
.addDefaultRuntimeLibrary(parameters)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(Main.class)
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
diff --git a/src/test/java/com/android/tools/r8/apimodel/ApiModelVirtualDispatchInterfaceOverrideTest.java b/src/test/java/com/android/tools/r8/apimodel/ApiModelVirtualDispatchInterfaceOverrideTest.java
index d262834..da3050f 100644
--- a/src/test/java/com/android/tools/r8/apimodel/ApiModelVirtualDispatchInterfaceOverrideTest.java
+++ b/src/test/java/com/android/tools/r8/apimodel/ApiModelVirtualDispatchInterfaceOverrideTest.java
@@ -48,7 +48,7 @@
descriptor(AssetManager.class), "Landroid/content/res/AssetManager;")
.transform())
.addLibraryFiles(ToolHelper.getAndroidJar(LATEST))
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(Main.class)
.apply(ApiModelingTestHelper::enableApiCallerIdentification)
.apply(
diff --git a/src/test/java/com/android/tools/r8/apimodel/ApiModelVirtualDispatchInterfaceTest.java b/src/test/java/com/android/tools/r8/apimodel/ApiModelVirtualDispatchInterfaceTest.java
index 892f9d8..b885036 100644
--- a/src/test/java/com/android/tools/r8/apimodel/ApiModelVirtualDispatchInterfaceTest.java
+++ b/src/test/java/com/android/tools/r8/apimodel/ApiModelVirtualDispatchInterfaceTest.java
@@ -39,7 +39,7 @@
testForR8(parameters.getBackend())
.addProgramClasses(Main.class)
.addDefaultRuntimeLibrary(parameters)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(Main.class)
.apply(ApiModelingTestHelper::enableApiCallerIdentification)
.apply(
diff --git a/src/test/java/com/android/tools/r8/apimodel/ApiModelVirtualDispatchLinkInterfaceTest.java b/src/test/java/com/android/tools/r8/apimodel/ApiModelVirtualDispatchLinkInterfaceTest.java
index f28c3c6..b8f96aa 100644
--- a/src/test/java/com/android/tools/r8/apimodel/ApiModelVirtualDispatchLinkInterfaceTest.java
+++ b/src/test/java/com/android/tools/r8/apimodel/ApiModelVirtualDispatchLinkInterfaceTest.java
@@ -49,7 +49,7 @@
"Landroid/view/accessibility/AccessibilityNodeInfo$AccessibilityAction;")
.transform())
.addLibraryFiles(ToolHelper.getAndroidJar(LATEST))
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(Main.class)
.apply(ApiModelingTestHelper::enableApiCallerIdentification)
// We are testing that we do not inline/merge higher api-levels
diff --git a/src/test/java/com/android/tools/r8/apimodel/ApiModelVirtualDispatchSuperTypeTest.java b/src/test/java/com/android/tools/r8/apimodel/ApiModelVirtualDispatchSuperTypeTest.java
index c79c69b..7fed8d9 100644
--- a/src/test/java/com/android/tools/r8/apimodel/ApiModelVirtualDispatchSuperTypeTest.java
+++ b/src/test/java/com/android/tools/r8/apimodel/ApiModelVirtualDispatchSuperTypeTest.java
@@ -46,7 +46,7 @@
.addLibraryFiles(
ToolHelper.getFirstSupportedAndroidJar(
parameters.isCfRuntime() ? AndroidApiLevel.B : parameters.getApiLevel()))
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(Main.class)
.apply(ApiModelingTestHelper::enableApiCallerIdentification)
.apply(
diff --git a/src/test/java/com/android/tools/r8/apimodel/ClassValueTest.java b/src/test/java/com/android/tools/r8/apimodel/ClassValueTest.java
index ad9ea40..04d14ba 100644
--- a/src/test/java/com/android/tools/r8/apimodel/ClassValueTest.java
+++ b/src/test/java/com/android/tools/r8/apimodel/ClassValueTest.java
@@ -64,7 +64,7 @@
assumeTrue(parameters.isDexRuntime());
testForD8(parameters.getBackend())
.addInnerClasses(getClass())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::computeValuePresent)
.run(parameters.getRuntime(), TestClass.class)
@@ -77,7 +77,7 @@
.addLibraryFiles(ToolHelper.getAndroidJar(AndroidApiLevel.T))
.addInnerClasses(getClass())
.addKeepMainRule(TestClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addDontWarn(ClassValue.class)
.compile()
.inspect(this::computeValueAbsent)
@@ -95,7 +95,7 @@
.addLibraryFiles(ToolHelper.getAndroidJar(AndroidApiLevel.T))
.addInnerClasses(getClass())
.addKeepMainRule(TestClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
// ProGuard warns about the inner class attributes referring to this outer class.
.addDontWarn(this.getClass().getTypeName())
// ProGuard also warns about ClassValueSub not having method get.
@@ -115,7 +115,7 @@
.addLibraryFiles(ToolHelper.getAndroidJar(AndroidApiLevel.T))
.addInnerClasses(getClass())
.addKeepMainRule(TestClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addDontWarn(ClassValue.class)
// Try to keep computeValue on classes extending unknown type.
.addKeepRules("-keep class * extends " + ClassValue.class.getTypeName() + " { *; }")
@@ -144,7 +144,7 @@
.addLibraryFiles(ToolHelper.getAndroidJar(AndroidApiLevel.T))
.addInnerClasses(getClass())
.addKeepMainRule(TestClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
// ProGuard warns about the inner class attributes referring to this outer class.
.addDontWarn(this.getClass().getTypeName())
// Just -dontwarn on ClassValue is not sufficient. ProGuard also warns about ClassValueSub
@@ -167,7 +167,7 @@
.addLibraryFiles(ToolHelper.getAndroidJar(AndroidApiLevel.T))
.addInnerClasses(getClass())
.addKeepMainRule(TestClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addDontWarn(dontWarn)
.addKeepRules(
"-keep class "
diff --git a/src/test/java/com/android/tools/r8/apimodel/DuplicateClassTest.java b/src/test/java/com/android/tools/r8/apimodel/DuplicateClassTest.java
index 458bb9d..47ea2a8 100644
--- a/src/test/java/com/android/tools/r8/apimodel/DuplicateClassTest.java
+++ b/src/test/java/com/android/tools/r8/apimodel/DuplicateClassTest.java
@@ -40,7 +40,7 @@
.setClassDescriptor("Ljava/lang/Exception;")
.removeInnerClasses()
.transform())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("Hello World")
diff --git a/src/test/java/com/android/tools/r8/bridgeremoval/B77836766.java b/src/test/java/com/android/tools/r8/bridgeremoval/B77836766.java
index 73f2712..1df8164 100644
--- a/src/test/java/com/android/tools/r8/bridgeremoval/B77836766.java
+++ b/src/test/java/com/android/tools/r8/bridgeremoval/B77836766.java
@@ -148,7 +148,7 @@
.enableConstantArgumentAnnotations()
.noHorizontalClassMerging(cls2Class.name)
.addDontObfuscate()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector -> {
@@ -281,7 +281,7 @@
.enableConstantArgumentAnnotations()
.noHorizontalClassMerging(derivedIntegerClass.name)
.addDontObfuscate()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector -> {
@@ -393,7 +393,7 @@
.addOptionsModification(this::configure)
.enableConstantArgumentAnnotations()
.addDontObfuscate()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector -> {
@@ -482,7 +482,7 @@
.addOptionsModification(this::configure)
.enableConstantArgumentAnnotations()
.addDontObfuscate()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector -> {
diff --git a/src/test/java/com/android/tools/r8/bridgeremoval/BridgeWithInvokeSuperOnInterfaceTest.java b/src/test/java/com/android/tools/r8/bridgeremoval/BridgeWithInvokeSuperOnInterfaceTest.java
index cc24115..4c6af25 100644
--- a/src/test/java/com/android/tools/r8/bridgeremoval/BridgeWithInvokeSuperOnInterfaceTest.java
+++ b/src/test/java/com/android/tools/r8/bridgeremoval/BridgeWithInvokeSuperOnInterfaceTest.java
@@ -49,7 +49,7 @@
testForR8(parameters.getBackend())
.addProgramClasses(Main.class, I.class)
.addProgramClassFileData(getJWithBridgeAccessFlag())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(Main.class)
.enableNoVerticalClassMergingAnnotations()
.enableInliningAnnotations()
diff --git a/src/test/java/com/android/tools/r8/bridgeremoval/BridgeWithInvokeSuperTest.java b/src/test/java/com/android/tools/r8/bridgeremoval/BridgeWithInvokeSuperTest.java
index b965fea..93795cf 100644
--- a/src/test/java/com/android/tools/r8/bridgeremoval/BridgeWithInvokeSuperTest.java
+++ b/src/test/java/com/android/tools/r8/bridgeremoval/BridgeWithInvokeSuperTest.java
@@ -49,7 +49,7 @@
testForR8(parameters.getBackend())
.addProgramClasses(Main.class, I.class)
.addProgramClassFileData(getAWithBridgeAccessFlag())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(Main.class)
.enableNoVerticalClassMergingAnnotations()
.enableInliningAnnotations()
diff --git a/src/test/java/com/android/tools/r8/bridgeremoval/KeepAbstractMethodShadowingTest.java b/src/test/java/com/android/tools/r8/bridgeremoval/KeepAbstractMethodShadowingTest.java
index d151f76..cfdcc90 100644
--- a/src/test/java/com/android/tools/r8/bridgeremoval/KeepAbstractMethodShadowingTest.java
+++ b/src/test/java/com/android/tools/r8/bridgeremoval/KeepAbstractMethodShadowingTest.java
@@ -48,7 +48,7 @@
testForR8(parameters.getBackend())
.addProgramClasses(A.class, C.class, Main.class)
.addProgramClassFileData(getBWithAbstractFoo())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(Main.class)
.addKeepClassAndMembersRules(A.class)
.run(parameters.getRuntime(), Main.class)
diff --git a/src/test/java/com/android/tools/r8/bridgeremoval/RemoveVisibilityBridgeMethodsTest.java b/src/test/java/com/android/tools/r8/bridgeremoval/RemoveVisibilityBridgeMethodsTest.java
index ed0081e..604c13c 100644
--- a/src/test/java/com/android/tools/r8/bridgeremoval/RemoveVisibilityBridgeMethodsTest.java
+++ b/src/test/java/com/android/tools/r8/bridgeremoval/RemoveVisibilityBridgeMethodsTest.java
@@ -44,7 +44,7 @@
.addKeepMainRule(Main.class)
.allowAccessModification()
.minification(minification)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect)
.run(parameters.getRuntime(), Main.class)
@@ -107,7 +107,7 @@
.addOptionsModification(options -> options.inlinerOptions().enableInlining = false)
.allowAccessModification()
.minification(minification)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector -> {
diff --git a/src/test/java/com/android/tools/r8/bridgeremoval/bridgestokeep/KeepNonVisibilityBridgeMethodsTest.java b/src/test/java/com/android/tools/r8/bridgeremoval/bridgestokeep/KeepNonVisibilityBridgeMethodsTest.java
index f1b0e7a..a73b895 100644
--- a/src/test/java/com/android/tools/r8/bridgeremoval/bridgestokeep/KeepNonVisibilityBridgeMethodsTest.java
+++ b/src/test/java/com/android/tools/r8/bridgeremoval/bridgestokeep/KeepNonVisibilityBridgeMethodsTest.java
@@ -62,7 +62,7 @@
.enableNoVerticalClassMergingAnnotations()
.enableProguardTestOptions()
.minification(minification)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector -> {
diff --git a/src/test/java/com/android/tools/r8/bridgeremoval/hoisting/AbstractAfterTreeShakingBridgeHoistingTest.java b/src/test/java/com/android/tools/r8/bridgeremoval/hoisting/AbstractAfterTreeShakingBridgeHoistingTest.java
index 772ef4f..af66c10 100644
--- a/src/test/java/com/android/tools/r8/bridgeremoval/hoisting/AbstractAfterTreeShakingBridgeHoistingTest.java
+++ b/src/test/java/com/android/tools/r8/bridgeremoval/hoisting/AbstractAfterTreeShakingBridgeHoistingTest.java
@@ -46,7 +46,7 @@
"}")
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutput("Hello");
diff --git a/src/test/java/com/android/tools/r8/bridgeremoval/hoisting/BridgeHoistingAccessibilityTest.java b/src/test/java/com/android/tools/r8/bridgeremoval/hoisting/BridgeHoistingAccessibilityTest.java
index f0e4af3..2868cd8 100644
--- a/src/test/java/com/android/tools/r8/bridgeremoval/hoisting/BridgeHoistingAccessibilityTest.java
+++ b/src/test/java/com/android/tools/r8/bridgeremoval/hoisting/BridgeHoistingAccessibilityTest.java
@@ -81,7 +81,7 @@
.enableNeverClassInliningAnnotations()
// TODO(b/173398086): uniqueMethodWithName() does not work with argument changes.
.addDontObfuscate()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/bridgeremoval/hoisting/BridgeToPackagePrivateMethodTest.java b/src/test/java/com/android/tools/r8/bridgeremoval/hoisting/BridgeToPackagePrivateMethodTest.java
index 449975b..b786730 100644
--- a/src/test/java/com/android/tools/r8/bridgeremoval/hoisting/BridgeToPackagePrivateMethodTest.java
+++ b/src/test/java/com/android/tools/r8/bridgeremoval/hoisting/BridgeToPackagePrivateMethodTest.java
@@ -49,7 +49,7 @@
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
.enableNoVerticalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines(EXPECTED_OUTPUT);
diff --git a/src/test/java/com/android/tools/r8/bridgeremoval/hoisting/BridgeToPackagePrivateMethodThatOverridesPublicMethodTest.java b/src/test/java/com/android/tools/r8/bridgeremoval/hoisting/BridgeToPackagePrivateMethodThatOverridesPublicMethodTest.java
index af36954..8f4fd0e 100644
--- a/src/test/java/com/android/tools/r8/bridgeremoval/hoisting/BridgeToPackagePrivateMethodThatOverridesPublicMethodTest.java
+++ b/src/test/java/com/android/tools/r8/bridgeremoval/hoisting/BridgeToPackagePrivateMethodThatOverridesPublicMethodTest.java
@@ -62,7 +62,7 @@
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
.enableNoVerticalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector -> {
diff --git a/src/test/java/com/android/tools/r8/bridgeremoval/hoisting/FinalBridgeHoistingTest.java b/src/test/java/com/android/tools/r8/bridgeremoval/hoisting/FinalBridgeHoistingTest.java
index 34ea8d3..fb4868b 100644
--- a/src/test/java/com/android/tools/r8/bridgeremoval/hoisting/FinalBridgeHoistingTest.java
+++ b/src/test/java/com/android/tools/r8/bridgeremoval/hoisting/FinalBridgeHoistingTest.java
@@ -46,7 +46,7 @@
.enableConstantArgumentAnnotations()
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/bridgeremoval/hoisting/InterfaceBridgeHoistingTest.java b/src/test/java/com/android/tools/r8/bridgeremoval/hoisting/InterfaceBridgeHoistingTest.java
index 0e79433..42ae02f 100644
--- a/src/test/java/com/android/tools/r8/bridgeremoval/hoisting/InterfaceBridgeHoistingTest.java
+++ b/src/test/java/com/android/tools/r8/bridgeremoval/hoisting/InterfaceBridgeHoistingTest.java
@@ -40,7 +40,7 @@
.enableInliningAnnotations()
.enableNoVerticalClassMergingAnnotations()
.enableNeverClassInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutputLines("Hello world!");
diff --git a/src/test/java/com/android/tools/r8/bridgeremoval/hoisting/KeptBridgeHoistingTest.java b/src/test/java/com/android/tools/r8/bridgeremoval/hoisting/KeptBridgeHoistingTest.java
index 13cd7b4..cb226c5 100644
--- a/src/test/java/com/android/tools/r8/bridgeremoval/hoisting/KeptBridgeHoistingTest.java
+++ b/src/test/java/com/android/tools/r8/bridgeremoval/hoisting/KeptBridgeHoistingTest.java
@@ -47,7 +47,7 @@
.enableNeverClassInliningAnnotations()
// TODO(b/173398086): uniqueMethodWithName() does not work with signature changes.
.addDontObfuscate()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/bridgeremoval/hoisting/NonReboundBridgeHoistingTest.java b/src/test/java/com/android/tools/r8/bridgeremoval/hoisting/NonReboundBridgeHoistingTest.java
index dd3f482..06f1e31 100644
--- a/src/test/java/com/android/tools/r8/bridgeremoval/hoisting/NonReboundBridgeHoistingTest.java
+++ b/src/test/java/com/android/tools/r8/bridgeremoval/hoisting/NonReboundBridgeHoistingTest.java
@@ -45,7 +45,7 @@
.enableInliningAnnotations()
.enableNoVerticalClassMergingAnnotations()
.enableNeverClassInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/bridgeremoval/hoisting/NonSuperclassBridgeHoistingTest.java b/src/test/java/com/android/tools/r8/bridgeremoval/hoisting/NonSuperclassBridgeHoistingTest.java
index 6264e0c..64dbdc1 100644
--- a/src/test/java/com/android/tools/r8/bridgeremoval/hoisting/NonSuperclassBridgeHoistingTest.java
+++ b/src/test/java/com/android/tools/r8/bridgeremoval/hoisting/NonSuperclassBridgeHoistingTest.java
@@ -49,7 +49,7 @@
.enableNeverClassInliningAnnotations()
// TODO(b/173398086): uniqueMethodWithName() does not work with signature changes.
.addDontObfuscate()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/bridgeremoval/hoisting/PositiveBridgeHoistingTest.java b/src/test/java/com/android/tools/r8/bridgeremoval/hoisting/PositiveBridgeHoistingTest.java
index 156c74b..be18c7e 100644
--- a/src/test/java/com/android/tools/r8/bridgeremoval/hoisting/PositiveBridgeHoistingTest.java
+++ b/src/test/java/com/android/tools/r8/bridgeremoval/hoisting/PositiveBridgeHoistingTest.java
@@ -60,7 +60,7 @@
.enableNoHorizontalClassMergingAnnotations()
// TODO(b/173398086): uniqueMethodWithName() does not work with argument changes.
.addDontObfuscate()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/bridgeremoval/hoisting/SingleBridgeToPackagePrivateMethodThatOverridesPublicMethodTest.java b/src/test/java/com/android/tools/r8/bridgeremoval/hoisting/SingleBridgeToPackagePrivateMethodThatOverridesPublicMethodTest.java
index a353ff8..29e1d89 100644
--- a/src/test/java/com/android/tools/r8/bridgeremoval/hoisting/SingleBridgeToPackagePrivateMethodThatOverridesPublicMethodTest.java
+++ b/src/test/java/com/android/tools/r8/bridgeremoval/hoisting/SingleBridgeToPackagePrivateMethodThatOverridesPublicMethodTest.java
@@ -81,7 +81,7 @@
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
.enableNoVerticalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector -> {
diff --git a/src/test/java/com/android/tools/r8/cf/AlwaysNullGetItemTestRunner.java b/src/test/java/com/android/tools/r8/cf/AlwaysNullGetItemTestRunner.java
index a459923..fa17abd 100644
--- a/src/test/java/com/android/tools/r8/cf/AlwaysNullGetItemTestRunner.java
+++ b/src/test/java/com/android/tools/r8/cf/AlwaysNullGetItemTestRunner.java
@@ -41,7 +41,7 @@
.debug()
.addDontObfuscate()
.noTreeShaking()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), CLASS)
.assertSuccessWithOutputLines(NullPointerException.class.getSimpleName());
diff --git a/src/test/java/com/android/tools/r8/cf/CompanionClassPreamblePositionTest.java b/src/test/java/com/android/tools/r8/cf/CompanionClassPreamblePositionTest.java
index 49d7ef6..d56bc2b 100644
--- a/src/test/java/com/android/tools/r8/cf/CompanionClassPreamblePositionTest.java
+++ b/src/test/java/com/android/tools/r8/cf/CompanionClassPreamblePositionTest.java
@@ -59,7 +59,7 @@
testForD8(parameters.getBackend())
.addProgramClasses(TestClass.class, A.class)
.addProgramClassFileData(getTransformedI(false))
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.writeToZip();
testForJvm()
diff --git a/src/test/java/com/android/tools/r8/cf/GetClassLdcClassTest.java b/src/test/java/com/android/tools/r8/cf/GetClassLdcClassTest.java
index 0b4e818..82d2be9 100644
--- a/src/test/java/com/android/tools/r8/cf/GetClassLdcClassTest.java
+++ b/src/test/java/com/android/tools/r8/cf/GetClassLdcClassTest.java
@@ -61,7 +61,7 @@
testForR8(parameters.getBackend())
.addProgramClassFileData(getDowngradedClass(Runner.class))
.addProgramClassFileData(getDowngradedClass(TestClass.class))
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(TestClass.class)
// We cannot keep class Runner, as that prohibits getClass optimization.
// Instead disable minification and inlining of the Runner class and method.
@@ -86,7 +86,7 @@
.addProgramClassFileData(getDowngradedClass(Runner.class))
// Here the main class is not downgraded, thus the output may upgrade to that version.
.addProgramClasses(TestClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(TestClass.class)
// We cannot keep class Runner, as that prohibits getClass optimization.
// Instead disable minification and inlining of the Runner class and method.
diff --git a/src/test/java/com/android/tools/r8/cf/InconsistentLocalTypeOnExceptionEdgeTest.java b/src/test/java/com/android/tools/r8/cf/InconsistentLocalTypeOnExceptionEdgeTest.java
index 9c97a2e..97c1aa5 100644
--- a/src/test/java/com/android/tools/r8/cf/InconsistentLocalTypeOnExceptionEdgeTest.java
+++ b/src/test/java/com/android/tools/r8/cf/InconsistentLocalTypeOnExceptionEdgeTest.java
@@ -47,10 +47,7 @@
.assertFailureWithErrorThatThrows(VerifyError.class);
} else {
try {
- testForD8()
- .addProgramClassFileData(classFileData)
- .setMinApi(parameters.getApiLevel())
- .compile();
+ testForD8().addProgramClassFileData(classFileData).setMinApi(parameters).compile();
} catch (CompilationFailedException e) {
inspectCompilationFailedException(e);
}
@@ -61,7 +58,7 @@
.addProgramClassFileData(classFileData)
.addKeepAllClassesRule()
.allowDiagnosticWarningMessages()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compileWithExpectedDiagnostics(
diagnostics ->
diagnostics.assertWarningsMatch(
diff --git a/src/test/java/com/android/tools/r8/cf/InlineCmpDoubleTest.java b/src/test/java/com/android/tools/r8/cf/InlineCmpDoubleTest.java
index 36e6189..a8f99b9 100644
--- a/src/test/java/com/android/tools/r8/cf/InlineCmpDoubleTest.java
+++ b/src/test/java/com/android/tools/r8/cf/InlineCmpDoubleTest.java
@@ -44,7 +44,7 @@
.addKeepMainRule(TestClass.class)
.addOptionsModification(options -> options.inlinerOptions().enableInlining = enableInlining)
.enableKeepUnusedReturnValueAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/cf/InstructionsTest.java b/src/test/java/com/android/tools/r8/cf/InstructionsTest.java
index 199d55b..986b838 100644
--- a/src/test/java/com/android/tools/r8/cf/InstructionsTest.java
+++ b/src/test/java/com/android/tools/r8/cf/InstructionsTest.java
@@ -39,7 +39,7 @@
testForR8(parameters.getBackend())
.addProgramClassFileData(dump())
.addKeepMainRule("Test")
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), "Test")
.assertSuccessWithOutputLines(EXPECTED);
}
diff --git a/src/test/java/com/android/tools/r8/cf/InvokeClinitTest.java b/src/test/java/com/android/tools/r8/cf/InvokeClinitTest.java
index 568fff6..8d0ca9a 100644
--- a/src/test/java/com/android/tools/r8/cf/InvokeClinitTest.java
+++ b/src/test/java/com/android/tools/r8/cf/InvokeClinitTest.java
@@ -59,7 +59,7 @@
testForD8(parameters.getBackend())
.addProgramClasses(A.class)
.addProgramClassFileData(transformMain())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile());
}
@@ -72,7 +72,7 @@
.addProgramClasses(A.class)
.addProgramClassFileData(transformMain())
.addKeepMainRule(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile());
}
diff --git a/src/test/java/com/android/tools/r8/cf/KeepDeserializeLambdaMethodTestRunner.java b/src/test/java/com/android/tools/r8/cf/KeepDeserializeLambdaMethodTestRunner.java
index 193e5b5..e002b80 100644
--- a/src/test/java/com/android/tools/r8/cf/KeepDeserializeLambdaMethodTestRunner.java
+++ b/src/test/java/com/android/tools/r8/cf/KeepDeserializeLambdaMethodTestRunner.java
@@ -77,7 +77,7 @@
R8CompatTestBuilder builder =
testForR8Compat(parameters.getBackend())
.addProgramClasses(getClasses())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(getMainClass())
.addOptionsModification(
options -> options.getOpenClosedInterfacesOptions().suppressAllOpenInterfaces());
diff --git a/src/test/java/com/android/tools/r8/cf/MissingClassJoinsToObjectTest.java b/src/test/java/com/android/tools/r8/cf/MissingClassJoinsToObjectTest.java
index b4b25c7..eb27756 100644
--- a/src/test/java/com/android/tools/r8/cf/MissingClassJoinsToObjectTest.java
+++ b/src/test/java/com/android/tools/r8/cf/MissingClassJoinsToObjectTest.java
@@ -61,7 +61,7 @@
.addDontWarn(B.class)
.allowDiagnosticWarningMessages()
.enableNoMethodStaticizingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compileWithExpectedDiagnostics(
diagnostics ->
diagnostics.assertWarningsMatch(
diff --git a/src/test/java/com/android/tools/r8/cf/PrintSeedsWithDeserializeLambdaMethodTest.java b/src/test/java/com/android/tools/r8/cf/PrintSeedsWithDeserializeLambdaMethodTest.java
index 8b0251f..5d9dd66 100644
--- a/src/test/java/com/android/tools/r8/cf/PrintSeedsWithDeserializeLambdaMethodTest.java
+++ b/src/test/java/com/android/tools/r8/cf/PrintSeedsWithDeserializeLambdaMethodTest.java
@@ -51,7 +51,7 @@
public void test() throws Exception {
testForR8Compat(parameters.getBackend())
.addProgramClasses(getClasses())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(getMainClass())
// TODO(b/214496607): Improve analysis precision to ensure there are no open interfaces.
.addOptionsModification(
diff --git a/src/test/java/com/android/tools/r8/cf/SillyBlockOrderTest.java b/src/test/java/com/android/tools/r8/cf/SillyBlockOrderTest.java
index d1e4ef7..76d3b1f 100644
--- a/src/test/java/com/android/tools/r8/cf/SillyBlockOrderTest.java
+++ b/src/test/java/com/android/tools/r8/cf/SillyBlockOrderTest.java
@@ -43,7 +43,7 @@
} else {
testForD8()
.addProgramClasses(TestClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutput(EXPECTED)
.inspect(i -> checkNumberOfGotos(i, 1));
diff --git a/src/test/java/com/android/tools/r8/cf/StackMapForThrowingInitializerTest.java b/src/test/java/com/android/tools/r8/cf/StackMapForThrowingInitializerTest.java
index ffb3334..4518f1b 100644
--- a/src/test/java/com/android/tools/r8/cf/StackMapForThrowingInitializerTest.java
+++ b/src/test/java/com/android/tools/r8/cf/StackMapForThrowingInitializerTest.java
@@ -49,7 +49,7 @@
public void testD8() throws Exception {
testForD8(parameters.getBackend())
.addProgramClassFileData(StackMapForThrowingInitializerTest$MainDump.dump())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class, EXPECTED)
.assertSuccessWithOutputLines(EXPECTED);
}
@@ -62,7 +62,7 @@
.addKeepClassAndMembersRules(Main.class)
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class, EXPECTED)
.assertSuccessWithOutputLines(EXPECTED);
}
diff --git a/src/test/java/com/android/tools/r8/cf/UnusedMultiNewArrayTest.java b/src/test/java/com/android/tools/r8/cf/UnusedMultiNewArrayTest.java
index 0820b25..2ec3d66 100644
--- a/src/test/java/com/android/tools/r8/cf/UnusedMultiNewArrayTest.java
+++ b/src/test/java/com/android/tools/r8/cf/UnusedMultiNewArrayTest.java
@@ -33,7 +33,7 @@
.addProgramClasses(TestClass.class)
.addKeepMainRule(TestClass.class)
.addDontWarn(A.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile();
}
diff --git a/src/test/java/com/android/tools/r8/cf/frames/DoubleAndLongIncompatibleTypesOnStackTest.java b/src/test/java/com/android/tools/r8/cf/frames/DoubleAndLongIncompatibleTypesOnStackTest.java
index fa8d660..38d090c 100644
--- a/src/test/java/com/android/tools/r8/cf/frames/DoubleAndLongIncompatibleTypesOnStackTest.java
+++ b/src/test/java/com/android/tools/r8/cf/frames/DoubleAndLongIncompatibleTypesOnStackTest.java
@@ -68,7 +68,7 @@
() ->
testForD8()
.addProgramClassFileData(getTransformedMain())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile());
}
@@ -79,7 +79,7 @@
testForR8(parameters.getBackend())
.addProgramClassFileData(getTransformedMain())
.addKeepMainRule(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile());
}
diff --git a/src/test/java/com/android/tools/r8/cf/frames/OverlappingWidesOnStackTest.java b/src/test/java/com/android/tools/r8/cf/frames/OverlappingWidesOnStackTest.java
index 24b76fb..28c0401 100644
--- a/src/test/java/com/android/tools/r8/cf/frames/OverlappingWidesOnStackTest.java
+++ b/src/test/java/com/android/tools/r8/cf/frames/OverlappingWidesOnStackTest.java
@@ -68,7 +68,7 @@
() ->
testForD8()
.addProgramClassFileData(getTransformedMain())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile());
}
@@ -79,7 +79,7 @@
testForR8(parameters.getBackend())
.addProgramClassFileData(getTransformedMain())
.addKeepMainRule(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile());
}
diff --git a/src/test/java/com/android/tools/r8/cf/frames/PrimitiveAndObjectIncompatibleTypesOnStackTest.java b/src/test/java/com/android/tools/r8/cf/frames/PrimitiveAndObjectIncompatibleTypesOnStackTest.java
index 1b368c1..c108710 100644
--- a/src/test/java/com/android/tools/r8/cf/frames/PrimitiveAndObjectIncompatibleTypesOnStackTest.java
+++ b/src/test/java/com/android/tools/r8/cf/frames/PrimitiveAndObjectIncompatibleTypesOnStackTest.java
@@ -68,7 +68,7 @@
() ->
testForD8()
.addProgramClassFileData(getTransformedMain())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile());
}
@@ -79,7 +79,7 @@
testForR8(parameters.getBackend())
.addProgramClassFileData(getTransformedMain())
.addKeepMainRule(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile());
}
diff --git a/src/test/java/com/android/tools/r8/cf/methodhandles/InvokeMethodHandleRuntimeErrorTest.java b/src/test/java/com/android/tools/r8/cf/methodhandles/InvokeMethodHandleRuntimeErrorTest.java
index b16a586..cf0d616 100644
--- a/src/test/java/com/android/tools/r8/cf/methodhandles/InvokeMethodHandleRuntimeErrorTest.java
+++ b/src/test/java/com/android/tools/r8/cf/methodhandles/InvokeMethodHandleRuntimeErrorTest.java
@@ -65,7 +65,7 @@
testForD8()
.addProgramClasses(Main.class, I.class, Super.class)
.addProgramClassFileData(getInvokeCustomTransform())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compileWithExpectedDiagnostics(
diagnostics -> {
if (hasCompileSupport()) {
diff --git a/src/test/java/com/android/tools/r8/cf/methodhandles/InvokePolymorphicTypesTest.java b/src/test/java/com/android/tools/r8/cf/methodhandles/InvokePolymorphicTypesTest.java
index b32d175..f1b4516 100644
--- a/src/test/java/com/android/tools/r8/cf/methodhandles/InvokePolymorphicTypesTest.java
+++ b/src/test/java/com/android/tools/r8/cf/methodhandles/InvokePolymorphicTypesTest.java
@@ -60,7 +60,7 @@
|| parameters.asDexRuntime().getVersion().isNewerThanOrEqual(Version.V8_1_0);
testForD8(parameters.getBackend())
.addProgramClasses(Data.class, TestClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), TestClass.class)
.applyIf(
hasCompileSupport,
@@ -87,7 +87,7 @@
|| parameters.asDexRuntime().getVersion().isNewerThanOrEqual(Version.V8_1_0);
testForR8(parameters.getBackend())
.addProgramClasses(Data.class, TestClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.applyIf(
!hasCompileSupport,
b ->
diff --git a/src/test/java/com/android/tools/r8/cf/methodhandles/MethodHandleTestRunner.java b/src/test/java/com/android/tools/r8/cf/methodhandles/MethodHandleTestRunner.java
index 3189837..34f58ce 100644
--- a/src/test/java/com/android/tools/r8/cf/methodhandles/MethodHandleTestRunner.java
+++ b/src/test/java/com/android/tools/r8/cf/methodhandles/MethodHandleTestRunner.java
@@ -74,7 +74,7 @@
public void testD8() throws Exception {
assumeTrue(parameters.isDexRuntime());
testForD8(parameters.getBackend())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addProgramClasses(getInputClasses())
.addProgramClassFileData(getTransformedClasses())
.compileWithExpectedDiagnostics(this::checkDiagnostics)
@@ -98,7 +98,7 @@
private void runR8(ThrowableConsumer<R8FullTestBuilder> additionalSetUp) throws Exception {
testForR8(parameters.getBackend())
.apply(additionalSetUp)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addProgramClasses(getInputClasses())
.addProgramClassFileData(getTransformedClasses())
.addLibraryFiles(ToolHelper.getMostRecentAndroidJar())
diff --git a/src/test/java/com/android/tools/r8/cf/methodhandles/VarHandleTest.java b/src/test/java/com/android/tools/r8/cf/methodhandles/VarHandleTest.java
index ce9cae3..1d9ef5b 100644
--- a/src/test/java/com/android/tools/r8/cf/methodhandles/VarHandleTest.java
+++ b/src/test/java/com/android/tools/r8/cf/methodhandles/VarHandleTest.java
@@ -92,7 +92,7 @@
parameters.isDexRuntimeVersion(Version.DEFAULT));
testForD8()
.addProgramFiles(getProgramInputs())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compileWithExpectedDiagnostics(
diagnostics -> {
if (hasInvokePolymorphicCompileSupport()) {
@@ -127,7 +127,7 @@
assumeTrue(hasInvokePolymorphicCompileSupport() && hasFindStaticVarHandleMethod());
testForR8(parameters.getBackend())
.addProgramFiles(getProgramInputs())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepClassAndMembersRules(MAIN.typeName())
.applyIf(!hasVarHandleInLibrary(), b -> b.addDontWarn("java.lang.invoke.VarHandle"))
.run(parameters.getRuntime(), MAIN.typeName())
diff --git a/src/test/java/com/android/tools/r8/cf/methodhandles/fields/ClassFieldMethodHandleTest.java b/src/test/java/com/android/tools/r8/cf/methodhandles/fields/ClassFieldMethodHandleTest.java
index daf61c4..2d5ea93 100644
--- a/src/test/java/com/android/tools/r8/cf/methodhandles/fields/ClassFieldMethodHandleTest.java
+++ b/src/test/java/com/android/tools/r8/cf/methodhandles/fields/ClassFieldMethodHandleTest.java
@@ -71,7 +71,7 @@
.addLibraryFiles(ToolHelper.getMostRecentAndroidJar())
.addProgramClasses(C.class)
.addProgramClassFileData(getTransformedMain())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compileWithExpectedDiagnostics(this::checkDiagnostics)
.run(parameters.getRuntime(), Main.class)
.apply(this::checkResult);
@@ -84,7 +84,7 @@
.addLibraryFiles(ToolHelper.getMostRecentAndroidJar())
.addProgramClasses(C.class)
.addProgramClassFileData(getTransformedMain())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.allowDiagnosticMessages()
.compileWithExpectedDiagnostics(this::checkDiagnostics)
.run(parameters.getRuntime(), Main.class)
diff --git a/src/test/java/com/android/tools/r8/cf/methodhandles/fields/InterfaceFieldMethodHandleTest.java b/src/test/java/com/android/tools/r8/cf/methodhandles/fields/InterfaceFieldMethodHandleTest.java
index 927b27e..020f83e 100644
--- a/src/test/java/com/android/tools/r8/cf/methodhandles/fields/InterfaceFieldMethodHandleTest.java
+++ b/src/test/java/com/android/tools/r8/cf/methodhandles/fields/InterfaceFieldMethodHandleTest.java
@@ -74,7 +74,7 @@
.addLibraryFiles(ToolHelper.getMostRecentAndroidJar())
.addProgramClasses(I.class)
.addProgramClassFileData(getTransformedMain())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compileWithExpectedDiagnostics(this::checkDiagnostics)
.run(parameters.getRuntime(), Main.class)
.apply(this::checkResult);
@@ -87,7 +87,7 @@
.addLibraryFiles(ToolHelper.getMostRecentAndroidJar())
.addProgramClasses(I.class)
.addProgramClassFileData(getTransformedMain())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.allowDiagnosticMessages()
.compileWithExpectedDiagnostics(this::checkDiagnostics)
.run(parameters.getRuntime(), Main.class)
diff --git a/src/test/java/com/android/tools/r8/cf/methodhandles/invokespecial/InvokeSpecialMethodHandleTest.java b/src/test/java/com/android/tools/r8/cf/methodhandles/invokespecial/InvokeSpecialMethodHandleTest.java
index 10a6837..6f607ae 100644
--- a/src/test/java/com/android/tools/r8/cf/methodhandles/invokespecial/InvokeSpecialMethodHandleTest.java
+++ b/src/test/java/com/android/tools/r8/cf/methodhandles/invokespecial/InvokeSpecialMethodHandleTest.java
@@ -75,7 +75,7 @@
.addLibraryFiles(ToolHelper.getMostRecentAndroidJar())
.addProgramClasses(C.class, Main.class)
.addProgramClassFileData(getTransformedD())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.apply(ApiModelingTestHelper::disableOutliningAndStubbing)
.compileWithExpectedDiagnostics(this::checkDiagnostics)
.run(parameters.getRuntime(), Main.class)
@@ -89,7 +89,7 @@
.addLibraryFiles(ToolHelper.getMostRecentAndroidJar())
.addProgramClasses(C.class, Main.class)
.addProgramClassFileData(getTransformedD())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.allowDiagnosticMessages()
.apply(ApiModelingTestHelper::disableOutliningAndStubbing)
.compileWithExpectedDiagnostics(this::checkDiagnostics)
diff --git a/src/test/java/com/android/tools/r8/cf/stackmap/ImpreciseFrameAtCatchHandlerTest.java b/src/test/java/com/android/tools/r8/cf/stackmap/ImpreciseFrameAtCatchHandlerTest.java
index f734f79..53b6c09 100644
--- a/src/test/java/com/android/tools/r8/cf/stackmap/ImpreciseFrameAtCatchHandlerTest.java
+++ b/src/test/java/com/android/tools/r8/cf/stackmap/ImpreciseFrameAtCatchHandlerTest.java
@@ -42,7 +42,7 @@
testForR8(parameters.getBackend())
.addInnerClasses(getClass())
.addKeepMainRule(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("Caught");
}
diff --git a/src/test/java/com/android/tools/r8/cf/stackmap/InvalidLongStackValueMaxHeightTest.java b/src/test/java/com/android/tools/r8/cf/stackmap/InvalidLongStackValueMaxHeightTest.java
index ae574e9..0880720 100644
--- a/src/test/java/com/android/tools/r8/cf/stackmap/InvalidLongStackValueMaxHeightTest.java
+++ b/src/test/java/com/android/tools/r8/cf/stackmap/InvalidLongStackValueMaxHeightTest.java
@@ -47,7 +47,7 @@
testForD8(parameters.getBackend())
.addProgramClasses(Tester.class)
.addProgramClassFileData(getMainWithChangedMaxStackHeight())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compileWithExpectedDiagnostics(
diagnostics -> {
diagnostics.assertWarningThatMatches(
@@ -61,7 +61,7 @@
testForD8(parameters.getBackend())
.addProgramClasses(Tester.class)
.addProgramClassFileData(getMainWithChangedMaxStackHeight())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compileWithExpectedDiagnostics(
diagnostics -> {
diagnostics.assertWarningThatMatches(
diff --git a/src/test/java/com/android/tools/r8/cf/stackmap/InvalidStackHeightTest.java b/src/test/java/com/android/tools/r8/cf/stackmap/InvalidStackHeightTest.java
index e29b8db..9552075 100644
--- a/src/test/java/com/android/tools/r8/cf/stackmap/InvalidStackHeightTest.java
+++ b/src/test/java/com/android/tools/r8/cf/stackmap/InvalidStackHeightTest.java
@@ -46,7 +46,7 @@
assumeTrue(parameters.isCfRuntime());
testForD8(parameters.getBackend())
.addProgramClassFileData(getMainWithChangedMaxStackHeight())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compileWithExpectedDiagnostics(this::inspect);
}
@@ -55,7 +55,7 @@
assumeTrue(parameters.isDexRuntime());
testForD8(parameters.getBackend())
.addProgramClassFileData(getMainWithChangedMaxStackHeight())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compileWithExpectedDiagnostics(this::inspect)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines(EXPECTED);
@@ -68,7 +68,7 @@
.addProgramClassFileData(getMainWithChangedMaxStackHeight())
.enableInliningAnnotations()
.addKeepMainRule(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.allowDiagnosticWarningMessages()
.compileWithExpectedDiagnostics(this::inspect)
.run(parameters.getRuntime(), Main.class)
diff --git a/src/test/java/com/android/tools/r8/cf/stackmap/LongStackValuesInFramesTest.java b/src/test/java/com/android/tools/r8/cf/stackmap/LongStackValuesInFramesTest.java
index 742472b..77cd080 100644
--- a/src/test/java/com/android/tools/r8/cf/stackmap/LongStackValuesInFramesTest.java
+++ b/src/test/java/com/android/tools/r8/cf/stackmap/LongStackValuesInFramesTest.java
@@ -51,7 +51,7 @@
testForD8(parameters.getBackend())
.addProgramClasses(Tester.class)
.addProgramClassFileData(dump())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines(EXPECTED);
}
diff --git a/src/test/java/com/android/tools/r8/cf/stackmap/MajorMinorStackTraceVerificationTest.java b/src/test/java/com/android/tools/r8/cf/stackmap/MajorMinorStackTraceVerificationTest.java
index 44dfe61..9d7e6cf 100644
--- a/src/test/java/com/android/tools/r8/cf/stackmap/MajorMinorStackTraceVerificationTest.java
+++ b/src/test/java/com/android/tools/r8/cf/stackmap/MajorMinorStackTraceVerificationTest.java
@@ -32,7 +32,7 @@
testForR8(parameters.getBackend())
.addProgramClassFileData(
transformer(Main.class).setVersion(CfVersion.V1_1).stripFrames("main").transform())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(Main.class)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("Hello World");
diff --git a/src/test/java/com/android/tools/r8/cf/stackmap/StackMapVerificationNoFrameForHandlerTest.java b/src/test/java/com/android/tools/r8/cf/stackmap/StackMapVerificationNoFrameForHandlerTest.java
index 49d84b1..e8db38c 100644
--- a/src/test/java/com/android/tools/r8/cf/stackmap/StackMapVerificationNoFrameForHandlerTest.java
+++ b/src/test/java/com/android/tools/r8/cf/stackmap/StackMapVerificationNoFrameForHandlerTest.java
@@ -77,7 +77,7 @@
.stripFrames("main")
.transform())
.addOptionsModification(options -> options.testing.readInputStackMaps = true)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compileWithExpectedDiagnostics(this::verifyWarningsRegardingStackMap)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines(EXPECTED_OUTPUT);
@@ -93,7 +93,7 @@
.stripFrames("main")
.transform())
.addKeepMainRule(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.allowDiagnosticWarningMessages(!includeFrameInHandler)
.addOptionsModification(
options -> {
diff --git a/src/test/java/com/android/tools/r8/cf/stackmap/SwitchStackFrameFallThroughTest.java b/src/test/java/com/android/tools/r8/cf/stackmap/SwitchStackFrameFallThroughTest.java
index e552c0a..e38eaf5 100644
--- a/src/test/java/com/android/tools/r8/cf/stackmap/SwitchStackFrameFallThroughTest.java
+++ b/src/test/java/com/android/tools/r8/cf/stackmap/SwitchStackFrameFallThroughTest.java
@@ -47,7 +47,7 @@
assumeTrue(parameters.isDexRuntime());
testForD8(parameters.getBackend())
.addProgramClassFileData(SwitchStackFrameFallThroughTest$MainDump.dump())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addOptionsModification(options -> options.testing.readInputStackMaps = true)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("java.io.IOException");
diff --git a/src/test/java/com/android/tools/r8/cf/stackmap/UndefinedTypesAssignmentTest.java b/src/test/java/com/android/tools/r8/cf/stackmap/UndefinedTypesAssignmentTest.java
index 9e8c086e..adf93da 100644
--- a/src/test/java/com/android/tools/r8/cf/stackmap/UndefinedTypesAssignmentTest.java
+++ b/src/test/java/com/android/tools/r8/cf/stackmap/UndefinedTypesAssignmentTest.java
@@ -40,7 +40,7 @@
public void testReference() throws Exception {
testForD8(parameters.getBackend())
.addProgramClasses(TestClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.addRunClasspathClasses(I.class, A.class)
.run(parameters.getRuntime(), TestClass.class)
@@ -53,7 +53,7 @@
.addProgramClasses(TestClass.class)
.addDontWarn(I.class, A.class)
.addKeepMainRule(TestClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.allowDiagnosticWarningMessages()
.compileWithExpectedDiagnostics(
diagnostics ->
diff --git a/src/test/java/com/android/tools/r8/cf/stackmap/UninitializedGetFieldTest.java b/src/test/java/com/android/tools/r8/cf/stackmap/UninitializedGetFieldTest.java
index 00c3c60..d5540f3 100644
--- a/src/test/java/com/android/tools/r8/cf/stackmap/UninitializedGetFieldTest.java
+++ b/src/test/java/com/android/tools/r8/cf/stackmap/UninitializedGetFieldTest.java
@@ -49,7 +49,7 @@
assumeTrue(parameters.isCfRuntime());
testForD8(parameters.getBackend())
.addProgramClassFileData(dump())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compileWithExpectedDiagnostics(this::inspect);
}
@@ -58,7 +58,7 @@
assumeTrue(parameters.isDexRuntime());
testForD8(parameters.getBackend())
.addProgramClassFileData(dump())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compileWithExpectedDiagnostics(this::inspect)
.run(parameters.getRuntime(), Main.class)
.assertFailureWithErrorThatThrows(VerifyError.class);
diff --git a/src/test/java/com/android/tools/r8/cf/stackmap/UninitializedInstanceOfTest.java b/src/test/java/com/android/tools/r8/cf/stackmap/UninitializedInstanceOfTest.java
index 9e5411e..b5fd730 100644
--- a/src/test/java/com/android/tools/r8/cf/stackmap/UninitializedInstanceOfTest.java
+++ b/src/test/java/com/android/tools/r8/cf/stackmap/UninitializedInstanceOfTest.java
@@ -49,7 +49,7 @@
assumeTrue(parameters.isCfRuntime());
testForD8(parameters.getBackend())
.addProgramClassFileData(dump())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compileWithExpectedDiagnostics(this::inspect);
}
@@ -59,7 +59,7 @@
boolean expectFailure = parameters.getDexRuntimeVersion().isNewerThanOrEqual(Version.V7_0_0);
testForD8(parameters.getBackend())
.addProgramClassFileData(dump())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compileWithExpectedDiagnostics(this::inspect)
.run(parameters.getRuntime(), Main.class)
.applyIf(
diff --git a/src/test/java/com/android/tools/r8/cf/stackmap/UninitializedNewCheckCastTest.java b/src/test/java/com/android/tools/r8/cf/stackmap/UninitializedNewCheckCastTest.java
index 669829b..9039a86 100644
--- a/src/test/java/com/android/tools/r8/cf/stackmap/UninitializedNewCheckCastTest.java
+++ b/src/test/java/com/android/tools/r8/cf/stackmap/UninitializedNewCheckCastTest.java
@@ -47,7 +47,7 @@
assumeTrue(parameters.isCfRuntime());
testForD8(parameters.getBackend())
.addProgramClassFileData(dump())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compileWithExpectedDiagnostics(this::inspect);
}
@@ -56,7 +56,7 @@
assumeTrue(parameters.isDexRuntime());
testForD8(parameters.getBackend())
.addProgramClassFileData(dump())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compileWithExpectedDiagnostics(this::inspect)
.run(parameters.getRuntime(), Main.class)
.assertFailureWithErrorThatThrows(VerifyError.class);
diff --git a/src/test/java/com/android/tools/r8/cf/stackmap/UninitializedPutFieldSelfTest.java b/src/test/java/com/android/tools/r8/cf/stackmap/UninitializedPutFieldSelfTest.java
index e4e918b..4e541e4 100644
--- a/src/test/java/com/android/tools/r8/cf/stackmap/UninitializedPutFieldSelfTest.java
+++ b/src/test/java/com/android/tools/r8/cf/stackmap/UninitializedPutFieldSelfTest.java
@@ -47,7 +47,7 @@
assumeTrue(parameters.isCfRuntime());
testForD8(parameters.getBackend())
.addProgramClassFileData(dump())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compileWithExpectedDiagnostics(this::inspect);
}
@@ -59,7 +59,7 @@
|| parameters.getDexRuntimeVersion().isNewerThan(Version.V6_0_1);
testForD8(parameters.getBackend())
.addProgramClassFileData(dump())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compileWithExpectedDiagnostics(this::inspect)
.run(parameters.getRuntime(), Main.class)
.assertFailureWithErrorThatThrowsIf(willFailVerification, VerifyError.class)
diff --git a/src/test/java/com/android/tools/r8/cf/stackmap/UninitializedPutFieldTest.java b/src/test/java/com/android/tools/r8/cf/stackmap/UninitializedPutFieldTest.java
index e943ebc..7740360 100644
--- a/src/test/java/com/android/tools/r8/cf/stackmap/UninitializedPutFieldTest.java
+++ b/src/test/java/com/android/tools/r8/cf/stackmap/UninitializedPutFieldTest.java
@@ -46,7 +46,7 @@
assumeTrue(parameters.isCfRuntime());
testForD8(parameters.getBackend())
.addProgramClassFileData(dump())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compileWithExpectedDiagnostics(
diagnostics -> {
diagnostics.assertNoWarningsMatch(
@@ -61,7 +61,7 @@
assumeTrue(parameters.isDexRuntime());
testForD8(parameters.getBackend())
.addProgramClassFileData(dump())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compileWithExpectedDiagnostics(
diagnostics -> {
diagnostics.assertNoWarningsMatch(
diff --git a/src/test/java/com/android/tools/r8/cf/stringconcatfactory/StringConcatFactoryTest.java b/src/test/java/com/android/tools/r8/cf/stringconcatfactory/StringConcatFactoryTest.java
index 3bc8a3d..a066aaa 100644
--- a/src/test/java/com/android/tools/r8/cf/stringconcatfactory/StringConcatFactoryTest.java
+++ b/src/test/java/com/android/tools/r8/cf/stringconcatfactory/StringConcatFactoryTest.java
@@ -73,7 +73,7 @@
public void testJdk8NoIgnoreR8() throws Exception {
R8FullTestBuilder builder =
testForR8(parameters.getBackend())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addProgramClassFileData(MAIN.bytes())
// Always link to the JDK8 rt.jar which has no definition of StringConcatFactory.
.addLibraryFiles(ToolHelper.getJava8RuntimeJar())
@@ -105,7 +105,7 @@
@Test
public void testJdk8WithIgnoreR8() throws Exception {
testForR8(parameters.getBackend())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addProgramClassFileData(MAIN.bytes())
// Always link to the JDK8 rt.jar which has no definition of StringConcatFactory.
.addLibraryFiles(ToolHelper.getJava8RuntimeJar())
@@ -132,7 +132,7 @@
}
};
R8FullTestBuilder.create(new TestState(temp, handler), parameters.getBackend())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addProgramClassFileData(MAIN.bytes())
// Always link to the JDK8 rt.jar which has no definition of StringConcatFactory.
.addLibraryFiles(ToolHelper.getJava8RuntimeJar())
@@ -157,7 +157,7 @@
@Test
public void testSystemJdkNoIgnoreClassesR8() throws Exception {
testForR8(parameters.getBackend())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addProgramClassFileData(MAIN.bytes())
// The system runtime has StringConcatFactory so link to its bootclasspath.
.addLibraryProvider(JdkClassFileProvider.fromSystemJdk())
diff --git a/src/test/java/com/android/tools/r8/cf/varhandle/VarHandleDesugaringTestBase.java b/src/test/java/com/android/tools/r8/cf/varhandle/VarHandleDesugaringTestBase.java
index cb6c812..e4cfea6 100644
--- a/src/test/java/com/android/tools/r8/cf/varhandle/VarHandleDesugaringTestBase.java
+++ b/src/test/java/com/android/tools/r8/cf/varhandle/VarHandleDesugaringTestBase.java
@@ -181,7 +181,7 @@
assumeTrue(parameters.isDexRuntime());
testForD8(parameters.getBackend())
.addProgramClassFileData(getProgramClassFileData())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addOptionsModification(options -> options.enableVarHandleDesugaring = true)
.run(parameters.getRuntime(), getMainClass())
.applyIf(
@@ -210,7 +210,7 @@
b -> b.addLibraryProvider(JdkClassFileProvider.fromSystemJdk()))
.addProgramClassFileData(getProgramClassFileData())
.addOptionsModification(options -> options.enableVarHandleDesugaring = true)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(getMainClass())
.addKeepRules(getKeepRules())
.run(parameters.getRuntime(), getMainClass())
diff --git a/src/test/java/com/android/tools/r8/cf/varhandle/VarHandleNoDesugaredTypesInSignaturesNoAttributesTest.java b/src/test/java/com/android/tools/r8/cf/varhandle/VarHandleNoDesugaredTypesInSignaturesNoAttributesTest.java
index 872febb..6e97d61 100644
--- a/src/test/java/com/android/tools/r8/cf/varhandle/VarHandleNoDesugaredTypesInSignaturesNoAttributesTest.java
+++ b/src/test/java/com/android/tools/r8/cf/varhandle/VarHandleNoDesugaredTypesInSignaturesNoAttributesTest.java
@@ -73,7 +73,7 @@
b -> b.addLibraryProvider(JdkClassFileProvider.fromSystemJdk()))
.addProgramFiles(programWithoutAttributes)
.addOptionsModification(options -> options.enableVarHandleDesugaring = true)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(MAIN_CLASS)
.addKeepRules("-keep class " + MAIN_CLASS + "{ <fields>; }")
.run(parameters.getRuntime(), MAIN_CLASS)
diff --git a/src/test/java/com/android/tools/r8/checkdiscarded/B162969014.java b/src/test/java/com/android/tools/r8/checkdiscarded/B162969014.java
index ad0af4b..c57e057 100644
--- a/src/test/java/com/android/tools/r8/checkdiscarded/B162969014.java
+++ b/src/test/java/com/android/tools/r8/checkdiscarded/B162969014.java
@@ -54,7 +54,7 @@
.apply(this::applyCheckDiscardedRule)
.enableAssumeNoSideEffectsAnnotations()
.enableInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compileWithExpectedDiagnostics(
diagnostics -> {
if (checkLogIsDiscarded) {
diff --git a/src/test/java/com/android/tools/r8/checkdiscarded/CheckAllMembersDiscardedTest.java b/src/test/java/com/android/tools/r8/checkdiscarded/CheckAllMembersDiscardedTest.java
index dbcd8a3..e1aa327 100644
--- a/src/test/java/com/android/tools/r8/checkdiscarded/CheckAllMembersDiscardedTest.java
+++ b/src/test/java/com/android/tools/r8/checkdiscarded/CheckAllMembersDiscardedTest.java
@@ -58,7 +58,7 @@
// if the class should also be fully discarded.
getRuleForSecret("checkdiscard"),
getRuleForSecret("keep,allowshrinking"))
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compileWithExpectedDiagnostics(
diagnostics -> {
if (shrinkMethodReferences && shrinkTypeReference) {
diff --git a/src/test/java/com/android/tools/r8/checkdiscarded/CheckClassDiscardedEntirelyTest.java b/src/test/java/com/android/tools/r8/checkdiscarded/CheckClassDiscardedEntirelyTest.java
index 97a8f50..d1612ce 100644
--- a/src/test/java/com/android/tools/r8/checkdiscarded/CheckClassDiscardedEntirelyTest.java
+++ b/src/test/java/com/android/tools/r8/checkdiscarded/CheckClassDiscardedEntirelyTest.java
@@ -59,7 +59,7 @@
// for the class and all of its members. Therefore, the corresponding rule to
// disallow optimizations must apply to all members.
getRuleForSecret("keep,allowshrinking", true))
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compileWithExpectedDiagnostics(
diagnostics -> {
if (shrink) {
diff --git a/src/test/java/com/android/tools/r8/checkdiscarded/CheckSingleMemberDiscardedTest.java b/src/test/java/com/android/tools/r8/checkdiscarded/CheckSingleMemberDiscardedTest.java
index 1ca8851..c851d22 100644
--- a/src/test/java/com/android/tools/r8/checkdiscarded/CheckSingleMemberDiscardedTest.java
+++ b/src/test/java/com/android/tools/r8/checkdiscarded/CheckSingleMemberDiscardedTest.java
@@ -47,7 +47,7 @@
getRuleForSecret("checkdiscard"),
getRuleForSecret("keep,allowshrinking"))
.enableInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("Public"));
diff --git a/src/test/java/com/android/tools/r8/checkdiscarded/CheckSubclassDiscardedEntirelyTest.java b/src/test/java/com/android/tools/r8/checkdiscarded/CheckSubclassDiscardedEntirelyTest.java
index fe6cd7e..516998b 100644
--- a/src/test/java/com/android/tools/r8/checkdiscarded/CheckSubclassDiscardedEntirelyTest.java
+++ b/src/test/java/com/android/tools/r8/checkdiscarded/CheckSubclassDiscardedEntirelyTest.java
@@ -75,7 +75,7 @@
VerticallyMergedClassesInspector::assertNoClassesMerged)
.enableInliningAnnotations()
.enableNoVerticalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compileWithExpectedDiagnostics(
diagnostics -> {
if (shrink) {
diff --git a/src/test/java/com/android/tools/r8/classFiltering/ClassFilteringTest.java b/src/test/java/com/android/tools/r8/classFiltering/ClassFilteringTest.java
index f8a97c4..35e0bf4 100644
--- a/src/test/java/com/android/tools/r8/classFiltering/ClassFilteringTest.java
+++ b/src/test/java/com/android/tools/r8/classFiltering/ClassFilteringTest.java
@@ -44,7 +44,7 @@
// Run a test with normal providers, verify nothing is removed.
testForD8()
.addProgramClasses(input)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutput("Keep Remove ");
@@ -53,12 +53,13 @@
@Test
public void testFilterByChecksum() throws Exception {
// Step #1: Build the inputs with checksum encoded.
- final Path output = testForD8()
- .setMinApi(parameters.getApiLevel())
- .addProgramClasses(TestClass.class, TestClass.Remove.class, TestClass.Keep.class)
- .setIncludeClassesChecksum(true)
- .compile()
- .writeToZip();
+ final Path output =
+ testForD8()
+ .setMinApi(parameters)
+ .addProgramClasses(TestClass.class, TestClass.Remove.class, TestClass.Keep.class)
+ .setIncludeClassesChecksum(true)
+ .compile()
+ .writeToZip();
// Step #2: "Re-compile" the output dex with a filter that removes a class by checksum.
@@ -67,9 +68,12 @@
testForD8()
.addProgramFiles(output)
- .setMinApi(parameters.getApiLevel())
- .apply(b -> b.getBuilder().setDexClassChecksumFilter(
- (classDescriptor, checksum) -> !checksum.equals(crc)))
+ .setMinApi(parameters)
+ .apply(
+ b ->
+ b.getBuilder()
+ .setDexClassChecksumFilter(
+ (classDescriptor, checksum) -> !checksum.equals(crc)))
.compile()
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutput("Keep No Remove ");
@@ -85,28 +89,35 @@
buildDex(TestClass.Remove.class, true, null)};
// Step #2: Now use D8 as a merging tool.
- final Path merged = testForD8()
- .setMinApi(parameters.getApiLevel())
- .addProgramFiles(dexInput)
- .setIncludeClassesChecksum(true)
- .compile()
- .writeToZip();
+ final Path merged =
+ testForD8()
+ .setMinApi(parameters)
+ .addProgramFiles(dexInput)
+ .setIncludeClassesChecksum(true)
+ .compile()
+ .writeToZip();
// Try it with and without checksum. Both should yield identical result.
testForD8()
.addProgramFiles(merged)
- .setMinApi(parameters.getApiLevel())
- .apply(b -> b.getBuilder().setDexClassChecksumFilter(
- (classDescriptor, checksum) -> keepCrcs.contains(checksum)))
+ .setMinApi(parameters)
+ .apply(
+ b ->
+ b.getBuilder()
+ .setDexClassChecksumFilter(
+ (classDescriptor, checksum) -> keepCrcs.contains(checksum)))
.compile()
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutput("Keep No Remove ");
testForD8()
.addProgramFiles(merged)
- .setMinApi(parameters.getApiLevel())
- .apply(b -> b.getBuilder().setDexClassChecksumFilter(
- (classDescriptor, checksum) -> keepCrcs.contains(checksum)))
+ .setMinApi(parameters)
+ .apply(
+ b ->
+ b.getBuilder()
+ .setDexClassChecksumFilter(
+ (classDescriptor, checksum) -> keepCrcs.contains(checksum)))
.setIncludeClassesChecksum(true)
.compile()
.run(parameters.getRuntime(), TestClass.class)
@@ -127,7 +138,7 @@
// Step #2: Now use D8 as a merging tool and verify that the compilation fails as expected.
try {
testForD8()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addProgramFiles(dexInput)
.setIncludeClassesChecksum(true)
.compile()
@@ -142,40 +153,48 @@
@Test
public void testDexFilePerClassFilteringOutput() throws Exception {
// Step #1: Build the program pretending to be multidex files with DexPerClass.
- final Path outZip = testForD8()
- .setMinApi(parameters.getApiLevel())
- .addProgramClasses(TestClass.class, TestClass.Keep.class, TestClass.Remove.class)
- .setIncludeClassesChecksum(true)
- .setOutputMode(OutputMode.DexFilePerClass)
- .compile()
- .writeToZip();
+ final Path outZip =
+ testForD8()
+ .setMinApi(parameters)
+ .addProgramClasses(TestClass.class, TestClass.Keep.class, TestClass.Remove.class)
+ .setIncludeClassesChecksum(true)
+ .setOutputMode(OutputMode.DexFilePerClass)
+ .compile()
+ .writeToZip();
// Step #2: Verify that the checksums are present and filtering is working as expected.
final long crc = ToolHelper.getClassByteCrc(TestClass.Remove.class);
testForD8()
.addProgramFiles(outZip)
.apply(b -> b.getBuilder().setDexClassChecksumFilter((desc, checksum) -> checksum != crc))
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutput("Keep No Remove ");
}
@Test
public void testLambdaChecksum() throws Exception {
- final Path output = testForD8()
- .setMinApi(parameters.getApiLevel())
- .addProgramClasses(TestDesugar.class, TestDesugar.Consumer.class)
- .setIncludeClassesChecksum(true)
- .compile()
- .writeToZip();
+ final Path output =
+ testForD8()
+ .setMinApi(parameters)
+ .addProgramClasses(TestDesugar.class, TestDesugar.Consumer.class)
+ .setIncludeClassesChecksum(true)
+ .compile()
+ .writeToZip();
List<String> classesWithChecksum = Lists.newArrayList();
testForD8()
.addProgramFiles(output)
.setIncludeClassesChecksum(true)
- .apply(b -> b.getBuilder().setDexClassChecksumFilter(
- (classDescriptor, checksum) -> { classesWithChecksum.add(classDescriptor); return true; }))
- .setMinApi(parameters.getApiLevel())
+ .apply(
+ b ->
+ b.getBuilder()
+ .setDexClassChecksumFilter(
+ (classDescriptor, checksum) -> {
+ classesWithChecksum.add(classDescriptor);
+ return true;
+ }))
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), TestDesugar.class)
.assertSuccessWithOutput("TestDesugar.consume");
@@ -198,7 +217,7 @@
crcCollection.add(ToolHelper.getClassByteCrc(c));
}
return testForD8()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addProgramClasses(c)
.setIncludeClassesChecksum(checksum)
.compile()
diff --git a/src/test/java/com/android/tools/r8/classlookup/ClasspathClassExtendsProgramClassTest.java b/src/test/java/com/android/tools/r8/classlookup/ClasspathClassExtendsProgramClassTest.java
index f9d6e4d..0d5b809 100644
--- a/src/test/java/com/android/tools/r8/classlookup/ClasspathClassExtendsProgramClassTest.java
+++ b/src/test/java/com/android/tools/r8/classlookup/ClasspathClassExtendsProgramClassTest.java
@@ -73,7 +73,7 @@
@Test
public void testR8() throws Exception {
testForR8(parameters.getBackend())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addProgramClasses(Main.class, ProgramClass.class)
.addClasspathClasses(ClasspathClass.class, ClasspathIndirection.class)
.addKeepMainRule(Main.class)
diff --git a/src/test/java/com/android/tools/r8/classlookup/LibraryClassExtendsProgramClassTest.java b/src/test/java/com/android/tools/r8/classlookup/LibraryClassExtendsProgramClassTest.java
index c827c09..c58b9e1 100644
--- a/src/test/java/com/android/tools/r8/classlookup/LibraryClassExtendsProgramClassTest.java
+++ b/src/test/java/com/android/tools/r8/classlookup/LibraryClassExtendsProgramClassTest.java
@@ -110,7 +110,7 @@
@Test
public void testFullMode() throws Exception {
testForR8(parameters.getBackend())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addProgramClasses(TestClass.class)
.addProgramClassFileData(junitClasses)
.addKeepAllClassesRule()
@@ -124,7 +124,7 @@
@Test
public void testCompatibilityMode() throws Exception {
testForR8Compat(parameters.getBackend())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addProgramClasses(TestClass.class)
.addProgramClassFileData(junitClasses)
.addKeepAllClassesRule()
@@ -139,7 +139,7 @@
public void testD8() throws Exception {
assumeTrue("Only run D8 for Dex backend", parameters.isDexRuntime());
testForD8()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addProgramClasses(TestClass.class)
.addProgramClassFileData(junitClasses)
.compile()
@@ -151,7 +151,7 @@
public void testFullModeError() throws Exception {
R8FullTestBuilder builder =
testForR8(parameters.getBackend())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addProgramClasses(TestClass.class)
.addProgramClassFileData(junitClasses)
.addKeepAllClassesRule()
@@ -175,7 +175,7 @@
@Test
public void testCompatibilityModeWarning() throws Exception {
testForR8Compat(parameters.getBackend())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addProgramClasses(TestClass.class)
.addProgramClassFileData(junitClasses)
.addKeepAllClassesRule()
@@ -194,7 +194,7 @@
@Test
public void testWithDontWarn() throws Exception {
testForR8(parameters.getBackend())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addProgramClasses(TestClass.class)
.addProgramClassFileData(junitClasses)
.addKeepAllClassesRule()
diff --git a/src/test/java/com/android/tools/r8/classmerging/StatefulSingletonClassesMergingTest.java b/src/test/java/com/android/tools/r8/classmerging/StatefulSingletonClassesMergingTest.java
index 465cd5e..4b17a16 100644
--- a/src/test/java/com/android/tools/r8/classmerging/StatefulSingletonClassesMergingTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/StatefulSingletonClassesMergingTest.java
@@ -40,7 +40,7 @@
.enableInliningAnnotations()
.enableMemberValuePropagationAnnotations()
.enableNeverClassInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("A", "B");
}
diff --git a/src/test/java/com/android/tools/r8/classmerging/StatelessSingletonClassesMergingTest.java b/src/test/java/com/android/tools/r8/classmerging/StatelessSingletonClassesMergingTest.java
index 8e2433a..7c40be3 100644
--- a/src/test/java/com/android/tools/r8/classmerging/StatelessSingletonClassesMergingTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/StatelessSingletonClassesMergingTest.java
@@ -36,7 +36,7 @@
inspector -> inspector.assertIsCompleteMergeGroup(A.class, B.class))
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("A", "B");
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/AbstractMethodMergingNonTrivialTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/AbstractMethodMergingNonTrivialTest.java
index fbd058a..4cfed17 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/AbstractMethodMergingNonTrivialTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/AbstractMethodMergingNonTrivialTest.java
@@ -26,7 +26,7 @@
.enableInliningAnnotations()
.enableNoHorizontalClassMergingAnnotations()
.enableNoVerticalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("ASub1.f()", "B.f()", "C.f()", "A.g()", "BSub1.g()", "C.g()");
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/AbstractMethodMergingTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/AbstractMethodMergingTest.java
index a30ca9e..d794cd6 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/AbstractMethodMergingTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/AbstractMethodMergingTest.java
@@ -26,7 +26,7 @@
.enableInliningAnnotations()
.enableNoHorizontalClassMergingAnnotations()
.enableNoVerticalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines(
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/AbstractMethodWithSuperMethodMergingTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/AbstractMethodWithSuperMethodMergingTest.java
index 0f0fb29..68fe6e4 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/AbstractMethodWithSuperMethodMergingTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/AbstractMethodWithSuperMethodMergingTest.java
@@ -37,7 +37,7 @@
.enableInliningAnnotations()
.enableNoHorizontalClassMergingAnnotations()
.enableNoVerticalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertSuccess();
}
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/AdaptResourceFileContentsTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/AdaptResourceFileContentsTest.java
index cdd0df8..ea4e866 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/AdaptResourceFileContentsTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/AdaptResourceFileContentsTest.java
@@ -40,7 +40,7 @@
DataEntryResource.fromString(
"foo.txt", Origin.unknown(), A.class.getTypeName(), B.class.getTypeName()))
.addKeepRules("-adaptresourcefilecontents foo.txt")
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addHorizontallyMergedClassesInspector(
inspector -> inspector.assertMergedInto(B.class, A.class))
.compile()
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/AdaptVerticallyMergedResourceFileContentsTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/AdaptVerticallyMergedResourceFileContentsTest.java
index 1cbf805..1e179f2 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/AdaptVerticallyMergedResourceFileContentsTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/AdaptVerticallyMergedResourceFileContentsTest.java
@@ -41,7 +41,7 @@
A.class.getTypeName(),
B.class.getTypeName()))
.addKeepRules("-adaptresourcefilecontents foo.txt")
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addHorizontallyMergedClassesInspector(
inspector -> inspector.assertMergedInto(B.class, A.class))
.addVerticallyMergedClassesInspector(
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/ClassWithInstanceFieldsTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/ClassWithInstanceFieldsTest.java
index 41071d8..6ac8ec5 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/ClassWithInstanceFieldsTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/ClassWithInstanceFieldsTest.java
@@ -25,7 +25,7 @@
.addKeepMainRule(Main.class)
.enableNeverClassInliningAnnotations()
.enableInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addHorizontallyMergedClassesInspector(
inspector -> inspector.assertMergedInto(B.class, A.class))
.run(parameters.getRuntime(), Main.class)
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/ClassesDistinguishedByDirectCheckCastTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/ClassesDistinguishedByDirectCheckCastTest.java
index bbf9149..13f3ed4 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/ClassesDistinguishedByDirectCheckCastTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/ClassesDistinguishedByDirectCheckCastTest.java
@@ -24,7 +24,7 @@
.addKeepMainRule(Main.class)
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("fail", "bar")
.inspect(
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/ClassesDistinguishedByDirectInstanceOfTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/ClassesDistinguishedByDirectInstanceOfTest.java
index d380c43..c835052 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/ClassesDistinguishedByDirectInstanceOfTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/ClassesDistinguishedByDirectInstanceOfTest.java
@@ -24,7 +24,7 @@
.addKeepMainRule(Main.class)
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("foo", "bar", "false", "true")
.inspect(
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/ClassesDistinguishedByIndirectCheckCastToInterfaceTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/ClassesDistinguishedByIndirectCheckCastToInterfaceTest.java
index 9847ac8..84ce288 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/ClassesDistinguishedByIndirectCheckCastToInterfaceTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/ClassesDistinguishedByIndirectCheckCastToInterfaceTest.java
@@ -27,7 +27,7 @@
.enableNoVerticalClassMergingAnnotations()
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("fail", "bar")
.inspect(
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/ClassesDistuingishedByIndirectInstanceOfInterfaceCheckCast.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/ClassesDistuingishedByIndirectInstanceOfInterfaceCheckCast.java
index 8bf955c..f53cbfc 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/ClassesDistuingishedByIndirectInstanceOfInterfaceCheckCast.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/ClassesDistuingishedByIndirectInstanceOfInterfaceCheckCast.java
@@ -27,7 +27,7 @@
.enableInliningAnnotations()
.enableNoVerticalClassMergingAnnotations()
.enableNeverClassInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("false", "true")
.inspect(
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/ClassesWithDifferentFieldsTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/ClassesWithDifferentFieldsTest.java
index 7e90337..c00cab4 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/ClassesWithDifferentFieldsTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/ClassesWithDifferentFieldsTest.java
@@ -27,7 +27,7 @@
.addKeepMainRule(Main.class)
.enableNeverClassInliningAnnotations()
.enableInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addHorizontallyMergedClassesInspector(
inspector -> inspector.assertMergedInto(B.class, A.class))
.compile()
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/ClassesWithDifferentInterfacesTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/ClassesWithDifferentInterfacesTest.java
index 1d6c93f..f074ea1 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/ClassesWithDifferentInterfacesTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/ClassesWithDifferentInterfacesTest.java
@@ -29,7 +29,7 @@
.enableNeverClassInliningAnnotations()
.enableNoParameterTypeStrengtheningAnnotations()
.enableNoVerticalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addHorizontallyMergedClassesInspector(
inspector -> inspector.assertMergedInto(Z.class, Y.class))
.run(parameters.getRuntime(), Main.class)
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/ClassesWithDifferentVisibilityFieldsTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/ClassesWithDifferentVisibilityFieldsTest.java
index 05698dc..ebbb020 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/ClassesWithDifferentVisibilityFieldsTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/ClassesWithDifferentVisibilityFieldsTest.java
@@ -29,7 +29,7 @@
.addKeepMainRule(Main.class)
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addHorizontallyMergedClassesInspector(
inspector -> inspector.assertMergedInto(B.class, A.class))
.run(parameters.getRuntime(), Main.class)
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/ClassesWithFeatureSplitTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/ClassesWithFeatureSplitTest.java
index ad66194..b5f0cb1 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/ClassesWithFeatureSplitTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/ClassesWithFeatureSplitTest.java
@@ -41,7 +41,7 @@
.addKeepFeatureMainRule(Feature1Main.class)
.addKeepFeatureMainRule(Feature2Main.class)
.enableNeverClassInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspectBase, this::inspectFeature1, this::inspectFeature2);
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/ClassesWithIdenticalInterfacesTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/ClassesWithIdenticalInterfacesTest.java
index 29e7e0e..81396ab 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/ClassesWithIdenticalInterfacesTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/ClassesWithIdenticalInterfacesTest.java
@@ -27,7 +27,7 @@
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
.enableNoParameterTypeStrengtheningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addHorizontallyMergedClassesInspector(
inspector ->
inspector.assertMergedInto(Y.class, X.class).assertMergedInto(Z.class, X.class))
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/ClassesWithNativeMethodsTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/ClassesWithNativeMethodsTest.java
index dcdd8f8..52b7cbe 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/ClassesWithNativeMethodsTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/ClassesWithNativeMethodsTest.java
@@ -27,7 +27,7 @@
.addKeepMainRule(Main.class)
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepPackageNamesRule(Main.class.getPackage())
.addHorizontallyMergedClassesInspector(
HorizontallyMergedClassesInspector::assertNoClassesMerged)
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/ClassesWithOverlappingVisibilitiesTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/ClassesWithOverlappingVisibilitiesTest.java
index db0ce63..f3380dc 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/ClassesWithOverlappingVisibilitiesTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/ClassesWithOverlappingVisibilitiesTest.java
@@ -29,7 +29,7 @@
.addKeepMainRule(Main.class)
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("foo A", "FOO B", "FOO C", "foo D", "FOO E")
.inspect(
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/ClassesWithStaticFields.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/ClassesWithStaticFields.java
index d66a630..59cb48a 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/ClassesWithStaticFields.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/ClassesWithStaticFields.java
@@ -23,7 +23,7 @@
.addInnerClasses(getClass())
.addKeepMainRule(Main.class)
.enableNeverClassInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addHorizontallyMergedClassesInspector(
inspector -> inspector.assertMergedInto(B.class, A.class))
.run(parameters.getRuntime(), Main.class)
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/ClinitDeadlockAfterMergingClassInitializedBySuperTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/ClinitDeadlockAfterMergingClassInitializedBySuperTest.java
index aa46eb2..7342117 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/ClinitDeadlockAfterMergingClassInitializedBySuperTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/ClinitDeadlockAfterMergingClassInitializedBySuperTest.java
@@ -35,7 +35,7 @@
.addOptionsModification(
options ->
options.horizontalClassMergerOptions().setEnableClassInitializerDeadlockDetection())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile();
}
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/ClinitDeadlockAfterMergingMultipleGroupsTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/ClinitDeadlockAfterMergingMultipleGroupsTest.java
index 3d07644..635ff0e 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/ClinitDeadlockAfterMergingMultipleGroupsTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/ClinitDeadlockAfterMergingMultipleGroupsTest.java
@@ -51,7 +51,7 @@
.addAll(policies)
.build();
})
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile();
}
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/ClinitDeadlockAfterMergingMutuallyDependentClassesTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/ClinitDeadlockAfterMergingMutuallyDependentClassesTest.java
index ae35061..502e06d 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/ClinitDeadlockAfterMergingMutuallyDependentClassesTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/ClinitDeadlockAfterMergingMutuallyDependentClassesTest.java
@@ -37,7 +37,7 @@
options ->
options.horizontalClassMergerOptions().setEnableClassInitializerDeadlockDetection())
.enableNoHorizontalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile();
}
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/ClinitDeadlockAfterMergingSingletonClassesInstantiatedByCompanionTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/ClinitDeadlockAfterMergingSingletonClassesInstantiatedByCompanionTest.java
index f7ca4c1..a75b207 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/ClinitDeadlockAfterMergingSingletonClassesInstantiatedByCompanionTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/ClinitDeadlockAfterMergingSingletonClassesInstantiatedByCompanionTest.java
@@ -52,7 +52,7 @@
options ->
options.horizontalClassMergerOptions().setEnableClassInitializerDeadlockDetection())
.enableInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile();
}
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/CompanionClassMergingTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/CompanionClassMergingTest.java
index 364f7ed..bc35c0c 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/CompanionClassMergingTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/CompanionClassMergingTest.java
@@ -27,7 +27,7 @@
.addKeepMainRule(Main.class)
.addOptionsModification(options -> options.enableClassInlining = false)
.enableNeverClassInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addHorizontallyMergedClassesInspector(
inspector -> inspector.assertMergedInto(B.Companion.class, A.Companion.class))
.run(parameters.getRuntime(), Main.class)
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/CompatKeepConstructorLiveTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/CompatKeepConstructorLiveTest.java
index ac4e8d8..e605671 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/CompatKeepConstructorLiveTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/CompatKeepConstructorLiveTest.java
@@ -25,7 +25,7 @@
.addKeepMainRule(Main.class)
.enableNeverClassInliningAnnotations()
.enableNoHorizontalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("b: main", "true")
.inspect(
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/ConstructorCantInlineTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/ConstructorCantInlineTest.java
index 1cd81d7..3b62f5b 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/ConstructorCantInlineTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/ConstructorCantInlineTest.java
@@ -25,7 +25,7 @@
.addKeepMainRule(Main.class)
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("c", "foo: foo")
.inspect(
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/ConstructorMergingAfterUnusedArgumentRemovalTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/ConstructorMergingAfterUnusedArgumentRemovalTest.java
index fd1a5ac..ffad7d6 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/ConstructorMergingAfterUnusedArgumentRemovalTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/ConstructorMergingAfterUnusedArgumentRemovalTest.java
@@ -21,7 +21,7 @@
.addInnerClasses(getClass())
.addKeepMainRule(Main.class)
.enableNeverClassInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addHorizontallyMergedClassesInspector(
inspector ->
inspector
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/ConstructorMergingOverlapTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/ConstructorMergingOverlapTest.java
index a4dd321..1772f42 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/ConstructorMergingOverlapTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/ConstructorMergingOverlapTest.java
@@ -32,7 +32,7 @@
.addKeepMainRule(Main.class)
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("42", "13", "7", "print a", "print b")
.inspect(
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/ConstructorMergingPreoptimizedTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/ConstructorMergingPreoptimizedTest.java
index 9f0bb44..90a19bc 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/ConstructorMergingPreoptimizedTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/ConstructorMergingPreoptimizedTest.java
@@ -38,7 +38,7 @@
.enableNeverClassInliningAnnotations()
.enableNoHorizontalClassMergingAnnotations()
.enableNoMethodStaticizingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("changed", "0", "42", "foo", "7", "foo", "print a", "print b")
.inspect(
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/ConstructorMergingTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/ConstructorMergingTest.java
index b76442b..09daff2 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/ConstructorMergingTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/ConstructorMergingTest.java
@@ -23,13 +23,13 @@
.addInnerClasses(getClass())
.addKeepMainRule(Main.class)
.enableNeverClassInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("foo", "bar")
.inspect(
codeInspector -> {
- assertThat(codeInspector.clazz(A.class), isPresent());
- assertThat(codeInspector.clazz(B.class), not(isPresent()));
+ assertThat(codeInspector.clazz(A.class), isPresent());
+ assertThat(codeInspector.clazz(B.class), not(isPresent()));
});
}
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/ConstructorMergingTrivialOverlapTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/ConstructorMergingTrivialOverlapTest.java
index 38119c1..13bd28a 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/ConstructorMergingTrivialOverlapTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/ConstructorMergingTrivialOverlapTest.java
@@ -32,7 +32,7 @@
.addKeepMainRule(Main.class)
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("7", "42", "13", "print a", "print b")
.inspect(
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/ConstructorMergingWithArgumentsTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/ConstructorMergingWithArgumentsTest.java
index 30a84ca..e10e905 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/ConstructorMergingWithArgumentsTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/ConstructorMergingWithArgumentsTest.java
@@ -25,18 +25,18 @@
.addInnerClasses(getClass())
.addKeepMainRule(Main.class)
.enableNeverClassInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("foo hello", "bar world")
.inspect(
codeInspector -> {
- ClassSubject aClassSubject = codeInspector.clazz(A.class);
+ ClassSubject aClassSubject = codeInspector.clazz(A.class);
- assertThat(aClassSubject, isPresent());
- assertThat(codeInspector.clazz(B.class), not(isPresent()));
+ assertThat(aClassSubject, isPresent());
+ assertThat(codeInspector.clazz(B.class), not(isPresent()));
- MethodSubject initSubject = aClassSubject.init(String.class.getName(), "int");
- assertThat(initSubject, isPresent());
+ MethodSubject initSubject = aClassSubject.init(String.class.getName(), "int");
+ assertThat(initSubject, isPresent());
});
}
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/DefaultInterfaceMethodCollisionAfterClassMergingTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/DefaultInterfaceMethodCollisionAfterClassMergingTest.java
index f5ba678..6e78ba4 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/DefaultInterfaceMethodCollisionAfterClassMergingTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/DefaultInterfaceMethodCollisionAfterClassMergingTest.java
@@ -44,7 +44,7 @@
.enableNoHorizontalClassMergingAnnotations()
.enableNoUnusedInterfaceRemovalAnnotations()
.enableNoVerticalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("I", "J");
}
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/DefaultInterfaceMethodCollisionInSubclassAfterClassMergingTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/DefaultInterfaceMethodCollisionInSubclassAfterClassMergingTest.java
index e8919da..934b512 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/DefaultInterfaceMethodCollisionInSubclassAfterClassMergingTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/DefaultInterfaceMethodCollisionInSubclassAfterClassMergingTest.java
@@ -42,7 +42,7 @@
.enableNoHorizontalClassMergingAnnotations()
.enableNoUnusedInterfaceRemovalAnnotations()
.enableNoVerticalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
// TODO(b/229951607): Should always succeed.
.applyIf(
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/DistinguishExceptionClassesTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/DistinguishExceptionClassesTest.java
index d784a77..67dc535 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/DistinguishExceptionClassesTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/DistinguishExceptionClassesTest.java
@@ -23,7 +23,7 @@
.addKeepMainRule(Main.class)
.addHorizontallyMergedClassesInspector(
HorizontallyMergedClassesInspector::assertNoClassesMerged)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("test success")
.inspect(
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/EmptyClassTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/EmptyClassTest.java
index d33b180..e3477b4 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/EmptyClassTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/EmptyClassTest.java
@@ -25,7 +25,7 @@
.addInnerClasses(getClass())
.addKeepMainRule(Main.class)
.enableNeverClassInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addHorizontallyMergedClassesInspector(
inspector -> inspector.assertMergedInto(B.class, A.class))
.run(parameters.getRuntime(), Main.class)
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/EquivalentConstructorsWithClassIdAfterUnusedArgumentRemovalMergingTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/EquivalentConstructorsWithClassIdAfterUnusedArgumentRemovalMergingTest.java
index 57108ff..92930b7 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/EquivalentConstructorsWithClassIdAfterUnusedArgumentRemovalMergingTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/EquivalentConstructorsWithClassIdAfterUnusedArgumentRemovalMergingTest.java
@@ -46,7 +46,7 @@
inspector.assertIsCompleteMergeGroup(A.class, B.class).assertNoOtherClassesMerged())
.enableNeverClassInliningAnnotations()
.enableNoHorizontalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector -> {
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/EquivalentConstructorsWithClassIdAndDifferentArgumentAndAssignmentOrderMergingTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/EquivalentConstructorsWithClassIdAndDifferentArgumentAndAssignmentOrderMergingTest.java
index e70cd5a..f319d54 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/EquivalentConstructorsWithClassIdAndDifferentArgumentAndAssignmentOrderMergingTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/EquivalentConstructorsWithClassIdAndDifferentArgumentAndAssignmentOrderMergingTest.java
@@ -46,7 +46,7 @@
inspector.assertIsCompleteMergeGroup(A.class, B.class).assertNoOtherClassesMerged())
.enableNeverClassInliningAnnotations()
.enableNoHorizontalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector -> {
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/EquivalentConstructorsWithClassIdAndDifferentArgumentOrderMergingTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/EquivalentConstructorsWithClassIdAndDifferentArgumentOrderMergingTest.java
index 5297a09..ba0b57d 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/EquivalentConstructorsWithClassIdAndDifferentArgumentOrderMergingTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/EquivalentConstructorsWithClassIdAndDifferentArgumentOrderMergingTest.java
@@ -46,7 +46,7 @@
inspector.assertIsCompleteMergeGroup(A.class, B.class).assertNoOtherClassesMerged())
.enableNeverClassInliningAnnotations()
.enableNoHorizontalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector -> {
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/EquivalentConstructorsWithClassIdAndDifferentAssignmentOrderMergingTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/EquivalentConstructorsWithClassIdAndDifferentAssignmentOrderMergingTest.java
index 7a7a997..a95ea45 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/EquivalentConstructorsWithClassIdAndDifferentAssignmentOrderMergingTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/EquivalentConstructorsWithClassIdAndDifferentAssignmentOrderMergingTest.java
@@ -46,7 +46,7 @@
inspector.assertIsCompleteMergeGroup(A.class, B.class).assertNoOtherClassesMerged())
.enableNeverClassInliningAnnotations()
.enableNoHorizontalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector -> {
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/EquivalentConstructorsWithClassIdAndExtraNullsMergingTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/EquivalentConstructorsWithClassIdAndExtraNullsMergingTest.java
index d02f16a..c4aafe8 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/EquivalentConstructorsWithClassIdAndExtraNullsMergingTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/EquivalentConstructorsWithClassIdAndExtraNullsMergingTest.java
@@ -44,7 +44,7 @@
inspector.assertIsCompleteMergeGroup(A.class, B.class).assertNoOtherClassesMerged())
.enableNeverClassInliningAnnotations()
.enableNoHorizontalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector -> {
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/EquivalentConstructorsWithClassIdMergingTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/EquivalentConstructorsWithClassIdMergingTest.java
index 2bbd4e5..4022587 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/EquivalentConstructorsWithClassIdMergingTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/EquivalentConstructorsWithClassIdMergingTest.java
@@ -44,7 +44,7 @@
inspector.assertIsCompleteMergeGroup(A.class, B.class).assertNoOtherClassesMerged())
.enableNeverClassInliningAnnotations()
.enableNoHorizontalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector -> {
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/EquivalentConstructorsWithInterfaceValueToParentTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/EquivalentConstructorsWithInterfaceValueToParentTest.java
index 7a1af72..981d62b 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/EquivalentConstructorsWithInterfaceValueToParentTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/EquivalentConstructorsWithInterfaceValueToParentTest.java
@@ -37,7 +37,7 @@
.enableNoHorizontalClassMergingAnnotations()
.enableNoUnusedInterfaceRemovalAnnotations()
.enableNoVerticalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("K", "L");
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/EquivalentConstructorsWithPrimitiveAndReferencesParametersTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/EquivalentConstructorsWithPrimitiveAndReferencesParametersTest.java
index 9d09c4d..0cddafe 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/EquivalentConstructorsWithPrimitiveAndReferencesParametersTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/EquivalentConstructorsWithPrimitiveAndReferencesParametersTest.java
@@ -47,7 +47,7 @@
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
.enableUnusedArgumentAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector -> {
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/EquivalentConstructorsWithoutClassIdAfterUnusedArgumentRemovalMergingTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/EquivalentConstructorsWithoutClassIdAfterUnusedArgumentRemovalMergingTest.java
index 4a66189..b1c5187 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/EquivalentConstructorsWithoutClassIdAfterUnusedArgumentRemovalMergingTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/EquivalentConstructorsWithoutClassIdAfterUnusedArgumentRemovalMergingTest.java
@@ -48,7 +48,7 @@
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
.enableNoHorizontalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector -> {
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/EquivalentConstructorsWithoutClassIdMergingTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/EquivalentConstructorsWithoutClassIdMergingTest.java
index 090699b..73b3856 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/EquivalentConstructorsWithoutClassIdMergingTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/EquivalentConstructorsWithoutClassIdMergingTest.java
@@ -46,7 +46,7 @@
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
.enableNoHorizontalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector -> {
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/FieldTypeMergedTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/FieldTypeMergedTest.java
index 3f32311..1ed945c 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/FieldTypeMergedTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/FieldTypeMergedTest.java
@@ -30,7 +30,7 @@
.addKeepMainRule(Main.class)
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("a", "b", "bar", "bar", "bar")
.inspect(
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/FieldsWithDifferentAccessFlagsTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/FieldsWithDifferentAccessFlagsTest.java
index 7468ce5..d196a5f 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/FieldsWithDifferentAccessFlagsTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/FieldsWithDifferentAccessFlagsTest.java
@@ -27,7 +27,7 @@
HorizontallyMergedClassesInspector::assertNoClassesMerged)
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("A", "B", "C");
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/GenericStaticFieldTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/GenericStaticFieldTest.java
index e1248e1..f084c0b 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/GenericStaticFieldTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/GenericStaticFieldTest.java
@@ -20,7 +20,7 @@
.addKeepMainRule(Main.class)
.addKeepRules("-keepattributes Signatures")
.enableNeverClassInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
// .addHorizontallyMergedClassesInspectorIf(
// enableHorizontalClassMerging, inspector ->
// inspector.assertMergedInto(EmptyClassTest.B.class, EmptyClassTest.A.class))
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/HorizontalClassMergingInD8WithClInitOnCCTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/HorizontalClassMergingInD8WithClInitOnCCTest.java
index 4e955d0..ba3a7bd 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/HorizontalClassMergingInD8WithClInitOnCCTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/HorizontalClassMergingInD8WithClInitOnCCTest.java
@@ -30,7 +30,7 @@
testForD8(parameters.getBackend())
.addInnerClasses(getClass())
.setMode(CompilationMode.RELEASE)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addOptionsModification(
options -> {
options.horizontalClassMergerOptions().enable();
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/HorizontalClassMergingInD8WithCompanionClassesTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/HorizontalClassMergingInD8WithCompanionClassesTest.java
index d143c60..7a8d50c 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/HorizontalClassMergingInD8WithCompanionClassesTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/HorizontalClassMergingInD8WithCompanionClassesTest.java
@@ -45,7 +45,7 @@
testForD8(parameters.getBackend())
.addInnerClasses(getClass())
.setMode(CompilationMode.RELEASE)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addOptionsModification(
options -> {
options.horizontalClassMergerOptions().enable();
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/HorizontalClassMergingOfInitArgumentTypesTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/HorizontalClassMergingOfInitArgumentTypesTest.java
index fc00578..6694cdb 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/HorizontalClassMergingOfInitArgumentTypesTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/HorizontalClassMergingOfInitArgumentTypesTest.java
@@ -46,7 +46,7 @@
options.horizontalClassMergerOptions().enableIf(enableHorizontalClassMerging);
})
.enableNoHorizontalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector -> {
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/HorizontalClassMergingWithStartupClassesTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/HorizontalClassMergingWithStartupClassesTest.java
index 8546374..a2d7c56 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/HorizontalClassMergingWithStartupClassesTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/HorizontalClassMergingWithStartupClassesTest.java
@@ -83,7 +83,7 @@
}
})
.enableInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("StartupA", "StartupB");
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/HorizontalMissingLookupTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/HorizontalMissingLookupTest.java
index e62a40e..321c7eb 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/HorizontalMissingLookupTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/HorizontalMissingLookupTest.java
@@ -25,7 +25,7 @@
.addProgramClassFileData(transformer(B.class).removeMethodsWithName("foo").transform())
.addKeepMainRule(Main.class)
.enableInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addHorizontallyMergedClassesInspector(
HorizontallyMergedClassesInspector::assertNoClassesMerged)
.run(parameters.getRuntime(), Main.class)
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/HorizontallyMergedClassInliningTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/HorizontallyMergedClassInliningTest.java
index 0ca2179..3874037 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/HorizontallyMergedClassInliningTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/HorizontallyMergedClassInliningTest.java
@@ -36,7 +36,7 @@
.addHorizontallyMergedClassesInspector(
inspector -> inspector.assertIsCompleteMergeGroup(A.class, B.class, C.class))
.allowAccessModification()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector -> {
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/IdenticalFieldMembersTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/IdenticalFieldMembersTest.java
index 08a3bd7..528603e 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/IdenticalFieldMembersTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/IdenticalFieldMembersTest.java
@@ -23,7 +23,7 @@
.addKeepMainRule(Main.class)
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("foo A", "bar 2")
.inspect(
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/IllegalInliningOfMergedConstructorTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/IllegalInliningOfMergedConstructorTest.java
index c0ba9c8..2608405 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/IllegalInliningOfMergedConstructorTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/IllegalInliningOfMergedConstructorTest.java
@@ -40,7 +40,7 @@
options -> options.inlinerOptions().simpleInliningInstructionLimit = 4)
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("Hello w0rld!");
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/ImplicitClassInitializationSynchronizationTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/ImplicitClassInitializationSynchronizationTest.java
index e1e3c7b..834a1f6 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/ImplicitClassInitializationSynchronizationTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/ImplicitClassInitializationSynchronizationTest.java
@@ -39,7 +39,7 @@
.addOptionsModification(
options ->
options.horizontalClassMergerOptions().setEnableClassInitializerDeadlockDetection())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines(getExpectedOutput());
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/InheritInterfaceWithDefaultTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/InheritInterfaceWithDefaultTest.java
index 02e26dc..a9cf16f 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/InheritInterfaceWithDefaultTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/InheritInterfaceWithDefaultTest.java
@@ -29,7 +29,7 @@
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
.enableNoMethodStaticizingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addHorizontallyMergedClassesInspector(
inspector -> inspector.assertMergedInto(B.class, A.class))
.run(parameters.getRuntime(), Main.class)
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/InheritOverrideInterfaceTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/InheritOverrideInterfaceTest.java
index 8bea286..445162f 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/InheritOverrideInterfaceTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/InheritOverrideInterfaceTest.java
@@ -24,7 +24,7 @@
.addKeepMainRule(Main.class)
.enableInliningAnnotations()
.enableNoVerticalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addHorizontallyMergedClassesInspector(
inspector -> inspector.assertMergedInto(B.class, A.class))
.run(parameters.getRuntime(), Main.class)
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/InheritsFromLibraryClassTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/InheritsFromLibraryClassTest.java
index 33a1909..4c93361 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/InheritsFromLibraryClassTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/InheritsFromLibraryClassTest.java
@@ -30,7 +30,7 @@
.addKeepMainRule(Main.class)
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("a", "foo a", "b", "foo")
.inspect(
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/InitClassToPackagePrivateFieldWithCrossPackageMergingTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/InitClassToPackagePrivateFieldWithCrossPackageMergingTest.java
index af9f880..c48c0c1 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/InitClassToPackagePrivateFieldWithCrossPackageMergingTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/InitClassToPackagePrivateFieldWithCrossPackageMergingTest.java
@@ -50,7 +50,7 @@
HorizontallyMergedClassesInspector::assertNoClassesMerged)
.enableInliningAnnotations()
.enableNoHorizontalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("Hello, world!");
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/InnerOuterClassesTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/InnerOuterClassesTest.java
index 6fad862..8617415 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/InnerOuterClassesTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/InnerOuterClassesTest.java
@@ -37,7 +37,7 @@
.addKeepMainRule(Main.class)
.enableNeverClassInliningAnnotations()
.addKeepAttributeInnerClassesAndEnclosingMethod()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addOptionsModification(
options ->
options.testing.horizontalClassMergingTarget =
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/InstantiatedAndUninstantiatedClassMergingTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/InstantiatedAndUninstantiatedClassMergingTest.java
index 7bc50fa..6ed6c30 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/InstantiatedAndUninstantiatedClassMergingTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/InstantiatedAndUninstantiatedClassMergingTest.java
@@ -36,7 +36,7 @@
.addKeepMainRule(TestClass.class)
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector -> {
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/InterfacesVisibilityTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/InterfacesVisibilityTest.java
index ef4dacd..aeccb3c 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/InterfacesVisibilityTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/InterfacesVisibilityTest.java
@@ -37,7 +37,7 @@
.enableNoParameterTypeStrengtheningAnnotations()
.enableNoVerticalClassMergingAnnotations()
.enableNoHorizontalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addHorizontallyMergedClassesInspector(
HorizontallyMergedClassesInspector::assertNoClassesMerged)
.compile()
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/JavaLambdaMergingTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/JavaLambdaMergingTest.java
index 6f96433..6c27b04 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/JavaLambdaMergingTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/JavaLambdaMergingTest.java
@@ -43,7 +43,7 @@
})
.addVerticallyMergedClassesInspector(
VerticallyMergedClassesInspector::assertNoClassesMerged)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("Hello world!");
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/LargeConstructorsMergingTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/LargeConstructorsMergingTest.java
index 00b1f38..68bc6a8 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/LargeConstructorsMergingTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/LargeConstructorsMergingTest.java
@@ -26,7 +26,7 @@
.addKeepMainRule(Main.class)
.addOptionsModification(options -> options.testing.verificationSizeLimitInBytesOverride = 4)
.enableNeverClassInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addHorizontallyMergedClassesInspector(
inspector ->
inspector.assertMergedInto(B.class, A.class).assertMergedInto(C.class, A.class))
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/MergeNonFinalAndFinalClassTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/MergeNonFinalAndFinalClassTest.java
index 1285ea1..c2f9d1e 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/MergeNonFinalAndFinalClassTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/MergeNonFinalAndFinalClassTest.java
@@ -27,7 +27,7 @@
inspector -> inspector.assertMergedInto(B.class, A.class))
.enableNeverClassInliningAnnotations()
.enableNoVerticalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(inspector -> assertThat(inspector.clazz(A.class), not(isFinal())))
.run(parameters.getRuntime(), Main.class)
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/MergePackagePrivateWithPublicClassTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/MergePackagePrivateWithPublicClassTest.java
index 409ea48..d348bb4 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/MergePackagePrivateWithPublicClassTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/MergePackagePrivateWithPublicClassTest.java
@@ -27,7 +27,7 @@
.addKeepMainRule(Main.class)
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("package private")
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/MergeWithRepackageNameCollissionTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/MergeWithRepackageNameCollissionTest.java
index f3772a7..0edf72c 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/MergeWithRepackageNameCollissionTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/MergeWithRepackageNameCollissionTest.java
@@ -31,7 +31,7 @@
.addProgramClasses(I.class, Runner.class)
.addKeepMainRule(Main.class)
.addKeepClassAndMembersRules(I.class, Runner.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.enableNoHorizontalClassMergingAnnotations()
.enableInliningAnnotations()
.run(parameters.getRuntime(), Main.class)
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/MergedConstructorForwardingTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/MergedConstructorForwardingTest.java
index 1c03f26..fb079ca 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/MergedConstructorForwardingTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/MergedConstructorForwardingTest.java
@@ -34,7 +34,7 @@
inspector -> inspector.assertIsCompleteMergeGroup(A.class, B.class))
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("42", "13", "21", "39", "print a", "print b")
.inspect(
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/MergedConstructorStackTraceTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/MergedConstructorStackTraceTest.java
index d1cedfc..be3d82f 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/MergedConstructorStackTraceTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/MergedConstructorStackTraceTest.java
@@ -48,7 +48,7 @@
inspector.assertIsCompleteMergeGroup(A.class, B.class).assertNoOtherClassesMerged())
.enableNoVerticalClassMergingAnnotations()
.enableNeverClassInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), Main.class)
.inspectStackTrace(
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/MergedConstructorWithEquivalenceStackTraceTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/MergedConstructorWithEquivalenceStackTraceTest.java
index cb0b232..f43e7bd 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/MergedConstructorWithEquivalenceStackTraceTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/MergedConstructorWithEquivalenceStackTraceTest.java
@@ -48,7 +48,7 @@
inspector.assertIsCompleteMergeGroup(A.class, B.class).assertNoOtherClassesMerged())
.enableNoVerticalClassMergingAnnotations()
.enableNeverClassInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), Main.class)
.inspectStackTrace(
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/MergedVirtualMethodStackTraceTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/MergedVirtualMethodStackTraceTest.java
index 204afc7..da563cb 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/MergedVirtualMethodStackTraceTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/MergedVirtualMethodStackTraceTest.java
@@ -60,7 +60,7 @@
.addKeepAttributeLineNumberTable()
.addKeepAttributeSourceFile()
.enableNeverClassInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.applyIf(
forceInlineOnly, b -> b.addOptionsModification(InlinerOptions::setOnlyForceInlining))
.addHorizontallyMergedClassesInspector(
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/MergedVirtualMethodStaticizerTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/MergedVirtualMethodStaticizerTest.java
index 3ffb5a2..1d82402 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/MergedVirtualMethodStaticizerTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/MergedVirtualMethodStaticizerTest.java
@@ -21,7 +21,7 @@
.addKeepClassAndMembersRules(Program.Main.class)
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addHorizontallyMergedClassesInspector(
inspector -> inspector.assertMergedInto(Program.B.class, Program.A.class))
.run(parameters.getRuntime(), Program.Main.class)
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/MergingProducesFieldCollisionTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/MergingProducesFieldCollisionTest.java
index 06242c1..3cd0ac6 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/MergingProducesFieldCollisionTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/MergingProducesFieldCollisionTest.java
@@ -30,7 +30,7 @@
.addProgramClasses(Parent.class, A.class, B.class, Main.class)
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertSuccess()
.inspect(
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/MergingWithSafeCheckCastTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/MergingWithSafeCheckCastTest.java
index 02f0f5b..0810864 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/MergingWithSafeCheckCastTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/MergingWithSafeCheckCastTest.java
@@ -38,7 +38,7 @@
.enableNoHorizontalClassMergingAnnotations()
.enableNoUnusedInterfaceRemovalAnnotations()
.enableNoVerticalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addHorizontallyMergedClassesInspector(
inspector ->
inspector
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/MinimizeFieldCastsTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/MinimizeFieldCastsTest.java
index 319e1c0..6d6bc66 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/MinimizeFieldCastsTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/MinimizeFieldCastsTest.java
@@ -24,7 +24,7 @@
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
.enableNoHorizontalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addHorizontallyMergedClassesInspector(
inspector ->
// Two merge groups are expected since we attempt to merge classes in a way that
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/NestClassMergingTestRunner.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/NestClassMergingTestRunner.java
index 0844722..30b4939 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/NestClassMergingTestRunner.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/NestClassMergingTestRunner.java
@@ -253,7 +253,7 @@
.apply(configuration)
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), examplesTypeName(NestClassMergingTest.class))
.assertSuccessWithOutputLines(
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/NoAbstractClassesWithNonAbstractClassesTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/NoAbstractClassesWithNonAbstractClassesTest.java
index 621a805..8e66c76 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/NoAbstractClassesWithNonAbstractClassesTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/NoAbstractClassesWithNonAbstractClassesTest.java
@@ -29,7 +29,7 @@
.enableNeverClassInliningAnnotations()
.enableNoMethodStaticizingAnnotations()
.enableNoVerticalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("bar", "foo c", "foo d", "foo c")
.inspect(
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/NoClassesOrMembersWithAnnotationsTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/NoClassesOrMembersWithAnnotationsTest.java
index 667c261..ebe21cf 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/NoClassesOrMembersWithAnnotationsTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/NoClassesOrMembersWithAnnotationsTest.java
@@ -58,7 +58,7 @@
.enableConstantArgumentAnnotations()
.enableNeverClassInliningAnnotations()
.enableInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
codeInspector -> {
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/NoHorizontalClassMergingTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/NoHorizontalClassMergingTest.java
index 1382648..5074df0 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/NoHorizontalClassMergingTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/NoHorizontalClassMergingTest.java
@@ -24,13 +24,13 @@
.addKeepMainRule(Main.class)
.enableNoHorizontalClassMergingAnnotations()
.enableNeverClassInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("a", "b")
.inspect(
codeInspector -> {
- assertThat(codeInspector.clazz(A.class), isPresent());
- assertThat(codeInspector.clazz(B.class), isPresent());
+ assertThat(codeInspector.clazz(A.class), isPresent());
+ assertThat(codeInspector.clazz(B.class), isPresent());
});
}
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/NonFinalOverrideOfFinalMethodNonTrivialMergeTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/NonFinalOverrideOfFinalMethodNonTrivialMergeTest.java
index 8709f49..478958e 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/NonFinalOverrideOfFinalMethodNonTrivialMergeTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/NonFinalOverrideOfFinalMethodNonTrivialMergeTest.java
@@ -38,7 +38,7 @@
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
.enableNoVerticalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addHorizontallyMergedClassesInspector(
inspector -> inspector.assertIsCompleteMergeGroup(A.class, B.class, C.class))
.compile()
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/NonFinalOverrideOfFinalMethodTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/NonFinalOverrideOfFinalMethodTest.java
index b0ef0f0..c92a474 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/NonFinalOverrideOfFinalMethodTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/NonFinalOverrideOfFinalMethodTest.java
@@ -37,7 +37,7 @@
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
.enableNoVerticalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addHorizontallyMergedClassesInspector(
inspector -> inspector.assertMergedInto(B.class, A.class))
.compile()
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/NonPublicOverrideOfPublicMethodAfterAbstractClassMergingTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/NonPublicOverrideOfPublicMethodAfterAbstractClassMergingTest.java
index 3790be6..39b5438 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/NonPublicOverrideOfPublicMethodAfterAbstractClassMergingTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/NonPublicOverrideOfPublicMethodAfterAbstractClassMergingTest.java
@@ -51,7 +51,7 @@
.enableNoHorizontalClassMergingAnnotations()
.enableNoMethodStaticizingAnnotations()
.enableNoVerticalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector -> {
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/NonPublicOverrideOfPublicMethodAfterClassMergingTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/NonPublicOverrideOfPublicMethodAfterClassMergingTest.java
index 79b840f..dbe5c95 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/NonPublicOverrideOfPublicMethodAfterClassMergingTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/NonPublicOverrideOfPublicMethodAfterClassMergingTest.java
@@ -50,7 +50,7 @@
.enableNoHorizontalClassMergingAnnotations()
.enableNoUnusedInterfaceRemovalAnnotations()
.enableNoVerticalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector -> {
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/NonReboundFieldAccessOnMergedClassTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/NonReboundFieldAccessOnMergedClassTest.java
index a54102f..1e8a582 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/NonReboundFieldAccessOnMergedClassTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/NonReboundFieldAccessOnMergedClassTest.java
@@ -28,7 +28,7 @@
inspector -> inspector.assertMergedInto(D.class, C.class))
.enableNeverClassInliningAnnotations()
.enableNoVerticalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("Hello world!");
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/NonReboundFieldAccessWithMergedTypeTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/NonReboundFieldAccessWithMergedTypeTest.java
index 4b17a09..a7f9a34 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/NonReboundFieldAccessWithMergedTypeTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/NonReboundFieldAccessWithMergedTypeTest.java
@@ -29,7 +29,7 @@
.enableNeverClassInliningAnnotations()
.enableNoHorizontalClassMergingAnnotations()
.enableNoVerticalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("Hello world!");
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/NonTrivialClassInitializationAfterMergingTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/NonTrivialClassInitializationAfterMergingTest.java
index d5bbb8e..27c721d 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/NonTrivialClassInitializationAfterMergingTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/NonTrivialClassInitializationAfterMergingTest.java
@@ -39,7 +39,7 @@
i -> i.assertIsCompleteMergeGroup(A.class, B.class))
.assertNoOtherClassesMerged())
.enableNoHorizontalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), Main.class)
.applyIf(
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/OverlappingConstructorsTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/OverlappingConstructorsTest.java
index 2927247..c57d26d 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/OverlappingConstructorsTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/OverlappingConstructorsTest.java
@@ -24,13 +24,13 @@
.addInnerClasses(getClass())
.addKeepMainRule(Main.class)
.enableNeverClassInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.inspect(
codeInspector -> {
- assertThat(codeInspector.clazz(A.class), isPresent());
- assertThat(codeInspector.clazz(B.class), not(isPresent()));
- assertThat(codeInspector.clazz(C.class), not(isPresent()));
+ assertThat(codeInspector.clazz(A.class), isPresent());
+ assertThat(codeInspector.clazz(B.class), not(isPresent()));
+ assertThat(codeInspector.clazz(C.class), not(isPresent()));
});
}
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/PackagePrivateMemberAccessTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/PackagePrivateMemberAccessTest.java
index 660dae3..2588a63 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/PackagePrivateMemberAccessTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/PackagePrivateMemberAccessTest.java
@@ -29,7 +29,7 @@
.enableConstantArgumentAnnotations()
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("foo", "B", "bar", "0", "foobar")
.inspect(
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/PackagePrivateMembersAccessedTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/PackagePrivateMembersAccessedTest.java
index bb756d0..6dea00f 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/PackagePrivateMembersAccessedTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/PackagePrivateMembersAccessedTest.java
@@ -28,7 +28,7 @@
.allowAccessModification(false)
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("foo", "hello", "5", "foobar")
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/PinnedClassMemberReferenceTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/PinnedClassMemberReferenceTest.java
index db6cc21..1fabb4f 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/PinnedClassMemberReferenceTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/PinnedClassMemberReferenceTest.java
@@ -29,7 +29,7 @@
.addDontObfuscate()
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
- .setMinApi(parameters.getApiLevel());
+ .setMinApi(parameters);
}
private R8TestRunResult runAndAssertOutput(R8FullTestBuilder builder) throws Exception {
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/PinnedClassMemberTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/PinnedClassMemberTest.java
index ca080ae..bf43463 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/PinnedClassMemberTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/PinnedClassMemberTest.java
@@ -23,7 +23,7 @@
.addKeepMainRule(Main.class)
.addKeepRules("-keepclassmembers class " + B.class.getTypeName() + " { void foo(); }")
.enableNeverClassInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("a", "b", "foo", "true")
.inspect(
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/PinnedClassTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/PinnedClassTest.java
index af092cc..ffe0871 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/PinnedClassTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/PinnedClassTest.java
@@ -23,7 +23,7 @@
.addKeepMainRule(Main.class)
.addKeepClassRules(B.class)
.enableNeverClassInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("a", "b", "true", "true")
.inspect(
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/PreventMergeMainDexListTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/PreventMergeMainDexListTest.java
index 2aeacb8..11a96b7 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/PreventMergeMainDexListTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/PreventMergeMainDexListTest.java
@@ -45,7 +45,7 @@
.addMainDexListClasses(A.class, Main.class)
.addOptionsModification(options -> options.minimalMainDex = true)
.enableNeverClassInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.allowDiagnosticMessages()
.compileWithExpectedDiagnostics(
diagnostics ->
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/PreventMergeMainDexTracingTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/PreventMergeMainDexTracingTest.java
index de0bd57..f25dea5 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/PreventMergeMainDexTracingTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/PreventMergeMainDexTracingTest.java
@@ -44,7 +44,7 @@
.addOptionsModification(options -> options.minimalMainDex = true)
.enableNeverClassInliningAnnotations()
.enableNoHorizontalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.apply(this::checkCompileResult)
.run(parameters.getRuntime(), Main.class)
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/PrivateAndInterfaceMethodCollisionTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/PrivateAndInterfaceMethodCollisionTest.java
index 837f374..a7124f3 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/PrivateAndInterfaceMethodCollisionTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/PrivateAndInterfaceMethodCollisionTest.java
@@ -36,7 +36,7 @@
.enableNeverClassInliningAnnotations()
.enableNoUnusedInterfaceRemovalAnnotations()
.enableNoVerticalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("A.foo()", "B.bar()", "J.foo()");
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/PrivateAndStaticMethodCollisionTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/PrivateAndStaticMethodCollisionTest.java
index a646bf3..c2ca89f 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/PrivateAndStaticMethodCollisionTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/PrivateAndStaticMethodCollisionTest.java
@@ -24,7 +24,7 @@
inspector -> inspector.assertMergedInto(B.class, A.class))
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("A.foo()", "A.bar()", "B.foo()", "B.bar()");
}
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/ReferencedInAnnotationTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/ReferencedInAnnotationTest.java
index 08f1f0d..0eb7c7e 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/ReferencedInAnnotationTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/ReferencedInAnnotationTest.java
@@ -38,7 +38,7 @@
.addKeepClassAndMembersRules(Annotation.class)
.addKeepRuntimeVisibleAnnotations()
.enableNeverClassInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutputLines("Hello world!")
.inspect(this::inspect);
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/RelaxedInstanceFieldCollisionTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/RelaxedInstanceFieldCollisionTest.java
index d35ce82..cfb2908 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/RelaxedInstanceFieldCollisionTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/RelaxedInstanceFieldCollisionTest.java
@@ -47,7 +47,7 @@
testForR8(parameters.getBackend())
.addProgramClasses(UnrelatedA.class, UnrelatedB.class, UnrelatedC.class, UnrelatedD.class)
.addProgramClassFileData(getTransformedClasses())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(Main.class)
.addKeepClassRules(UnrelatedA.class, UnrelatedB.class, UnrelatedC.class, UnrelatedD.class)
.addHorizontallyMergedClassesInspector(
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/RemapFieldTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/RemapFieldTest.java
index 3abb15d..2efb1ec 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/RemapFieldTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/RemapFieldTest.java
@@ -25,7 +25,7 @@
.addKeepMainRule(Main.class)
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addHorizontallyMergedClassesInspector(
inspector ->
inspector.assertMergedInto(B.class, A.class).assertMergedInto(D.class, C.class))
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/RemapMethodTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/RemapMethodTest.java
index 71e3e74..293646e 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/RemapMethodTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/RemapMethodTest.java
@@ -25,7 +25,7 @@
.addKeepMainRule(Main.class)
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("foo", "foo", "bar", "bar")
@@ -33,8 +33,8 @@
codeInspector -> {
assertThat(codeInspector.clazz(A.class), isPresent());
assertThat(codeInspector.clazz(C.class), isPresent());
- assertThat(codeInspector.clazz(B.class), not(isPresent()));
- assertThat(codeInspector.clazz(D.class), not(isPresent()));
+ assertThat(codeInspector.clazz(B.class), not(isPresent()));
+ assertThat(codeInspector.clazz(D.class), not(isPresent()));
});
}
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/ServiceLoaderParentTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/ServiceLoaderParentTest.java
index 311d835..08fcebb 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/ServiceLoaderParentTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/ServiceLoaderParentTest.java
@@ -37,7 +37,7 @@
"META-INF/services/" + A.class.getTypeName(),
Origin.unknown()))
.enableNoVerticalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertSuccess()
.inspect(
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/ServiceLoaderTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/ServiceLoaderTest.java
index 0b4a848..3327619 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/ServiceLoaderTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/ServiceLoaderTest.java
@@ -35,7 +35,7 @@
StringUtils.lines(serviceImplementations).getBytes(),
"META-INF/services/" + A.class.getTypeName(),
Origin.unknown()))
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertSuccess()
.inspect(
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/StaticAndInterfaceMethodCollisionTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/StaticAndInterfaceMethodCollisionTest.java
index c21469c..0b1cf27 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/StaticAndInterfaceMethodCollisionTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/StaticAndInterfaceMethodCollisionTest.java
@@ -36,7 +36,7 @@
.enableNeverClassInliningAnnotations()
.enableNoUnusedInterfaceRemovalAnnotations()
.enableNoVerticalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("A.foo()", "A.baz()", "B.bar()", "J.foo()");
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/StaticAndVirtualMethodCollisionTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/StaticAndVirtualMethodCollisionTest.java
index 993dd65..bf89549 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/StaticAndVirtualMethodCollisionTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/StaticAndVirtualMethodCollisionTest.java
@@ -25,7 +25,7 @@
inspector -> inspector.assertMergedInto(B.class, A.class))
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("A.foo()", "A.bar()", "B.foo()", "B.bar()");
}
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/StrictMethodMergingTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/StrictMethodMergingTest.java
index 3b1e8c1..0b644b8 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/StrictMethodMergingTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/StrictMethodMergingTest.java
@@ -36,7 +36,7 @@
.addKeepMainRule(Main.class)
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addHorizontallyMergedClassesInspector(
inspector ->
inspector.assertMergedInto(B.class, A.class).assertMergedInto(D.class, C.class))
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/SuperConstructorCallsVirtualMethodTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/SuperConstructorCallsVirtualMethodTest.java
index 821d644..f3335fa 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/SuperConstructorCallsVirtualMethodTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/SuperConstructorCallsVirtualMethodTest.java
@@ -25,14 +25,14 @@
.addKeepMainRule(Main.class)
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("5", "foo hello", "B", "bar world", "5", "B")
.inspect(
codeInspector -> {
- assertThat(codeInspector.clazz(Parent.class), isPresent());
- assertThat(codeInspector.clazz(A.class), isPresent());
- assertThat(codeInspector.clazz(B.class), not(isPresent()));
+ assertThat(codeInspector.clazz(Parent.class), isPresent());
+ assertThat(codeInspector.clazz(A.class), isPresent());
+ assertThat(codeInspector.clazz(B.class), not(isPresent()));
});
}
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/SynchronizedClassesTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/SynchronizedClassesTest.java
index 049e3cb..3798008 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/SynchronizedClassesTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/SynchronizedClassesTest.java
@@ -34,7 +34,7 @@
.enableConstantArgumentAnnotations()
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("foo", "b", "bar", "1", "true")
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/SynchronizedMethodMergingTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/SynchronizedMethodMergingTest.java
index 374e568..dd93d69 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/SynchronizedMethodMergingTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/SynchronizedMethodMergingTest.java
@@ -36,7 +36,7 @@
.addKeepMainRule(Main.class)
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addHorizontallyMergedClassesInspector(
inspector ->
inspector.assertMergedInto(B.class, A.class).assertMergedInto(D.class, C.class))
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/SyntheticConstructorArgumentsMerged.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/SyntheticConstructorArgumentsMerged.java
index eb3fe19..570b867 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/SyntheticConstructorArgumentsMerged.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/SyntheticConstructorArgumentsMerged.java
@@ -25,14 +25,14 @@
.addKeepMainRule(Main.class)
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("5", "42")
.inspect(
codeInspector -> {
- assertThat(codeInspector.clazz(A.class), isPresent());
- assertThat(codeInspector.clazz(B.class), not(isPresent()));
+ assertThat(codeInspector.clazz(A.class), isPresent());
+ assertThat(codeInspector.clazz(B.class), not(isPresent()));
});
}
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/SyntheticLambdaWithMissingInterfaceMergingTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/SyntheticLambdaWithMissingInterfaceMergingTest.java
index 3c92a8d..f976b5b 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/SyntheticLambdaWithMissingInterfaceMergingTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/SyntheticLambdaWithMissingInterfaceMergingTest.java
@@ -47,7 +47,7 @@
HorizontallyMergedClassesInspector::assertNoClassesMerged)
.applyIf(!enableOptimization, TestShrinkerBuilder::addDontOptimize)
.allowDiagnosticWarningMessages()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compileWithExpectedDiagnostics(
diagnostics ->
diagnostics.assertWarningsMatch(
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/TreeFixerCollisionTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/TreeFixerCollisionTest.java
index 2b56278..be26607 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/TreeFixerCollisionTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/TreeFixerCollisionTest.java
@@ -29,7 +29,7 @@
.enableNeverClassInliningAnnotations()
.enableNoVerticalClassMergingAnnotations()
.enableNoHorizontalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines(
"print a: foo a", "print b: foo b", "print d: foo a", "print e: foo b")
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/TreeFixerConstructorCollisionTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/TreeFixerConstructorCollisionTest.java
index c5dff9d..30b7679 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/TreeFixerConstructorCollisionTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/TreeFixerConstructorCollisionTest.java
@@ -27,7 +27,7 @@
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
.enableNoHorizontalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines(
"constructor a",
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/TreeFixerInterfaceCollisionTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/TreeFixerInterfaceCollisionTest.java
index 29feadd..775db15 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/TreeFixerInterfaceCollisionTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/TreeFixerInterfaceCollisionTest.java
@@ -36,7 +36,7 @@
.enableNeverClassInliningAnnotations()
.enableNoVerticalClassMergingAnnotations()
.enableNoHorizontalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("print a: c", "print b: parent", "print a: e")
.inspect(
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/TreeFixerInterfaceFixedCollisionTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/TreeFixerInterfaceFixedCollisionTest.java
index e346353..27ce5be 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/TreeFixerInterfaceFixedCollisionTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/TreeFixerInterfaceFixedCollisionTest.java
@@ -36,7 +36,7 @@
.enableNeverClassInliningAnnotations()
.enableNoVerticalClassMergingAnnotations()
.enableNoHorizontalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("print a: parent", "print b: c", "print b: e")
.inspect(
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/TreeFixerInterfaceImplementedByParentTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/TreeFixerInterfaceImplementedByParentTest.java
index 5904824..4404568 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/TreeFixerInterfaceImplementedByParentTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/TreeFixerInterfaceImplementedByParentTest.java
@@ -36,7 +36,7 @@
.enableNeverClassInliningAnnotations()
.enableNoVerticalClassMergingAnnotations()
.enableNoHorizontalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("print a: parent", "print b: i", "print b: e")
.inspect(
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/TreeFixerSubClassCollisionTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/TreeFixerSubClassCollisionTest.java
index b00bc63..e180f05 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/TreeFixerSubClassCollisionTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/TreeFixerSubClassCollisionTest.java
@@ -31,7 +31,7 @@
.enableNeverClassInliningAnnotations()
.enableNoVerticalClassMergingAnnotations()
.enableNoHorizontalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines(
"print a: foo c a", "print b: foo c b", "print b: foo c b", "print b: foo d b")
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/UnresolvableMethodWithClassMergingTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/UnresolvableMethodWithClassMergingTest.java
index c8a33ee..ba7e586 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/UnresolvableMethodWithClassMergingTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/UnresolvableMethodWithClassMergingTest.java
@@ -22,7 +22,7 @@
.addDontWarn(Missing.class)
.addHorizontallyMergedClassesInspector(
HorizontallyMergedClassesInspector::assertNoOtherClassesMerged)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.addRunClasspathFiles(buildOnDexRuntime(parameters, Missing.class))
.run(parameters.getRuntime(), Main.class)
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/VerticalMergingPreoptimizedTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/VerticalMergingPreoptimizedTest.java
index db15d9c..bade3e5 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/VerticalMergingPreoptimizedTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/VerticalMergingPreoptimizedTest.java
@@ -28,7 +28,7 @@
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
.enableNoHorizontalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines(
"changed", "print a", "foo", "print b", "foo", "unused argument")
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/VerticallyMergedClassDistinguishedByCheckCastTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/VerticallyMergedClassDistinguishedByCheckCastTest.java
index 0c13090..6ef25d2 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/VerticallyMergedClassDistinguishedByCheckCastTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/VerticallyMergedClassDistinguishedByCheckCastTest.java
@@ -23,7 +23,7 @@
.addKeepMainRule(Main.class)
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("fail", "bar")
.inspect(codeInspector -> {});
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/VerticallyMergedClassDistinguishedByInstanceOfTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/VerticallyMergedClassDistinguishedByInstanceOfTest.java
index a7a9f96..90416b3 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/VerticallyMergedClassDistinguishedByInstanceOfTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/VerticallyMergedClassDistinguishedByInstanceOfTest.java
@@ -23,7 +23,7 @@
.addKeepMainRule(Main.class)
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("false", "true")
.inspect(codeInspector -> {});
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/VerticallyMergedClassTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/VerticallyMergedClassTest.java
index ab48235..be027c7 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/VerticallyMergedClassTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/VerticallyMergedClassTest.java
@@ -27,7 +27,7 @@
.enableNoHorizontalClassMergingAnnotations()
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("b", "a", "c")
.inspect(
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/VirtualMethodMergingOfFinalAndNonFinalMethodTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/VirtualMethodMergingOfFinalAndNonFinalMethodTest.java
index 0c51c89..9d8d0d2 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/VirtualMethodMergingOfFinalAndNonFinalMethodTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/VirtualMethodMergingOfFinalAndNonFinalMethodTest.java
@@ -29,7 +29,7 @@
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
.enableNoVerticalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector -> {
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/VirtualMethodMergingOfPublicizedMethodsTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/VirtualMethodMergingOfPublicizedMethodsTest.java
index d3665e0..d9550f8 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/VirtualMethodMergingOfPublicizedMethodsTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/VirtualMethodMergingOfPublicizedMethodsTest.java
@@ -26,7 +26,7 @@
.allowAccessModification()
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutputLines(
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/VirtualMethodMergingWithAbsentMethodAndSuperClassMergingTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/VirtualMethodMergingWithAbsentMethodAndSuperClassMergingTest.java
index 984f431..796cdd7 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/VirtualMethodMergingWithAbsentMethodAndSuperClassMergingTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/VirtualMethodMergingWithAbsentMethodAndSuperClassMergingTest.java
@@ -104,7 +104,7 @@
i -> i.assertMergedInto(D.class, C.class),
i -> i.assertMergedInto(C.class, D.class))
.assertNoOtherClassesMerged())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("A", "B", "C", "A");
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/dispatch/NotOverlappingTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/dispatch/NotOverlappingTest.java
index 3d0fe4a..d496ad4 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/dispatch/NotOverlappingTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/dispatch/NotOverlappingTest.java
@@ -24,13 +24,13 @@
.addKeepMainRule(Main.class)
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("foo", "bar")
.inspect(
codeInspector -> {
- assertThat(codeInspector.clazz(A.class), isPresent());
- assertThat(codeInspector.clazz(B.class), not(isPresent()));
+ assertThat(codeInspector.clazz(A.class), isPresent());
+ assertThat(codeInspector.clazz(B.class), not(isPresent()));
});
}
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/dispatch/OverrideAbstractMethodWithDefaultTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/dispatch/OverrideAbstractMethodWithDefaultTest.java
index 4e38b33..50d3724 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/dispatch/OverrideAbstractMethodWithDefaultTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/dispatch/OverrideAbstractMethodWithDefaultTest.java
@@ -40,7 +40,7 @@
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
.enableNoVerticalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("J", "B2")
.inspect(
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/dispatch/OverrideDefaultMethodTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/dispatch/OverrideDefaultMethodTest.java
index f7f2e0d..90a1c33 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/dispatch/OverrideDefaultMethodTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/dispatch/OverrideDefaultMethodTest.java
@@ -31,7 +31,7 @@
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
.enableNoVerticalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addHorizontallyMergedClassesInspector(
inspector -> {
if (parameters.canUseDefaultAndStaticInterfaceMethods()) {
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/dispatch/OverrideDefaultOnSuperMethodTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/dispatch/OverrideDefaultOnSuperMethodTest.java
index 313dec7..93548c1 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/dispatch/OverrideDefaultOnSuperMethodTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/dispatch/OverrideDefaultOnSuperMethodTest.java
@@ -31,7 +31,7 @@
.enableNeverClassInliningAnnotations()
.enableNoUnusedInterfaceRemovalAnnotations()
.enableNoVerticalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addHorizontallyMergedClassesInspector(
inspector -> {
if (parameters.canUseDefaultAndStaticInterfaceMethods()) {
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/dispatch/OverrideMergeAbsentTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/dispatch/OverrideMergeAbsentTest.java
index 51b6b55..15e8d29 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/dispatch/OverrideMergeAbsentTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/dispatch/OverrideMergeAbsentTest.java
@@ -30,7 +30,7 @@
.enableNeverClassInliningAnnotations()
.enableNoParameterTypeStrengtheningAnnotations()
.enableNoVerticalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addHorizontallyMergedClassesInspector(
inspector -> {
if (parameters.canUseDefaultAndStaticInterfaceMethods()) {
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/dispatch/OverrideParentCollisionTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/dispatch/OverrideParentCollisionTest.java
index c62f59b..f819541 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/dispatch/OverrideParentCollisionTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/dispatch/OverrideParentCollisionTest.java
@@ -27,13 +27,13 @@
.addKeepMainRule(Main.class)
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("foo", "bar", "foo", "parent")
.inspect(
codeInspector -> {
- assertThat(codeInspector.clazz(A.class), isPresent());
- assertThat(codeInspector.clazz(B.class), not(isPresent()));
+ assertThat(codeInspector.clazz(A.class), isPresent());
+ assertThat(codeInspector.clazz(B.class), not(isPresent()));
});
}
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/dispatch/SuperMethodMergedTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/dispatch/SuperMethodMergedTest.java
index fb2189d..ba5e0b7 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/dispatch/SuperMethodMergedTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/dispatch/SuperMethodMergedTest.java
@@ -28,15 +28,15 @@
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
.enableNoVerticalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("foo", "parent b", "parent b", "x", "parent b")
.inspect(
codeInspector -> {
- assertThat(codeInspector.clazz(ParentA.class), isPresent());
- assertThat(codeInspector.clazz(ParentB.class), not(isPresent()));
- assertThat(codeInspector.clazz(X.class), isPresent());
- assertThat(codeInspector.clazz(Y.class), not(isPresent()));
+ assertThat(codeInspector.clazz(ParentA.class), isPresent());
+ assertThat(codeInspector.clazz(ParentB.class), not(isPresent()));
+ assertThat(codeInspector.clazz(X.class), isPresent());
+ assertThat(codeInspector.clazz(Y.class), not(isPresent()));
});
}
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/interfaces/ClassHierarchyCycleAfterMergingTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/interfaces/ClassHierarchyCycleAfterMergingTest.java
index 4d81f1a..d787141 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/interfaces/ClassHierarchyCycleAfterMergingTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/interfaces/ClassHierarchyCycleAfterMergingTest.java
@@ -7,7 +7,6 @@
import static com.android.tools.r8.utils.codeinspector.Matchers.isImplementing;
import static com.android.tools.r8.utils.codeinspector.Matchers.isPresent;
import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.Assert.assertFalse;
import com.android.tools.r8.NoHorizontalClassMerging;
import com.android.tools.r8.NoUnusedInterfaceRemoval;
@@ -47,7 +46,7 @@
.enableNoHorizontalClassMergingAnnotations()
.enableNoUnusedInterfaceRemovalAnnotations()
.enableNoVerticalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector -> {
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/interfaces/ClassHierarchyCycleCrossGroupMergingTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/interfaces/ClassHierarchyCycleCrossGroupMergingTest.java
index bbbec17..a2bce6c 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/interfaces/ClassHierarchyCycleCrossGroupMergingTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/interfaces/ClassHierarchyCycleCrossGroupMergingTest.java
@@ -40,7 +40,7 @@
.enableNoHorizontalClassMergingAnnotations()
.enableNoUnusedInterfaceRemovalAnnotations()
.enableNoVerticalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithEmptyOutput();
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/interfaces/CollisionWithDefaultMethodOutsideMergeGroupAfterSubclassMergingTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/interfaces/CollisionWithDefaultMethodOutsideMergeGroupAfterSubclassMergingTest.java
index 440ccde..dfe85b1 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/interfaces/CollisionWithDefaultMethodOutsideMergeGroupAfterSubclassMergingTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/interfaces/CollisionWithDefaultMethodOutsideMergeGroupAfterSubclassMergingTest.java
@@ -74,7 +74,7 @@
.enableNoMethodStaticizingAnnotations()
.enableNoUnusedInterfaceRemovalAnnotations()
.enableNoVerticalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector -> {
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/interfaces/CollisionWithDefaultMethodOutsideMergeGroupClassTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/interfaces/CollisionWithDefaultMethodOutsideMergeGroupClassTest.java
index dc48b45..d9ca89c 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/interfaces/CollisionWithDefaultMethodOutsideMergeGroupClassTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/interfaces/CollisionWithDefaultMethodOutsideMergeGroupClassTest.java
@@ -64,7 +64,7 @@
.enableNoMethodStaticizingAnnotations()
.enableNoUnusedInterfaceRemovalAnnotations()
.enableNoVerticalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector -> {
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/interfaces/CollisionWithDefaultMethodOutsideMergeGroupLambdaTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/interfaces/CollisionWithDefaultMethodOutsideMergeGroupLambdaTest.java
index a136180..c0fa6fe 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/interfaces/CollisionWithDefaultMethodOutsideMergeGroupLambdaTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/interfaces/CollisionWithDefaultMethodOutsideMergeGroupLambdaTest.java
@@ -59,7 +59,7 @@
.enableNoMethodStaticizingAnnotations()
.enableNoUnusedInterfaceRemovalAnnotations()
.enableNoVerticalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector -> {
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/interfaces/CollisionWithDefaultMethodsTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/interfaces/CollisionWithDefaultMethodsTest.java
index d40d1b9..89bc323 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/interfaces/CollisionWithDefaultMethodsTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/interfaces/CollisionWithDefaultMethodsTest.java
@@ -43,7 +43,7 @@
testForR8(parameters.getBackend())
.addInnerClasses(getClass())
.addKeepMainRule(TestClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepRules("-keep class ** { *; }")
.addHorizontallyMergedClassesInspector(
inspector -> {
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/interfaces/DisjointFunctionalInterfacesMergingTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/interfaces/DisjointFunctionalInterfacesMergingTest.java
index 05c63a7..e475259 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/interfaces/DisjointFunctionalInterfacesMergingTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/interfaces/DisjointFunctionalInterfacesMergingTest.java
@@ -40,7 +40,7 @@
.noClassInliningOfSynthetics()
.noHorizontalClassMergingOfSynthetics()
.noInliningOfSynthetics()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("I", "J");
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/interfaces/DisjointFunctionalInterfacesWithIntersectionMergingTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/interfaces/DisjointFunctionalInterfacesWithIntersectionMergingTest.java
index 7125324..ec4a511 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/interfaces/DisjointFunctionalInterfacesWithIntersectionMergingTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/interfaces/DisjointFunctionalInterfacesWithIntersectionMergingTest.java
@@ -43,7 +43,7 @@
.noClassInliningOfSynthetics()
.noHorizontalClassMergingOfSynthetics()
.noInliningOfSynthetics()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("I & J", "I & J");
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/interfaces/DisjointFunctionalInterfacesWithSameNameAndDifferentParametersMergingTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/interfaces/DisjointFunctionalInterfacesWithSameNameAndDifferentParametersMergingTest.java
index 4588182..e78ba30 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/interfaces/DisjointFunctionalInterfacesWithSameNameAndDifferentParametersMergingTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/interfaces/DisjointFunctionalInterfacesWithSameNameAndDifferentParametersMergingTest.java
@@ -42,7 +42,7 @@
.noClassInliningOfSynthetics()
.noHorizontalClassMergingOfSynthetics()
.noInliningOfSynthetics()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("I", "J");
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/interfaces/DisjointFunctionalInterfacesWithSameNameAndDifferentReturnTypeMergingTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/interfaces/DisjointFunctionalInterfacesWithSameNameAndDifferentReturnTypeMergingTest.java
index c4af611..8038341 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/interfaces/DisjointFunctionalInterfacesWithSameNameAndDifferentReturnTypeMergingTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/interfaces/DisjointFunctionalInterfacesWithSameNameAndDifferentReturnTypeMergingTest.java
@@ -42,7 +42,7 @@
.noClassInliningOfSynthetics()
.noHorizontalClassMergingOfSynthetics()
.noInliningOfSynthetics()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("I", "J");
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/interfaces/DisjointInterfacesWithDefaultMethodsMergingTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/interfaces/DisjointInterfacesWithDefaultMethodsMergingTest.java
index a544c7e..97bc4fc 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/interfaces/DisjointInterfacesWithDefaultMethodsMergingTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/interfaces/DisjointInterfacesWithDefaultMethodsMergingTest.java
@@ -54,7 +54,7 @@
.enableNoMethodStaticizingAnnotations()
.enableNoUnusedInterfaceRemovalAnnotations()
.enableNoVerticalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector -> {
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/interfaces/DisjointInterfacesWithoutDefaultMethodsMergingTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/interfaces/DisjointInterfacesWithoutDefaultMethodsMergingTest.java
index 08d1d2c..26ad493 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/interfaces/DisjointInterfacesWithoutDefaultMethodsMergingTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/interfaces/DisjointInterfacesWithoutDefaultMethodsMergingTest.java
@@ -45,7 +45,7 @@
.enableNeverClassInliningAnnotations()
.enableNoUnusedInterfaceRemovalAnnotations()
.enableNoVerticalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector -> {
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/interfaces/EmptyInterfaceChainMergingTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/interfaces/EmptyInterfaceChainMergingTest.java
index 80160a4..43fc57d 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/interfaces/EmptyInterfaceChainMergingTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/interfaces/EmptyInterfaceChainMergingTest.java
@@ -44,7 +44,7 @@
.assertNoOtherClassesMerged())
.enableNoUnusedInterfaceRemovalAnnotations()
.enableNoVerticalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector -> {
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/interfaces/EmptyInterfacesMergingTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/interfaces/EmptyInterfacesMergingTest.java
index 53086a7..9bd86a9 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/interfaces/EmptyInterfacesMergingTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/interfaces/EmptyInterfacesMergingTest.java
@@ -41,7 +41,7 @@
inspector -> inspector.assertIsCompleteMergeGroup(I.class, J.class))
.enableNoUnusedInterfaceRemovalAnnotations()
.enableNoVerticalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector -> {
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/interfaces/IdenticalFunctionalInterfacesMergingTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/interfaces/IdenticalFunctionalInterfacesMergingTest.java
index 02239dd..e6e63ec 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/interfaces/IdenticalFunctionalInterfacesMergingTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/interfaces/IdenticalFunctionalInterfacesMergingTest.java
@@ -40,7 +40,7 @@
.noClassInliningOfSynthetics()
.noHorizontalClassMergingOfSynthetics()
.noInliningOfSynthetics()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("I", "J");
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/interfaces/IdenticalFunctionalInterfacesWithIntersectionMergingTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/interfaces/IdenticalFunctionalInterfacesWithIntersectionMergingTest.java
index 6687fac..e09329a 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/interfaces/IdenticalFunctionalInterfacesWithIntersectionMergingTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/interfaces/IdenticalFunctionalInterfacesWithIntersectionMergingTest.java
@@ -42,7 +42,7 @@
.enableNoVerticalClassMergingAnnotations()
.noClassInliningOfSynthetics()
.noInliningOfSynthetics()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("I & J", "I & J");
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/interfaces/IllegalOverrideAfterInterfaceMergingTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/interfaces/IllegalOverrideAfterInterfaceMergingTest.java
index d904b01..b3a256c 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/interfaces/IllegalOverrideAfterInterfaceMergingTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/interfaces/IllegalOverrideAfterInterfaceMergingTest.java
@@ -52,7 +52,7 @@
.enableNoMethodStaticizingAnnotations()
.enableNoUnusedInterfaceRemovalAnnotations()
.enableNoVerticalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector -> {
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/interfaces/IllegalSiblingAfterInterfaceMergingTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/interfaces/IllegalSiblingAfterInterfaceMergingTest.java
index d4094c5..e03a298 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/interfaces/IllegalSiblingAfterInterfaceMergingTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/interfaces/IllegalSiblingAfterInterfaceMergingTest.java
@@ -53,7 +53,7 @@
.enableNoMethodStaticizingAnnotations()
.enableNoUnusedInterfaceRemovalAnnotations()
.enableNoVerticalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector -> {
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/interfaces/NoDefaultMethodMergingTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/interfaces/NoDefaultMethodMergingTest.java
index 9d18660..cfe6170 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/interfaces/NoDefaultMethodMergingTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/interfaces/NoDefaultMethodMergingTest.java
@@ -52,7 +52,7 @@
.enableNoMethodStaticizingAnnotations()
.enableNoUnusedInterfaceRemovalAnnotations()
.enableNoVerticalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector -> {
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontalstatic/HorizontalClassMergerShouldMergeSynchronizedMethodTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontalstatic/HorizontalClassMergerShouldMergeSynchronizedMethodTest.java
index 402d279..0bafca9 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontalstatic/HorizontalClassMergerShouldMergeSynchronizedMethodTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontalstatic/HorizontalClassMergerShouldMergeSynchronizedMethodTest.java
@@ -38,7 +38,7 @@
testForR8(parameters.getBackend())
.addInnerClasses(HorizontalClassMergerShouldMergeSynchronizedMethodTest.class)
.addKeepMainRule(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("1", "2", "3")
.inspect(
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontalstatic/HorizontalClassMergerSynchronizedMethodTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontalstatic/HorizontalClassMergerSynchronizedMethodTest.java
index 533cb86..1be65a7 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontalstatic/HorizontalClassMergerSynchronizedMethodTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontalstatic/HorizontalClassMergerSynchronizedMethodTest.java
@@ -57,7 +57,7 @@
inspector
.assertClassesNotMerged(LockOne.class, LockTwo.class, LockThree.class)
.assertMergedInto(AcquireThree.class, AcquireOne.class))
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutput("Hello World!")
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontalstatic/InliningAfterStaticClassMergerTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontalstatic/InliningAfterStaticClassMergerTest.java
index 18017a1..077f3ad 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontalstatic/InliningAfterStaticClassMergerTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontalstatic/InliningAfterStaticClassMergerTest.java
@@ -87,7 +87,7 @@
options -> options.libraryInterfacesMayHaveStaticInitialization = true)
.enableMemberValuePropagationAnnotations()
.addDontObfuscate()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutput(expected)
.inspector();
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontalstatic/StaticClassMergerInterfaceTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontalstatic/StaticClassMergerInterfaceTest.java
index 6905202..b259340 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontalstatic/StaticClassMergerInterfaceTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontalstatic/StaticClassMergerInterfaceTest.java
@@ -54,7 +54,7 @@
}
})
.enableInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutput(expectedOutput)
.inspect(
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontalstatic/StaticClassMergerTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontalstatic/StaticClassMergerTest.java
index 12f1b94..77d2e17 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontalstatic/StaticClassMergerTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontalstatic/StaticClassMergerTest.java
@@ -81,7 +81,7 @@
inspector.assertMergedInto(
StaticMergeCandidateB.class, StaticMergeCandidateA.class))
.enableInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutput(EXPECTED)
.inspect(
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontalstatic/StaticClassMergerVisibilityTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontalstatic/StaticClassMergerVisibilityTest.java
index 7555576..aa373c6 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontalstatic/StaticClassMergerVisibilityTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontalstatic/StaticClassMergerVisibilityTest.java
@@ -45,7 +45,7 @@
.assertMergedInto(B.class, D.class)
.assertMergedInto(C.class, D.class))
.enableInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addDontObfuscate()
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("A.print()", "B.print()", "C.print()", "D.print()")
diff --git a/src/test/java/com/android/tools/r8/classmerging/vertical/B141942381.java b/src/test/java/com/android/tools/r8/classmerging/vertical/B141942381.java
index 6156017..1dbda74 100644
--- a/src/test/java/com/android/tools/r8/classmerging/vertical/B141942381.java
+++ b/src/test/java/com/android/tools/r8/classmerging/vertical/B141942381.java
@@ -49,7 +49,7 @@
testForR8(parameters.getBackend())
.addInnerClasses(B141942381.class)
.addKeepMainRule(TestClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepAttributes("Signatures")
.enableNeverClassInliningAnnotations()
.addDontObfuscate()
diff --git a/src/test/java/com/android/tools/r8/classmerging/vertical/ClassesHaveBeenMergedTest.java b/src/test/java/com/android/tools/r8/classmerging/vertical/ClassesHaveBeenMergedTest.java
index 6ed6dd9..f22226d 100644
--- a/src/test/java/com/android/tools/r8/classmerging/vertical/ClassesHaveBeenMergedTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/vertical/ClassesHaveBeenMergedTest.java
@@ -40,7 +40,7 @@
.addVerticallyMergedClassesInspector(this::inspectVerticallyMergedClasses)
.enableInliningAnnotations()
.enableNoHorizontalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/classmerging/vertical/ConflictWasDetectedTest.java b/src/test/java/com/android/tools/r8/classmerging/vertical/ConflictWasDetectedTest.java
index 8b24e99..b1185f0 100644
--- a/src/test/java/com/android/tools/r8/classmerging/vertical/ConflictWasDetectedTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/vertical/ConflictWasDetectedTest.java
@@ -38,7 +38,7 @@
.enableInliningAnnotations()
// .enableNoHorizontalClassMergingAnnotations()
.enableUnusedArgumentAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), Main.class);
}
diff --git a/src/test/java/com/android/tools/r8/classmerging/vertical/ExceptionTablesTest.java b/src/test/java/com/android/tools/r8/classmerging/vertical/ExceptionTablesTest.java
index ffe849e..a27783e 100644
--- a/src/test/java/com/android/tools/r8/classmerging/vertical/ExceptionTablesTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/vertical/ExceptionTablesTest.java
@@ -41,7 +41,7 @@
.addInnerClasses(ExceptionTablesTest.class)
.addKeepMainRule(TestClass.class)
.addVerticallyMergedClassesInspector(this::inspectVerticallyMergedClasses)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/classmerging/vertical/ForceInlineConstructorWithMultiPackageAccessesTest.java b/src/test/java/com/android/tools/r8/classmerging/vertical/ForceInlineConstructorWithMultiPackageAccessesTest.java
index d830cdb..f363c21 100644
--- a/src/test/java/com/android/tools/r8/classmerging/vertical/ForceInlineConstructorWithMultiPackageAccessesTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/vertical/ForceInlineConstructorWithMultiPackageAccessesTest.java
@@ -38,7 +38,7 @@
.addInnerClasses(ForceInlineConstructorWithMultiPackageAccessesTestClasses.class)
.addKeepMainRule(TestClass.class)
.enableNoVerticalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/classmerging/vertical/InterfaceWithProxyTest.java b/src/test/java/com/android/tools/r8/classmerging/vertical/InterfaceWithProxyTest.java
index b9e0066..ecdf0ba 100644
--- a/src/test/java/com/android/tools/r8/classmerging/vertical/InterfaceWithProxyTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/vertical/InterfaceWithProxyTest.java
@@ -46,7 +46,7 @@
.addKeepMainRule(TestClass.class)
.enableNeverClassInliningAnnotations()
.enableInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutput(EXPECTED);
}
diff --git a/src/test/java/com/android/tools/r8/classmerging/vertical/LambdaRewritingTest.java b/src/test/java/com/android/tools/r8/classmerging/vertical/LambdaRewritingTest.java
index 4cb9707..98b1442 100644
--- a/src/test/java/com/android/tools/r8/classmerging/vertical/LambdaRewritingTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/vertical/LambdaRewritingTest.java
@@ -34,7 +34,7 @@
.addVerticallyMergedClassesInspector(
inspector -> inspector.assertMergedIntoSubtype(Interface.class))
.enableInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), Main.class);
}
diff --git a/src/test/java/com/android/tools/r8/classmerging/vertical/MergeSynthesizingContextIntoSyntheticLambdaTest.java b/src/test/java/com/android/tools/r8/classmerging/vertical/MergeSynthesizingContextIntoSyntheticLambdaTest.java
index d2bf4cd..9de32aa 100644
--- a/src/test/java/com/android/tools/r8/classmerging/vertical/MergeSynthesizingContextIntoSyntheticLambdaTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/vertical/MergeSynthesizingContextIntoSyntheticLambdaTest.java
@@ -49,7 +49,7 @@
inspector.assertMergedIntoSubtype(I.class);
}
})
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("I", "J");
diff --git a/src/test/java/com/android/tools/r8/classmerging/vertical/MethodCollisionTest.java b/src/test/java/com/android/tools/r8/classmerging/vertical/MethodCollisionTest.java
index 4baa783..ea8f326 100644
--- a/src/test/java/com/android/tools/r8/classmerging/vertical/MethodCollisionTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/vertical/MethodCollisionTest.java
@@ -42,7 +42,7 @@
VerticallyMergedClassesInspector::assertNoClassesMerged)
.enableInliningAnnotations()
.enableNoHorizontalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), Main.class);
}
diff --git a/src/test/java/com/android/tools/r8/classmerging/vertical/NoIllegalClassAccessWithAccessModificationsTest.java b/src/test/java/com/android/tools/r8/classmerging/vertical/NoIllegalClassAccessWithAccessModificationsTest.java
index f2edbce..3541501 100644
--- a/src/test/java/com/android/tools/r8/classmerging/vertical/NoIllegalClassAccessWithAccessModificationsTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/vertical/NoIllegalClassAccessWithAccessModificationsTest.java
@@ -44,7 +44,7 @@
.allowAccessModification()
.enableInliningAnnotations()
.enableNoHorizontalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/classmerging/vertical/NonReboundFieldAccessOnMergedClassTest.java b/src/test/java/com/android/tools/r8/classmerging/vertical/NonReboundFieldAccessOnMergedClassTest.java
index c65809a..913f012 100644
--- a/src/test/java/com/android/tools/r8/classmerging/vertical/NonReboundFieldAccessOnMergedClassTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/vertical/NonReboundFieldAccessOnMergedClassTest.java
@@ -38,7 +38,7 @@
inspector -> inspector.assertMergedIntoSubtype(C.class))
.enableNeverClassInliningAnnotations()
.enableNoVerticalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("Hello world!");
diff --git a/src/test/java/com/android/tools/r8/classmerging/vertical/NonReboundFieldAccessWithMergedTypeTest.java b/src/test/java/com/android/tools/r8/classmerging/vertical/NonReboundFieldAccessWithMergedTypeTest.java
index 6d8cef1..40f22e1 100644
--- a/src/test/java/com/android/tools/r8/classmerging/vertical/NonReboundFieldAccessWithMergedTypeTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/vertical/NonReboundFieldAccessWithMergedTypeTest.java
@@ -38,7 +38,7 @@
inspector -> inspector.assertMergedIntoSubtype(GreetingBase.class))
.enableNeverClassInliningAnnotations()
.enableNoVerticalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("Hello world!");
diff --git a/src/test/java/com/android/tools/r8/classmerging/vertical/SyntheticBridgeSignaturesTest.java b/src/test/java/com/android/tools/r8/classmerging/vertical/SyntheticBridgeSignaturesTest.java
index 829e56b..b7bb268 100644
--- a/src/test/java/com/android/tools/r8/classmerging/vertical/SyntheticBridgeSignaturesTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/vertical/SyntheticBridgeSignaturesTest.java
@@ -60,7 +60,7 @@
.addVerticallyMergedClassesInspector(this::inspectVerticallyMergedClasses)
.enableInliningAnnotations()
.enableNoHorizontalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile();
compileResult
diff --git a/src/test/java/com/android/tools/r8/classmerging/vertical/VerticalClassMergerIndirectReflectiveNameTest.java b/src/test/java/com/android/tools/r8/classmerging/vertical/VerticalClassMergerIndirectReflectiveNameTest.java
index 6edb466..3892fcc 100644
--- a/src/test/java/com/android/tools/r8/classmerging/vertical/VerticalClassMergerIndirectReflectiveNameTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/vertical/VerticalClassMergerIndirectReflectiveNameTest.java
@@ -47,7 +47,7 @@
testForR8(parameters.getBackend())
.addProgramClasses(Main.class, A.class, B.class)
.addKeepMainRule(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
.compile()
diff --git a/src/test/java/com/android/tools/r8/classmerging/vertical/VerticalClassMergerReflectiveNameTest.java b/src/test/java/com/android/tools/r8/classmerging/vertical/VerticalClassMergerReflectiveNameTest.java
index 865b5bb..7bbb17e 100644
--- a/src/test/java/com/android/tools/r8/classmerging/vertical/VerticalClassMergerReflectiveNameTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/vertical/VerticalClassMergerReflectiveNameTest.java
@@ -47,7 +47,7 @@
testForR8(parameters.getBackend())
.addProgramClasses(Main.class, A.class, B.class)
.addKeepMainRule(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
.run(parameters.getRuntime(), Main.class)
diff --git a/src/test/java/com/android/tools/r8/classmerging/vertical/VerticalClassMergerShouldMergeSynchronizedMethodTest.java b/src/test/java/com/android/tools/r8/classmerging/vertical/VerticalClassMergerShouldMergeSynchronizedMethodTest.java
index f9c51ce..43304b2 100644
--- a/src/test/java/com/android/tools/r8/classmerging/vertical/VerticalClassMergerShouldMergeSynchronizedMethodTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/vertical/VerticalClassMergerShouldMergeSynchronizedMethodTest.java
@@ -39,7 +39,7 @@
testForR8(parameters.getBackend())
.addInnerClasses(VerticalClassMergerShouldMergeSynchronizedMethodTest.class)
.addKeepMainRule(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("1", "2", "3", "4")
.inspect(
diff --git a/src/test/java/com/android/tools/r8/classmerging/vertical/VerticalClassMergerSuperCallInStaticTest.java b/src/test/java/com/android/tools/r8/classmerging/vertical/VerticalClassMergerSuperCallInStaticTest.java
index 4701f68..4374800 100644
--- a/src/test/java/com/android/tools/r8/classmerging/vertical/VerticalClassMergerSuperCallInStaticTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/vertical/VerticalClassMergerSuperCallInStaticTest.java
@@ -58,7 +58,7 @@
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
.enableNoVerticalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines(EXPECTED)
.inspect(inspector -> assertThat(inspector.clazz(A.class), not(isPresent())));
diff --git a/src/test/java/com/android/tools/r8/classmerging/vertical/VerticalClassMergerSuperToLibraryTest.java b/src/test/java/com/android/tools/r8/classmerging/vertical/VerticalClassMergerSuperToLibraryTest.java
index 4c83705..fa191c8 100644
--- a/src/test/java/com/android/tools/r8/classmerging/vertical/VerticalClassMergerSuperToLibraryTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/vertical/VerticalClassMergerSuperToLibraryTest.java
@@ -58,7 +58,7 @@
.addLibraryClasses(Lib.class, LibParent.class)
.addProgramClasses(B.class, Main.class)
.addProgramClassFileData(getAWithRewrittenInvokeSpecialToBase())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.addBootClasspathFiles(
buildOnDexRuntime(
@@ -81,7 +81,7 @@
.addKeepMainRule(Main.class)
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addVerticallyMergedClassesInspector(
VerticallyMergedClassesInspector::assertNoClassesMerged)
.compile()
diff --git a/src/test/java/com/android/tools/r8/classmerging/vertical/VerticalClassMergerSynchronizedBlockTest.java b/src/test/java/com/android/tools/r8/classmerging/vertical/VerticalClassMergerSynchronizedBlockTest.java
index 327be46..a817755 100644
--- a/src/test/java/com/android/tools/r8/classmerging/vertical/VerticalClassMergerSynchronizedBlockTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/vertical/VerticalClassMergerSynchronizedBlockTest.java
@@ -52,7 +52,7 @@
testForR8(parameters.getBackend())
.addInnerClasses(VerticalClassMergerSynchronizedBlockTest.class)
.addKeepMainRule(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutput("Hello World!")
.inspect(inspector -> assertThat(inspector.clazz(LockOne.class), isPresent()));
diff --git a/src/test/java/com/android/tools/r8/classmerging/vertical/VerticalClassMergerSynchronizedBlockWithArraysTest.java b/src/test/java/com/android/tools/r8/classmerging/vertical/VerticalClassMergerSynchronizedBlockWithArraysTest.java
index 6c3f55d..d75594d 100644
--- a/src/test/java/com/android/tools/r8/classmerging/vertical/VerticalClassMergerSynchronizedBlockWithArraysTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/vertical/VerticalClassMergerSynchronizedBlockWithArraysTest.java
@@ -52,7 +52,7 @@
testForR8(parameters.getBackend())
.addInnerClasses(VerticalClassMergerSynchronizedBlockWithArraysTest.class)
.addKeepMainRule(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutput("Hello World!")
.inspect(inspector -> assertThat(inspector.clazz(LockOne.class), isPresent()));
diff --git a/src/test/java/com/android/tools/r8/classmerging/vertical/VerticalClassMergerSynchronizedMethodTest.java b/src/test/java/com/android/tools/r8/classmerging/vertical/VerticalClassMergerSynchronizedMethodTest.java
index ff081a4..b515416 100644
--- a/src/test/java/com/android/tools/r8/classmerging/vertical/VerticalClassMergerSynchronizedMethodTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/vertical/VerticalClassMergerSynchronizedMethodTest.java
@@ -54,7 +54,7 @@
.addInnerClasses(VerticalClassMergerSynchronizedMethodTest.class)
.addKeepMainRule(Main.class)
.enableNoVerticalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutput("Hello World!")
.inspect(inspector -> assertThat(inspector.clazz(LockOne.class), isPresent()));
diff --git a/src/test/java/com/android/tools/r8/classmerging/vertical/VerticalClassMergerTest.java b/src/test/java/com/android/tools/r8/classmerging/vertical/VerticalClassMergerTest.java
index 7799ba7..d8b923b 100644
--- a/src/test/java/com/android/tools/r8/classmerging/vertical/VerticalClassMergerTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/vertical/VerticalClassMergerTest.java
@@ -103,7 +103,7 @@
.enableProguardTestOptions()
.addDontObfuscate()
.addOptionsModification(optionsConsumer)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspector();
}
@@ -1186,7 +1186,7 @@
})
.addDontObfuscate()
.enableProguardTestOptions()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile();
Path proguardMapPath = File.createTempFile("mapping", ".txt", temp.getRoot()).toPath();
diff --git a/src/test/java/com/android/tools/r8/classmerging/vertical/VerticalClassMergerVirtualToLibraryTest.java b/src/test/java/com/android/tools/r8/classmerging/vertical/VerticalClassMergerVirtualToLibraryTest.java
index b70b14a..468309e 100644
--- a/src/test/java/com/android/tools/r8/classmerging/vertical/VerticalClassMergerVirtualToLibraryTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/vertical/VerticalClassMergerVirtualToLibraryTest.java
@@ -58,7 +58,7 @@
.addLibraryClasses(LibParent.class)
.addLibraryClassFileData(classWithoutBarMethod(Lib.class))
.addProgramClasses(A.class, B.class, Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.addBootClasspathFiles(
buildOnDexRuntime(
@@ -79,7 +79,7 @@
.addKeepMainRule(Main.class)
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addVerticallyMergedClassesInspector(
VerticallyMergedClassesInspector::assertNoClassesMerged)
.compile()
diff --git a/src/test/java/com/android/tools/r8/classmerging/vertical/VerticalClassMergingWithGetNameTest.java b/src/test/java/com/android/tools/r8/classmerging/vertical/VerticalClassMergingWithGetNameTest.java
index df89c21..080cd92 100644
--- a/src/test/java/com/android/tools/r8/classmerging/vertical/VerticalClassMergingWithGetNameTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/vertical/VerticalClassMergingWithGetNameTest.java
@@ -39,7 +39,7 @@
.addVerticallyMergedClassesInspector(
inspector -> inspector.assertMergedIntoSubtype(A.class))
.enableInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), Main.class)
.apply(
diff --git a/src/test/java/com/android/tools/r8/classmerging/vertical/VerticalClassMergingWithMissingSuperClassTest.java b/src/test/java/com/android/tools/r8/classmerging/vertical/VerticalClassMergingWithMissingSuperClassTest.java
index 53fbaa5..3437967 100644
--- a/src/test/java/com/android/tools/r8/classmerging/vertical/VerticalClassMergingWithMissingSuperClassTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/vertical/VerticalClassMergingWithMissingSuperClassTest.java
@@ -34,7 +34,7 @@
.addVerticallyMergedClassesInspector(
inspector -> inspector.assertMergedIntoSubtype(B.class))
.enableNoVerticalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.addRunClasspathFiles(buildOnDexRuntime(parameters, MissingClass.class))
.run(parameters.getRuntime(), Main.class)
diff --git a/src/test/java/com/android/tools/r8/classmerging/vertical/VerticalClassMergingWithMissingTypeArgsSubstitutionTest.java b/src/test/java/com/android/tools/r8/classmerging/vertical/VerticalClassMergingWithMissingTypeArgsSubstitutionTest.java
index 69d794e..d5bfade 100644
--- a/src/test/java/com/android/tools/r8/classmerging/vertical/VerticalClassMergingWithMissingTypeArgsSubstitutionTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/vertical/VerticalClassMergingWithMissingTypeArgsSubstitutionTest.java
@@ -46,7 +46,7 @@
.enableInliningAnnotations()
.enableNoMethodStaticizingAnnotations()
.enableConstantArgumentAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("T", "Hello World")
.inspect(
diff --git a/src/test/java/com/android/tools/r8/classmerging/vertical/VerticalClassMergingWithMissingTypeArgsTest.java b/src/test/java/com/android/tools/r8/classmerging/vertical/VerticalClassMergingWithMissingTypeArgsTest.java
index 00d8557..6aeda77 100644
--- a/src/test/java/com/android/tools/r8/classmerging/vertical/VerticalClassMergingWithMissingTypeArgsTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/vertical/VerticalClassMergingWithMissingTypeArgsTest.java
@@ -34,7 +34,7 @@
.addVerticallyMergedClassesInspector(
inspector -> inspector.assertMergedIntoSubtype(A.class))
.enableInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("B.m()");
diff --git a/src/test/java/com/android/tools/r8/classmerging/vertical/VerticalClassMergingWithNonVisibleAnnotationTest.java b/src/test/java/com/android/tools/r8/classmerging/vertical/VerticalClassMergingWithNonVisibleAnnotationTest.java
index c431ea1..075483e 100644
--- a/src/test/java/com/android/tools/r8/classmerging/vertical/VerticalClassMergingWithNonVisibleAnnotationTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/vertical/VerticalClassMergingWithNonVisibleAnnotationTest.java
@@ -43,7 +43,7 @@
testForR8Compat(parameters.getBackend())
.addInnerClasses(VerticalClassMergingWithNonVisibleAnnotationTestClasses.class)
.addProgramClasses(Sub.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(Sub.class)
.addKeepClassRules(
VerticalClassMergingWithNonVisibleAnnotationTestClasses.class.getTypeName()
diff --git a/src/test/java/com/android/tools/r8/code/invokedynamic/InvokeCustomRuntimeErrorTest.java b/src/test/java/com/android/tools/r8/code/invokedynamic/InvokeCustomRuntimeErrorTest.java
index a7acf9e..adb977f 100644
--- a/src/test/java/com/android/tools/r8/code/invokedynamic/InvokeCustomRuntimeErrorTest.java
+++ b/src/test/java/com/android/tools/r8/code/invokedynamic/InvokeCustomRuntimeErrorTest.java
@@ -86,7 +86,7 @@
testForD8(parameters.getBackend())
.addProgramClasses(I.class, A.class)
.addProgramClassFileData(getTransformedTestClass())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.disableDesugaring()
.compileWithExpectedDiagnostics(
diagnostics ->
diff --git a/src/test/java/com/android/tools/r8/code/invokedynamic/InvokeDynamicVirtualDispatchToDefaultInterfaceMethodTest.java b/src/test/java/com/android/tools/r8/code/invokedynamic/InvokeDynamicVirtualDispatchToDefaultInterfaceMethodTest.java
index 7494b13..3511307 100644
--- a/src/test/java/com/android/tools/r8/code/invokedynamic/InvokeDynamicVirtualDispatchToDefaultInterfaceMethodTest.java
+++ b/src/test/java/com/android/tools/r8/code/invokedynamic/InvokeDynamicVirtualDispatchToDefaultInterfaceMethodTest.java
@@ -69,7 +69,7 @@
.allowAccessModification()
.addProgramClasses(I.class, A.class)
.addProgramClassFileData(getTransformedTestClass())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(TestClass.class)
.addKeepRules("-keepclassmembers class * { *** foo(...); }")
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/compatproguard/KeepClassMemberNamesMinificationTest.java b/src/test/java/com/android/tools/r8/compatproguard/KeepClassMemberNamesMinificationTest.java
index 70aaa93..8db0c0c 100644
--- a/src/test/java/com/android/tools/r8/compatproguard/KeepClassMemberNamesMinificationTest.java
+++ b/src/test/java/com/android/tools/r8/compatproguard/KeepClassMemberNamesMinificationTest.java
@@ -72,7 +72,7 @@
.addKeepMainRule(Main.class)
.addKeepClassAndMembersRulesWithAllowObfuscation(A.class)
.addKeepRules("-keepclassmembernames class ** { *; }")
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector -> {
diff --git a/src/test/java/com/android/tools/r8/compatproguard/ShrinkFieldsWhileKeepingFieldNameTest.java b/src/test/java/com/android/tools/r8/compatproguard/ShrinkFieldsWhileKeepingFieldNameTest.java
index 9358839..dd4ee99 100644
--- a/src/test/java/com/android/tools/r8/compatproguard/ShrinkFieldsWhileKeepingFieldNameTest.java
+++ b/src/test/java/com/android/tools/r8/compatproguard/ShrinkFieldsWhileKeepingFieldNameTest.java
@@ -47,7 +47,7 @@
.enableNeverClassInliningAnnotations()
.addKeepMainRule(Main.class)
.addKeepRules(KEEP_FIELD_NAMES_RULE)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::assertSingleFieldWithOriginalName)
.run(parameters.getRuntime(), Main.class)
@@ -61,7 +61,7 @@
.enableNeverClassInliningAnnotations()
.addKeepMainRule(Main.class)
.addKeepRules(KEEP_FIELD_NAMES_RULE)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
// TODO(b/200933020): this assert shall pass.
// .inspect(this::assertSingleFieldWithOriginalName)
diff --git a/src/test/java/com/android/tools/r8/d8/IncompatiblePrimitiveTypesTest.java b/src/test/java/com/android/tools/r8/d8/IncompatiblePrimitiveTypesTest.java
index 6117999..d34c9b2 100644
--- a/src/test/java/com/android/tools/r8/d8/IncompatiblePrimitiveTypesTest.java
+++ b/src/test/java/com/android/tools/r8/d8/IncompatiblePrimitiveTypesTest.java
@@ -82,7 +82,7 @@
TestRunResult<?> d8Result =
testForD8()
.addProgramFiles(inputJar)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), "TestClass");
if (parameters.getRuntime().asDex().getVm().getVersion().isNewerThan(Version.V4_4_4)) {
d8Result.assertSuccessWithOutput(expectedOutput);
diff --git a/src/test/java/com/android/tools/r8/d8/NonNamedMemberClassTest.java b/src/test/java/com/android/tools/r8/d8/NonNamedMemberClassTest.java
index 9bb37c4..fb4d472 100644
--- a/src/test/java/com/android/tools/r8/d8/NonNamedMemberClassTest.java
+++ b/src/test/java/com/android/tools/r8/d8/NonNamedMemberClassTest.java
@@ -34,7 +34,7 @@
public void testD8() throws Exception {
testForD8()
.addProgramClassFileData(Dump.dump())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.assertOnlyInfos()
.assertInfoMessageThatMatches(containsString("missing EnclosingMethod"));
diff --git a/src/test/java/com/android/tools/r8/d8/ProguardMapSortByTest.java b/src/test/java/com/android/tools/r8/d8/ProguardMapSortByTest.java
index 49e78f6..eac78c0 100644
--- a/src/test/java/com/android/tools/r8/d8/ProguardMapSortByTest.java
+++ b/src/test/java/com/android/tools/r8/d8/ProguardMapSortByTest.java
@@ -57,7 +57,7 @@
d8TestBuilder
.release()
.addProgramClasses(A.class, B.class, C.class, D.class, E.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.apply(b -> b.getBuilder().setProguardInputMapFile(mappingFile))
.run(parameters.getRuntime(), A.class)
.assertSuccessWithOutputLines("Hello world!")
diff --git a/src/test/java/com/android/tools/r8/d8/ThrowingConstStringTest.java b/src/test/java/com/android/tools/r8/d8/ThrowingConstStringTest.java
index 314d32d..9ae8bb3 100644
--- a/src/test/java/com/android/tools/r8/d8/ThrowingConstStringTest.java
+++ b/src/test/java/com/android/tools/r8/d8/ThrowingConstStringTest.java
@@ -37,7 +37,7 @@
Path cfout =
testForD8(Backend.CF)
.addInnerClasses(ThrowingConstStringTest.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addOptionsModification(o -> o.testing.forceIRForCfToCfDesugar = true)
.compile()
.inspect(
@@ -56,7 +56,7 @@
.writeToZip();
testForD8(parameters.getBackend())
.addProgramFiles(cfout)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutput(EXPECTED);
}
diff --git a/src/test/java/com/android/tools/r8/dagger/DaggerBasicNotSingletonUsingBindsTest.java b/src/test/java/com/android/tools/r8/dagger/DaggerBasicNotSingletonUsingBindsTest.java
index fd03050..885ac9b 100644
--- a/src/test/java/com/android/tools/r8/dagger/DaggerBasicNotSingletonUsingBindsTest.java
+++ b/src/test/java/com/android/tools/r8/dagger/DaggerBasicNotSingletonUsingBindsTest.java
@@ -61,7 +61,7 @@
assumeTrue(parameters.isDexRuntime());
testForD8(parameters.getBackend())
.addProgramFiles(getProgramFiles(target))
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), MAIN_CLASS)
.assertSuccessWithOutputLines(EXPECTED_OUTPUT);
}
@@ -74,7 +74,7 @@
public void testR8() throws Exception {
testForR8(parameters.getBackend())
.addProgramFiles(getProgramFiles(target))
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(MAIN_CLASS)
.run(parameters.getRuntime(), MAIN_CLASS)
.inspect(this::inspect)
diff --git a/src/test/java/com/android/tools/r8/dagger/DaggerBasicNotSingletonUsingProvidesTest.java b/src/test/java/com/android/tools/r8/dagger/DaggerBasicNotSingletonUsingProvidesTest.java
index 87ca11c..bd932c1 100644
--- a/src/test/java/com/android/tools/r8/dagger/DaggerBasicNotSingletonUsingProvidesTest.java
+++ b/src/test/java/com/android/tools/r8/dagger/DaggerBasicNotSingletonUsingProvidesTest.java
@@ -61,7 +61,7 @@
assumeTrue(parameters.isDexRuntime());
testForD8(parameters.getBackend())
.addProgramFiles(getProgramFiles(target))
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), MAIN_CLASS)
.assertSuccessWithOutputLines(EXPECTED_OUTPUT);
}
@@ -74,7 +74,7 @@
public void testR8() throws Exception {
testForR8(parameters.getBackend())
.addProgramFiles(getProgramFiles(target))
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(MAIN_CLASS)
.run(parameters.getRuntime(), MAIN_CLASS)
.inspect(this::inspect)
diff --git a/src/test/java/com/android/tools/r8/dagger/DaggerBasicSingletonUsingBindsTest.java b/src/test/java/com/android/tools/r8/dagger/DaggerBasicSingletonUsingBindsTest.java
index 36fcfaf..d339df2 100644
--- a/src/test/java/com/android/tools/r8/dagger/DaggerBasicSingletonUsingBindsTest.java
+++ b/src/test/java/com/android/tools/r8/dagger/DaggerBasicSingletonUsingBindsTest.java
@@ -64,7 +64,7 @@
assumeTrue(parameters.isDexRuntime());
testForD8(parameters.getBackend())
.addProgramFiles(getProgramFiles(target))
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), MAIN_CLASS)
.assertSuccessWithOutputLines(EXPECTED_OUTPUT);
}
@@ -89,7 +89,7 @@
public void testR8() throws Exception {
testForR8(parameters.getBackend())
.addProgramFiles(getProgramFiles(target))
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(MAIN_CLASS)
.addHorizontallyMergedClassesInspector(
inspector -> {
diff --git a/src/test/java/com/android/tools/r8/dagger/DaggerBasicSingletonUsingProvidesTest.java b/src/test/java/com/android/tools/r8/dagger/DaggerBasicSingletonUsingProvidesTest.java
index c7d75f1..74d0197 100644
--- a/src/test/java/com/android/tools/r8/dagger/DaggerBasicSingletonUsingProvidesTest.java
+++ b/src/test/java/com/android/tools/r8/dagger/DaggerBasicSingletonUsingProvidesTest.java
@@ -80,7 +80,7 @@
assumeTrue(parameters.isDexRuntime());
testForD8(parameters.getBackend())
.addProgramFiles(getProgramFiles(target))
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), MAIN_CLASS)
.assertSuccessWithOutputLines(EXPECTED_OUTPUT);
}
@@ -89,7 +89,7 @@
public void testR8() throws Exception {
testForR8(parameters.getBackend())
.addProgramFiles(getProgramFiles(target))
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(MAIN_CLASS)
.allowStdoutMessages()
.addHorizontallyMergedClassesInspector(
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 2376a81..682eaf4 100644
--- a/src/test/java/com/android/tools/r8/debug/KotlinStdLibCompilationTest.java
+++ b/src/test/java/com/android/tools/r8/debug/KotlinStdLibCompilationTest.java
@@ -48,7 +48,7 @@
assumeTrue(parameters.isDexRuntime());
testForD8()
.addProgramFiles(kotlinTestParameters.getCompiler().getKotlinStdlibJar())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compileWithExpectedDiagnostics(
diagnostics -> {
if (kotlinTestParameters.isNewerThanOrEqualTo(KotlinCompilerVersion.KOTLINC_1_8_0)
@@ -74,7 +74,7 @@
.addDontObfuscate()
.noTreeShaking()
.setMode(CompilationMode.DEBUG)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.applyIf(
parameters.isCfRuntime()
&& kotlinTestParameters.isNewerThanOrEqualTo(KotlinCompilerVersion.KOTLINC_1_8_0),
diff --git a/src/test/java/com/android/tools/r8/debug/LineNumberOptimizationTest.java b/src/test/java/com/android/tools/r8/debug/LineNumberOptimizationTest.java
index c161a96..1ed300a 100644
--- a/src/test/java/com/android/tools/r8/debug/LineNumberOptimizationTest.java
+++ b/src/test/java/com/android/tools/r8/debug/LineNumberOptimizationTest.java
@@ -49,7 +49,7 @@
R8TestCompileResult result =
testForR8(parameters.getBackend())
.addProgramFiles(DEBUGGEE_JAR)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.setMode(dontOptimizeByEnablingDebug ? CompilationMode.DEBUG : CompilationMode.RELEASE)
.noTreeShaking()
.addDontObfuscate()
diff --git a/src/test/java/com/android/tools/r8/debug/UninitializedInitialLocalsTest.java b/src/test/java/com/android/tools/r8/debug/UninitializedInitialLocalsTest.java
index 15112b4..03c591f 100644
--- a/src/test/java/com/android/tools/r8/debug/UninitializedInitialLocalsTest.java
+++ b/src/test/java/com/android/tools/r8/debug/UninitializedInitialLocalsTest.java
@@ -38,7 +38,7 @@
} else {
testForD8()
.addProgramClassFileData(dump())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), "Test")
.assertSuccessWithOutputLines("42");
}
diff --git a/src/test/java/com/android/tools/r8/debug/classinit/ClassInitializationTest.java b/src/test/java/com/android/tools/r8/debug/classinit/ClassInitializationTest.java
index 1abe558..62649cd 100644
--- a/src/test/java/com/android/tools/r8/debug/classinit/ClassInitializationTest.java
+++ b/src/test/java/com/android/tools/r8/debug/classinit/ClassInitializationTest.java
@@ -44,7 +44,7 @@
final String CLASS = typeName(clazz);
testForD8(parameters.getBackend())
.addProgramClasses(clazz)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), clazz)
.debugger(
config ->
@@ -77,7 +77,7 @@
final String CLASS = typeName(clazz);
testForD8(parameters.getBackend())
.addProgramClasses(clazz)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), clazz)
.debugger(
config ->
@@ -98,7 +98,7 @@
testForD8(parameters.getBackend())
.addProgramClasses(clazz)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), clazz)
.debugger(
config ->
@@ -134,7 +134,7 @@
testForD8(parameters.getBackend())
.addProgramClasses(clazz)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), clazz)
.debugger(
config ->
diff --git a/src/test/java/com/android/tools/r8/debuginfo/DebugSetFileSmaliTest.java b/src/test/java/com/android/tools/r8/debuginfo/DebugSetFileSmaliTest.java
index 416cada..df8f5d0 100644
--- a/src/test/java/com/android/tools/r8/debuginfo/DebugSetFileSmaliTest.java
+++ b/src/test/java/com/android/tools/r8/debuginfo/DebugSetFileSmaliTest.java
@@ -53,7 +53,7 @@
" throw v0");
testForD8(parameters.getBackend())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addProgramDexFileData(builder.compile())
.compile()
.inspect(
diff --git a/src/test/java/com/android/tools/r8/debuginfo/DexPcWithDebugInfoForOverloadedMethodsTestRunner.java b/src/test/java/com/android/tools/r8/debuginfo/DexPcWithDebugInfoForOverloadedMethodsTestRunner.java
index c31af39..3e19580 100644
--- a/src/test/java/com/android/tools/r8/debuginfo/DexPcWithDebugInfoForOverloadedMethodsTestRunner.java
+++ b/src/test/java/com/android/tools/r8/debuginfo/DexPcWithDebugInfoForOverloadedMethodsTestRunner.java
@@ -68,7 +68,7 @@
.addKeepMethodRules(MAIN, "void overloaded(...)")
.addKeepAttributeLineNumberTable()
.enableAlwaysInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), MAIN)
.assertFailureWithErrorThatMatches(containsString(EXPECTED))
.inspectOriginalStackTrace(
diff --git a/src/test/java/com/android/tools/r8/debuginfo/EnsureNoDebugInfoEmittedForPcOnlyTestRunner.java b/src/test/java/com/android/tools/r8/debuginfo/EnsureNoDebugInfoEmittedForPcOnlyTestRunner.java
index 9d8cf281..720ce74 100644
--- a/src/test/java/com/android/tools/r8/debuginfo/EnsureNoDebugInfoEmittedForPcOnlyTestRunner.java
+++ b/src/test/java/com/android/tools/r8/debuginfo/EnsureNoDebugInfoEmittedForPcOnlyTestRunner.java
@@ -58,7 +58,7 @@
testForD8(parameters.getBackend())
.debug()
.addProgramClasses(MAIN)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.internalEnableMappingOutput()
.run(parameters.getRuntime(), MAIN)
// For a debug build we always expect the output to have actual line information.
@@ -71,7 +71,7 @@
testForD8(parameters.getBackend())
.release()
.addProgramClasses(MAIN)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.internalEnableMappingOutput()
.applyIf(
apiLevelSupportsPcAndSourceFileOutput(),
@@ -108,7 +108,7 @@
testForD8(parameters.getBackend())
.release()
.addProgramClasses(MAIN)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), MAIN)
// If compiling without a map output actual debug info should also be retained. Otherwise
// there would not be any way to obtain the actual lines.
@@ -123,7 +123,7 @@
.addProgramClasses(MAIN)
.addKeepMainRule(MAIN)
.addKeepAttributeLineNumberTable()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), MAIN)
.inspectOriginalStackTrace(
(stackTrace, inspector) -> {
diff --git a/src/test/java/com/android/tools/r8/debuginfo/InliningWithoutPositionsTestRunner.java b/src/test/java/com/android/tools/r8/debuginfo/InliningWithoutPositionsTestRunner.java
index 944b163..c164fa7 100644
--- a/src/test/java/com/android/tools/r8/debuginfo/InliningWithoutPositionsTestRunner.java
+++ b/src/test/java/com/android/tools/r8/debuginfo/InliningWithoutPositionsTestRunner.java
@@ -76,7 +76,7 @@
@Test
public void testStackTrace() throws Exception {
testForR8(parameters.getBackend())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addProgramClassFileData(
InliningWithoutPositionsTestSourceDump.dump(
mainPos, foo1Pos, barPos, foo2Pos, throwLocation))
diff --git a/src/test/java/com/android/tools/r8/debuginfo/NoLineInfoTest.java b/src/test/java/com/android/tools/r8/debuginfo/NoLineInfoTest.java
index 08e6c5f..87820f1 100644
--- a/src/test/java/com/android/tools/r8/debuginfo/NoLineInfoTest.java
+++ b/src/test/java/com/android/tools/r8/debuginfo/NoLineInfoTest.java
@@ -89,7 +89,7 @@
.addKeepClassAndMembersRules(TestClass.class)
.addKeepAttributeSourceFile()
.addKeepAttributeLineNumberTable()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addOptionsModification(o -> o.testing.forcePcBasedEncoding = true)
.applyIf(
customSourceFile,
diff --git a/src/test/java/com/android/tools/r8/debuginfo/OverloadWithNoLineNumberTest.java b/src/test/java/com/android/tools/r8/debuginfo/OverloadWithNoLineNumberTest.java
index 7a519a6..3695c0e 100644
--- a/src/test/java/com/android/tools/r8/debuginfo/OverloadWithNoLineNumberTest.java
+++ b/src/test/java/com/android/tools/r8/debuginfo/OverloadWithNoLineNumberTest.java
@@ -44,7 +44,7 @@
transformer(SimpleCallChainClassWithOverloads.class)
.removeLineNumberTable(MethodPredicate.onName("test"))
.transform())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(SimpleCallChainClassWithOverloads.class)
.addKeepClassAndMembersRules(SimpleCallChainClassWithOverloads.class)
.addKeepAttributeLineNumberTable()
diff --git a/src/test/java/com/android/tools/r8/debuginfo/Regress216178582Test.java b/src/test/java/com/android/tools/r8/debuginfo/Regress216178582Test.java
index 92a8a3d..f47a779 100644
--- a/src/test/java/com/android/tools/r8/debuginfo/Regress216178582Test.java
+++ b/src/test/java/com/android/tools/r8/debuginfo/Regress216178582Test.java
@@ -45,7 +45,7 @@
Path out =
testForR8(parameters.getBackend())
.addInnerClasses(Regress216178582Test.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(TestClass.class)
.addKeepAttributeLineNumberTable()
.addOptionsModification(o -> o.testing.forcePcBasedEncoding = true)
@@ -88,7 +88,7 @@
testForD8(parameters.getBackend())
.addProgramFiles(out)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addOptionsModification(o -> o.testing.forceJumboStringProcessing = true)
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutput(EXPECTED);
diff --git a/src/test/java/com/android/tools/r8/debuginfo/Regress233857593Test.java b/src/test/java/com/android/tools/r8/debuginfo/Regress233857593Test.java
index 46d76ca..e040828 100644
--- a/src/test/java/com/android/tools/r8/debuginfo/Regress233857593Test.java
+++ b/src/test/java/com/android/tools/r8/debuginfo/Regress233857593Test.java
@@ -30,7 +30,7 @@
public void testD8() throws Exception {
testForD8(parameters.getBackend())
.addProgramClasses(TestClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector ->
diff --git a/src/test/java/com/android/tools/r8/debuginfo/SingleLineInfoInlineRemoveTest.java b/src/test/java/com/android/tools/r8/debuginfo/SingleLineInfoInlineRemoveTest.java
index 84db0e5..07ef08c 100644
--- a/src/test/java/com/android/tools/r8/debuginfo/SingleLineInfoInlineRemoveTest.java
+++ b/src/test/java/com/android/tools/r8/debuginfo/SingleLineInfoInlineRemoveTest.java
@@ -60,7 +60,7 @@
public void testDefaultSourceFile() throws Exception {
testForR8(parameters.getBackend())
.addInnerClasses(getClass())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(Main.class)
.addKeepAttributeSourceFile()
.addKeepAttributeLineNumberTable()
@@ -83,7 +83,7 @@
public void testManuallySetDefaultSourceFile() throws Exception {
testForR8(parameters.getBackend())
.addInnerClasses(getClass())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(Main.class)
.addKeepAttributeSourceFile()
.addKeepAttributeLineNumberTable()
@@ -107,7 +107,7 @@
public void testManuallySetEmptySourceFile() throws Exception {
testForR8(parameters.getBackend())
.addInnerClasses(getClass())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(Main.class)
.addKeepAttributeSourceFile()
.addKeepAttributeLineNumberTable()
@@ -131,7 +131,7 @@
public void testNonDefaultSourceFile() throws Exception {
testForR8(parameters.getBackend())
.addInnerClasses(getClass())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(Main.class)
.addKeepAttributeSourceFile()
.addKeepAttributeLineNumberTable()
diff --git a/src/test/java/com/android/tools/r8/debuginfo/SingleLineInfoMultipleCallsRemoveTest.java b/src/test/java/com/android/tools/r8/debuginfo/SingleLineInfoMultipleCallsRemoveTest.java
index e1075c6..6ea4a91 100644
--- a/src/test/java/com/android/tools/r8/debuginfo/SingleLineInfoMultipleCallsRemoveTest.java
+++ b/src/test/java/com/android/tools/r8/debuginfo/SingleLineInfoMultipleCallsRemoveTest.java
@@ -51,7 +51,7 @@
public void testR8() throws Exception {
testForR8(parameters.getBackend())
.addInnerClasses(getClass())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(Main.class)
.addKeepAttributeSourceFile()
.addKeepAttributeLineNumberTable()
diff --git a/src/test/java/com/android/tools/r8/debuginfo/SingleLineInfoMultipleInlineTest.java b/src/test/java/com/android/tools/r8/debuginfo/SingleLineInfoMultipleInlineTest.java
index c547357..562146f 100644
--- a/src/test/java/com/android/tools/r8/debuginfo/SingleLineInfoMultipleInlineTest.java
+++ b/src/test/java/com/android/tools/r8/debuginfo/SingleLineInfoMultipleInlineTest.java
@@ -55,7 +55,7 @@
public void testR8() throws Exception {
testForR8(parameters.getBackend())
.addInnerClasses(getClass())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(Main.class)
.addKeepAttributeSourceFile()
.addKeepAttributeLineNumberTable()
diff --git a/src/test/java/com/android/tools/r8/debuginfo/SingleLineInfoRemoveTest.java b/src/test/java/com/android/tools/r8/debuginfo/SingleLineInfoRemoveTest.java
index 46b9e22..66e65a0 100644
--- a/src/test/java/com/android/tools/r8/debuginfo/SingleLineInfoRemoveTest.java
+++ b/src/test/java/com/android/tools/r8/debuginfo/SingleLineInfoRemoveTest.java
@@ -61,7 +61,7 @@
public void testR8() throws Exception {
testForR8(parameters.getBackend())
.addInnerClasses(getClass())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(Main.class)
.addKeepAttributeSourceFile()
.addKeepAttributeLineNumberTable()
diff --git a/src/test/java/com/android/tools/r8/debuginfo/pc2pc/DifferentParameterCountMultilineCodeTestRunner.java b/src/test/java/com/android/tools/r8/debuginfo/pc2pc/DifferentParameterCountMultilineCodeTestRunner.java
index 637e1f0..8cd026d 100644
--- a/src/test/java/com/android/tools/r8/debuginfo/pc2pc/DifferentParameterCountMultilineCodeTestRunner.java
+++ b/src/test/java/com/android/tools/r8/debuginfo/pc2pc/DifferentParameterCountMultilineCodeTestRunner.java
@@ -47,7 +47,7 @@
.addKeepAttributeLineNumberTable()
.addKeepAttributeSourceFile()
.addKeepRules("-renamesourcefileattribute " + (customSourceFile ? "X" : "SourceFile"))
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), CLASS)
.assertFailureWithErrorThatThrows(IllegalStateException.class)
.inspectOriginalStackTrace(
diff --git a/src/test/java/com/android/tools/r8/debuginfo/pc2pc/DifferentParameterCountSingleLineCodeTestRunner.java b/src/test/java/com/android/tools/r8/debuginfo/pc2pc/DifferentParameterCountSingleLineCodeTestRunner.java
index c036aaf..6c31cf2 100644
--- a/src/test/java/com/android/tools/r8/debuginfo/pc2pc/DifferentParameterCountSingleLineCodeTestRunner.java
+++ b/src/test/java/com/android/tools/r8/debuginfo/pc2pc/DifferentParameterCountSingleLineCodeTestRunner.java
@@ -47,7 +47,7 @@
.addKeepAttributeLineNumberTable()
.addKeepAttributeSourceFile()
.addKeepRules("-renamesourcefileattribute " + (customSourceFile ? "X" : "SourceFile"))
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), CLASS)
.assertFailureWithErrorThatThrows(IllegalStateException.class)
.inspectOriginalStackTrace(
diff --git a/src/test/java/com/android/tools/r8/debuginfo/pc2pc/SharedPc2PcDebugInfo.java b/src/test/java/com/android/tools/r8/debuginfo/pc2pc/SharedPc2PcDebugInfo.java
index 0cc3e5b..105cb36 100644
--- a/src/test/java/com/android/tools/r8/debuginfo/pc2pc/SharedPc2PcDebugInfo.java
+++ b/src/test/java/com/android/tools/r8/debuginfo/pc2pc/SharedPc2PcDebugInfo.java
@@ -43,7 +43,7 @@
.addProgramClasses(TestClass.class)
.addKeepClassAndMembersRules(TestClass.class)
.addKeepAttributeLineNumberTable()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutput(EXPECTED)
diff --git a/src/test/java/com/android/tools/r8/desugar/ConcurrencyTest.java b/src/test/java/com/android/tools/r8/desugar/ConcurrencyTest.java
index 848fc6d..e5b8227 100644
--- a/src/test/java/com/android/tools/r8/desugar/ConcurrencyTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/ConcurrencyTest.java
@@ -89,7 +89,7 @@
testForR8(parameters.getBackend())
.addProgramClasses(getClasses())
.addProgramClassFileData(getTransformedClasses())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepAllClassesRule()
.compile();
}
diff --git a/src/test/java/com/android/tools/r8/desugar/DefaultInterfaceWithIdentifierNameString.java b/src/test/java/com/android/tools/r8/desugar/DefaultInterfaceWithIdentifierNameString.java
index 5fbca11..72e9c9e 100644
--- a/src/test/java/com/android/tools/r8/desugar/DefaultInterfaceWithIdentifierNameString.java
+++ b/src/test/java/com/android/tools/r8/desugar/DefaultInterfaceWithIdentifierNameString.java
@@ -69,7 +69,7 @@
testForR8(parameters.getBackend())
.addInnerClasses(DefaultInterfaceWithIdentifierNameString.class)
.addKeepMainRule(TestClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.enableInliningAnnotations()
.enableNoVerticalClassMergingAnnotations()
.enableNeverClassInliningAnnotations()
diff --git a/src/test/java/com/android/tools/r8/desugar/DefaultLambdaMethodWithPrivateSuperClassTest.java b/src/test/java/com/android/tools/r8/desugar/DefaultLambdaMethodWithPrivateSuperClassTest.java
index 6ba2e12..de74f3f 100644
--- a/src/test/java/com/android/tools/r8/desugar/DefaultLambdaMethodWithPrivateSuperClassTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/DefaultLambdaMethodWithPrivateSuperClassTest.java
@@ -46,7 +46,7 @@
public void testDesugar() throws Exception {
testForD8(parameters.getBackend())
.addInnerClasses(getClass())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.applyIf(
parameters.isCfRuntime()
diff --git a/src/test/java/com/android/tools/r8/desugar/DefaultLambdaMethodWithPublicSuperClassTest.java b/src/test/java/com/android/tools/r8/desugar/DefaultLambdaMethodWithPublicSuperClassTest.java
index a439984..317b949 100644
--- a/src/test/java/com/android/tools/r8/desugar/DefaultLambdaMethodWithPublicSuperClassTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/DefaultLambdaMethodWithPublicSuperClassTest.java
@@ -42,7 +42,7 @@
public void testDesugar() throws Exception {
testForD8(parameters.getBackend())
.addInnerClasses(getClass())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines(EXPECTED);
}
diff --git a/src/test/java/com/android/tools/r8/desugar/DefaultLambdaWithSelfReferenceTestRunner.java b/src/test/java/com/android/tools/r8/desugar/DefaultLambdaWithSelfReferenceTestRunner.java
index 4dff885..85b999a 100644
--- a/src/test/java/com/android/tools/r8/desugar/DefaultLambdaWithSelfReferenceTestRunner.java
+++ b/src/test/java/com/android/tools/r8/desugar/DefaultLambdaWithSelfReferenceTestRunner.java
@@ -101,7 +101,7 @@
public void testR8() throws Throwable {
testForR8(parameters.getBackend())
.addProgramClassesAndInnerClasses(CLASS)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addDontObfuscate()
.noTreeShaking()
.addKeepAllAttributes()
@@ -120,7 +120,7 @@
Path out1 = temp.newFolder().toPath().resolve("out1.zip");
testForD8()
.addProgramClassesAndInnerClasses(CLASS)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.assertNoMessages()
.writeToZip(out1)
@@ -140,7 +140,7 @@
.addProgramClasses(CLASS)
.addClasspathFiles(ToolHelper.getClassPathForTests())
.setIntermediate(true)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.assertNoMessages()
.writeToZip(mainOut);
@@ -152,7 +152,7 @@
.addProgramFiles(innerClass)
.addClasspathFiles(ToolHelper.getClassPathForTests())
.setIntermediate(true)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.assertNoMessages()
.writeToZip(out);
@@ -160,7 +160,7 @@
Path out2 = temp.newFolder().toPath().resolve("out2.zip");
D8TestCompileResult compiledResult =
- testForD8().addProgramFiles(outs).setMinApi(parameters.getApiLevel()).compile();
+ testForD8().addProgramFiles(outs).setMinApi(parameters).compile();
compiledResult
.assertNoMessages()
diff --git a/src/test/java/com/android/tools/r8/desugar/DesugarInnerClassesInInterfaces.java b/src/test/java/com/android/tools/r8/desugar/DesugarInnerClassesInInterfaces.java
index 06c1b50..88a21c8 100644
--- a/src/test/java/com/android/tools/r8/desugar/DesugarInnerClassesInInterfaces.java
+++ b/src/test/java/com/android/tools/r8/desugar/DesugarInnerClassesInInterfaces.java
@@ -66,7 +66,7 @@
parameters.assumeR8TestParameters();
testForR8Compat(parameters.getBackend())
.addInnerClasses(DesugarInnerClassesInInterfaces.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepAllClassesRule()
.addKeepAttributeInnerClassesAndEnclosingMethod()
.noHorizontalClassMergingOfSynthetics()
@@ -83,7 +83,7 @@
parameters.assumeR8TestParameters();
testForR8(parameters.getBackend())
.addInnerClasses(DesugarInnerClassesInInterfaces.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepAllClassesRule()
.addKeepAttributeInnerClassesAndEnclosingMethod()
.compile()
diff --git a/src/test/java/com/android/tools/r8/desugar/DesugarInstanceLambdaWithReadsTest.java b/src/test/java/com/android/tools/r8/desugar/DesugarInstanceLambdaWithReadsTest.java
index de06aad..820789c 100644
--- a/src/test/java/com/android/tools/r8/desugar/DesugarInstanceLambdaWithReadsTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/DesugarInstanceLambdaWithReadsTest.java
@@ -54,7 +54,7 @@
.addKeepClassRules(Consumer.class)
.addKeepMainRule(Main.class)
.enableInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutput(EXPECTED)
.inspect(inspector -> checkNumberOfLambdaMethods(inspector, true));
diff --git a/src/test/java/com/android/tools/r8/desugar/DesugarLambdaContextDuplicateInLibraryTest.java b/src/test/java/com/android/tools/r8/desugar/DesugarLambdaContextDuplicateInLibraryTest.java
index c712d37..c343ea8 100644
--- a/src/test/java/com/android/tools/r8/desugar/DesugarLambdaContextDuplicateInLibraryTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/DesugarLambdaContextDuplicateInLibraryTest.java
@@ -53,7 +53,7 @@
.addProgramClasses(LIBRARY)
.addKeepMainRule(MAIN)
.addKeepMethodRules(pinnedPrintLn())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addHorizontallyMergedClassesInspector(
inspector -> {
// The regression test relies on the library type being the target. A change to
@@ -80,7 +80,7 @@
.addDefaultRuntimeLibrary(parameters)
.addKeepMainRule(MAIN)
.addKeepMethodRules(pinnedPrintLn())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
// Use a checksum filter to simulate the classes being found on bootclasspath by removing
// then from the program output.
.setIncludeClassesChecksum(true)
diff --git a/src/test/java/com/android/tools/r8/desugar/DesugarLambdaWithAnonymousClass.java b/src/test/java/com/android/tools/r8/desugar/DesugarLambdaWithAnonymousClass.java
index 17bbafd..2e1e23a 100644
--- a/src/test/java/com/android/tools/r8/desugar/DesugarLambdaWithAnonymousClass.java
+++ b/src/test/java/com/android/tools/r8/desugar/DesugarLambdaWithAnonymousClass.java
@@ -115,7 +115,7 @@
try {
testForR8(parameters.getBackend())
.addInnerClasses(DesugarLambdaWithAnonymousClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
// Keep the synthesized inner classes.
.addKeepRules("-keep class **.*$TestClass$1")
.addKeepRules("-keep class **.*$TestClass$2")
diff --git a/src/test/java/com/android/tools/r8/desugar/DesugarLambdaWithLocalClass.java b/src/test/java/com/android/tools/r8/desugar/DesugarLambdaWithLocalClass.java
index adfe2b4..517288b 100644
--- a/src/test/java/com/android/tools/r8/desugar/DesugarLambdaWithLocalClass.java
+++ b/src/test/java/com/android/tools/r8/desugar/DesugarLambdaWithLocalClass.java
@@ -113,7 +113,7 @@
parameters.assumeR8TestParameters();
testForR8(parameters.getBackend())
.addInnerClasses(DesugarLambdaWithLocalClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
// Keep the synthesized inner classes.
.addKeepRules("-keep class **.*$TestClass$*MyConsumerImpl")
// Keep the outer context: TestClass *and* the synthetic lambda methods.
diff --git a/src/test/java/com/android/tools/r8/desugar/DesugarMissingTypeClassTest.java b/src/test/java/com/android/tools/r8/desugar/DesugarMissingTypeClassTest.java
index 1269b34..f852e5f 100644
--- a/src/test/java/com/android/tools/r8/desugar/DesugarMissingTypeClassTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/DesugarMissingTypeClassTest.java
@@ -53,9 +53,7 @@
.assertSuccessWithOutput(EXPECTED);
} else {
D8TestBuilder builder =
- testForD8()
- .addProgramClasses(TestClass.class, MyClass.class)
- .setMinApi(parameters.getApiLevel());
+ testForD8().addProgramClasses(TestClass.class, MyClass.class).setMinApi(parameters);
TestDiagnosticMessages messages = builder.getState().getDiagnosticsMessages();
D8TestCompileResult compileResult = builder.compile();
if (supportsDefaultInterfaceMethods()) {
@@ -63,7 +61,7 @@
compileResult
.addRunClasspathFiles(
testForD8()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addProgramClasses(MissingInterface.class)
.compile()
.writeToZip())
diff --git a/src/test/java/com/android/tools/r8/desugar/DesugarMissingTypeLambdaTest.java b/src/test/java/com/android/tools/r8/desugar/DesugarMissingTypeLambdaTest.java
index 875ead2..25444c6 100644
--- a/src/test/java/com/android/tools/r8/desugar/DesugarMissingTypeLambdaTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/DesugarMissingTypeLambdaTest.java
@@ -53,8 +53,7 @@
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutput(EXPECTED);
} else {
- D8TestBuilder builder =
- testForD8().addProgramClasses(TestClass.class).setMinApi(parameters.getApiLevel());
+ D8TestBuilder builder = testForD8().addProgramClasses(TestClass.class).setMinApi(parameters);
TestDiagnosticMessages messages = builder.getState().getDiagnosticsMessages();
D8TestCompileResult compileResult = builder.compile();
if (supportsDefaultInterfaceMethods()) {
@@ -62,7 +61,7 @@
compileResult
.addRunClasspathFiles(
testForD8()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addProgramClasses(MissingInterface.class)
.compile()
.writeToZip())
diff --git a/src/test/java/com/android/tools/r8/desugar/DesugarMissingTypeStaticInvokeTest.java b/src/test/java/com/android/tools/r8/desugar/DesugarMissingTypeStaticInvokeTest.java
index 2ee795b..d7cad40 100644
--- a/src/test/java/com/android/tools/r8/desugar/DesugarMissingTypeStaticInvokeTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/DesugarMissingTypeStaticInvokeTest.java
@@ -54,8 +54,7 @@
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutput(EXPECTED);
} else {
- D8TestBuilder builder =
- testForD8().addProgramClasses(TestClass.class).setMinApi(parameters.getApiLevel());
+ D8TestBuilder builder = testForD8().addProgramClasses(TestClass.class).setMinApi(parameters);
TestDiagnosticMessages messages = builder.getState().getDiagnosticsMessages();
D8TestCompileResult compileResult = builder.compile();
if (supportsDefaultInterfaceMethods()) {
@@ -63,7 +62,7 @@
compileResult
.addRunClasspathFiles(
testForD8()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addProgramClasses(MissingInterface.class)
.compile()
.writeToZip())
diff --git a/src/test/java/com/android/tools/r8/desugar/DesugarToClassFile.java b/src/test/java/com/android/tools/r8/desugar/DesugarToClassFile.java
index a0b196f..d9365c5 100644
--- a/src/test/java/com/android/tools/r8/desugar/DesugarToClassFile.java
+++ b/src/test/java/com/android/tools/r8/desugar/DesugarToClassFile.java
@@ -57,7 +57,7 @@
Path jar =
testForD8(Backend.CF)
.addInnerClasses(DesugarToClassFile.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::checkHasCompanionClassIfRequired)
.inspect(this::checkHasLambdaClass)
@@ -74,7 +74,7 @@
// Convert to DEX without desugaring.
testForD8()
.addProgramFiles(jar)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.disableDesugaring()
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutputLines("Hello, world!", "I::foo", "J::bar", "42");
diff --git a/src/test/java/com/android/tools/r8/desugar/DesugarToClassFileDeprecatedAttribute.java b/src/test/java/com/android/tools/r8/desugar/DesugarToClassFileDeprecatedAttribute.java
index ebadde4..a2bdaef 100644
--- a/src/test/java/com/android/tools/r8/desugar/DesugarToClassFileDeprecatedAttribute.java
+++ b/src/test/java/com/android/tools/r8/desugar/DesugarToClassFileDeprecatedAttribute.java
@@ -88,7 +88,7 @@
Path jar =
testForD8(Backend.CF)
.addProgramClasses(TestClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.setProgramConsumer(
new ClassFileConsumer.ForwardingConsumer(null) {
@Override
@@ -111,7 +111,7 @@
// Convert to DEX without desugaring.
testForD8()
.addProgramFiles(jar)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.disableDesugaring()
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutputLines("Hello, world!");
@@ -126,7 +126,7 @@
.addProgramClasses(TestClass.class)
.addKeepClassAndMembersRules(TestClass.class)
.addKeepAllAttributes()
- .setMinApi(parameters.getApiLevel());
+ .setMinApi(parameters);
if (parameters.isCfRuntime()) {
builder.setProgramConsumer(
new ForwardingConsumer(null) {
diff --git a/src/test/java/com/android/tools/r8/desugar/DesugarToClassFileInputCfVersion.java b/src/test/java/com/android/tools/r8/desugar/DesugarToClassFileInputCfVersion.java
index 6b50afe..5f7b139 100644
--- a/src/test/java/com/android/tools/r8/desugar/DesugarToClassFileInputCfVersion.java
+++ b/src/test/java/com/android/tools/r8/desugar/DesugarToClassFileInputCfVersion.java
@@ -45,7 +45,7 @@
Path jar =
testForD8(Backend.CF)
.addProgramClassFileData(transformer(TestClass.class).setVersion(cfVersion).transform())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.writeToZip();
@@ -60,7 +60,7 @@
// Convert to DEX without desugaring.
testForD8()
.addProgramFiles(jar)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.disableDesugaring()
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutputLines("Hello, world!");
diff --git a/src/test/java/com/android/tools/r8/desugar/DesugaredLambdaImplementationInliningTest.java b/src/test/java/com/android/tools/r8/desugar/DesugaredLambdaImplementationInliningTest.java
index 6a0f410..c89f08c 100644
--- a/src/test/java/com/android/tools/r8/desugar/DesugaredLambdaImplementationInliningTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/DesugaredLambdaImplementationInliningTest.java
@@ -46,7 +46,7 @@
.addProgramClasses(TestClass.class)
.addKeepMainRule(TestClass.class)
.addDontObfuscate()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutput(EXPECTED)
.inspector()
diff --git a/src/test/java/com/android/tools/r8/desugar/InterfaceInvokePrivateTest.java b/src/test/java/com/android/tools/r8/desugar/InterfaceInvokePrivateTest.java
index b377efa..4f5e11a 100644
--- a/src/test/java/com/android/tools/r8/desugar/InterfaceInvokePrivateTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/InterfaceInvokePrivateTest.java
@@ -107,7 +107,7 @@
.addKeepMainRule(TestRunner.class)
// TODO(b/185463156): Not keeping I and its members will "fix" the ICCE for all runtimes.
.addKeepClassAndMembersRules(I.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), TestRunner.class)
.applyIf(
diff --git a/src/test/java/com/android/tools/r8/desugar/LambdaMissingInterfaceTest.java b/src/test/java/com/android/tools/r8/desugar/LambdaMissingInterfaceTest.java
index 6c9fe50..8a5f41b 100644
--- a/src/test/java/com/android/tools/r8/desugar/LambdaMissingInterfaceTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/LambdaMissingInterfaceTest.java
@@ -38,7 +38,7 @@
testForR8(parameters.getBackend())
.addProgramClasses(ClassWithLambda.class, Main.class)
.addKeepMainRule(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addDontWarn(MissingInterface.class)
.allowDiagnosticWarningMessages()
.enableInliningAnnotations()
diff --git a/src/test/java/com/android/tools/r8/desugar/LambdaWithDefaultMethodsTest.java b/src/test/java/com/android/tools/r8/desugar/LambdaWithDefaultMethodsTest.java
index ce7a552..9066663 100644
--- a/src/test/java/com/android/tools/r8/desugar/LambdaWithDefaultMethodsTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/LambdaWithDefaultMethodsTest.java
@@ -40,7 +40,7 @@
testForR8(parameters.getBackend())
.addProgramClasses(I.class, A.class, TestClass.class)
.addKeepMainRule(TestClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutput(EXPECTED);
}
diff --git a/src/test/java/com/android/tools/r8/desugar/VirtualInvokePrivateTest.java b/src/test/java/com/android/tools/r8/desugar/VirtualInvokePrivateTest.java
index c012532..7ce589a 100644
--- a/src/test/java/com/android/tools/r8/desugar/VirtualInvokePrivateTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/VirtualInvokePrivateTest.java
@@ -52,7 +52,7 @@
testForR8(parameters.getBackend())
.addProgramClassFileData(transformInvokeSpecialToInvokeVirtual())
.addKeepMainRule(TestRunner.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), TestRunner.class)
.assertSuccessWithOutput(EXPECTED_OUTPUT);
}
diff --git a/src/test/java/com/android/tools/r8/desugar/b72538146/B72538146.java b/src/test/java/com/android/tools/r8/desugar/b72538146/B72538146.java
index fbb29e8..0361951 100644
--- a/src/test/java/com/android/tools/r8/desugar/b72538146/B72538146.java
+++ b/src/test/java/com/android/tools/r8/desugar/b72538146/B72538146.java
@@ -45,17 +45,13 @@
Parent.Inner4.class);
Path parent =
- testForD8()
- .addProgramClasses(parentClasses)
- .setMinApi(parameters.getApiLevel())
- .compile()
- .writeToZip();
+ testForD8().addProgramClasses(parentClasses).setMinApi(parameters).compile().writeToZip();
Path child =
testForD8()
.addProgramClasses(Child.class)
.addClasspathClasses(parentClasses)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.writeToZip();
@@ -63,7 +59,7 @@
testForD8()
.addProgramFiles(
Paths.get("build/test/examplesAndroidApi/classes/classloader/Runner.class"))
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(
parameters.getRuntime(),
diff --git a/src/test/java/com/android/tools/r8/desugar/backports/AbstractBackportTest.java b/src/test/java/com/android/tools/r8/desugar/backports/AbstractBackportTest.java
index 0c6d576..55c17af 100644
--- a/src/test/java/com/android/tools/r8/desugar/backports/AbstractBackportTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/backports/AbstractBackportTest.java
@@ -162,7 +162,7 @@
.assertSuccess();
} else {
testForD8()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.apply(this::configureProgram)
.setIncludeClassesChecksum(true)
.compileWithExpectedDiagnostics(
diff --git a/src/test/java/com/android/tools/r8/desugar/backports/BackportDuplicationTest.java b/src/test/java/com/android/tools/r8/desugar/backports/BackportDuplicationTest.java
index ccff561..ed2dd4e 100644
--- a/src/test/java/com/android/tools/r8/desugar/backports/BackportDuplicationTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/backports/BackportDuplicationTest.java
@@ -84,7 +84,7 @@
.addProgramClasses(CLASSES)
.addKeepMainRule(TestClass.class)
.addKeepClassAndMembersRules(MiniAssert.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.minification(minify)
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutput(EXPECTED)
@@ -95,7 +95,7 @@
public void testD8() throws Exception {
testForD8(parameters.getBackend())
.addProgramClasses(CLASSES)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutput(EXPECTED)
.inspect(this::checkNoOriginalsAndNoInternalSynthetics)
@@ -120,7 +120,7 @@
testForD8(parameters.getBackend())
.addProgramClasses(User1.class)
.addClasspathClasses(CLASSES)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.setIntermediate(intermediate)
.compile()
.writeToZip();
@@ -130,7 +130,7 @@
testForD8(parameters.getBackend())
.addProgramClasses(User2.class)
.addClasspathClasses(CLASSES)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.setIntermediate(intermediate)
.compile()
.writeToZip();
@@ -146,7 +146,7 @@
testForD8(parameters.getBackend())
.addProgramClasses(MiniAssert.class, TestClass.class)
.addProgramFiles(out1, out2)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.setIntermediate(true)
.compile()
.writeToZip(out3)
@@ -158,7 +158,7 @@
// Finally do a non-intermediate merge.
testForD8(parameters.getBackend())
.addProgramFiles(out3)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutput(EXPECTED)
.inspect(this::checkNoOriginalsAndNoInternalSynthetics)
@@ -192,12 +192,12 @@
testForD8(parameters.getBackend())
.setOutputMode(outputMode)
.addProgramClasses(CLASSES)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.writeToZip();
testForD8()
.addProgramFiles(perClassOutput)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutput(EXPECTED)
.inspect(this::checkNoOriginalsAndNoInternalSynthetics)
@@ -241,7 +241,7 @@
List<byte[]> outputsRoundOne = Collections.synchronizedList(new ArrayList<>());
testForD8(firstRoundOutput)
.addProgramClasses(CLASSES)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.setIntermediate(true /* First round is always intermediate. */)
.setProgramConsumer(
firstRoundOutput.isCf()
@@ -282,7 +282,7 @@
firstRoundOutput.isCf(),
b -> b.addProgramClassFileData(bytes),
b -> b.addProgramDexFileData(bytes))
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.setIntermediate(intermediate)
.compile()
.writeToZip());
diff --git a/src/test/java/com/android/tools/r8/desugar/backports/BackportMainDexTest.java b/src/test/java/com/android/tools/r8/desugar/backports/BackportMainDexTest.java
index a3bec4a..7a7f23e 100644
--- a/src/test/java/com/android/tools/r8/desugar/backports/BackportMainDexTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/backports/BackportMainDexTest.java
@@ -111,12 +111,7 @@
@Test
public void testMainDexTracingDex() throws Exception {
assumeTrue(parameters.isDexRuntime());
- Path out =
- testForD8()
- .addProgramClasses(CLASSES)
- .setMinApi(parameters.getApiLevel())
- .compile()
- .writeToZip();
+ Path out = testForD8().addProgramClasses(CLASSES).setMinApi(parameters).compile().writeToZip();
GenerateMainDexListRunResult mainDexListFromDex =
traceMainDex(Collections.emptyList(), Collections.singleton(out));
assertEquals(
@@ -136,7 +131,7 @@
// Setting intermediate will annotate synthetics, which should not cause types in those
// to become main-dex included.
.setIntermediate(true)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.writeToZip();
GenerateMainDexListRunResult mainDexListFromDex =
@@ -152,7 +147,7 @@
MainDexConsumer mainDexConsumer = new MainDexConsumer();
testForD8(parameters.getBackend())
.addProgramClasses(CLASSES)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addMainDexRules(keepMainProguardConfiguration(TestClass.class))
.setProgramConsumer(mainDexConsumer)
.compile()
@@ -178,13 +173,13 @@
testForD8(parameters.getBackend())
.setOutputMode(outputMode)
.addProgramClasses(CLASSES)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.writeToZip();
MainDexConsumer mainDexConsumer = new MainDexConsumer();
testForD8()
.addProgramFiles(perClassOutput)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
// Trace the classes run by main which will pick up their dependencies.
.addMainDexRules(keepMainProguardConfiguration(TestClass.class))
.setProgramConsumer(mainDexConsumer)
@@ -203,7 +198,7 @@
.addProgramClasses(User1.class)
.addClasspathClasses(CLASSES)
.setIntermediate(true)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.writeToZip();
@@ -212,7 +207,7 @@
.addProgramClasses(User2.class)
.addClasspathClasses(CLASSES)
.setIntermediate(true)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.writeToZip();
@@ -223,7 +218,7 @@
testForD8(parameters.getBackend())
.addProgramClasses(classes)
.addProgramFiles(files)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addMainDexListClassReferences(traceResult.getMainDexList())
.setProgramConsumer(mainDexConsumer)
.compile()
@@ -247,7 +242,7 @@
Reference.methodFromMethod(User1.class.getMethod("testBooleanCompare")),
Reference.methodFromMethod(User1.class.getMethod("testCharacterCompare")))
.addMainDexRules(keepMainProguardConfiguration(TestClass.class))
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), TestClass.class, getRunArgs())
.assertSuccessWithOutput(EXPECTED)
.inspect(this::checkExpectedSynthetics);
diff --git a/src/test/java/com/android/tools/r8/desugar/backports/BackportPlatformTest.java b/src/test/java/com/android/tools/r8/desugar/backports/BackportPlatformTest.java
index 45c2816..5a2956c 100644
--- a/src/test/java/com/android/tools/r8/desugar/backports/BackportPlatformTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/backports/BackportPlatformTest.java
@@ -51,7 +51,7 @@
.addProgramClasses(CLASSES)
.addKeepMainRule(TestClass.class)
.addKeepClassAndMembersRules(MiniAssert.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutput(EXPECTED);
}
@@ -60,7 +60,7 @@
public void testD8() throws Exception {
testForD8(parameters.getBackend())
.addProgramClasses(CLASSES)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutput(EXPECTED);
}
@@ -73,7 +73,7 @@
.addProgramClasses(CLASSES)
.addKeepMainRule(TestClass.class)
.addKeepClassAndMembersRules(MiniAssert.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compileWithExpectedDiagnostics(this::checkDiagnostics);
}
@@ -83,7 +83,7 @@
.apply(b -> b.getBuilder().setAndroidPlatformBuild(true))
.addOptionsModification(o -> o.disableBackportsWithErrorDiagnostics = true)
.addProgramClasses(CLASSES)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compileWithExpectedDiagnostics(this::checkDiagnostics);
}
@@ -97,7 +97,7 @@
transformer(BooleanDefinition.class)
.setClassDescriptor("Ljava/lang/Boolean;")
.transform())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutput(EXPECTED);
}
diff --git a/src/test/java/com/android/tools/r8/desugar/backports/ThreadLocalBackportTest.java b/src/test/java/com/android/tools/r8/desugar/backports/ThreadLocalBackportTest.java
index bf0036d..f780b08 100644
--- a/src/test/java/com/android/tools/r8/desugar/backports/ThreadLocalBackportTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/backports/ThreadLocalBackportTest.java
@@ -50,7 +50,7 @@
public void testD8() throws Exception {
testForD8(parameters.getBackend())
.addInnerClasses(getClass())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compileWithExpectedDiagnostics(this::checkDiagnostics)
.run(parameters.getRuntime(), TestClass.class)
.apply(this::checkExpected);
@@ -66,7 +66,7 @@
: ToolHelper.getAndroidJar(LATEST))
.addInnerClasses(getClass())
.addKeepMainRule(TestClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), TestClass.class)
.apply(this::checkExpected);
}
diff --git a/src/test/java/com/android/tools/r8/desugar/buffercovariantreturntype/BufferCovariantReturnTypeTest.java b/src/test/java/com/android/tools/r8/desugar/buffercovariantreturntype/BufferCovariantReturnTypeTest.java
index c3fea3d..81a2fc9 100644
--- a/src/test/java/com/android/tools/r8/desugar/buffercovariantreturntype/BufferCovariantReturnTypeTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/buffercovariantreturntype/BufferCovariantReturnTypeTest.java
@@ -58,7 +58,7 @@
public void testD8() throws Exception {
testForD8(parameters.getBackend())
.addProgramFiles(JAR)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), "buffercovariantreturntype.BufferCovariantReturnTypeMain")
.assertSuccessWithOutput(EXPECTED_RESULT);
}
@@ -69,7 +69,7 @@
testForR8(parameters.getBackend())
.addProgramFiles(JAR)
.addKeepMainRule("buffercovariantreturntype.BufferCovariantReturnTypeMain")
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), "buffercovariantreturntype.BufferCovariantReturnTypeMain")
.assertSuccessWithOutput(EXPECTED_RESULT);
}
diff --git a/src/test/java/com/android/tools/r8/desugar/constantdynamic/BasicConstantDynamicTest.java b/src/test/java/com/android/tools/r8/desugar/constantdynamic/BasicConstantDynamicTest.java
index 714c381..b986d0e 100644
--- a/src/test/java/com/android/tools/r8/desugar/constantdynamic/BasicConstantDynamicTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/constantdynamic/BasicConstantDynamicTest.java
@@ -76,7 +76,7 @@
parameters.assumeR8TestParameters();
testForR8(parameters.getBackend())
.addProgramClassFileData(getTransformedClasses())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(MAIN_CLASS)
// TODO(b/198142613): There should not be a warnings on class references which are
// desugared away.
diff --git a/src/test/java/com/android/tools/r8/desugar/constantdynamic/BootstrapMethodNotFoundConstantDynamicTest.java b/src/test/java/com/android/tools/r8/desugar/constantdynamic/BootstrapMethodNotFoundConstantDynamicTest.java
index 14a35d0..dedfc73 100644
--- a/src/test/java/com/android/tools/r8/desugar/constantdynamic/BootstrapMethodNotFoundConstantDynamicTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/constantdynamic/BootstrapMethodNotFoundConstantDynamicTest.java
@@ -74,7 +74,7 @@
parameters.assumeR8TestParameters();
testForR8(parameters.getBackend())
.addProgramClassFileData(getTransformedClasses())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(A.class)
// TODO(b/198142625): Support CONSTANT_Dynamic output for class files.
.applyIf(
diff --git a/src/test/java/com/android/tools/r8/desugar/constantdynamic/BootstrapMethodPrivateConstantDynamicTest.java b/src/test/java/com/android/tools/r8/desugar/constantdynamic/BootstrapMethodPrivateConstantDynamicTest.java
index e18f288..eb01a29 100644
--- a/src/test/java/com/android/tools/r8/desugar/constantdynamic/BootstrapMethodPrivateConstantDynamicTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/constantdynamic/BootstrapMethodPrivateConstantDynamicTest.java
@@ -73,7 +73,7 @@
parameters.assumeR8TestParameters();
testForR8(parameters.getBackend())
.addProgramClassFileData(getTransformedClasses())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(A.class)
// TODO(b/198142625): Support CONSTANT_Dynamic output for class files.
.applyIf(
diff --git a/src/test/java/com/android/tools/r8/desugar/constantdynamic/BootstrapMethodVirtualConstantDynamicTest.java b/src/test/java/com/android/tools/r8/desugar/constantdynamic/BootstrapMethodVirtualConstantDynamicTest.java
index e39e6f5..a6339c3 100644
--- a/src/test/java/com/android/tools/r8/desugar/constantdynamic/BootstrapMethodVirtualConstantDynamicTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/constantdynamic/BootstrapMethodVirtualConstantDynamicTest.java
@@ -73,7 +73,7 @@
parameters.assumeR8TestParameters();
testForR8(parameters.getBackend())
.addProgramClassFileData(getTransformedClasses())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(A.class)
// TODO(b/198142625): Support CONSTANT_Dynamic output for class files.
.applyIf(
diff --git a/src/test/java/com/android/tools/r8/desugar/constantdynamic/ConstantDynamicGetDeclaredMethodsTest.java b/src/test/java/com/android/tools/r8/desugar/constantdynamic/ConstantDynamicGetDeclaredMethodsTest.java
index 2c58272..def1b0e 100644
--- a/src/test/java/com/android/tools/r8/desugar/constantdynamic/ConstantDynamicGetDeclaredMethodsTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/constantdynamic/ConstantDynamicGetDeclaredMethodsTest.java
@@ -94,7 +94,7 @@
assumeTrue(parameters.isDexRuntime());
testForR8(parameters.getBackend())
.addProgramClassFileData(getTransformedClasses())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(MAIN_CLASS)
.applyIf(
parameters.getApiLevel().isLessThan(AndroidApiLevel.O),
@@ -108,7 +108,7 @@
assumeTrue(parameters.isDexRuntime());
testForR8(parameters.getBackend())
.addProgramClassFileData(getTransformedClasses())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(MAIN_CLASS)
.addKeepMethodRules(MAIN_CLASS, "myConstant(...)")
.applyIf(
diff --git a/src/test/java/com/android/tools/r8/desugar/constantdynamic/ConstantDynamicHolderTest.java b/src/test/java/com/android/tools/r8/desugar/constantdynamic/ConstantDynamicHolderTest.java
index 9525784..e483817 100644
--- a/src/test/java/com/android/tools/r8/desugar/constantdynamic/ConstantDynamicHolderTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/constantdynamic/ConstantDynamicHolderTest.java
@@ -59,7 +59,7 @@
testForD8()
.addProgramClassFileData(getTransformedMain())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.setDiagnosticsLevelModifier(
(level, diagnostic) ->
(diagnostic instanceof UnsupportedFeatureDiagnostic
@@ -90,7 +90,7 @@
testForR8(parameters.getBackend())
.addProgramClassFileData(getTransformedMain())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(Main.class)
.compile();
}
@@ -101,7 +101,7 @@
testForR8(parameters.getBackend())
.addProgramClassFileData(getTransformedMain())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(Main.class)
.allowDiagnosticWarningMessages()
.compileWithExpectedDiagnostics(
diff --git a/src/test/java/com/android/tools/r8/desugar/constantdynamic/ConstantDynamicInDefaultInterfaceMethodICCETest.java b/src/test/java/com/android/tools/r8/desugar/constantdynamic/ConstantDynamicInDefaultInterfaceMethodICCETest.java
index 9b43848..0430da2 100644
--- a/src/test/java/com/android/tools/r8/desugar/constantdynamic/ConstantDynamicInDefaultInterfaceMethodICCETest.java
+++ b/src/test/java/com/android/tools/r8/desugar/constantdynamic/ConstantDynamicInDefaultInterfaceMethodICCETest.java
@@ -77,7 +77,7 @@
testForR8(parameters.getBackend())
.addProgramClasses(MAIN_CLASS)
.addProgramClassFileData(getTransformedClasses())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(MAIN_CLASS)
// TODO(b/198142625): Support CONSTANT_Dynamic output for class files.
.applyIf(
diff --git a/src/test/java/com/android/tools/r8/desugar/constantdynamic/ConstantDynamicInDefaultInterfaceMethodTest.java b/src/test/java/com/android/tools/r8/desugar/constantdynamic/ConstantDynamicInDefaultInterfaceMethodTest.java
index bdf5591..d7effe9 100644
--- a/src/test/java/com/android/tools/r8/desugar/constantdynamic/ConstantDynamicInDefaultInterfaceMethodTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/constantdynamic/ConstantDynamicInDefaultInterfaceMethodTest.java
@@ -78,7 +78,7 @@
testForR8(parameters.getBackend())
.addProgramClasses(MAIN_CLASS)
.addProgramClassFileData(getTransformedClasses())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(MAIN_CLASS)
// TODO(b/198142613): There should not be a warnings on class references which are
// desugared away.
diff --git a/src/test/java/com/android/tools/r8/desugar/constantdynamic/HierarchyConstantDynamicTest.java b/src/test/java/com/android/tools/r8/desugar/constantdynamic/HierarchyConstantDynamicTest.java
index cee69bd..2760b20 100644
--- a/src/test/java/com/android/tools/r8/desugar/constantdynamic/HierarchyConstantDynamicTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/constantdynamic/HierarchyConstantDynamicTest.java
@@ -58,7 +58,7 @@
testForD8(parameters.getBackend())
.addProgramClassFileData(getTransformedClasses())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), MAIN_CLASS)
.assertSuccessWithOutput(EXPECTED_OUTPUT);
}
@@ -68,7 +68,7 @@
parameters.assumeR8TestParameters();
testForR8(parameters.getBackend())
.addProgramClassFileData(getTransformedClasses())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(MAIN_CLASS)
// TODO(b/198142613): There should not be a warnings on class references which are
// desugared away.
diff --git a/src/test/java/com/android/tools/r8/desugar/constantdynamic/JacocoConstantDynamicGetDeclaredMethods.java b/src/test/java/com/android/tools/r8/desugar/constantdynamic/JacocoConstantDynamicGetDeclaredMethods.java
index f90490d..899af9f 100644
--- a/src/test/java/com/android/tools/r8/desugar/constantdynamic/JacocoConstantDynamicGetDeclaredMethods.java
+++ b/src/test/java/com/android/tools/r8/desugar/constantdynamic/JacocoConstantDynamicGetDeclaredMethods.java
@@ -112,7 +112,7 @@
testForD8(parameters.getBackend())
.addProgramFiles(testClasses.getInstrumented())
.addProgramFiles(ToolHelper.JACOCO_AGENT)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.runWithJaCoCo(agentOutput, parameters.getRuntime(), MAIN_CLASS)
.applyIf(
@@ -129,7 +129,7 @@
testForR8(parameters.getBackend())
.addProgramFiles(testClasses.getInstrumented())
.addProgramFiles(ToolHelper.JACOCO_AGENT)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRules(TestRunner.class)
.applyIf(
parameters.getApiLevel().isLessThan(AndroidApiLevel.O),
@@ -156,7 +156,7 @@
testForR8(parameters.getBackend())
.addProgramFiles(testClasses.getInstrumented())
.addProgramFiles(ToolHelper.JACOCO_AGENT)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRules(TestRunner.class)
.addKeepRules("-keep class ** { *** " + jacocoBootstrapMethodName + "(...); }")
.applyIf(
diff --git a/src/test/java/com/android/tools/r8/desugar/constantdynamic/JacocoConstantDynamicTest.java b/src/test/java/com/android/tools/r8/desugar/constantdynamic/JacocoConstantDynamicTest.java
index 46261e5..63772bd 100644
--- a/src/test/java/com/android/tools/r8/desugar/constantdynamic/JacocoConstantDynamicTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/constantdynamic/JacocoConstantDynamicTest.java
@@ -108,7 +108,7 @@
testForD8(parameters.getBackend())
.addProgramFiles(testClasses.getInstrumented())
.addProgramFiles(ToolHelper.JACOCO_AGENT)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.runWithJaCoCo(agentOutput, parameters.getRuntime(), MAIN_CLASS)
.assertSuccessWithOutput(EXPECTED_OUTPUT);
@@ -123,7 +123,7 @@
testForD8(parameters.getBackend())
.addProgramFiles(testClasses.getInstrumented())
.addProgramFiles(ToolHelper.JACOCO_AGENT)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile();
}
}
diff --git a/src/test/java/com/android/tools/r8/desugar/constantdynamic/MultipleBootstrapMethodConstantDynamicTest.java b/src/test/java/com/android/tools/r8/desugar/constantdynamic/MultipleBootstrapMethodConstantDynamicTest.java
index 254bda9..58988d8 100644
--- a/src/test/java/com/android/tools/r8/desugar/constantdynamic/MultipleBootstrapMethodConstantDynamicTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/constantdynamic/MultipleBootstrapMethodConstantDynamicTest.java
@@ -77,7 +77,7 @@
parameters.assumeR8TestParameters();
testForR8(parameters.getBackend())
.addProgramClassFileData(getTransformedClasses())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(A.class)
// TODO(b/198142613): There should not be a warnings on class references which are
// desugared away.
diff --git a/src/test/java/com/android/tools/r8/desugar/constantdynamic/MultipleNamedConstantDynamicTest.java b/src/test/java/com/android/tools/r8/desugar/constantdynamic/MultipleNamedConstantDynamicTest.java
index 17ed163..436c9c2 100644
--- a/src/test/java/com/android/tools/r8/desugar/constantdynamic/MultipleNamedConstantDynamicTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/constantdynamic/MultipleNamedConstantDynamicTest.java
@@ -78,7 +78,7 @@
parameters.assumeR8TestParameters();
testForR8(parameters.getBackend())
.addProgramClassFileData(getTransformedClasses())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(A.class)
// TODO(b/198142613): There should not be a warnings on class references which are
// desugared away.
diff --git a/src/test/java/com/android/tools/r8/desugar/constantdynamic/MultipleTypesConstantDynamicTest.java b/src/test/java/com/android/tools/r8/desugar/constantdynamic/MultipleTypesConstantDynamicTest.java
index 33c63fa..2303d46 100644
--- a/src/test/java/com/android/tools/r8/desugar/constantdynamic/MultipleTypesConstantDynamicTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/constantdynamic/MultipleTypesConstantDynamicTest.java
@@ -77,7 +77,7 @@
parameters.assumeR8TestParameters();
testForR8(parameters.getBackend())
.addProgramClassFileData(getTransformedClasses())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(MAIN_CLASS)
// TODO(b/198142613): There should not be a warnings on class references which are
// desugared away.
diff --git a/src/test/java/com/android/tools/r8/desugar/constantdynamic/SharedBootstrapMethodConstantDynamicTest.java b/src/test/java/com/android/tools/r8/desugar/constantdynamic/SharedBootstrapMethodConstantDynamicTest.java
index 87c74d3..19802ae 100644
--- a/src/test/java/com/android/tools/r8/desugar/constantdynamic/SharedBootstrapMethodConstantDynamicTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/constantdynamic/SharedBootstrapMethodConstantDynamicTest.java
@@ -83,7 +83,7 @@
assumeTrue(parameters.isCfRuntime());
testForD8(parameters.getBackend())
.addProgramClassFileData(getTransformedClasses())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.setDiagnosticsLevelModifier(
(level, diagnostic) ->
(diagnostic instanceof ConstantDynamicDesugarDiagnostic
@@ -114,7 +114,7 @@
assumeTrue(parameters.isDexRuntime());
testForD8(parameters.getBackend())
.addProgramClassFileData(getTransformedClasses())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.setDiagnosticsLevelModifier(
(level, diagnostic) ->
(diagnostic instanceof ConstantDynamicDesugarDiagnostic
@@ -163,7 +163,7 @@
testForR8(parameters.getBackend())
.addProgramClassFileData(getTransformedClasses())
.addLibraryFiles(ToolHelper.getMostRecentAndroidJar())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(MAIN_CLASS)
.allowDiagnosticMessages()
.compileWithExpectedDiagnostics(
diff --git a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/CollectionOfTest.java b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/CollectionOfTest.java
index 44cbf36..e58ce54 100644
--- a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/CollectionOfTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/CollectionOfTest.java
@@ -92,7 +92,7 @@
libraryDesugaringSpecification == JDK8 && compilationSpecification == D8_L8DEBUG);
testForD8()
.addProgramFiles(INPUT_JAR)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), MAIN_CLASS)
.assertSuccessWithOutput(getExpectedOutput(false, true));
}
diff --git a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/DesugaredLibraryMismatchTest.java b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/DesugaredLibraryMismatchTest.java
index 9f50994..1dede5d 100644
--- a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/DesugaredLibraryMismatchTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/DesugaredLibraryMismatchTest.java
@@ -60,7 +60,7 @@
Path libraryDex =
testForD8(Backend.DEX)
.addProgramClasses(Library.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.writeToZip();
@@ -93,7 +93,7 @@
Path desugaredLibrary =
testForD8(Backend.CF)
.addProgramClasses(Library.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.writeToZip();
@@ -110,7 +110,7 @@
Path desugaredLibrary =
testForD8(Backend.CF)
.addProgramClasses(Library.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.writeToZip();
@@ -118,7 +118,7 @@
Path desugaredLibraryDex =
testForD8(Backend.DEX)
.addProgramFiles(desugaredLibrary)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.disableDesugaring()
.compile()
.writeToZip();
@@ -135,7 +135,7 @@
Path desugaredLibrary =
testForD8(Backend.CF)
.addProgramClasses(Library.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.enableCoreLibraryDesugaring(
LibraryDesugaringTestConfiguration.forSpecification(
libraryDesugaringSpecification.getSpecification()))
@@ -146,7 +146,7 @@
testForD8()
.addProgramFiles(desugaredLibrary)
.addProgramClasses(TestRunner.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile();
}
@@ -164,14 +164,14 @@
Path programDex =
testForD8(Backend.DEX)
.addProgramClasses(TestRunner.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.writeToZip();
testForD8()
.addProgramFiles(libraryDex)
.addProgramFiles(programDex)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile();
}
@@ -182,7 +182,7 @@
Path libraryDex =
testForD8(Backend.DEX)
.addProgramClasses(Library.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.enableCoreLibraryDesugaring(
LibraryDesugaringTestConfiguration.builder()
// Minimal configuration with a different identifier.
@@ -213,14 +213,14 @@
Path programDex =
testForD8(Backend.DEX)
.addProgramClasses(TestRunner.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.writeToZip();
testForD8()
.addProgramFiles(libraryDex)
.addProgramFiles(programDex)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile();
}
diff --git a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/J$ExtensionTest.java b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/J$ExtensionTest.java
index 7d4a771..250be0e 100644
--- a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/J$ExtensionTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/J$ExtensionTest.java
@@ -113,7 +113,7 @@
stderr =
testForD8()
.addProgramFiles(compiledClasses)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), MAIN_CLASS_NAME)
.assertFailure()
.getStdErr();
diff --git a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/LocalDateEpochTest.java b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/LocalDateEpochTest.java
index a1a428b..e9c4466 100644
--- a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/LocalDateEpochTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/LocalDateEpochTest.java
@@ -57,7 +57,7 @@
.addLibraryFiles(ToolHelper.getAndroidJar(AndroidApiLevel.R))
.addProgramClasses(DesugarLocalDate.class)
.addProgramClassFileData(getMainClassFileData())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addOptionsModification(opt -> opt.setDesugaredLibrarySpecification(getSpecification(opt)))
.compile()
.run(parameters.getRuntime(), Main.class)
@@ -72,7 +72,7 @@
.addProgramClasses(DesugarLocalDate.class)
.addProgramClassFileData(getMainClassFileData())
.addKeepMainRule(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addOptionsModification(opt -> opt.setDesugaredLibrarySpecification(getSpecification(opt)))
.compile()
.run(parameters.getRuntime(), Main.class)
diff --git a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/MergingWithDesugaredLibraryTest.java b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/MergingWithDesugaredLibraryTest.java
index c9b6885..26a5169 100644
--- a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/MergingWithDesugaredLibraryTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/MergingWithDesugaredLibraryTest.java
@@ -64,7 +64,7 @@
testForD8()
.addLibraryFiles(libraryDesugaringSpecification.getLibraryFiles())
.addProgramFiles(buildPart1DesugaredLibrary(), buildPart2NoDesugaredLibrary())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.applyIf(
someLibraryDesugaringRequired(),
b ->
@@ -117,7 +117,7 @@
testForD8()
.addProgramFiles(buildPart1DesugaredLibrary(), shrunkenLib)
.addLibraryFiles(libraryDesugaringSpecification.getLibraryFiles())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.applyIf(
someLibraryDesugaringRequired(),
b ->
@@ -144,7 +144,7 @@
Path desugaredLibCf =
testForD8(Backend.CF)
.addProgramClasses(Part2.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.writeToZip();
@@ -163,7 +163,7 @@
testForD8()
.addProgramFiles(desugaredLibCf)
.disableDesugaring()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.writeToZip();
@@ -185,7 +185,7 @@
app =
testForD8()
.addProgramFiles(buildPart1DesugaredLibrary(), desugaredLibDex)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.writeToZip();
@@ -221,7 +221,7 @@
.addProgramFiles(buildPart1DesugaredLibrary())
.addProgramClasses(Part2.class)
.addLibraryFiles(libraryDesugaringSpecification.getLibraryFiles())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.applyIf(
someLibraryDesugaringRequired(),
b ->
@@ -254,7 +254,7 @@
return testForD8()
.addLibraryFiles(libraryDesugaringSpecification.getLibraryFiles())
.addProgramClasses(Part1.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.applyIf(
someLibraryDesugaringRequired(),
b ->
@@ -266,11 +266,7 @@
}
private Path buildPart2NoDesugaredLibrary() throws Exception {
- return testForD8()
- .addProgramClasses(Part2.class)
- .setMinApi(parameters.getApiLevel())
- .compile()
- .writeToZip();
+ return testForD8().addProgramClasses(Part2.class).setMinApi(parameters).compile().writeToZip();
}
@SuppressWarnings("RedundantOperationOnEmptyContainer")
diff --git a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/NeverMergeCoreLibDesugarClasses.java b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/NeverMergeCoreLibDesugarClasses.java
index 0462bc2..8c499b3 100644
--- a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/NeverMergeCoreLibDesugarClasses.java
+++ b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/NeverMergeCoreLibDesugarClasses.java
@@ -59,7 +59,7 @@
testForD8()
.addInnerClasses(NeverMergeCoreLibDesugarClasses.class)
.addProgramDexFileData(builder.compile())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compileWithExpectedDiagnostics(
diagnostics -> {
diagnostics.assertErrorsCount(1);
@@ -90,7 +90,7 @@
testForD8()
.addInnerClasses(NeverMergeCoreLibDesugarClasses.class)
.addLibraryFiles(libraryDesugaringSpecification.getLibraryFiles())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addProgramFiles(input)
.compileWithExpectedDiagnostics(
diagnostics -> {
diff --git a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/conversiontests/APIConversionTest.java b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/conversiontests/APIConversionTest.java
index 367d791..8c7f50e 100644
--- a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/conversiontests/APIConversionTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/conversiontests/APIConversionTest.java
@@ -65,7 +65,7 @@
compilationSpecification == D8_L8DEBUG && libraryDesugaringSpecification == JDK8);
testForD8()
.addInnerClasses(APIConversionTest.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.assertNoWarningMessageThatMatches(containsString("java.util.Arrays#setAll"))
.assertNoWarningMessageThatMatches(containsString("java.util.Random#ints"))
diff --git a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/conversiontests/ConversionAndMergeTest.java b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/conversiontests/ConversionAndMergeTest.java
index 985e6d4..1485859 100644
--- a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/conversiontests/ConversionAndMergeTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/conversiontests/ConversionAndMergeTest.java
@@ -64,7 +64,7 @@
private Path buildClass(Class<?> cls) throws Exception {
return testForD8()
.addLibraryFiles(libraryDesugaringSpecification.getLibraryFiles())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addProgramClasses(cls)
.enableCoreLibraryDesugaring(
LibraryDesugaringTestConfiguration.forSpecification(
diff --git a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/conversiontests/FlatMapConversionTest.java b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/conversiontests/FlatMapConversionTest.java
index 62561e1..ba18666 100644
--- a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/conversiontests/FlatMapConversionTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/conversiontests/FlatMapConversionTest.java
@@ -74,7 +74,7 @@
"Run only once",
libraryDesugaringSpecification == JDK11 && compilationSpecification == D8_L8DEBUG);
testForD8()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addProgramClasses(Executor.class, CustomLibClass.class)
.run(parameters.getRuntime(), Executor.class)
.assertSuccessWithOutput(EXPECTED_RESULT);
diff --git a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/conversiontests/SuperAPIConversionTest.java b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/conversiontests/SuperAPIConversionTest.java
index 6617920..edbe42c 100644
--- a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/conversiontests/SuperAPIConversionTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/conversiontests/SuperAPIConversionTest.java
@@ -56,7 +56,7 @@
libraryDesugaringSpecification == JDK8 && compilationSpecification.isProgramShrink());
testForD8()
.addInnerClasses(SuperAPIConversionTest.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Executor.class)
.assertSuccessWithOutputLines("Head");
}
diff --git a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/jdk11/StackWalkerTest.java b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/jdk11/StackWalkerTest.java
index 920798f..0e9fe1e 100644
--- a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/jdk11/StackWalkerTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/jdk11/StackWalkerTest.java
@@ -70,7 +70,7 @@
compilationSpecification == D8_L8DEBUG && libraryDesugaringSpecification == JDK11);
// No desugared library, this should work.
testForD8()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addProgramFiles(INPUT_JAR)
.run(parameters.getRuntime(), MAIN_CLASS)
.assertSuccessWithOutput(EXPECTED_OUTPUT);
diff --git a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/test/DesugaredLibraryTestBuilder.java b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/test/DesugaredLibraryTestBuilder.java
index ed81c32..5259fb6 100644
--- a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/test/DesugaredLibraryTestBuilder.java
+++ b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/test/DesugaredLibraryTestBuilder.java
@@ -76,9 +76,7 @@
}
private void setUp() {
- builder
- .setMinApi(parameters.getApiLevel())
- .setMode(compilationSpecification.getProgramCompilationMode());
+ builder.setMinApi(parameters).setMode(compilationSpecification.getProgramCompilationMode());
LibraryDesugaringTestConfiguration.Builder libraryConfBuilder =
LibraryDesugaringTestConfiguration.builder()
.addDesugaredLibraryConfiguration(
diff --git a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/test/DesugaredLibraryTestCompileResult.java b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/test/DesugaredLibraryTestCompileResult.java
index d49f2ef..224139d 100644
--- a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/test/DesugaredLibraryTestCompileResult.java
+++ b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/test/DesugaredLibraryTestCompileResult.java
@@ -154,7 +154,7 @@
}
return test.testForD8()
.addProgramFiles(this.compileResult.writeToZip())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.setMode(compilationSpecification.getProgramCompilationMode())
.disableDesugaring()
.compile();
diff --git a/src/test/java/com/android/tools/r8/desugar/enclosingmethod/EnclosingMethodRewriteTest.java b/src/test/java/com/android/tools/r8/desugar/enclosingmethod/EnclosingMethodRewriteTest.java
index 9a47de9..f74bc45 100644
--- a/src/test/java/com/android/tools/r8/desugar/enclosingmethod/EnclosingMethodRewriteTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/enclosingmethod/EnclosingMethodRewriteTest.java
@@ -97,7 +97,7 @@
.addProgramClasses(C.class, MAIN)
.addKeepAllClassesRule()
.addKeepAttributeInnerClassesAndEnclosingMethod()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect)
.run(parameters.getRuntime(), MAIN)
@@ -121,7 +121,7 @@
.addProgramClasses(C.class, MAIN)
.addKeepAllClassesRule()
.addKeepAttributeInnerClassesAndEnclosingMethod()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect)
.run(parameters.getRuntime(), MAIN)
diff --git a/src/test/java/com/android/tools/r8/desugar/enclosingmethod/InvalidEnclosingMethodAttributeTest.java b/src/test/java/com/android/tools/r8/desugar/enclosingmethod/InvalidEnclosingMethodAttributeTest.java
index 6183472..06f7f3e 100644
--- a/src/test/java/com/android/tools/r8/desugar/enclosingmethod/InvalidEnclosingMethodAttributeTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/enclosingmethod/InvalidEnclosingMethodAttributeTest.java
@@ -45,7 +45,7 @@
testForR8(parameters.getBackend())
.addProgramClasses(Main.class)
.addProgramClassFileData(getProgramClassFileDataWithRewrittenEnclosingMethod())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepAttributeInnerClassesAndEnclosingMethod()
.addKeepAllClassesRule()
.run(parameters.getRuntime(), Main.class)
diff --git a/src/test/java/com/android/tools/r8/desugar/graph/CompilationDependentSetTest.java b/src/test/java/com/android/tools/r8/desugar/graph/CompilationDependentSetTest.java
index b0f6682..514fde2 100644
--- a/src/test/java/com/android/tools/r8/desugar/graph/CompilationDependentSetTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/graph/CompilationDependentSetTest.java
@@ -63,11 +63,7 @@
.assertSuccessWithOutputLines("Hello World!");
} else {
Path dexInputForB =
- testForD8()
- .addProgramClasses(B.class)
- .setMinApi(parameters.getApiLevel())
- .compile()
- .writeToZip();
+ testForD8().addProgramClasses(B.class).setMinApi(parameters).compile().writeToZip();
D8TestBuilder builder = testForD8();
DesugarGraphTestConsumer consumer = new DesugarGraphTestConsumer();
@@ -77,7 +73,7 @@
Origin originTestClass = DesugarGraphUtils.addClassWithOrigin(TestClass.class, builder);
builder
.addProgramFiles(dexInputForB)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutputLines("Hello World!");
// If API level indicates desugaring is needed check the edges are reported.
diff --git a/src/test/java/com/android/tools/r8/desugar/graph/InterfaceBridgeDependencyTest.java b/src/test/java/com/android/tools/r8/desugar/graph/InterfaceBridgeDependencyTest.java
index ec8fcd4..cccd43b 100644
--- a/src/test/java/com/android/tools/r8/desugar/graph/InterfaceBridgeDependencyTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/graph/InterfaceBridgeDependencyTest.java
@@ -81,7 +81,7 @@
Origin originJ = DesugarGraphUtils.addClassWithOrigin(J.class, builder);
Origin originK = DesugarGraphUtils.addClassWithOrigin(K.class, builder);
builder
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addProgramClasses(TestClass.class)
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutput(EXPECTED);
diff --git a/src/test/java/com/android/tools/r8/desugar/graph/InterfaceToImplementingClassDependencyTest.java b/src/test/java/com/android/tools/r8/desugar/graph/InterfaceToImplementingClassDependencyTest.java
index 6339195..87a33f9 100644
--- a/src/test/java/com/android/tools/r8/desugar/graph/InterfaceToImplementingClassDependencyTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/graph/InterfaceToImplementingClassDependencyTest.java
@@ -75,7 +75,7 @@
Origin originA = DesugarGraphUtils.addClassWithOrigin(A.class, builder);
builder
.addProgramClasses(TestClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutputLines("Hello World!");
// If API level indicates desugaring is needed check the edges are reported.
diff --git a/src/test/java/com/android/tools/r8/desugar/graph/LambdaDependencyTest.java b/src/test/java/com/android/tools/r8/desugar/graph/LambdaDependencyTest.java
index d7f39e5..9c8a99a 100644
--- a/src/test/java/com/android/tools/r8/desugar/graph/LambdaDependencyTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/graph/LambdaDependencyTest.java
@@ -65,7 +65,7 @@
Origin originA = DesugarGraphUtils.addClassWithOrigin(A.class, builder);
Origin originMain = DesugarGraphUtils.addClassWithOrigin(TestClass.class, builder);
builder
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutputLines("lambda!");
// If API level indicates desugaring is needed check the edges are reported.
diff --git a/src/test/java/com/android/tools/r8/desugar/graph/NestDependencyTest.java b/src/test/java/com/android/tools/r8/desugar/graph/NestDependencyTest.java
index c67f497..7bf1ab9 100644
--- a/src/test/java/com/android/tools/r8/desugar/graph/NestDependencyTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/graph/NestDependencyTest.java
@@ -73,7 +73,7 @@
DesugarGraphUtils.addClassWithOrigin("Member2", inNest(Member2.class), builder);
builder
.addProgramClasses(TestClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutputLines("Hello World!");
// Currently there is no level at which nest desugaring is not needed.
diff --git a/src/test/java/com/android/tools/r8/desugar/jdk8272564/Jdk8272564InvalidCode.java b/src/test/java/com/android/tools/r8/desugar/jdk8272564/Jdk8272564InvalidCode.java
index c9dbd5c..be271ed 100644
--- a/src/test/java/com/android/tools/r8/desugar/jdk8272564/Jdk8272564InvalidCode.java
+++ b/src/test/java/com/android/tools/r8/desugar/jdk8272564/Jdk8272564InvalidCode.java
@@ -69,7 +69,7 @@
testForR8(parameters.getBackend())
.addProgramClasses(I.class)
.addProgramClassFileData(getTransformedClass())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(A.class)
.addOptionsModification(options -> options.testing.allowInvokeErrors = true)
.run(parameters.getRuntime(), A.class)
diff --git a/src/test/java/com/android/tools/r8/desugar/jdk8272564/Jdk8272564Test.java b/src/test/java/com/android/tools/r8/desugar/jdk8272564/Jdk8272564Test.java
index 85dedf3..1948366 100644
--- a/src/test/java/com/android/tools/r8/desugar/jdk8272564/Jdk8272564Test.java
+++ b/src/test/java/com/android/tools/r8/desugar/jdk8272564/Jdk8272564Test.java
@@ -156,7 +156,7 @@
// The R8 lens code rewriter rewrites to the code prior to fixing JDK-8272564.
testForR8(parameters.getBackend())
.addProgramFiles(Jdk8272564.jar())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.noTreeShaking()
.addKeepClassAndMembersRules(Jdk8272564.Main.typeName())
.run(parameters.getRuntime(), Jdk8272564.Main.typeName())
diff --git a/src/test/java/com/android/tools/r8/desugar/lambdas/ExplicitCallToJavacGeneratedInstanceLambdaMethodTest.java b/src/test/java/com/android/tools/r8/desugar/lambdas/ExplicitCallToJavacGeneratedInstanceLambdaMethodTest.java
index ac20adf..92e7752 100644
--- a/src/test/java/com/android/tools/r8/desugar/lambdas/ExplicitCallToJavacGeneratedInstanceLambdaMethodTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/lambdas/ExplicitCallToJavacGeneratedInstanceLambdaMethodTest.java
@@ -52,7 +52,7 @@
.addProgramClasses(Main.class, A.class, FunctionalInterface.class)
.addProgramClassFileData(getProgramClassFileData())
.addKeepMainRule(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("Hello world!", "Hello world!");
diff --git a/src/test/java/com/android/tools/r8/desugar/lambdas/ExplicitCallToJavacGeneratedStaticLambdaMethodTest.java b/src/test/java/com/android/tools/r8/desugar/lambdas/ExplicitCallToJavacGeneratedStaticLambdaMethodTest.java
index f57ef59..69b59d0 100644
--- a/src/test/java/com/android/tools/r8/desugar/lambdas/ExplicitCallToJavacGeneratedStaticLambdaMethodTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/lambdas/ExplicitCallToJavacGeneratedStaticLambdaMethodTest.java
@@ -51,7 +51,7 @@
.addProgramClasses(Main.class, A.class, FunctionalInterface.class)
.addProgramClassFileData(getProgramClassFileData())
.addKeepMainRule(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("Hello world!", "Hello world!");
diff --git a/src/test/java/com/android/tools/r8/desugar/lambdas/LambdaEqualityTest.java b/src/test/java/com/android/tools/r8/desugar/lambdas/LambdaEqualityTest.java
index 579f000..90fed59 100644
--- a/src/test/java/com/android/tools/r8/desugar/lambdas/LambdaEqualityTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/lambdas/LambdaEqualityTest.java
@@ -94,7 +94,7 @@
public void testD8() throws Exception {
testForD8(parameters.getBackend())
.addInnerClasses(LambdaEqualityTest.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutput(EXPECTED_D8);
}
@@ -104,7 +104,7 @@
parameters.assumeR8TestParameters();
testForR8(parameters.getBackend())
.addInnerClasses(LambdaEqualityTest.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(TestClass.class)
.addKeepMethodRules(
Reference.methodFromMethod(
diff --git a/src/test/java/com/android/tools/r8/desugar/lambdas/LambdaFactoryTest.java b/src/test/java/com/android/tools/r8/desugar/lambdas/LambdaFactoryTest.java
index bed4577..befc9dc 100644
--- a/src/test/java/com/android/tools/r8/desugar/lambdas/LambdaFactoryTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/lambdas/LambdaFactoryTest.java
@@ -113,7 +113,7 @@
testForR8(parameters.getBackend())
.addInnerClasses(getClass())
.addKeepMainRule(TestClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), TestClass.class)
.inspect(
inspector -> {
diff --git a/src/test/java/com/android/tools/r8/desugar/lambdas/LambdaInStacktraceTest.java b/src/test/java/com/android/tools/r8/desugar/lambdas/LambdaInStacktraceTest.java
index 9c29a9b..80ff8a4 100644
--- a/src/test/java/com/android/tools/r8/desugar/lambdas/LambdaInStacktraceTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/lambdas/LambdaInStacktraceTest.java
@@ -86,7 +86,7 @@
public void testD8() throws Exception {
testForD8(parameters.getBackend())
.addInnerClasses(LambdaInStacktraceTest.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), TestRunner.class, Boolean.toString(isDalvik))
.assertSuccessWithOutput(isAndroidOOrLater ? EXPECTED_D8_ANDROID_O : EXPECTED_D8);
}
@@ -97,7 +97,7 @@
String stdout =
testForR8(parameters.getBackend())
.addInnerClasses(LambdaInStacktraceTest.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(TestRunner.class)
.addKeepAttributeSourceFile()
.addKeepRules("-renamesourcefileattribute SourceFile")
diff --git a/src/test/java/com/android/tools/r8/desugar/lambdas/LambdaJava17Test.java b/src/test/java/com/android/tools/r8/desugar/lambdas/LambdaJava17Test.java
index 6c9e899..c516b32 100644
--- a/src/test/java/com/android/tools/r8/desugar/lambdas/LambdaJava17Test.java
+++ b/src/test/java/com/android/tools/r8/desugar/lambdas/LambdaJava17Test.java
@@ -71,7 +71,7 @@
parameters.isCfRuntime() && !parameters.getApiLevel().isEqualTo(AndroidApiLevel.B),
// Alternatively we need to pass Jdk17 as library.
b -> b.addKeepRules("-dontwarn java.lang.invoke.StringConcatFactory"))
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(MAIN)
.run(parameters.getRuntime(), MAIN)
.assertSuccessWithOutputLines(EXPECTED_RESULT);
diff --git a/src/test/java/com/android/tools/r8/desugar/lambdas/LambdaMethodsWithModifiedAccessTest.java b/src/test/java/com/android/tools/r8/desugar/lambdas/LambdaMethodsWithModifiedAccessTest.java
index 3bd5016..8a4743e 100644
--- a/src/test/java/com/android/tools/r8/desugar/lambdas/LambdaMethodsWithModifiedAccessTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/lambdas/LambdaMethodsWithModifiedAccessTest.java
@@ -89,7 +89,7 @@
testForD8(parameters.getBackend())
.addProgramClasses(TestClass.class)
.addProgramClassFileData(getTransformedLambdaTest())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile();
}
@@ -106,7 +106,7 @@
.addProgramClasses(TestClass.class)
.addProgramClassFileData(getTransformedLambdaTest())
.addKeepMainRule(TestClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile();
}
diff --git a/src/test/java/com/android/tools/r8/desugar/lambdas/LambdaNamingConflictTest.java b/src/test/java/com/android/tools/r8/desugar/lambdas/LambdaNamingConflictTest.java
index e862e2e..6882f73 100644
--- a/src/test/java/com/android/tools/r8/desugar/lambdas/LambdaNamingConflictTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/lambdas/LambdaNamingConflictTest.java
@@ -57,7 +57,7 @@
.addProgramClasses(I.class)
.addProgramClassFileData(getConflictingNameClass())
.addProgramClassFileData(getTransformedMainClass())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutput(EXPECTED);
}
@@ -68,7 +68,7 @@
.addProgramClasses(I.class)
.addProgramClassFileData(getConflictingNameClass())
.addProgramClassFileData(getTransformedMainClass())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(TestClass.class)
// Ensure that R8 cannot remove or rename the conflicting name.
.addKeepClassAndMembersRules(CONFLICTING_NAME.getTypeName())
diff --git a/src/test/java/com/android/tools/r8/desugar/lambdas/LambdaPrivateInstanceInterfaceMethodWithNonLambdaCallSiteTest.java b/src/test/java/com/android/tools/r8/desugar/lambdas/LambdaPrivateInstanceInterfaceMethodWithNonLambdaCallSiteTest.java
index 6961fe9..0db3824 100644
--- a/src/test/java/com/android/tools/r8/desugar/lambdas/LambdaPrivateInstanceInterfaceMethodWithNonLambdaCallSiteTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/lambdas/LambdaPrivateInstanceInterfaceMethodWithNonLambdaCallSiteTest.java
@@ -66,7 +66,7 @@
.addProgramClasses(Main.class, A.class, FunctionalInterface.class)
.addProgramClassFileData(getProgramClassFileData())
.addKeepMainRule(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("Hello world!", "Hello world!");
}
diff --git a/src/test/java/com/android/tools/r8/desugar/lambdas/LambdaPrivateStaticMethodTest.java b/src/test/java/com/android/tools/r8/desugar/lambdas/LambdaPrivateStaticMethodTest.java
index 448234c..780d2ee 100644
--- a/src/test/java/com/android/tools/r8/desugar/lambdas/LambdaPrivateStaticMethodTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/lambdas/LambdaPrivateStaticMethodTest.java
@@ -40,7 +40,7 @@
testForR8(parameters.getBackend())
.addInnerClasses(getClass())
.addKeepMainRule(TestClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutput(EXPECTED);
}
diff --git a/src/test/java/com/android/tools/r8/desugar/lambdas/LambdaStaticInstanceFieldDuplicationTest.java b/src/test/java/com/android/tools/r8/desugar/lambdas/LambdaStaticInstanceFieldDuplicationTest.java
index ac5b076..bf651f1 100644
--- a/src/test/java/com/android/tools/r8/desugar/lambdas/LambdaStaticInstanceFieldDuplicationTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/lambdas/LambdaStaticInstanceFieldDuplicationTest.java
@@ -71,7 +71,7 @@
.addKeepMainRule(TestClass.class)
// Prevent R8 from eliminating the lambdas by keeping the application of them.
.addKeepClassAndMembersRules(Accept.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.minification(minify)
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutput(EXPECTED)
@@ -82,7 +82,7 @@
public void testD8() throws Exception {
testForD8(parameters.getBackend())
.addProgramClasses(CLASSES)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutput(EXPECTED)
.inspect(this::checkNoOriginalsAndNoInternalSynthetics)
@@ -111,7 +111,7 @@
testForD8(parameters.getBackend())
.addProgramClasses(User1.class)
.addClasspathClasses(CLASSES)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.setIntermediate(intermediate)
.compile()
.writeToZip();
@@ -121,7 +121,7 @@
testForD8(parameters.getBackend())
.addProgramClasses(User2.class)
.addClasspathClasses(CLASSES)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.setIntermediate(intermediate)
.compile()
.writeToZip();
@@ -137,7 +137,7 @@
testForD8(parameters.getBackend())
.addProgramClasses(TestClass.class, MyConsumer.class, Accept.class)
.addProgramFiles(out1, out2)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.setIntermediate(true)
.compile()
.writeToZip(out3)
@@ -149,7 +149,7 @@
// Finally do a non-intermediate merge.
testForD8(parameters.getBackend())
.addProgramFiles(out3)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutput(EXPECTED)
.inspect(this::checkNoOriginalsAndNoInternalSynthetics)
@@ -183,12 +183,12 @@
testForD8(parameters.getBackend())
.setOutputMode(outputMode)
.addProgramClasses(CLASSES)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.writeToZip();
testForD8()
.addProgramFiles(perClassOutput)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutput(EXPECTED)
.inspect(this::checkNoOriginalsAndNoInternalSynthetics)
diff --git a/src/test/java/com/android/tools/r8/desugar/lambdas/LambdaToSysOutPrintlnDuplicationTest.java b/src/test/java/com/android/tools/r8/desugar/lambdas/LambdaToSysOutPrintlnDuplicationTest.java
index 5b73125..fae9f61 100644
--- a/src/test/java/com/android/tools/r8/desugar/lambdas/LambdaToSysOutPrintlnDuplicationTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/lambdas/LambdaToSysOutPrintlnDuplicationTest.java
@@ -69,7 +69,7 @@
testForR8(parameters.getBackend())
.addProgramClasses(CLASSES)
.addKeepMainRule(TestClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.minification(minify)
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutput(EXPECTED)
@@ -80,7 +80,7 @@
public void testD8() throws Exception {
testForD8(parameters.getBackend())
.addProgramClasses(CLASSES)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutput(EXPECTED)
.inspect(this::checkNoOriginalsAndNoInternalSynthetics)
@@ -109,7 +109,7 @@
testForD8(parameters.getBackend())
.addProgramClasses(User1.class)
.addClasspathClasses(CLASSES)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.setIntermediate(intermediate)
.compile()
.writeToZip();
@@ -119,7 +119,7 @@
testForD8(parameters.getBackend())
.addProgramClasses(User2.class)
.addClasspathClasses(CLASSES)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.setIntermediate(intermediate)
.compile()
.writeToZip();
@@ -135,7 +135,7 @@
testForD8(parameters.getBackend())
.addProgramClasses(TestClass.class, MyConsumer.class, Accept.class)
.addProgramFiles(out1, out2)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.setIntermediate(true)
.compile()
.writeToZip(out3)
@@ -147,7 +147,7 @@
// Finally do a non-intermediate merge.
testForD8(parameters.getBackend())
.addProgramFiles(out3)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutput(EXPECTED)
.inspect(this::checkNoOriginalsAndNoInternalSynthetics)
@@ -181,12 +181,12 @@
testForD8(parameters.getBackend())
.setOutputMode(outputMode)
.addProgramClasses(CLASSES)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.writeToZip();
testForD8()
.addProgramFiles(perClassOutput)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutput(EXPECTED)
.inspect(this::checkNoOriginalsAndNoInternalSynthetics)
diff --git a/src/test/java/com/android/tools/r8/desugar/lambdas/LambdaWithPrivateInterfaceInvokeTest.java b/src/test/java/com/android/tools/r8/desugar/lambdas/LambdaWithPrivateInterfaceInvokeTest.java
index d66b1d2..0f38db4 100644
--- a/src/test/java/com/android/tools/r8/desugar/lambdas/LambdaWithPrivateInterfaceInvokeTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/lambdas/LambdaWithPrivateInterfaceInvokeTest.java
@@ -56,7 +56,7 @@
.addProgramClasses(TestClass.class, MyFun.class, A.class)
.addProgramClassFileData(getTransformForI())
.addKeepMainRule(TestClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutput(EXPECTED);
}
diff --git a/src/test/java/com/android/tools/r8/desugar/lambdas/LegacyLambdaMergeTest.java b/src/test/java/com/android/tools/r8/desugar/lambdas/LegacyLambdaMergeTest.java
index dd00acf..51b0242 100644
--- a/src/test/java/com/android/tools/r8/desugar/lambdas/LegacyLambdaMergeTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/lambdas/LegacyLambdaMergeTest.java
@@ -53,12 +53,9 @@
// Merging legacy lambdas is only valid for DEX inputs, thus also not R8 applicable.
assumeTrue(parameters.isDexRuntime());
D8TestCompileResult lambda =
- testForD8()
- .setMinApi(parameters.getApiLevel())
- .addProgramClassFileData(getTransformedLambda())
- .compile();
+ testForD8().setMinApi(parameters).addProgramClassFileData(getTransformedLambda()).compile();
testForD8()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addProgramClassFileData(getTransformedMain())
// Add the lambda twice.
.addProgramFiles(lambda.writeToZip())
diff --git a/src/test/java/com/android/tools/r8/desugar/lambdas/OverlappingLambdaMethodInSubclassWithSameNameTest.java b/src/test/java/com/android/tools/r8/desugar/lambdas/OverlappingLambdaMethodInSubclassWithSameNameTest.java
index 84ce7aa..b890947 100644
--- a/src/test/java/com/android/tools/r8/desugar/lambdas/OverlappingLambdaMethodInSubclassWithSameNameTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/lambdas/OverlappingLambdaMethodInSubclassWithSameNameTest.java
@@ -53,7 +53,7 @@
MAIN_CLASS,
OverlappingLambdaMethodInSubclassWithSameNameTestA.class,
OverlappingLambdaMethodInSubclassWithSameNameTestB.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), MAIN_CLASS)
.assertSuccessWithOutput(EXPECTED);
}
@@ -66,7 +66,7 @@
MAIN_CLASS,
OverlappingLambdaMethodInSubclassWithSameNameTestA.class,
OverlappingLambdaMethodInSubclassWithSameNameTestB.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(MAIN_CLASS)
.run(parameters.getRuntime(), MAIN_CLASS)
.assertSuccessWithOutput(EXPECTED);
diff --git a/src/test/java/com/android/tools/r8/desugar/lambdas/mergedcontext/MergedContextTest.java b/src/test/java/com/android/tools/r8/desugar/lambdas/mergedcontext/MergedContextTest.java
index 86d541e..bea9627 100644
--- a/src/test/java/com/android/tools/r8/desugar/lambdas/mergedcontext/MergedContextTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/lambdas/mergedcontext/MergedContextTest.java
@@ -39,7 +39,7 @@
.enableInliningAnnotations()
.enableNoHorizontalClassMergingAnnotations()
.enableNeverClassInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addHorizontallyMergedClassesInspector(
inspector -> {
inspector.assertClassesNotMerged(C.class);
diff --git a/src/test/java/com/android/tools/r8/desugar/nest/NestBasedAccessToNativeMethodTest.java b/src/test/java/com/android/tools/r8/desugar/nest/NestBasedAccessToNativeMethodTest.java
index c8f709b..be1214b 100644
--- a/src/test/java/com/android/tools/r8/desugar/nest/NestBasedAccessToNativeMethodTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/nest/NestBasedAccessToNativeMethodTest.java
@@ -41,7 +41,7 @@
assumeTrue(parameters.isDexRuntime());
testForD8()
.addProgramClassFileData(getProgramClassFileData())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("Hello from native");
@@ -52,7 +52,7 @@
testForR8(parameters.getBackend())
.addProgramClassFileData(getProgramClassFileData())
.addKeepMainRule(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("Hello from native");
diff --git a/src/test/java/com/android/tools/r8/desugar/nestaccesscontrol/FullNestOnProgramPathTest.java b/src/test/java/com/android/tools/r8/desugar/nestaccesscontrol/FullNestOnProgramPathTest.java
index 6fb309f..9737f85 100644
--- a/src/test/java/com/android/tools/r8/desugar/nestaccesscontrol/FullNestOnProgramPathTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/nestaccesscontrol/FullNestOnProgramPathTest.java
@@ -103,12 +103,13 @@
// then run the main class from this dex.
@Test
public void testSingleNestR8() throws Exception {
+ parameters.assumeR8TestParameters();
for (String nestID : NEST_IDS) {
testForR8(parameters.getBackend())
.noTreeShaking()
.addDontObfuscate()
.addKeepAllAttributes()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addProgramFiles(classesOfNest(nestID))
.addOptionsModification(options -> options.enableNestReduction = false)
.applyIf(parameters.isCfRuntime(), Jdk9TestUtils.addJdk9LibraryFiles(temp))
@@ -122,7 +123,7 @@
public void testSingleNestD8() throws Exception {
for (String nestID : NEST_IDS) {
testForD8(parameters.getBackend())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addProgramFiles(classesOfNest(nestID))
.compile()
.run(parameters.getRuntime(), getMainClass(nestID))
diff --git a/src/test/java/com/android/tools/r8/desugar/nestaccesscontrol/MethodParametersTest.java b/src/test/java/com/android/tools/r8/desugar/nestaccesscontrol/MethodParametersTest.java
index 01051d2..3c7248a 100644
--- a/src/test/java/com/android/tools/r8/desugar/nestaccesscontrol/MethodParametersTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/nestaccesscontrol/MethodParametersTest.java
@@ -54,7 +54,7 @@
Path nestDesugared =
testForD8(Backend.CF)
.addProgramFiles(nestCompiledWithParameters)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.assertNoMessages()
.inspect(this::verifyNoAnnotationsOnSyntheticConstructors)
@@ -63,7 +63,7 @@
Path nestDesugaredTwice =
testForD8(Backend.CF)
.addProgramFiles(nestDesugared)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.assertNoMessages()
.inspect(this::verifyNoAnnotationsOnSyntheticConstructors)
@@ -73,7 +73,7 @@
testForD8(Backend.CF)
.addClasspathClasses(Outer.class)
.addInnerClasses(getClass())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.assertNoMessages()
.writeToZip();
@@ -81,7 +81,7 @@
testForD8(parameters.getBackend())
.addProgramFiles(nestDesugaredTwice)
.addProgramFiles(programDesugared)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.assertNoMessages()
.inspect(this::verifyNoAnnotationsOnSyntheticConstructors)
diff --git a/src/test/java/com/android/tools/r8/desugar/nestaccesscontrol/NestAttributesInDexRewriteInvokeInterfaceTest.java b/src/test/java/com/android/tools/r8/desugar/nestaccesscontrol/NestAttributesInDexRewriteInvokeInterfaceTest.java
index 34fec39..c491627 100644
--- a/src/test/java/com/android/tools/r8/desugar/nestaccesscontrol/NestAttributesInDexRewriteInvokeInterfaceTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/nestaccesscontrol/NestAttributesInDexRewriteInvokeInterfaceTest.java
@@ -86,7 +86,7 @@
dumpHostImpl(),
dumpMember1Impl(),
dumpMember2Impl())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addOptionsModification(options -> options.emitNestAnnotationsInDex = true)
.compile()
.inspect(
@@ -118,7 +118,7 @@
testForD8()
.addProgramClassFileData(dumpHost())
.addClasspathClassFileData(dumpMember1(), dumpMember2())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addOptionsModification(options -> options.emitNestAnnotationsInDex = true)
.compile()
.inspect(
@@ -134,7 +134,7 @@
testForD8()
.addProgramClassFileData(dumpMember1())
.addClasspathClassFileData(dumpHost(), dumpMember2())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addOptionsModification(options -> options.emitNestAnnotationsInDex = true)
.compile()
.inspect(
@@ -150,7 +150,7 @@
testForD8()
.addProgramClassFileData(dumpMember2())
.addClasspathClassFileData(dumpHost(), dumpMember1())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addOptionsModification(options -> options.emitNestAnnotationsInDex = true)
.compile()
.inspect(
@@ -166,7 +166,7 @@
testForD8()
.addProgramClassFileData(dumpHostImpl(), dumpMember1Impl(), dumpMember2Impl())
.addClasspathClassFileData(dumpHost(), dumpMember1(), dumpMember2Impl())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addOptionsModification(options -> options.emitNestAnnotationsInDex = true)
.compile()
.writeToZip();
@@ -174,7 +174,7 @@
testForD8()
.addProgramFiles(host, member1, member2, impls)
.addClasspathClassFileData(dumpMember2())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addOptionsModification(options -> options.emitNestAnnotationsInDex = true)
.compile()
.inspect(
@@ -207,7 +207,7 @@
() ->
testForD8()
.addProgramClassFileData(dumpHost())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addOptionsModification(options -> options.emitNestAnnotationsInDex = true)
.compileWithExpectedDiagnostics(
diagnostics -> {
@@ -228,7 +228,7 @@
() ->
testForD8()
.addProgramClassFileData(dumpMember1(), dumpMember2())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addOptionsModification(options -> options.emitNestAnnotationsInDex = true)
.compileWithExpectedDiagnostics(
diagnostics -> {
diff --git a/src/test/java/com/android/tools/r8/desugar/nestaccesscontrol/NestAttributesInDexRewriteInvokeSuperTest.java b/src/test/java/com/android/tools/r8/desugar/nestaccesscontrol/NestAttributesInDexRewriteInvokeSuperTest.java
index 6d88841..b505020 100644
--- a/src/test/java/com/android/tools/r8/desugar/nestaccesscontrol/NestAttributesInDexRewriteInvokeSuperTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/nestaccesscontrol/NestAttributesInDexRewriteInvokeSuperTest.java
@@ -72,7 +72,7 @@
assertFalse(parameters.getApiLevel().getLevel() > 33);
testForD8()
.addProgramClassFileData(dumpHost(), dumpMember(), dumpSubMember())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addOptionsModification(options -> options.emitNestAnnotationsInDex = true)
.compile()
.inspect(
@@ -108,7 +108,7 @@
testForD8()
.addProgramClassFileData(dumpHost())
.addClasspathClassFileData(dumpMember(), dumpSubMember())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addOptionsModification(options -> options.emitNestAnnotationsInDex = true)
.compile()
.inspect(
@@ -128,7 +128,7 @@
testForD8()
.addProgramClassFileData(dumpMember())
.addClasspathClassFileData(dumpHost(), dumpSubMember())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addOptionsModification(options -> options.emitNestAnnotationsInDex = true)
.compile()
.inspect(
@@ -144,7 +144,7 @@
testForD8()
.addProgramClassFileData(dumpSubMember())
.addClasspathClassFileData(dumpHost(), dumpMember())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addOptionsModification(options -> options.emitNestAnnotationsInDex = true)
.compile()
.inspect(
@@ -159,7 +159,7 @@
testForD8()
.addProgramFiles(host, member, subMember)
.addClasspathClassFileData(dumpSubMember())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addOptionsModification(options -> options.emitNestAnnotationsInDex = true)
.compile()
.inspect(
@@ -196,7 +196,7 @@
() ->
testForD8()
.addProgramClassFileData(dumpHost())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addOptionsModification(options -> options.emitNestAnnotationsInDex = true)
.compileWithExpectedDiagnostics(
diagnostics -> {
@@ -217,7 +217,7 @@
() ->
testForD8()
.addProgramClassFileData(dumpMember(), dumpSubMember())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addOptionsModification(options -> options.emitNestAnnotationsInDex = true)
.compileWithExpectedDiagnostics(
diagnostics -> {
diff --git a/src/test/java/com/android/tools/r8/desugar/nestaccesscontrol/NestAttributesInDexRewriteInvokeVirtualTest.java b/src/test/java/com/android/tools/r8/desugar/nestaccesscontrol/NestAttributesInDexRewriteInvokeVirtualTest.java
index 715989f..6701a25 100644
--- a/src/test/java/com/android/tools/r8/desugar/nestaccesscontrol/NestAttributesInDexRewriteInvokeVirtualTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/nestaccesscontrol/NestAttributesInDexRewriteInvokeVirtualTest.java
@@ -72,7 +72,7 @@
assertFalse(parameters.getApiLevel().getLevel() > 33);
testForD8()
.addProgramClassFileData(dumpHost(), dumpMember1(), dumpMember2())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addOptionsModification(options -> options.emitNestAnnotationsInDex = true)
.compile()
.inspect(
@@ -108,7 +108,7 @@
testForD8()
.addProgramClassFileData(dumpHost())
.addClasspathClassFileData(dumpMember1(), dumpMember2())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addOptionsModification(options -> options.emitNestAnnotationsInDex = true)
.compile()
.inspect(
@@ -128,7 +128,7 @@
testForD8()
.addProgramClassFileData(dumpMember1())
.addClasspathClassFileData(dumpHost(), dumpMember2())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addOptionsModification(options -> options.emitNestAnnotationsInDex = true)
.compile()
.inspect(
@@ -144,7 +144,7 @@
testForD8()
.addProgramClassFileData(dumpMember2())
.addClasspathClassFileData(dumpHost(), dumpMember1())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addOptionsModification(options -> options.emitNestAnnotationsInDex = true)
.compile()
.inspect(
@@ -159,7 +159,7 @@
testForD8()
.addProgramFiles(host, member1, member2)
.addClasspathClassFileData(dumpMember2())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addOptionsModification(options -> options.emitNestAnnotationsInDex = true)
.compile()
.inspect(
@@ -196,7 +196,7 @@
() ->
testForD8()
.addProgramClassFileData(dumpHost())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addOptionsModification(options -> options.emitNestAnnotationsInDex = true)
.compileWithExpectedDiagnostics(
diagnostics -> {
@@ -217,7 +217,7 @@
() ->
testForD8()
.addProgramClassFileData(dumpMember1(), dumpMember2())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addOptionsModification(options -> options.emitNestAnnotationsInDex = true)
.compileWithExpectedDiagnostics(
diagnostics -> {
diff --git a/src/test/java/com/android/tools/r8/desugar/nestaccesscontrol/NestAttributesInDexShrinkingFieldsTest.java b/src/test/java/com/android/tools/r8/desugar/nestaccesscontrol/NestAttributesInDexShrinkingFieldsTest.java
index a3cbac7..d39faf3 100644
--- a/src/test/java/com/android/tools/r8/desugar/nestaccesscontrol/NestAttributesInDexShrinkingFieldsTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/nestaccesscontrol/NestAttributesInDexShrinkingFieldsTest.java
@@ -87,7 +87,7 @@
.addProgramClassFileData(
dumpHost(ACC_PRIVATE), dumpMember1(ACC_PRIVATE), dumpMember2(ACC_PRIVATE))
.addKeepMainRule("Host")
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addOptionsModification(options -> options.emitNestAnnotationsInDex = true)
.compile()
.inspect(inspector -> assertEquals(1, inspector.allClasses().size()))
@@ -104,7 +104,7 @@
testForR8(parameters.getBackend())
.addProgramClassFileData(
dumpHost(ACC_PRIVATE), dumpMember1(ACC_PRIVATE), dumpMember2(ACC_PRIVATE))
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addOptionsModification(options -> options.emitNestAnnotationsInDex = true)
.addKeepMainRule("Host")
.addKeepClassAndMembersRules("Host", "Host$Member1", "Host$Member2")
@@ -126,7 +126,7 @@
testForR8(parameters.getBackend())
.addProgramClassFileData(
dumpHost(ACC_PUBLIC), dumpMember1(ACC_PUBLIC), dumpMember2(ACC_PUBLIC))
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addOptionsModification(options -> options.emitNestAnnotationsInDex = true)
.addKeepMainRule("Host")
.addKeepClassAndMembersRules("Host", "Host$Member1", "Host$Member2")
diff --git a/src/test/java/com/android/tools/r8/desugar/nestaccesscontrol/NestAttributesInDexShrinkingMethodsTest.java b/src/test/java/com/android/tools/r8/desugar/nestaccesscontrol/NestAttributesInDexShrinkingMethodsTest.java
index 6f68a7a..de46609 100644
--- a/src/test/java/com/android/tools/r8/desugar/nestaccesscontrol/NestAttributesInDexShrinkingMethodsTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/nestaccesscontrol/NestAttributesInDexShrinkingMethodsTest.java
@@ -86,7 +86,7 @@
.addProgramClassFileData(
dumpHost(ACC_PRIVATE), dumpMember1(ACC_PRIVATE), dumpMember2(ACC_PRIVATE))
.addKeepMainRule("Host")
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addOptionsModification(options -> options.emitNestAnnotationsInDex = true)
.compile()
.inspect(inspector -> assertEquals(1, inspector.allClasses().size()))
@@ -103,7 +103,7 @@
testForR8(parameters.getBackend())
.addProgramClassFileData(
dumpHost(ACC_PRIVATE), dumpMember1(ACC_PRIVATE), dumpMember2(ACC_PRIVATE))
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addOptionsModification(options -> options.emitNestAnnotationsInDex = true)
.addKeepMainRule("Host")
.addKeepClassAndMembersRules("Host", "Host$Member1", "Host$Member2")
@@ -125,7 +125,7 @@
testForR8(parameters.getBackend())
.addProgramClassFileData(
dumpHost(ACC_PUBLIC), dumpMember1(ACC_PUBLIC), dumpMember2(ACC_PUBLIC))
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addOptionsModification(options -> options.emitNestAnnotationsInDex = true)
.addKeepMainRule("Host")
.addKeepClassAndMembersRules("Host", "Host$Member1", "Host$Member2")
diff --git a/src/test/java/com/android/tools/r8/desugar/nestaccesscontrol/NestAttributesInDexTest.java b/src/test/java/com/android/tools/r8/desugar/nestaccesscontrol/NestAttributesInDexTest.java
index 775c7ae..2267ab4 100644
--- a/src/test/java/com/android/tools/r8/desugar/nestaccesscontrol/NestAttributesInDexTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/nestaccesscontrol/NestAttributesInDexTest.java
@@ -112,7 +112,7 @@
testForD8(parameters.getBackend())
.addProgramClassFileData(getTransformedClasses())
.addProgramClasses(OtherHost.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addOptionsModification(options -> options.emitNestAnnotationsInDex = true)
.compile()
.inspect(inspector -> inspect(inspector, true))
@@ -127,7 +127,7 @@
.addProgramClassFileData(getTransformedClasses())
.addProgramClasses(OtherHost.class)
.disableDesugaring()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addOptionsModification(options -> assertFalse(options.emitNestAnnotationsInDex))
.compile()
.inspect(inspector -> inspect(inspector, false))
@@ -142,7 +142,7 @@
testForR8(parameters.getBackend())
.addProgramClassFileData(getTransformedClasses())
.addProgramClasses(OtherHost.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addOptionsModification(options -> options.emitNestAnnotationsInDex = true)
.addKeepMainRule(TestClass.class)
.compile()
@@ -161,7 +161,7 @@
testForR8(parameters.getBackend())
.addProgramClassFileData(getTransformedClasses())
.addProgramClasses(OtherHost.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addOptionsModification(options -> options.emitNestAnnotationsInDex = true)
.addKeepMainRule(TestClass.class)
.addKeepClassRules(Host.class)
@@ -182,7 +182,7 @@
testForR8(parameters.getBackend())
.addProgramClassFileData(getTransformedClasses())
.addProgramClasses(OtherHost.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addOptionsModification(options -> options.emitNestAnnotationsInDex = true)
.addKeepMainRule(TestClass.class)
.addKeepClassRules(Member1.class, Member2.class)
@@ -203,7 +203,7 @@
testForR8(parameters.getBackend())
.addProgramClassFileData(getTransformedClasses())
.addProgramClasses(OtherHost.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addOptionsModification(options -> options.emitNestAnnotationsInDex = true)
.addKeepMainRule(TestClass.class)
.addKeepClassRules(Host.class, Member1.class, Member2.class)
diff --git a/src/test/java/com/android/tools/r8/desugar/nestaccesscontrol/NestCompilationExceptionTest.java b/src/test/java/com/android/tools/r8/desugar/nestaccesscontrol/NestCompilationExceptionTest.java
index c7c4b21..dcd8bb1 100644
--- a/src/test/java/com/android/tools/r8/desugar/nestaccesscontrol/NestCompilationExceptionTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/nestaccesscontrol/NestCompilationExceptionTest.java
@@ -65,12 +65,14 @@
@Test
public void testWarningR8() throws Exception {
+ parameters.assumeR8TestParameters();
testIncompleteNestWarning(false, parameters.isDexRuntime());
testMissingNestHostWarning(false, parameters.isDexRuntime());
}
@Test
public void testErrorR8() {
+ parameters.assumeR8TestParameters();
testMissingNestHostError(false);
testIncompleteNestError(false);
}
@@ -87,14 +89,14 @@
.collect(toList());
if (d8) {
return testForD8(parameters.getBackend())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addProgramFiles(matchingClasses);
} else {
return testForR8(parameters.getBackend())
.noTreeShaking()
.addDontObfuscate()
.addKeepAllAttributes()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addProgramFiles(matchingClasses)
.applyIf(parameters.isCfRuntime(), Jdk9TestUtils.addJdk9LibraryFiles(temp))
.addIgnoreWarnings(ignoreMissingClasses)
diff --git a/src/test/java/com/android/tools/r8/desugar/nestaccesscontrol/NestConstructorRemovedArgTest.java b/src/test/java/com/android/tools/r8/desugar/nestaccesscontrol/NestConstructorRemovedArgTest.java
index adfc202..5b59d1d 100644
--- a/src/test/java/com/android/tools/r8/desugar/nestaccesscontrol/NestConstructorRemovedArgTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/nestaccesscontrol/NestConstructorRemovedArgTest.java
@@ -41,11 +41,12 @@
@Test
public void testRemoveArgConstructorNestsR8() throws Exception {
+ parameters.assumeR8TestParameters();
String nestID = "constructors";
testForR8(parameters.getBackend())
.addKeepMainRule(getMainClass(nestID))
.addDontObfuscate()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addOptionsModification(options -> options.enableClassInlining = false)
.addProgramFiles(classesOfNest(nestID))
.applyIf(parameters.isCfRuntime(), Jdk9TestUtils.addJdk9LibraryFiles(temp))
@@ -56,12 +57,13 @@
@Test
public void testRemoveArgConstructorNestsR8NoTreeShaking() throws Exception {
+ parameters.assumeR8TestParameters();
String nestID = "constructors";
testForR8(parameters.getBackend())
.noTreeShaking()
.addKeepMainRule(getMainClass(nestID))
.addDontObfuscate()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addOptionsModification(options -> options.enableClassInlining = false)
.addProgramFiles(classesOfNest(nestID))
.applyIf(parameters.isCfRuntime(), Jdk9TestUtils.addJdk9LibraryFiles(temp))
diff --git a/src/test/java/com/android/tools/r8/desugar/nestaccesscontrol/NestLambdaJava17Test.java b/src/test/java/com/android/tools/r8/desugar/nestaccesscontrol/NestLambdaJava17Test.java
index e9de7f8..9f883b8 100644
--- a/src/test/java/com/android/tools/r8/desugar/nestaccesscontrol/NestLambdaJava17Test.java
+++ b/src/test/java/com/android/tools/r8/desugar/nestaccesscontrol/NestLambdaJava17Test.java
@@ -57,7 +57,7 @@
public void testJavaD8() throws Exception {
testForD8(parameters.getBackend())
.addProgramFiles(JDK17_JAR)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), MAIN)
.assertSuccessWithOutput(EXPECTED_RESULT);
}
@@ -71,7 +71,7 @@
parameters.isCfRuntime(),
// Alternatively we need to pass Jdk17 as library.
b -> b.addKeepRules("-dontwarn java.lang.invoke.StringConcatFactory"))
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(MAIN)
.run(parameters.getRuntime(), MAIN)
.assertSuccessWithOutput(EXPECTED_RESULT);
diff --git a/src/test/java/com/android/tools/r8/desugar/nestaccesscontrol/NestOnProgramAndClassPathTest.java b/src/test/java/com/android/tools/r8/desugar/nestaccesscontrol/NestOnProgramAndClassPathTest.java
index 4029469..91ea754 100644
--- a/src/test/java/com/android/tools/r8/desugar/nestaccesscontrol/NestOnProgramAndClassPathTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/nestaccesscontrol/NestOnProgramAndClassPathTest.java
@@ -98,7 +98,7 @@
endsWith("BasicNestHostWithInnerClassConstructors"));
testForD8()
.addProgramFiles(inner.writeToZip(), host.writeToZip())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), getMainClass("constructors"))
.assertSuccessWithOutput(getExpectedResult("constructors"));
@@ -112,7 +112,7 @@
.map(name -> CLASSES_PATH.resolve(name + CLASS_EXTENSION))
.collect(toList());
return testForD8()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addProgramFiles(matchingClasses)
.addClasspathFiles(JAR)
.compile();
diff --git a/src/test/java/com/android/tools/r8/desugar/nestaccesscontrol/NestPrivateInterfaceMethodsTest.java b/src/test/java/com/android/tools/r8/desugar/nestaccesscontrol/NestPrivateInterfaceMethodsTest.java
index 52bc03e..1dad0bd 100644
--- a/src/test/java/com/android/tools/r8/desugar/nestaccesscontrol/NestPrivateInterfaceMethodsTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/nestaccesscontrol/NestPrivateInterfaceMethodsTest.java
@@ -65,26 +65,26 @@
testForD8(parameters.getBackend())
.addProgramClassFileData(bytesI)
.addClasspathClassFileData(bytesJ)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.writeToZip();
Path outJ =
testForD8(parameters.getBackend())
.addProgramClassFileData(bytesJ)
.addClasspathClassFileData(bytesI)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.writeToZip();
Path outTestClass =
testForD8(parameters.getBackend())
.addProgramClasses(TestClass.class)
.addClasspathClassFileData(bytesI, bytesJ)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.writeToZip();
testForD8(parameters.getBackend())
.addProgramFiles(outI, outJ, outTestClass)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutput(EXPECTED);
}
diff --git a/src/test/java/com/android/tools/r8/desugar/r8bootstrap/JavaR8CompilationTest.java b/src/test/java/com/android/tools/r8/desugar/r8bootstrap/JavaR8CompilationTest.java
index b28ef17..39782bd 100644
--- a/src/test/java/com/android/tools/r8/desugar/r8bootstrap/JavaR8CompilationTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/r8bootstrap/JavaR8CompilationTest.java
@@ -54,7 +54,7 @@
public void testR8CompiledWithR8() throws Exception {
Assume.assumeTrue(JavaBootstrapUtils.exists(r8WithRelocatedDeps));
testForR8(parameters.getBackend())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addProgramFiles(r8WithRelocatedDeps)
.addKeepRuleFiles(MAIN_KEEP)
.compile()
diff --git a/src/test/java/com/android/tools/r8/desugar/records/EmptyRecordAnnotationTest.java b/src/test/java/com/android/tools/r8/desugar/records/EmptyRecordAnnotationTest.java
index b56ffdb..56e1862 100644
--- a/src/test/java/com/android/tools/r8/desugar/records/EmptyRecordAnnotationTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/records/EmptyRecordAnnotationTest.java
@@ -58,7 +58,7 @@
}
testForD8(parameters.getBackend())
.addProgramClassFileData(PROGRAM_DATA)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), MAIN_TYPE)
.assertSuccessWithOutput(EXPECTED_RESULT_DEX);
@@ -70,7 +70,7 @@
R8FullTestBuilder builder =
testForR8(parameters.getBackend())
.addProgramClassFileData(PROGRAM_DATA)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepRules("-keep class records.EmptyRecordAnnotation { *; }")
.addKeepRules("-keepattributes *Annotation*")
.addKeepRules("-keep class records.EmptyRecordAnnotation$Empty")
diff --git a/src/test/java/com/android/tools/r8/desugar/records/EmptyRecordTest.java b/src/test/java/com/android/tools/r8/desugar/records/EmptyRecordTest.java
index 7c56c29..aee7d34 100644
--- a/src/test/java/com/android/tools/r8/desugar/records/EmptyRecordTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/records/EmptyRecordTest.java
@@ -57,7 +57,7 @@
}
testForD8(parameters.getBackend())
.addProgramClassFileData(PROGRAM_DATA)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), MAIN_TYPE)
.assertSuccessWithOutput(EXPECTED_RESULT_D8);
@@ -73,7 +73,7 @@
parameters.isCfRuntime(),
testBuilder -> testBuilder.addLibraryFiles(RecordTestUtils.getJdk15LibraryFiles(temp)))
.minification(enableMinification)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.applyIf(
parameters.isCfRuntime(),
diff --git a/src/test/java/com/android/tools/r8/desugar/records/RecordClasspathTest.java b/src/test/java/com/android/tools/r8/desugar/records/RecordClasspathTest.java
index 5376f89..2d434ff 100644
--- a/src/test/java/com/android/tools/r8/desugar/records/RecordClasspathTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/records/RecordClasspathTest.java
@@ -78,7 +78,7 @@
testForD8(parameters.getBackend())
.addProgramClasses(TestClass.class)
.addClasspathClassFileData(getClasspathData())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::assertNoRecord)
.run(parameters.getRuntime(), TestClass.class)
@@ -92,7 +92,7 @@
testForD8(parameters.getBackend())
.addProgramClasses(TestClass.class)
.addClasspathClassFileData(getClasspathData())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.setIntermediate(true)
.setOutputMode(OutputMode.DexFilePerClassFile)
.apply(b -> b.getBuilder().setGlobalSyntheticsConsumer(globals))
@@ -110,7 +110,7 @@
testForR8(parameters.getBackend())
.addProgramClasses(TestClass.class)
.addClasspathClassFileData(getClasspathData())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(TestClass.class);
if (parameters.isCfRuntime()) {
builder
diff --git a/src/test/java/com/android/tools/r8/desugar/records/RecordInstanceOfTest.java b/src/test/java/com/android/tools/r8/desugar/records/RecordInstanceOfTest.java
index d92f1dc..860d42a 100644
--- a/src/test/java/com/android/tools/r8/desugar/records/RecordInstanceOfTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/records/RecordInstanceOfTest.java
@@ -48,7 +48,7 @@
}
testForD8(parameters.getBackend())
.addProgramClassFileData(PROGRAM_DATA)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), MAIN_TYPE)
.assertSuccessWithOutput(EXPECTED_RESULT);
@@ -60,7 +60,7 @@
R8FullTestBuilder builder =
testForR8(parameters.getBackend())
.addProgramClassFileData(PROGRAM_DATA)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(MAIN_TYPE);
if (parameters.isCfRuntime()) {
builder
diff --git a/src/test/java/com/android/tools/r8/desugar/records/RecordInvokeCustomSplitDesugaringTest.java b/src/test/java/com/android/tools/r8/desugar/records/RecordInvokeCustomSplitDesugaringTest.java
index 30691a8..528c5fc 100644
--- a/src/test/java/com/android/tools/r8/desugar/records/RecordInvokeCustomSplitDesugaringTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/records/RecordInvokeCustomSplitDesugaringTest.java
@@ -54,12 +54,12 @@
Path desugared =
testForD8(Backend.CF)
.addProgramClassFileData(PROGRAM_DATA)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.writeToZip();
testForD8(parameters.getBackend())
.addProgramFiles(desugared)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), MAIN_TYPE)
.assertSuccessWithOutput(EXPECTED_RESULT_D8);
@@ -71,12 +71,12 @@
Path desugared =
testForD8(Backend.CF)
.addProgramClassFileData(PROGRAM_DATA)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.writeToZip();
testForR8(parameters.getBackend())
.addProgramFiles(desugared)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(MAIN_TYPE)
.compile()
.run(parameters.getRuntime(), MAIN_TYPE)
diff --git a/src/test/java/com/android/tools/r8/desugar/records/RecordInvokeCustomTest.java b/src/test/java/com/android/tools/r8/desugar/records/RecordInvokeCustomTest.java
index cda5724..175ac55 100644
--- a/src/test/java/com/android/tools/r8/desugar/records/RecordInvokeCustomTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/records/RecordInvokeCustomTest.java
@@ -65,7 +65,7 @@
}
testForD8(parameters.getBackend())
.addProgramClassFileData(PROGRAM_DATA)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), MAIN_TYPE)
.assertSuccessWithOutput(EXPECTED_RESULT_D8);
@@ -77,7 +77,7 @@
R8FullTestBuilder builder =
testForR8(parameters.getBackend())
.addProgramClassFileData(PROGRAM_DATA)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(MAIN_TYPE);
if (parameters.isCfRuntime()) {
builder
diff --git a/src/test/java/com/android/tools/r8/desugar/records/RecordKeepRulesTest.java b/src/test/java/com/android/tools/r8/desugar/records/RecordKeepRulesTest.java
index f34bd67..68c85df 100644
--- a/src/test/java/com/android/tools/r8/desugar/records/RecordKeepRulesTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/records/RecordKeepRulesTest.java
@@ -83,7 +83,7 @@
private void testR8FieldNames(String keepRules, String expectedOutput) throws Exception {
testForR8Compat(parameters.getBackend(), proguardCompatibility)
.addProgramClassFileData(PROGRAM_DATA)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(MAIN_TYPE)
.addKeepRules(keepRules)
.run(parameters.getRuntime(), MAIN_TYPE)
@@ -94,7 +94,6 @@
Path desugared =
testForR8Compat(Backend.CF, proguardCompatibility)
.addProgramClassFileData(PROGRAM_DATA)
- .setMinApi(parameters.getApiLevel())
.addKeepMainRule(MAIN_TYPE)
.addKeepRules(keepRules)
.addLibraryFiles(RecordTestUtils.getJdk15LibraryFiles(temp))
@@ -102,7 +101,7 @@
.writeToZip();
testForD8(parameters.getBackend())
.addProgramFiles(desugared)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), MAIN_TYPE)
.assertSuccessWithOutput(expectedOutput);
}
diff --git a/src/test/java/com/android/tools/r8/desugar/records/RecordLibMergeTest.java b/src/test/java/com/android/tools/r8/desugar/records/RecordLibMergeTest.java
index 0671e9e..34b5f2a 100644
--- a/src/test/java/com/android/tools/r8/desugar/records/RecordLibMergeTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/records/RecordLibMergeTest.java
@@ -47,7 +47,6 @@
Path lib =
testForR8(Backend.CF)
.addProgramClassFileData(PROGRAM_DATA_LIB)
- .setMinApi(parameters.getApiLevel())
.addKeepRules(
"-keep class records.RecordLib { public static java.lang.Object getRecord(); }")
.addKeepRules("-keep class records.RecordLib$LibRecord")
@@ -58,7 +57,7 @@
testForR8(parameters.getBackend())
.addProgramFiles(lib)
.addProgramClassFileData(PROGRAM_DATA_MAIN)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(MAIN_TYPE)
.addKeepRules("-keep class records.RecordLib$LibRecord")
.addKeepRules("-keep class records.RecordMain$MainRecord");
diff --git a/src/test/java/com/android/tools/r8/desugar/records/RecordMergeTest.java b/src/test/java/com/android/tools/r8/desugar/records/RecordMergeTest.java
index 0866830..cf819a3 100644
--- a/src/test/java/com/android/tools/r8/desugar/records/RecordMergeTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/records/RecordMergeTest.java
@@ -62,7 +62,7 @@
() ->
testForD8(parameters.getBackend())
.addProgramClassFileData(PROGRAM_DATA_1)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.setIntermediate(true)
.compileWithExpectedDiagnostics(
diagnostics ->
@@ -88,7 +88,7 @@
Path output1 =
testForD8(parameters.getBackend())
.addProgramClassFileData(PROGRAM_DATA_1)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.setIntermediate(true)
.applyIf(
filePerClass && !parameters.isCfRuntime(),
@@ -102,7 +102,7 @@
Path output2 =
testForD8(parameters.getBackend())
.addProgramClassFileData(PROGRAM_DATA_2)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.setIntermediate(true)
.applyIf(
filePerClass && !parameters.isCfRuntime(),
@@ -123,7 +123,7 @@
b.getBuilder()
.addGlobalSyntheticsResourceProviders(globals1.getProviders())
.addGlobalSyntheticsResourceProviders(globals2.getProviders()))
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::assertHasRecordTag);
@@ -137,7 +137,7 @@
Path output1 =
testForD8(parameters.getBackend())
.addProgramClassFileData(PROGRAM_DATA_1)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.setIntermediate(true)
.apply(b -> b.getBuilder().setGlobalSyntheticsConsumer(globals1))
.compile()
@@ -149,7 +149,7 @@
.apply(
b -> b.getBuilder().addGlobalSyntheticsResourceProviders(globals1.getProviders()))
.addProgramClassFileData(PROGRAM_DATA_2)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile();
result.run(parameters.getRuntime(), MAIN_TYPE_1).assertSuccessWithOutput(EXPECTED_RESULT_1);
result.run(parameters.getRuntime(), MAIN_TYPE_2).assertSuccessWithOutput(EXPECTED_RESULT_2);
@@ -160,7 +160,7 @@
Path output1 =
testForD8(parameters.getBackend())
.addProgramClassFileData(PROGRAM_DATA_1)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::assertHasRecordTag)
.writeToZip();
@@ -168,7 +168,7 @@
Path output2 =
testForD8(parameters.getBackend())
.addProgramClassFileData(PROGRAM_DATA_2)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::assertHasRecordTag)
.writeToZip();
@@ -178,7 +178,7 @@
() ->
testForD8(parameters.getBackend())
.addProgramFiles(output1, output2)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compileWithExpectedDiagnostics(
diagnostics ->
diagnostics
diff --git a/src/test/java/com/android/tools/r8/desugar/records/RecordReflectionTest.java b/src/test/java/com/android/tools/r8/desugar/records/RecordReflectionTest.java
index 1bdc08d..0e958c7 100644
--- a/src/test/java/com/android/tools/r8/desugar/records/RecordReflectionTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/records/RecordReflectionTest.java
@@ -55,7 +55,7 @@
public void testR8Cf() throws Exception {
testForR8(parameters.getBackend())
.addProgramClassFileData(PROGRAM_DATA)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(MAIN_TYPE)
.addKeepRules("-keepattributes *")
.addKeepRules("-keep class * extends java.lang.Record { private final <fields>; }")
diff --git a/src/test/java/com/android/tools/r8/desugar/records/RecordShrinkFieldTest.java b/src/test/java/com/android/tools/r8/desugar/records/RecordShrinkFieldTest.java
index e9981a2..0137c4f 100644
--- a/src/test/java/com/android/tools/r8/desugar/records/RecordShrinkFieldTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/records/RecordShrinkFieldTest.java
@@ -54,7 +54,7 @@
Assume.assumeTrue("Only valid in R8", minifying);
testForD8(parameters.getBackend())
.addProgramClassFileData(PROGRAM_DATA)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), MAIN_TYPE)
.assertSuccessWithOutput(EXPECTED_RESULT_D8);
@@ -65,7 +65,7 @@
parameters.assumeR8TestParameters();
testForR8(parameters.getBackend())
.addProgramClassFileData(PROGRAM_DATA)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(MAIN_TYPE)
.minification(minifying)
.compile()
@@ -81,7 +81,6 @@
Path desugared =
testForR8(Backend.CF)
.addProgramClassFileData(PROGRAM_DATA)
- .setMinApi(parameters.getApiLevel())
.addKeepMainRule(MAIN_TYPE)
.minification(minifying)
.addLibraryFiles(RecordTestUtils.getJdk15LibraryFiles(temp))
@@ -89,7 +88,7 @@
.writeToZip();
testForR8(parameters.getBackend())
.addProgramFiles(desugared)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(MAIN_TYPE)
.minification(minifying)
.compile()
diff --git a/src/test/java/com/android/tools/r8/desugar/records/RecordWithMembersTest.java b/src/test/java/com/android/tools/r8/desugar/records/RecordWithMembersTest.java
index cd9d4c3..ee83835 100644
--- a/src/test/java/com/android/tools/r8/desugar/records/RecordWithMembersTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/records/RecordWithMembersTest.java
@@ -50,7 +50,7 @@
}
testForD8(parameters.getBackend())
.addProgramClassFileData(PROGRAM_DATA)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), MAIN_TYPE)
.assertSuccessWithOutput(EXPECTED_RESULT);
@@ -62,7 +62,7 @@
R8FullTestBuilder builder =
testForR8(parameters.getBackend())
.addProgramClassFileData(PROGRAM_DATA)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(MAIN_TYPE);
if (parameters.isCfRuntime()) {
builder
diff --git a/src/test/java/com/android/tools/r8/desugar/records/RecordWithNonMaterializableConstClassTest.java b/src/test/java/com/android/tools/r8/desugar/records/RecordWithNonMaterializableConstClassTest.java
index 6a28af7..b83d865 100644
--- a/src/test/java/com/android/tools/r8/desugar/records/RecordWithNonMaterializableConstClassTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/records/RecordWithNonMaterializableConstClassTest.java
@@ -46,18 +46,21 @@
}
@Test
+ public void testJvm() throws Exception {
+ parameters.assumeJvmTestParameters();
+ testForJvm(parameters)
+ .addProgramClassFileData(PROGRAM_DATA)
+ .addProgramClassFileData(EXTRA_DATA)
+ .run(parameters.getRuntime(), MAIN_TYPE)
+ .assertSuccessWithOutput(EXPECTED_RESULT_D8);
+ }
+
+ @Test
public void testD8AndJvm() throws Exception {
- if (parameters.isCfRuntime()) {
- testForJvm()
- .addProgramClassFileData(PROGRAM_DATA)
- .addProgramClassFileData(EXTRA_DATA)
- .run(parameters.getRuntime(), MAIN_TYPE)
- .assertSuccessWithOutput(EXPECTED_RESULT_D8);
- }
testForD8(parameters.getBackend())
.addProgramClassFileData(PROGRAM_DATA)
.addProgramClassFileData(EXTRA_DATA)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), MAIN_TYPE)
.assertSuccessWithOutput(EXPECTED_RESULT_D8);
@@ -70,6 +73,7 @@
.addProgramClassFileData(PROGRAM_DATA)
.addProgramClassFileData(EXTRA_DATA)
.apply(this::configureR8)
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), MAIN_TYPE)
.assertSuccessWithOutput(EXPECTED_RESULT_R8);
@@ -89,6 +93,7 @@
testForR8(parameters.getBackend())
.addProgramFiles(desugared)
.apply(this::configureR8)
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), MAIN_TYPE)
.assertSuccessWithOutput(EXPECTED_RESULT_R8);
@@ -98,7 +103,6 @@
testBuilder
.addKeepMainRule(MAIN_TYPE)
.addKeepRules("-keep class " + PRIVATE_CLASS_NAME)
- .setMinApi(parameters.getApiLevel())
.applyIf(
parameters.isCfRuntime(),
b -> b.addLibraryFiles(RecordTestUtils.getJdk15LibraryFiles(temp)));
diff --git a/src/test/java/com/android/tools/r8/desugar/records/SimpleRecordTest.java b/src/test/java/com/android/tools/r8/desugar/records/SimpleRecordTest.java
index 7b4c893..1b217b7 100644
--- a/src/test/java/com/android/tools/r8/desugar/records/SimpleRecordTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/records/SimpleRecordTest.java
@@ -58,7 +58,7 @@
public void testD8() throws Exception {
testForD8(parameters.getBackend())
.addProgramClassFileData(PROGRAM_DATA)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspectWithOptions(
RecordTestUtils::assertNoJavaLangRecord,
@@ -78,7 +78,7 @@
b ->
b.getBuilder()
.addGlobalSyntheticsResourceProviders(globals.getIndexedModeProvider()))
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.setIncludeClassesChecksum(true)
.run(parameters.getRuntime(), MAIN_TYPE)
.assertSuccessWithOutput(EXPECTED_RESULT);
@@ -96,7 +96,7 @@
b ->
b.getBuilder()
.addGlobalSyntheticsResourceProviders(globals.getIndexedModeProvider()))
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.setIncludeClassesChecksum(true)
.disableDesugaring()
.run(parameters.getRuntime(), MAIN_TYPE)
@@ -107,7 +107,7 @@
throws Exception {
return testForD8(Backend.DEX)
.addProgramClassFileData(PROGRAM_DATA)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.setIntermediate(true)
.setIncludeClassesChecksum(true)
.apply(b -> b.getBuilder().setGlobalSyntheticsConsumer(globalSyntheticsConsumer))
@@ -122,7 +122,7 @@
R8FullTestBuilder builder =
testForR8(parameters.getBackend())
.addProgramClassFileData(PROGRAM_DATA)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(MAIN_TYPE);
if (parameters.isCfRuntime()) {
builder
@@ -150,7 +150,7 @@
testForR8(parameters.getBackend())
.addProgramClassFileData(PROGRAM_DATA)
.addDontObfuscate()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(MAIN_TYPE);
if (parameters.isCfRuntime()) {
builder
diff --git a/src/test/java/com/android/tools/r8/desugar/records/UnusedRecordFieldTest.java b/src/test/java/com/android/tools/r8/desugar/records/UnusedRecordFieldTest.java
index 8b0f9aa..beee05f 100644
--- a/src/test/java/com/android/tools/r8/desugar/records/UnusedRecordFieldTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/records/UnusedRecordFieldTest.java
@@ -48,7 +48,7 @@
}
testForD8(parameters.getBackend())
.addProgramClassFileData(PROGRAM_DATA)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), MAIN_TYPE)
.assertSuccessWithOutput(EXPECTED_RESULT);
@@ -60,7 +60,7 @@
R8FullTestBuilder builder =
testForR8(parameters.getBackend())
.addProgramClassFileData(PROGRAM_DATA)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepRules("-keep class records.UnusedRecordField { *; }")
.addKeepMainRule(MAIN_TYPE);
if (parameters.isCfRuntime()) {
diff --git a/src/test/java/com/android/tools/r8/desugar/records/UnusedRecordMethodTest.java b/src/test/java/com/android/tools/r8/desugar/records/UnusedRecordMethodTest.java
index 607b9aa..89d4717 100644
--- a/src/test/java/com/android/tools/r8/desugar/records/UnusedRecordMethodTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/records/UnusedRecordMethodTest.java
@@ -48,7 +48,7 @@
}
testForD8(parameters.getBackend())
.addProgramClassFileData(PROGRAM_DATA)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), MAIN_TYPE)
.assertSuccessWithOutput(EXPECTED_RESULT);
@@ -60,7 +60,7 @@
R8FullTestBuilder builder =
testForR8(parameters.getBackend())
.addProgramClassFileData(PROGRAM_DATA)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepRules("-keep class records.UnusedRecordMethod { *; }")
.addKeepMainRule(MAIN_TYPE);
if (parameters.isCfRuntime()) {
diff --git a/src/test/java/com/android/tools/r8/desugar/records/UnusedRecordReflectionTest.java b/src/test/java/com/android/tools/r8/desugar/records/UnusedRecordReflectionTest.java
index 498cf71..71973f5 100644
--- a/src/test/java/com/android/tools/r8/desugar/records/UnusedRecordReflectionTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/records/UnusedRecordReflectionTest.java
@@ -48,7 +48,7 @@
}
testForD8(parameters.getBackend())
.addProgramClassFileData(PROGRAM_DATA)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), MAIN_TYPE)
.assertSuccessWithOutput(EXPECTED_RESULT);
@@ -60,7 +60,7 @@
R8FullTestBuilder builder =
testForR8(parameters.getBackend())
.addProgramClassFileData(PROGRAM_DATA)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepRules("-keep class records.UnusedRecordReflection { *; }")
.addKeepMainRule(MAIN_TYPE);
if (parameters.isCfRuntime()) {
diff --git a/src/test/java/com/android/tools/r8/desugar/sealed/PermittedSubclassesAttributeInDexTest.java b/src/test/java/com/android/tools/r8/desugar/sealed/PermittedSubclassesAttributeInDexTest.java
index 78fc404..458c593 100644
--- a/src/test/java/com/android/tools/r8/desugar/sealed/PermittedSubclassesAttributeInDexTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/sealed/PermittedSubclassesAttributeInDexTest.java
@@ -68,7 +68,7 @@
testForD8(parameters.getBackend())
.addProgramClassFileData(getTransformedClasses())
.addProgramClasses(Sub1.class, Sub2.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addOptionsModification(options -> options.emitPermittedSubclassesAnnotationsInDex = true)
.compile()
.inspect(this::inspect)
diff --git a/src/test/java/com/android/tools/r8/desugar/sealed/SealedAttributeClasspathTest.java b/src/test/java/com/android/tools/r8/desugar/sealed/SealedAttributeClasspathTest.java
index facd808..54e3117 100644
--- a/src/test/java/com/android/tools/r8/desugar/sealed/SealedAttributeClasspathTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/sealed/SealedAttributeClasspathTest.java
@@ -33,7 +33,7 @@
builder
.addClasspathFiles(Sealed.jar())
.addInnerClasses(getClass())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), TestRunner.class)
.assertSuccessWithOutputLines("Hello, world!");
}
diff --git a/src/test/java/com/android/tools/r8/desugar/sealed/SealedAttributeLibraryTest.java b/src/test/java/com/android/tools/r8/desugar/sealed/SealedAttributeLibraryTest.java
index 57684f3..bf78e04 100644
--- a/src/test/java/com/android/tools/r8/desugar/sealed/SealedAttributeLibraryTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/sealed/SealedAttributeLibraryTest.java
@@ -34,7 +34,7 @@
.addDefaultRuntimeLibrary(parameters)
.addLibraryFiles(Sealed.jar())
.addInnerClasses(getClass())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), TestRunner.class)
.assertSuccessWithOutputLines("Hello, world!");
}
diff --git a/src/test/java/com/android/tools/r8/desugar/sealed/SealedAttributeTest.java b/src/test/java/com/android/tools/r8/desugar/sealed/SealedAttributeTest.java
index 8748705..afce761 100644
--- a/src/test/java/com/android/tools/r8/desugar/sealed/SealedAttributeTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/sealed/SealedAttributeTest.java
@@ -65,7 +65,7 @@
R8FullTestBuilder builder =
testForR8(parameters.getBackend())
.addProgramFiles(Sealed.jar())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(Sealed.Main.typeName());
if (parameters.isCfRuntime()) {
assertThrows(
diff --git a/src/test/java/com/android/tools/r8/desugar/softverificationerrorremoval/GetDeclaredMethodsErrorRemovalTest.java b/src/test/java/com/android/tools/r8/desugar/softverificationerrorremoval/GetDeclaredMethodsErrorRemovalTest.java
index 2b72a6f..cd6ac90 100644
--- a/src/test/java/com/android/tools/r8/desugar/softverificationerrorremoval/GetDeclaredMethodsErrorRemovalTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/softverificationerrorremoval/GetDeclaredMethodsErrorRemovalTest.java
@@ -51,7 +51,7 @@
D8TestRunResult run =
testForD8()
.addInnerClasses(GetDeclaredMethodsErrorRemovalTest.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), TestClass.class);
if (parameters.getDexRuntimeVersion().isOlderThanOrEqual(ToolHelper.DexVm.Version.V6_0_1)) {
@@ -70,7 +70,7 @@
testForD8()
.addInnerClasses(GetDeclaredMethodsErrorRemovalTest.class)
.addProgramFiles(stubs)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutputLines(EXPECTED_RESULT);
diff --git a/src/test/java/com/android/tools/r8/desugar/softverificationerrorremoval/SoftVerificationErrorRemovalTest.java b/src/test/java/com/android/tools/r8/desugar/softverificationerrorremoval/SoftVerificationErrorRemovalTest.java
index 1a1720e..2fac1a6 100644
--- a/src/test/java/com/android/tools/r8/desugar/softverificationerrorremoval/SoftVerificationErrorRemovalTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/softverificationerrorremoval/SoftVerificationErrorRemovalTest.java
@@ -38,7 +38,7 @@
D8TestRunResult run =
testForD8()
.addInnerClasses(SoftVerificationErrorRemovalTest.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), TestClass.class);
assertVerificationErrorsPresent(
@@ -68,7 +68,7 @@
testForD8()
.addInnerClasses(SoftVerificationErrorRemovalTest.class)
.addProgramFiles(stubs)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), TestClass.class);
assertVerificationErrorsPresent(run.getStdErr(), false);
diff --git a/src/test/java/com/android/tools/r8/desugar/staticinterfacemethod/InlineIntoReprocessedStaticInterfaceMethodTest.java b/src/test/java/com/android/tools/r8/desugar/staticinterfacemethod/InlineIntoReprocessedStaticInterfaceMethodTest.java
index fbc6474..f0b5644 100644
--- a/src/test/java/com/android/tools/r8/desugar/staticinterfacemethod/InlineIntoReprocessedStaticInterfaceMethodTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/staticinterfacemethod/InlineIntoReprocessedStaticInterfaceMethodTest.java
@@ -32,7 +32,7 @@
.addInnerClasses(getClass())
.addKeepMainRule(Main.class)
.enableInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("A");
diff --git a/src/test/java/com/android/tools/r8/desugar/staticinterfacemethod/InvokeStaticDesugarTest.java b/src/test/java/com/android/tools/r8/desugar/staticinterfacemethod/InvokeStaticDesugarTest.java
index 8cd35aa..2472ac4 100644
--- a/src/test/java/com/android/tools/r8/desugar/staticinterfacemethod/InvokeStaticDesugarTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/staticinterfacemethod/InvokeStaticDesugarTest.java
@@ -128,7 +128,7 @@
assert parameters.isDexRuntime();
return testForD8(parameters.getBackend())
.addProgramClasses(Library.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.disableDesugaring()
.addOptionsModification(
options -> {
diff --git a/src/test/java/com/android/tools/r8/desugar/staticinterfacemethod/InvokeStaticInterfaceNestedTest.java b/src/test/java/com/android/tools/r8/desugar/staticinterfacemethod/InvokeStaticInterfaceNestedTest.java
index 2eb135a..a15add8 100644
--- a/src/test/java/com/android/tools/r8/desugar/staticinterfacemethod/InvokeStaticInterfaceNestedTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/staticinterfacemethod/InvokeStaticInterfaceNestedTest.java
@@ -89,7 +89,7 @@
rewriteToUseNonInterfaceMethodReference(Main.class, "main"),
rewriteToUseNonInterfaceMethodReference(Library.class, "foo"))
.addKeepAllClassesRule()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(Main.class);
if (parameters.isDexRuntime()) {
checkDexResult(testBuilder.run(parameters.getRuntime(), Main.class), true);
diff --git a/src/test/java/com/android/tools/r8/desugar/staticinterfacemethod/MissingMethodTest.java b/src/test/java/com/android/tools/r8/desugar/staticinterfacemethod/MissingMethodTest.java
index d36953c..ebae5e7 100644
--- a/src/test/java/com/android/tools/r8/desugar/staticinterfacemethod/MissingMethodTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/staticinterfacemethod/MissingMethodTest.java
@@ -38,7 +38,7 @@
testForR8(parameters.getBackend())
.addProgramClassFileData(InterfaceDump.dump(), MainDump.dump())
.addKeepMainRule("Main")
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), "Main")
.assertFailureWithErrorThatThrows(NoSuchMethodError.class);
}
diff --git a/src/test/java/com/android/tools/r8/desugar/staticinterfacemethod/MutuallyRecursiveMethodsTest.java b/src/test/java/com/android/tools/r8/desugar/staticinterfacemethod/MutuallyRecursiveMethodsTest.java
index dfbbd6e..662eac3 100644
--- a/src/test/java/com/android/tools/r8/desugar/staticinterfacemethod/MutuallyRecursiveMethodsTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/staticinterfacemethod/MutuallyRecursiveMethodsTest.java
@@ -39,7 +39,7 @@
public void testR8() throws Exception {
testForR8(parameters.getBackend())
.addInnerClasses(MutuallyRecursiveMethodsTest.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(TestClass.class)
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutput(EXPECTED);
diff --git a/src/test/java/com/android/tools/r8/desugar/staticinterfacemethod/NoMissingClassWarningForNonInterfaceInvoke.java b/src/test/java/com/android/tools/r8/desugar/staticinterfacemethod/NoMissingClassWarningForNonInterfaceInvoke.java
index 08df42c..f1326ab 100644
--- a/src/test/java/com/android/tools/r8/desugar/staticinterfacemethod/NoMissingClassWarningForNonInterfaceInvoke.java
+++ b/src/test/java/com/android/tools/r8/desugar/staticinterfacemethod/NoMissingClassWarningForNonInterfaceInvoke.java
@@ -28,7 +28,7 @@
public void test() throws Exception {
testForD8(Backend.CF)
.addProgramClasses(TestClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.setIntermediate(true)
.compile()
.assertNoWarningMessages();
diff --git a/src/test/java/com/android/tools/r8/desugar/staticinterfacemethod/RegressionB244970402.java b/src/test/java/com/android/tools/r8/desugar/staticinterfacemethod/RegressionB244970402.java
index 58142a8..f86bb92 100644
--- a/src/test/java/com/android/tools/r8/desugar/staticinterfacemethod/RegressionB244970402.java
+++ b/src/test/java/com/android/tools/r8/desugar/staticinterfacemethod/RegressionB244970402.java
@@ -32,7 +32,7 @@
.addProgramClasses(I.class, TestClass.class)
.addKeepMainRule(TestClass.class)
.addMainDexRules("-keep class * { *; }")
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutputLines("null");
}
diff --git a/src/test/java/com/android/tools/r8/desugar/suppressedexceptions/SuppressedExceptionsTest.java b/src/test/java/com/android/tools/r8/desugar/suppressedexceptions/SuppressedExceptionsTest.java
index 17b079f..1e86eba 100644
--- a/src/test/java/com/android/tools/r8/desugar/suppressedexceptions/SuppressedExceptionsTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/suppressedexceptions/SuppressedExceptionsTest.java
@@ -75,7 +75,7 @@
parameters.assumeR8TestParameters();
testForR8(parameters.getBackend())
.addInnerClasses(SuppressedExceptionsTest.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(TestClass.class)
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutput(
diff --git a/src/test/java/com/android/tools/r8/desugar/suppressedexceptions/TwrSuppressedExceptionsTest.java b/src/test/java/com/android/tools/r8/desugar/suppressedexceptions/TwrSuppressedExceptionsTest.java
index 3b216d1..ce7e1a7 100644
--- a/src/test/java/com/android/tools/r8/desugar/suppressedexceptions/TwrSuppressedExceptionsTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/suppressedexceptions/TwrSuppressedExceptionsTest.java
@@ -112,7 +112,7 @@
parameters.assumeR8TestParameters();
testForR8(parameters.getBackend())
.addProgramFiles(getProgramInputs())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(MAIN.typeName())
// TODO(b/214250388): Don't warn about AutoClosable in synthesized code.
.apply(
diff --git a/src/test/java/com/android/tools/r8/desugar/twr/TwrCloseResourceDuplicationTest.java b/src/test/java/com/android/tools/r8/desugar/twr/TwrCloseResourceDuplicationTest.java
index 156f775..04021e6 100644
--- a/src/test/java/com/android/tools/r8/desugar/twr/TwrCloseResourceDuplicationTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/twr/TwrCloseResourceDuplicationTest.java
@@ -96,7 +96,7 @@
testForD8(parameters.getBackend())
.addProgramFiles(getProgramInputs())
.addLibraryFiles(ToolHelper.getAndroidJar(AndroidApiLevel.LATEST))
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), MAIN.typeName(), getZipFile())
.assertSuccessWithOutput(EXPECTED)
.inspect(
@@ -122,7 +122,7 @@
.addLibraryFiles(ToolHelper.getAndroidJar(AndroidApiLevel.LATEST))
.addKeepMainRule(MAIN.typeName())
.addKeepClassAndMembersRules(FOO.typeName(), BAR.typeName())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addDontObfuscate()
.run(parameters.getRuntime(), MAIN.typeName(), getZipFile())
.assertSuccessWithOutput(EXPECTED)
diff --git a/src/test/java/com/android/tools/r8/desugaring/DesugarCfVersion.java b/src/test/java/com/android/tools/r8/desugaring/DesugarCfVersion.java
index 493fe3d..6fb50b3 100644
--- a/src/test/java/com/android/tools/r8/desugaring/DesugarCfVersion.java
+++ b/src/test/java/com/android/tools/r8/desugaring/DesugarCfVersion.java
@@ -39,14 +39,14 @@
Path zip1 =
testForD8(parameters.getBackend())
.addProgramClassFileData(hide_1_8)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.writeToZip();
Path zip2 =
testForD8(parameters.getBackend())
.addProgramClassFileData(hide_1_7)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.writeToZip();
diff --git a/src/test/java/com/android/tools/r8/desugaring/interfacemethods/DefaultInterfaceMethodDesugaringImpossibleTest.java b/src/test/java/com/android/tools/r8/desugaring/interfacemethods/DefaultInterfaceMethodDesugaringImpossibleTest.java
index 88ede59..a1c258a 100644
--- a/src/test/java/com/android/tools/r8/desugaring/interfacemethods/DefaultInterfaceMethodDesugaringImpossibleTest.java
+++ b/src/test/java/com/android/tools/r8/desugaring/interfacemethods/DefaultInterfaceMethodDesugaringImpossibleTest.java
@@ -71,7 +71,7 @@
testForD8()
.addProgramClasses(getProgramClasses())
.addProgramClassFileData(getProgramClassData())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compileWithExpectedDiagnostics(this::checkDesugarError)
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutput(EXPECTED);
@@ -88,7 +88,7 @@
.addProgramClasses(getProgramClasses())
.addProgramClassFileData(getProgramClassData())
.addKeepAllClassesRule()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compileWithExpectedDiagnostics(this::checkDesugarError)
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutput(EXPECTED);
diff --git a/src/test/java/com/android/tools/r8/desugaring/interfacemethods/DefaultInterfaceMethodDesugaringWithPrivateStaticResolutionInvokeVirtualTest.java b/src/test/java/com/android/tools/r8/desugaring/interfacemethods/DefaultInterfaceMethodDesugaringWithPrivateStaticResolutionInvokeVirtualTest.java
index 3feba89..73e6ef8 100644
--- a/src/test/java/com/android/tools/r8/desugaring/interfacemethods/DefaultInterfaceMethodDesugaringWithPrivateStaticResolutionInvokeVirtualTest.java
+++ b/src/test/java/com/android/tools/r8/desugaring/interfacemethods/DefaultInterfaceMethodDesugaringWithPrivateStaticResolutionInvokeVirtualTest.java
@@ -94,7 +94,7 @@
.addProgramClasses(getProgramClasses())
.addProgramClassFileData(getProgramClassData())
.addKeepAllClassesRule()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), TestClass.class),
true);
diff --git a/src/test/java/com/android/tools/r8/desugaring/interfacemethods/DefaultInterfaceMethodDesugaringWithPrivateStaticResolutionTest.java b/src/test/java/com/android/tools/r8/desugaring/interfacemethods/DefaultInterfaceMethodDesugaringWithPrivateStaticResolutionTest.java
index 3a55d74..7e653d3 100644
--- a/src/test/java/com/android/tools/r8/desugaring/interfacemethods/DefaultInterfaceMethodDesugaringWithPrivateStaticResolutionTest.java
+++ b/src/test/java/com/android/tools/r8/desugaring/interfacemethods/DefaultInterfaceMethodDesugaringWithPrivateStaticResolutionTest.java
@@ -44,7 +44,7 @@
assumeTrue(parameters.isDexRuntime());
testForD8()
.addInnerClasses(DefaultInterfaceMethodDesugaringWithPrivateStaticResolutionTest.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutput(EXPECTED);
@@ -55,7 +55,7 @@
testForR8(parameters.getBackend())
.addInnerClasses(DefaultInterfaceMethodDesugaringWithPrivateStaticResolutionTest.class)
.addKeepAllClassesRule()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutput(EXPECTED);
diff --git a/src/test/java/com/android/tools/r8/desugaring/interfacemethods/DefaultInterfaceMethodDesugaringWithPublicStaticResolutionInvokeVirtualTest.java b/src/test/java/com/android/tools/r8/desugaring/interfacemethods/DefaultInterfaceMethodDesugaringWithPublicStaticResolutionInvokeVirtualTest.java
index ff4dff5..eb62f7c 100644
--- a/src/test/java/com/android/tools/r8/desugaring/interfacemethods/DefaultInterfaceMethodDesugaringWithPublicStaticResolutionInvokeVirtualTest.java
+++ b/src/test/java/com/android/tools/r8/desugaring/interfacemethods/DefaultInterfaceMethodDesugaringWithPublicStaticResolutionInvokeVirtualTest.java
@@ -94,7 +94,7 @@
.addProgramClasses(getProgramClasses())
.addProgramClassFileData(getProgramClassData())
.addKeepAllClassesRule()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), TestClass.class),
true);
diff --git a/src/test/java/com/android/tools/r8/desugaring/interfacemethods/DefaultInterfaceMethodDesugaringWithPublicStaticResolutionOnClassTest.java b/src/test/java/com/android/tools/r8/desugaring/interfacemethods/DefaultInterfaceMethodDesugaringWithPublicStaticResolutionOnClassTest.java
index dc8102e..1a905b1 100644
--- a/src/test/java/com/android/tools/r8/desugaring/interfacemethods/DefaultInterfaceMethodDesugaringWithPublicStaticResolutionOnClassTest.java
+++ b/src/test/java/com/android/tools/r8/desugaring/interfacemethods/DefaultInterfaceMethodDesugaringWithPublicStaticResolutionOnClassTest.java
@@ -67,7 +67,7 @@
testForD8(parameters.getBackend())
.addProgramClasses(getProgramClasses())
.addProgramClassFileData(getProgramClassData())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), TestClass.class)
.applyIf(
@@ -84,7 +84,7 @@
.addProgramClasses(getProgramClasses())
.addProgramClassFileData(getProgramClassData())
.addKeepAllClassesRule()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), TestClass.class)
.assertFailureWithErrorThatThrows(IncompatibleClassChangeError.class);
diff --git a/src/test/java/com/android/tools/r8/desugaring/interfacemethods/DefaultInterfaceMethodDesugaringWithPublicStaticResolutionTest.java b/src/test/java/com/android/tools/r8/desugaring/interfacemethods/DefaultInterfaceMethodDesugaringWithPublicStaticResolutionTest.java
index a8d0803..2bfef83 100644
--- a/src/test/java/com/android/tools/r8/desugaring/interfacemethods/DefaultInterfaceMethodDesugaringWithPublicStaticResolutionTest.java
+++ b/src/test/java/com/android/tools/r8/desugaring/interfacemethods/DefaultInterfaceMethodDesugaringWithPublicStaticResolutionTest.java
@@ -64,7 +64,7 @@
testForD8(parameters.getBackend())
.addProgramClasses(getProgramClasses())
.addProgramClassFileData(getProgramClassData())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutput(EXPECTED);
@@ -77,7 +77,7 @@
.addProgramClasses(getProgramClasses())
.addProgramClassFileData(getProgramClassData())
.addKeepAllClassesRule()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutput(EXPECTED);
diff --git a/src/test/java/com/android/tools/r8/desugaring/interfacemethods/InterfaceWithClinitAndNoStaticMethodReferencesTest.java b/src/test/java/com/android/tools/r8/desugaring/interfacemethods/InterfaceWithClinitAndNoStaticMethodReferencesTest.java
index f8907d9..7993c60 100644
--- a/src/test/java/com/android/tools/r8/desugaring/interfacemethods/InterfaceWithClinitAndNoStaticMethodReferencesTest.java
+++ b/src/test/java/com/android/tools/r8/desugaring/interfacemethods/InterfaceWithClinitAndNoStaticMethodReferencesTest.java
@@ -41,7 +41,7 @@
testForR8(parameters.getBackend())
.addInnerClasses(InterfaceWithClinitAndNoStaticMethodReferencesTest.class)
.addKeepMainRule(TestClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutput(EXPECTED);
}
diff --git a/src/test/java/com/android/tools/r8/desugaring/interfacemethods/InterfaceWithClinitAndNoStaticMethodsTest.java b/src/test/java/com/android/tools/r8/desugaring/interfacemethods/InterfaceWithClinitAndNoStaticMethodsTest.java
index c49856c1..d49b731 100644
--- a/src/test/java/com/android/tools/r8/desugaring/interfacemethods/InterfaceWithClinitAndNoStaticMethodsTest.java
+++ b/src/test/java/com/android/tools/r8/desugaring/interfacemethods/InterfaceWithClinitAndNoStaticMethodsTest.java
@@ -41,7 +41,7 @@
testForR8(parameters.getBackend())
.addInnerClasses(InterfaceWithClinitAndNoStaticMethodsTest.class)
.addKeepMainRule(TestClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutput(EXPECTED);
}
diff --git a/src/test/java/com/android/tools/r8/desugaring/interfacemethods/InvokeInterfaceToNonAccessPrivateInterfaceMethodTest.java b/src/test/java/com/android/tools/r8/desugaring/interfacemethods/InvokeInterfaceToNonAccessPrivateInterfaceMethodTest.java
index 96e2dae..f05ad47 100644
--- a/src/test/java/com/android/tools/r8/desugaring/interfacemethods/InvokeInterfaceToNonAccessPrivateInterfaceMethodTest.java
+++ b/src/test/java/com/android/tools/r8/desugaring/interfacemethods/InvokeInterfaceToNonAccessPrivateInterfaceMethodTest.java
@@ -60,7 +60,7 @@
.addProgramClassFileData(getTransformedI())
.addProgramClassFileData(getAndCheckJ())
.addKeepMainRule(TestClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), TestClass.class)
.assertFailureWithErrorThatThrows(NoSuchMethodError.class);
}
diff --git a/src/test/java/com/android/tools/r8/desugaring/interfacemethods/InvokeSpecialToNonAccessPrivateInterfaceMethodTest.java b/src/test/java/com/android/tools/r8/desugaring/interfacemethods/InvokeSpecialToNonAccessPrivateInterfaceMethodTest.java
index 1d77e8e..e176a3f 100644
--- a/src/test/java/com/android/tools/r8/desugaring/interfacemethods/InvokeSpecialToNonAccessPrivateInterfaceMethodTest.java
+++ b/src/test/java/com/android/tools/r8/desugaring/interfacemethods/InvokeSpecialToNonAccessPrivateInterfaceMethodTest.java
@@ -59,7 +59,7 @@
.addProgramClassFileData(getTransformedI())
.addProgramClassFileData(getTransformedJ())
.addKeepMainRule(TestClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), TestClass.class)
.assertFailureWithErrorThatThrows(NoSuchMethodError.class);
}
diff --git a/src/test/java/com/android/tools/r8/desugaring/interfacemethods/InvokeSuperInDefaultMethodResolvingToLibraryTest.java b/src/test/java/com/android/tools/r8/desugaring/interfacemethods/InvokeSuperInDefaultMethodResolvingToLibraryTest.java
index 190d79e..6a4a983 100644
--- a/src/test/java/com/android/tools/r8/desugaring/interfacemethods/InvokeSuperInDefaultMethodResolvingToLibraryTest.java
+++ b/src/test/java/com/android/tools/r8/desugaring/interfacemethods/InvokeSuperInDefaultMethodResolvingToLibraryTest.java
@@ -54,7 +54,7 @@
testForD8(parameters.getBackend())
.addInnerClasses(getClass())
.addLibraryFiles(ToolHelper.getAndroidJar(AndroidApiLevel.T))
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect)
.run(parameters.getRuntime(), TestClass.class)
@@ -76,7 +76,7 @@
.addInnerClasses(getClass())
.addLibraryFiles(ToolHelper.getAndroidJar(AndroidApiLevel.T))
.addAndroidBuildVersion(parameters.getApiLevel())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect)
.run(parameters.getRuntime(), TestClassWithApiLevelCheck.class)
@@ -89,7 +89,7 @@
testForR8(parameters.getBackend())
.addInnerClasses(getClass())
.addLibraryFiles(ToolHelper.getAndroidJar(AndroidApiLevel.T))
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(TestClass.class)
.run(parameters.getRuntime(), TestClass.class)
.applyIf(
@@ -109,7 +109,7 @@
testForR8(parameters.getBackend())
.addInnerClasses(getClass())
.addLibraryFiles(ToolHelper.getAndroidJar(AndroidApiLevel.T))
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(TestClassWithApiLevelCheck.class)
.addAndroidBuildVersion(parameters.getApiLevel())
.run(parameters.getRuntime(), TestClassWithApiLevelCheck.class)
diff --git a/src/test/java/com/android/tools/r8/desugaring/interfacemethods/MethodParametersTest.java b/src/test/java/com/android/tools/r8/desugaring/interfacemethods/MethodParametersTest.java
index 43373b9..828e2ce 100644
--- a/src/test/java/com/android/tools/r8/desugaring/interfacemethods/MethodParametersTest.java
+++ b/src/test/java/com/android/tools/r8/desugaring/interfacemethods/MethodParametersTest.java
@@ -90,14 +90,14 @@
Path interfaceDesugared =
testForD8(Backend.CF)
.addProgramFiles(compiledWithParameters.get())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.writeToZip();
Path interfaceDesugaredTwice =
testForD8(Backend.CF)
.addProgramFiles(interfaceDesugared)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.writeToZip();
@@ -105,14 +105,14 @@
testForD8(Backend.CF)
.addClasspathClasses(I.class)
.addInnerClasses(getClass())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.writeToZip();
testForD8(parameters.getBackend())
.addProgramFiles(interfaceDesugaredTwice)
.addProgramFiles(programDesugared)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), TestRunner.class)
.applyIf(
diff --git a/src/test/java/com/android/tools/r8/desugaring/interfacemethods/Regress148461139.java b/src/test/java/com/android/tools/r8/desugaring/interfacemethods/Regress148461139.java
index f92b58e..e7219f1 100644
--- a/src/test/java/com/android/tools/r8/desugaring/interfacemethods/Regress148461139.java
+++ b/src/test/java/com/android/tools/r8/desugaring/interfacemethods/Regress148461139.java
@@ -31,7 +31,7 @@
public void test() throws Exception {
// This only failed if tree-shaking was disabled.
testForR8(parameters.getBackend())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addProgramClasses(Condition.class)
.noTreeShaking()
.compile()
diff --git a/src/test/java/com/android/tools/r8/desugaring/interfacemethods/Regress171867367.java b/src/test/java/com/android/tools/r8/desugaring/interfacemethods/Regress171867367.java
index 6e01196..a0b91af 100644
--- a/src/test/java/com/android/tools/r8/desugaring/interfacemethods/Regress171867367.java
+++ b/src/test/java/com/android/tools/r8/desugaring/interfacemethods/Regress171867367.java
@@ -36,7 +36,7 @@
Path path =
testForD8(Backend.CF)
.addProgramClasses(TestClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.writeToZip();
D8TestBuilder d8TestBuilder =
@@ -44,7 +44,7 @@
.addProgramFiles(path)
.addAndroidBuildVersion()
.addProgramClasses(TestClass2.class)
- .setMinApi(parameters.getApiLevel());
+ .setMinApi(parameters);
if (parameters.getApiLevel().isLessThan(AndroidApiLevel.N)) {
d8TestBuilder
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/dex/whitespaceinidentifiers/WhiteSpaceInIdentifiersTest.java b/src/test/java/com/android/tools/r8/dex/whitespaceinidentifiers/WhiteSpaceInIdentifiersTest.java
index 1fad1ab..070867d 100644
--- a/src/test/java/com/android/tools/r8/dex/whitespaceinidentifiers/WhiteSpaceInIdentifiersTest.java
+++ b/src/test/java/com/android/tools/r8/dex/whitespaceinidentifiers/WhiteSpaceInIdentifiersTest.java
@@ -66,7 +66,7 @@
public void configure(TestCompilerBuilder<?, ?, ?, ?, ?> testBuilder) throws Exception {
testBuilder
.addProgramClassFileData(getTransformed())
- .applyIf(parameters.isDexRuntime(), b -> b.setMinApi(parameters.getApiLevel()))
+ .applyIf(parameters.isDexRuntime(), b -> b.setMinApi(parameters))
.applyIf(
parameters.isDexRuntime() && parameters.getApiLevel().isLessThan(AndroidApiLevel.R),
b -> {
@@ -111,7 +111,7 @@
String map =
testForR8(parameters.getBackend())
.addProgramClassFileData(getTransformed())
- .applyIf(parameters.isDexRuntime(), b -> b.setMinApi(parameters.getApiLevel()))
+ .applyIf(parameters.isDexRuntime(), b -> b.setMinApi(parameters))
.addKeepMainRule(TestClass.class)
.compile()
.getProguardMap();
@@ -163,7 +163,7 @@
// Run merge step with DEX with white space in input (not forcing min API level of R).
testForD8(parameters.getBackend())
.addProgramFiles(dex)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.applyIf(
parameters.getApiLevel().isLessThan(AndroidApiLevel.R),
b -> {
diff --git a/src/test/java/com/android/tools/r8/dexfilemerger/DexMergeChecksumsClassWithNoMethodsTest.java b/src/test/java/com/android/tools/r8/dexfilemerger/DexMergeChecksumsClassWithNoMethodsTest.java
index 9161a5d..bb738a3 100644
--- a/src/test/java/com/android/tools/r8/dexfilemerger/DexMergeChecksumsClassWithNoMethodsTest.java
+++ b/src/test/java/com/android/tools/r8/dexfilemerger/DexMergeChecksumsClassWithNoMethodsTest.java
@@ -45,15 +45,16 @@
Path dexArchiveA =
testForD8()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addProgramClassFileData(cw.toByteArray())
.setMode(CompilationMode.DEBUG)
.setIncludeClassesChecksum(true)
- .compile().writeToZip();
+ .compile()
+ .writeToZip();
Path dexArchiveTestClass =
testForD8()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addProgramClasses(TestClass.class)
.setMode(CompilationMode.DEBUG)
.setIncludeClassesChecksum(true)
@@ -61,7 +62,7 @@
.writeToZip();
testForD8()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addProgramFiles(dexArchiveA, dexArchiveTestClass)
.setIncludeClassesChecksum(true)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/dexfilemerger/DexMergeChecksumsFileWithNoClassesTest.java b/src/test/java/com/android/tools/r8/dexfilemerger/DexMergeChecksumsFileWithNoClassesTest.java
index c987370..e598f48 100644
--- a/src/test/java/com/android/tools/r8/dexfilemerger/DexMergeChecksumsFileWithNoClassesTest.java
+++ b/src/test/java/com/android/tools/r8/dexfilemerger/DexMergeChecksumsFileWithNoClassesTest.java
@@ -34,7 +34,7 @@
public void testChecksumWithNoClasses() throws Exception {
Path out1 =
testForD8()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.setMode(CompilationMode.DEBUG)
.setIncludeClassesChecksum(true)
.setIntermediate(true)
@@ -44,7 +44,7 @@
Path out2 =
testForD8()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.setMode(CompilationMode.DEBUG)
.setIncludeClassesChecksum(true)
.addProgramClasses(TestClass.class)
@@ -56,7 +56,7 @@
testForD8()
.addProgramFiles(out1, out2)
.setIncludeClassesChecksum(true)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), TestClass.class)
.inspect(this::checkContainsChecksums);
}
diff --git a/src/test/java/com/android/tools/r8/dexfilemerger/DexMergeChecksumsHighSortingStrings.java b/src/test/java/com/android/tools/r8/dexfilemerger/DexMergeChecksumsHighSortingStrings.java
index 24601c1..138f8b1 100644
--- a/src/test/java/com/android/tools/r8/dexfilemerger/DexMergeChecksumsHighSortingStrings.java
+++ b/src/test/java/com/android/tools/r8/dexfilemerger/DexMergeChecksumsHighSortingStrings.java
@@ -37,7 +37,7 @@
Path dexArchive1 =
testForD8()
.addProgramClasses(TestClass1.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.setMode(CompilationMode.DEBUG)
.setIncludeClassesChecksum(true)
.compile()
@@ -46,28 +46,28 @@
Path dexArchive2 =
testForD8()
.addProgramClasses(TestClass2.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.setMode(CompilationMode.DEBUG)
.setIncludeClassesChecksum(true)
.compile()
.writeToZip();
testForD8()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addProgramFiles(dexArchive1)
.setIncludeClassesChecksum(true)
.run(parameters.getRuntime(), TestClass1.class)
.assertSuccessWithOutputLines("Hello, \uDB3F\uDFFD");
testForD8()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addProgramFiles(dexArchive2)
.setIncludeClassesChecksum(true)
.run(parameters.getRuntime(), TestClass2.class)
.assertSuccessWithOutputLines("Hello, ~~~\u007f");
testForD8()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addProgramFiles(dexArchive1, dexArchive2)
.setIncludeClassesChecksum(true)
.run(parameters.getRuntime(), TestClass2.class)
diff --git a/src/test/java/com/android/tools/r8/dexfilemerger/DexMergeChecksumsMarkerInterfaceTest.java b/src/test/java/com/android/tools/r8/dexfilemerger/DexMergeChecksumsMarkerInterfaceTest.java
index b64ca95..fb73f38 100644
--- a/src/test/java/com/android/tools/r8/dexfilemerger/DexMergeChecksumsMarkerInterfaceTest.java
+++ b/src/test/java/com/android/tools/r8/dexfilemerger/DexMergeChecksumsMarkerInterfaceTest.java
@@ -31,7 +31,7 @@
public void testChecksumForMarkerInterface() throws Exception {
Path dexArchiveI =
testForD8()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addProgramClasses(I.class)
.setMode(CompilationMode.DEBUG)
.setIncludeClassesChecksum(true)
@@ -40,7 +40,7 @@
Path dexArchiveTestClass =
testForD8()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addProgramClasses(TestClass.class)
.setMode(CompilationMode.DEBUG)
.setIncludeClassesChecksum(true)
@@ -48,7 +48,7 @@
.writeToZip();
testForD8()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addProgramFiles(dexArchiveI, dexArchiveTestClass)
.setIncludeClassesChecksum(true)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/dexfilemerger/NonAsciiClassNameChecksumTest.java b/src/test/java/com/android/tools/r8/dexfilemerger/NonAsciiClassNameChecksumTest.java
index 351a74e..2c926c7 100644
--- a/src/test/java/com/android/tools/r8/dexfilemerger/NonAsciiClassNameChecksumTest.java
+++ b/src/test/java/com/android/tools/r8/dexfilemerger/NonAsciiClassNameChecksumTest.java
@@ -58,21 +58,22 @@
Path intermediate2 = compileIntermediate(TestClaass.class);
testForD8()
.addProgramFiles(intermediate1, intermediate2)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.setIncludeClassesChecksum(true)
.run(parameters.getRuntime(), getTransformedName(TaestClass.class))
.assertSuccessWithOutput(EXPECTED)
- .inspect(inspector -> {
- checkIncludesChecksum(inspector, TaestClass.class);
- checkIncludesChecksum(inspector, TestClaass.class);
- });
+ .inspect(
+ inspector -> {
+ checkIncludesChecksum(inspector, TaestClass.class);
+ checkIncludesChecksum(inspector, TestClaass.class);
+ });
}
private Path compileIntermediate(Class<?> clazz) throws Exception {
return testForD8()
.setOutputMode(OutputMode.DexFilePerClassFile)
.addProgramClassFileData(getTransform(clazz))
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.setIncludeClassesChecksum(true)
.compile()
.inspect(inspector -> checkIncludesChecksum(inspector, clazz))
diff --git a/src/test/java/com/android/tools/r8/dexsplitter/DevirtualizationAcrossFeatureSplitTest.java b/src/test/java/com/android/tools/r8/dexsplitter/DevirtualizationAcrossFeatureSplitTest.java
index 0553efe..8dc12d7 100644
--- a/src/test/java/com/android/tools/r8/dexsplitter/DevirtualizationAcrossFeatureSplitTest.java
+++ b/src/test/java/com/android/tools/r8/dexsplitter/DevirtualizationAcrossFeatureSplitTest.java
@@ -36,7 +36,7 @@
.addFeatureSplit(FeatureMain.class, BaseInterfaceImpl.class)
.addKeepFeatureMainRules(FeatureMain.class)
.enableInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.runFeature(parameters.getRuntime(), FeatureMain.class)
.assertSuccessWithOutputLines("Hello world!");
diff --git a/src/test/java/com/android/tools/r8/dexsplitter/R8FeatureSplitServiceLoaderTest.java b/src/test/java/com/android/tools/r8/dexsplitter/R8FeatureSplitServiceLoaderTest.java
index 9e116da..e5aa0e5 100644
--- a/src/test/java/com/android/tools/r8/dexsplitter/R8FeatureSplitServiceLoaderTest.java
+++ b/src/test/java/com/android/tools/r8/dexsplitter/R8FeatureSplitServiceLoaderTest.java
@@ -47,7 +47,7 @@
Path feature1Path = temp.newFile("feature1.zip").toPath();
testForR8(parameters.getBackend())
.addProgramClasses(Base.class, I.class, Feature1I.class, Feature2I.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(Base.class)
.addFeatureSplit(
builder -> simpleSplitProvider(builder, feature1Path, temp, Feature3Dummy.class))
@@ -75,7 +75,7 @@
R8TestRunResult runResult =
testForR8(parameters.getBackend())
.addProgramClasses(Base.class, I.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(Base.class)
.addFeatureSplit(
builder -> simpleSplitProvider(builder, feature1Path, temp, Feature1I.class))
@@ -109,7 +109,7 @@
R8TestRunResult runResult =
testForR8(parameters.getBackend())
.addProgramClasses(Base.class, I.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(Base.class)
.addFeatureSplitWithResources(
ImmutableList.of(
@@ -146,7 +146,7 @@
R8TestRunResult runResult =
testForR8(parameters.getBackend())
.addProgramClasses(Base.class, I.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(Base.class)
.addFeatureSplit(Feature1I.class)
.addFeatureSplit(Feature2I.class)
@@ -180,7 +180,7 @@
public void testR8OnlyFeature2() throws Exception {
testForR8(parameters.getBackend())
.addProgramClasses(Base.class, I.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(Base.class)
.addFeatureSplitWithResources(
ImmutableList.of(
diff --git a/src/test/java/com/android/tools/r8/dexsplitter/R8FeatureSplitTest.java b/src/test/java/com/android/tools/r8/dexsplitter/R8FeatureSplitTest.java
index b2d8fe8..e553e11 100644
--- a/src/test/java/com/android/tools/r8/dexsplitter/R8FeatureSplitTest.java
+++ b/src/test/java/com/android/tools/r8/dexsplitter/R8FeatureSplitTest.java
@@ -63,7 +63,7 @@
public void simpleApiTest() throws CompilationFailedException, IOException, ExecutionException {
testForR8(parameters.getBackend())
.addProgramClasses(HelloWorld.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addFeatureSplit(R8FeatureSplitTest::emptySplitProvider)
.addKeepMainRule(HelloWorld.class)
.compile()
@@ -132,7 +132,7 @@
.addProgramClasses(BaseClass.class, RunInterface.class, SplitRunner.class)
// Link against android.jar that contains ReflectiveOperationException.
.addLibraryFiles(parameters.getDefaultAndroidJarAbove(AndroidApiLevel.K))
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addFeatureSplit(
builder ->
splitWithNonJavaFile(builder, feature1Path, temp, nonJavaFiles, FeatureClass.class))
@@ -170,7 +170,7 @@
R8TestCompileResult compileResult =
testForR8(parameters.getBackend())
.addProgramClasses(BaseClass.class, RunInterface.class, SplitRunner.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addFeatureSplitWithResources(nonJavaFiles, FeatureClass.class)
.addFeatureSplitWithResources(nonJavaFiles, FeatureClass2.class)
.addKeepClassRulesWithAllowObfuscation(
@@ -258,7 +258,7 @@
.addProgramClasses(BaseClass.class, RunInterface.class, SplitRunner.class)
// Link against android.jar that contains ReflectiveOperationException.
.addLibraryFiles(parameters.getDefaultAndroidJarAbove(AndroidApiLevel.K))
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addFeatureSplit(FeatureClass.class)
.addFeatureSplit(FeatureClass2.class)
.addKeepAllClassesRule()
diff --git a/src/test/java/com/android/tools/r8/dexsplitter/SplitterTestBase.java b/src/test/java/com/android/tools/r8/dexsplitter/SplitterTestBase.java
index bd7929d..1d8821e 100644
--- a/src/test/java/com/android/tools/r8/dexsplitter/SplitterTestBase.java
+++ b/src/test/java/com/android/tools/r8/dexsplitter/SplitterTestBase.java
@@ -138,7 +138,7 @@
.addProgramClasses(baseClasses)
.addFeatureSplit(featureClasses.toArray(new Class[0]))
.addInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(SplitRunner.class)
.addKeepClassRules(toRun)
.apply(r8TestConfigurator)
diff --git a/src/test/java/com/android/tools/r8/dexsplitter/StaticClassMergingInFeatureSplitTest.java b/src/test/java/com/android/tools/r8/dexsplitter/StaticClassMergingInFeatureSplitTest.java
index 78e7738..02b8911 100644
--- a/src/test/java/com/android/tools/r8/dexsplitter/StaticClassMergingInFeatureSplitTest.java
+++ b/src/test/java/com/android/tools/r8/dexsplitter/StaticClassMergingInFeatureSplitTest.java
@@ -46,7 +46,7 @@
.addKeepFeatureMainRules(Feature1Main.class, Feature2Main.class)
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspectBase, this::inspectFeature1, this::inspectFeature2);
diff --git a/src/test/java/com/android/tools/r8/dexsplitter/SyntheticDistributionTest.java b/src/test/java/com/android/tools/r8/dexsplitter/SyntheticDistributionTest.java
index d0ea744..5ce196f 100644
--- a/src/test/java/com/android/tools/r8/dexsplitter/SyntheticDistributionTest.java
+++ b/src/test/java/com/android/tools/r8/dexsplitter/SyntheticDistributionTest.java
@@ -104,7 +104,7 @@
.addDontObfuscate()
// BaseDexClassLoader was introduced at api level 14.
.apply(ApiModelingTestHelper::disableOutliningAndStubbing)
- .setMinApi(parameters.getApiLevel());
+ .setMinApi(parameters);
}
public abstract static class BaseSuperClass implements RunInterface {
diff --git a/src/test/java/com/android/tools/r8/dexsplitter/VerticalClassMergingAcrossFeatureSplitTest.java b/src/test/java/com/android/tools/r8/dexsplitter/VerticalClassMergingAcrossFeatureSplitTest.java
index 933c3c7..be0f4dc 100644
--- a/src/test/java/com/android/tools/r8/dexsplitter/VerticalClassMergingAcrossFeatureSplitTest.java
+++ b/src/test/java/com/android/tools/r8/dexsplitter/VerticalClassMergingAcrossFeatureSplitTest.java
@@ -45,7 +45,7 @@
.addKeepFeatureMainRule(Feature2Main.class)
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspectBase, this::inspectFeature1, this::inspectFeature2);
diff --git a/src/test/java/com/android/tools/r8/dexsplitter/VerticalClassMergingInFeatureSplitTest.java b/src/test/java/com/android/tools/r8/dexsplitter/VerticalClassMergingInFeatureSplitTest.java
index 4e7e2d0..5095131 100644
--- a/src/test/java/com/android/tools/r8/dexsplitter/VerticalClassMergingInFeatureSplitTest.java
+++ b/src/test/java/com/android/tools/r8/dexsplitter/VerticalClassMergingInFeatureSplitTest.java
@@ -48,7 +48,7 @@
.addLibraryFiles(parameters.getDefaultAndroidJarAbove(AndroidApiLevel.K))
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspectBase, this::inspectFeature1, this::inspectFeature2);
diff --git a/src/test/java/com/android/tools/r8/dump/DumpMainDexInputsTest.java b/src/test/java/com/android/tools/r8/dump/DumpMainDexInputsTest.java
index f0372a8..ebbb9aa 100644
--- a/src/test/java/com/android/tools/r8/dump/DumpMainDexInputsTest.java
+++ b/src/test/java/com/android/tools/r8/dump/DumpMainDexInputsTest.java
@@ -94,13 +94,13 @@
Path dexed =
testForD8()
.addInnerClasses(DumpMainDexInputsTest.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.writeToZip();
testForD8()
.addProgramFiles(dexed)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addMainDexListFiles(
mainDexListForMainDexFile1AndMainDexFile2(), mainDexListForMainDexFile3())
.addMainDexListClasses(MainDexClass1.class, MainDexClass2.class, TestClass.class)
@@ -129,7 +129,7 @@
parameters.getApiLevel().isLessThanOrEqualTo(AndroidApiLevel.K));
Path dumpDir = temp.newFolder().toPath();
testForD8()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addInnerClasses(DumpMainDexInputsTest.class)
.addMainDexRulesFiles(newMainDexRulesPath1(), newMainDexRulesPath2())
.addMainDexKeepClassRules(MainDexClass1.class, MainDexClass2.class, TestClass.class)
@@ -149,7 +149,7 @@
parameters.getApiLevel().isLessThanOrEqualTo(AndroidApiLevel.K));
Path dumpDir = temp.newFolder().toPath();
testForR8(parameters.getBackend())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addInnerClasses(DumpMainDexInputsTest.class)
.addMainDexRuleFiles(newMainDexRulesPath1(), newMainDexRulesPath2())
.addMainDexKeepClassRules(MainDexClass1.class, MainDexClass2.class, TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/enumunboxing/AnnotationEnumUnboxingTest.java b/src/test/java/com/android/tools/r8/enumunboxing/AnnotationEnumUnboxingTest.java
index c6094ae..68b9393 100644
--- a/src/test/java/com/android/tools/r8/enumunboxing/AnnotationEnumUnboxingTest.java
+++ b/src/test/java/com/android/tools/r8/enumunboxing/AnnotationEnumUnboxingTest.java
@@ -62,7 +62,7 @@
.enableMemberValuePropagationAnnotations()
.enableNoVerticalClassMergingAnnotations()
.addOptionsModification(opt -> enableEnumOptions(opt, enumValueOptimization))
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("print", "1", "1", "1", "1", "1", "0", "0", "0", "0");
diff --git a/src/test/java/com/android/tools/r8/enumunboxing/CheckEnumUnboxedTest.java b/src/test/java/com/android/tools/r8/enumunboxing/CheckEnumUnboxedTest.java
index c5a786c..5fecb78 100644
--- a/src/test/java/com/android/tools/r8/enumunboxing/CheckEnumUnboxedTest.java
+++ b/src/test/java/com/android/tools/r8/enumunboxing/CheckEnumUnboxedTest.java
@@ -40,7 +40,7 @@
.addInnerClasses(getClass())
.addKeepMainRule(Main.class)
.enableCheckEnumUnboxedAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compileWithExpectedDiagnostics(
diagnostics -> {
diagnostics.assertErrorsMatch(
diff --git a/src/test/java/com/android/tools/r8/enumunboxing/ClInitSideEffectEnumUnboxingTest.java b/src/test/java/com/android/tools/r8/enumunboxing/ClInitSideEffectEnumUnboxingTest.java
index 743a819..2e8b769 100644
--- a/src/test/java/com/android/tools/r8/enumunboxing/ClInitSideEffectEnumUnboxingTest.java
+++ b/src/test/java/com/android/tools/r8/enumunboxing/ClInitSideEffectEnumUnboxingTest.java
@@ -45,7 +45,7 @@
.enableNoHorizontalClassMergingAnnotations()
.enableNeverClassInliningAnnotations()
.addOptionsModification(opt -> enableEnumOptions(opt, enumValueOptimization))
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), classToTest)
.assertSuccess()
diff --git a/src/test/java/com/android/tools/r8/enumunboxing/ClassAccessEnumUnboxingTest.java b/src/test/java/com/android/tools/r8/enumunboxing/ClassAccessEnumUnboxingTest.java
index a24cb93..9a42cdd 100644
--- a/src/test/java/com/android/tools/r8/enumunboxing/ClassAccessEnumUnboxingTest.java
+++ b/src/test/java/com/android/tools/r8/enumunboxing/ClassAccessEnumUnboxingTest.java
@@ -48,7 +48,7 @@
.enableNeverClassInliningAnnotations()
.enableInliningAnnotations()
.addOptionsModification(opt -> enableEnumOptions(opt, enumValueOptimization))
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), Main.class)
.assertSuccess()
diff --git a/src/test/java/com/android/tools/r8/enumunboxing/ComparisonEnumUnboxingTest.java b/src/test/java/com/android/tools/r8/enumunboxing/ComparisonEnumUnboxingTest.java
index e6fdc93..580fccc 100644
--- a/src/test/java/com/android/tools/r8/enumunboxing/ComparisonEnumUnboxingTest.java
+++ b/src/test/java/com/android/tools/r8/enumunboxing/ComparisonEnumUnboxingTest.java
@@ -49,7 +49,7 @@
.addEnumUnboxingInspector(
inspector ->
inspector.assertUnboxed(NullCheck.MyEnum.class, EnumComparison.MyEnum.class))
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector -> {
diff --git a/src/test/java/com/android/tools/r8/enumunboxing/ConstClassEnumUnboxingTest.java b/src/test/java/com/android/tools/r8/enumunboxing/ConstClassEnumUnboxingTest.java
index 8f1d0ab..429f45a 100644
--- a/src/test/java/com/android/tools/r8/enumunboxing/ConstClassEnumUnboxingTest.java
+++ b/src/test/java/com/android/tools/r8/enumunboxing/ConstClassEnumUnboxingTest.java
@@ -34,7 +34,7 @@
.addKeepMainRule(Main.class)
.addKeepRules(enumKeepRules.getKeepRules())
.addEnumUnboxingInspector(inspector -> inspector.assertUnboxed(MyEnum.class))
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("int");
diff --git a/src/test/java/com/android/tools/r8/enumunboxing/DoubleProcessingEnumUnboxingTest.java b/src/test/java/com/android/tools/r8/enumunboxing/DoubleProcessingEnumUnboxingTest.java
index e77f42a..bd6b65d 100644
--- a/src/test/java/com/android/tools/r8/enumunboxing/DoubleProcessingEnumUnboxingTest.java
+++ b/src/test/java/com/android/tools/r8/enumunboxing/DoubleProcessingEnumUnboxingTest.java
@@ -62,7 +62,6 @@
.enableNeverClassInliningAnnotations()
.enableInliningAnnotations()
.minification(minification)
- .setMinApi(parameters.getApiLevel())
.compile()
.writeToZip();
// Compile the app with the lib.
@@ -75,7 +74,7 @@
.enableNeverClassInliningAnnotations()
.enableInliningAnnotations()
.addOptionsModification(opt -> enableEnumOptions(opt, enumValueOptimization))
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::assertSharedUtilityClassPresent)
.run(parameters.getRuntime(), App.class)
diff --git a/src/test/java/com/android/tools/r8/enumunboxing/DoubleProcessingMergeEnumUnboxingTest.java b/src/test/java/com/android/tools/r8/enumunboxing/DoubleProcessingMergeEnumUnboxingTest.java
index e7651fb..aa341a7 100644
--- a/src/test/java/com/android/tools/r8/enumunboxing/DoubleProcessingMergeEnumUnboxingTest.java
+++ b/src/test/java/com/android/tools/r8/enumunboxing/DoubleProcessingMergeEnumUnboxingTest.java
@@ -66,7 +66,7 @@
.enableNeverClassInliningAnnotations()
.enableInliningAnnotations()
.addOptionsModification(opt -> enableEnumOptions(opt, enumValueOptimization))
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::assertSharedUtilityClassPresent)
.run(parameters.getRuntime(), App.class)
@@ -83,7 +83,6 @@
.enableInliningAnnotations()
.minification(minification)
.addKeepPackageNamesRule(libClass.getPackage())
- .setMinApi(parameters.getApiLevel())
.compile()
.writeToZip();
}
diff --git a/src/test/java/com/android/tools/r8/enumunboxing/EmptyEnumUnboxingTest.java b/src/test/java/com/android/tools/r8/enumunboxing/EmptyEnumUnboxingTest.java
index 34a9d32..c2ab4e2 100644
--- a/src/test/java/com/android/tools/r8/enumunboxing/EmptyEnumUnboxingTest.java
+++ b/src/test/java/com/android/tools/r8/enumunboxing/EmptyEnumUnboxingTest.java
@@ -43,7 +43,7 @@
.enableNeverClassInliningAnnotations()
.enableInliningAnnotations()
.addOptionsModification(opt -> enableEnumOptions(opt, enumValueOptimization))
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), Main.class)
.assertSuccess()
diff --git a/src/test/java/com/android/tools/r8/enumunboxing/EnumClinitWithSideEffectsUnboxingTest.java b/src/test/java/com/android/tools/r8/enumunboxing/EnumClinitWithSideEffectsUnboxingTest.java
index 92aa76e..6bc1231 100644
--- a/src/test/java/com/android/tools/r8/enumunboxing/EnumClinitWithSideEffectsUnboxingTest.java
+++ b/src/test/java/com/android/tools/r8/enumunboxing/EnumClinitWithSideEffectsUnboxingTest.java
@@ -31,7 +31,7 @@
.addInnerClasses(EnumClinitWithSideEffectsUnboxingTest.class)
.addKeepMainRule(TestClass.class)
.addKeepRules(enumEnumKeepRules.getKeepRules())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutputLines("Hello world!");
diff --git a/src/test/java/com/android/tools/r8/enumunboxing/EnumImplementingInterfaceImplicitUpcastClassInitializerTest.java b/src/test/java/com/android/tools/r8/enumunboxing/EnumImplementingInterfaceImplicitUpcastClassInitializerTest.java
index 278895d..d07311b 100644
--- a/src/test/java/com/android/tools/r8/enumunboxing/EnumImplementingInterfaceImplicitUpcastClassInitializerTest.java
+++ b/src/test/java/com/android/tools/r8/enumunboxing/EnumImplementingInterfaceImplicitUpcastClassInitializerTest.java
@@ -50,7 +50,7 @@
.addKeepMainRule(Main.class)
.addKeepRules(enumKeepRules.getKeepRules())
.enableNeverClassInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addOptionsModification(opt -> enableEnumOptions(opt, enumValueOptimization))
.addEnumUnboxingInspector(
inspector -> inspector.assertNotUnboxed(OtherEnum.class, MyEnum.class))
diff --git a/src/test/java/com/android/tools/r8/enumunboxing/EnumImplementingInterfaceImplicitUpcastInReturnTypeTest.java b/src/test/java/com/android/tools/r8/enumunboxing/EnumImplementingInterfaceImplicitUpcastInReturnTypeTest.java
index 9c797aa..349f8e3 100644
--- a/src/test/java/com/android/tools/r8/enumunboxing/EnumImplementingInterfaceImplicitUpcastInReturnTypeTest.java
+++ b/src/test/java/com/android/tools/r8/enumunboxing/EnumImplementingInterfaceImplicitUpcastInReturnTypeTest.java
@@ -51,7 +51,7 @@
.enableNeverClassInliningAnnotations()
.enableInliningAnnotations()
.addOptionsModification(opt -> enableEnumOptions(opt, enumValueOptimization))
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addEnumUnboxingInspector(inspector -> inspector.assertNotUnboxed(MyEnum.class))
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines(EXPECTED);
diff --git a/src/test/java/com/android/tools/r8/enumunboxing/EnumInEnumFieldTest.java b/src/test/java/com/android/tools/r8/enumunboxing/EnumInEnumFieldTest.java
index d2fe030..d5e9688 100644
--- a/src/test/java/com/android/tools/r8/enumunboxing/EnumInEnumFieldTest.java
+++ b/src/test/java/com/android/tools/r8/enumunboxing/EnumInEnumFieldTest.java
@@ -53,7 +53,7 @@
inspector.assertUnboxed(OtherEnum.class);
})
.addNeverClassInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("0");
}
diff --git a/src/test/java/com/android/tools/r8/enumunboxing/EnumInitWithSideEffectsUnboxingTest.java b/src/test/java/com/android/tools/r8/enumunboxing/EnumInitWithSideEffectsUnboxingTest.java
index c3967e5..2baf65b 100644
--- a/src/test/java/com/android/tools/r8/enumunboxing/EnumInitWithSideEffectsUnboxingTest.java
+++ b/src/test/java/com/android/tools/r8/enumunboxing/EnumInitWithSideEffectsUnboxingTest.java
@@ -31,7 +31,7 @@
.addInnerClasses(EnumInitWithSideEffectsUnboxingTest.class)
.addKeepMainRule(TestClass.class)
.addKeepRules(enumEnumKeepRules.getKeepRules())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutputLines("Hello world!");
diff --git a/src/test/java/com/android/tools/r8/enumunboxing/EnumInstanceFieldReferenceInsideAndOutsideTest.java b/src/test/java/com/android/tools/r8/enumunboxing/EnumInstanceFieldReferenceInsideAndOutsideTest.java
index 55cdede..a9116d7 100644
--- a/src/test/java/com/android/tools/r8/enumunboxing/EnumInstanceFieldReferenceInsideAndOutsideTest.java
+++ b/src/test/java/com/android/tools/r8/enumunboxing/EnumInstanceFieldReferenceInsideAndOutsideTest.java
@@ -51,7 +51,7 @@
.addKeepRules(enumKeepRules.getKeepRules())
.addOptionsModification(opt -> enableEnumOptions(opt, enumValueOptimization))
.addNeverClassInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addEnumUnboxingInspector(inspector -> inspector.assertNotUnboxed(MyEnum.class))
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("42");
diff --git a/src/test/java/com/android/tools/r8/enumunboxing/EnumInstanceFieldReferenceOutsideTest.java b/src/test/java/com/android/tools/r8/enumunboxing/EnumInstanceFieldReferenceOutsideTest.java
index 4dac1af..6bd1e12 100644
--- a/src/test/java/com/android/tools/r8/enumunboxing/EnumInstanceFieldReferenceOutsideTest.java
+++ b/src/test/java/com/android/tools/r8/enumunboxing/EnumInstanceFieldReferenceOutsideTest.java
@@ -52,7 +52,7 @@
.addEnumUnboxingInspector(inspector -> inspector.assertNotUnboxed(MyEnum.class))
.addOptionsModification(opt -> enableEnumOptions(opt, enumValueOptimization))
.addNeverClassInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("42");
}
diff --git a/src/test/java/com/android/tools/r8/enumunboxing/EnumMissingFieldsUnboxingTest.java b/src/test/java/com/android/tools/r8/enumunboxing/EnumMissingFieldsUnboxingTest.java
index e46a48c..8d178ea 100644
--- a/src/test/java/com/android/tools/r8/enumunboxing/EnumMissingFieldsUnboxingTest.java
+++ b/src/test/java/com/android/tools/r8/enumunboxing/EnumMissingFieldsUnboxingTest.java
@@ -44,7 +44,7 @@
.addEnumUnboxingInspector(inspector -> inspector.assertNotUnboxed(CompilationEnum.class))
.enableNeverClassInliningAnnotations()
.addOptionsModification(opt -> enableEnumOptions(opt, enumValueOptimization))
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), TestClass.class)
.assertFailureWithErrorThatMatches(containsString("NoSuchFieldError"))
diff --git a/src/test/java/com/android/tools/r8/enumunboxing/EnumToStringLibTest.java b/src/test/java/com/android/tools/r8/enumunboxing/EnumToStringLibTest.java
index 0d7a5dfc..8878fc6 100644
--- a/src/test/java/com/android/tools/r8/enumunboxing/EnumToStringLibTest.java
+++ b/src/test/java/com/android/tools/r8/enumunboxing/EnumToStringLibTest.java
@@ -71,7 +71,7 @@
options.enableEnumValueOptimization = enumValueOptimization;
options.enableEnumSwitchMapRemoval = enumValueOptimization;
})
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile();
compile
.run(parameters.getRuntime(), AlwaysCorrectProgram.class)
@@ -106,7 +106,6 @@
Reference.methodFromMethod(ToStringLib.class.getDeclaredMethod("directBean")),
Reference.methodFromMethod(ToStringLib.class.getDeclaredMethod("directSugar")))
.addKeepClassRules(ToStringLib.LibEnum.class)
- .setMinApi(parameters.getApiLevel())
.compile();
}
diff --git a/src/test/java/com/android/tools/r8/enumunboxing/EnumUnboxingArrayTest.java b/src/test/java/com/android/tools/r8/enumunboxing/EnumUnboxingArrayTest.java
index 4776d5f..c3919c7 100644
--- a/src/test/java/com/android/tools/r8/enumunboxing/EnumUnboxingArrayTest.java
+++ b/src/test/java/com/android/tools/r8/enumunboxing/EnumUnboxingArrayTest.java
@@ -59,7 +59,7 @@
EnumArrayReadWrite.MyEnum.class,
EnumArrayReadWriteNoEscape.MyEnum.class,
EnumVarArgs.MyEnum.class))
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile();
for (Class<?> main : TESTS) {
compile
diff --git a/src/test/java/com/android/tools/r8/enumunboxing/EnumUnboxingB160535628Test.java b/src/test/java/com/android/tools/r8/enumunboxing/EnumUnboxingB160535628Test.java
index 19b4a26..c59606a 100644
--- a/src/test/java/com/android/tools/r8/enumunboxing/EnumUnboxingB160535628Test.java
+++ b/src/test/java/com/android/tools/r8/enumunboxing/EnumUnboxingB160535628Test.java
@@ -58,7 +58,7 @@
!missingStaticMethods || enumKeepRules.isStudio(), Lib.LibEnum.class)
.assertUnboxedIf(!missingStaticMethods, Lib.LibEnumStaticMethod.class))
.allowDiagnosticMessages()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile();
if (missingStaticMethods) {
compile
@@ -93,7 +93,6 @@
inspector ->
inspector.assertNotUnboxed(Lib.LibEnum.class, Lib.LibEnumStaticMethod.class))
.allowDiagnosticMessages()
- .setMinApi(parameters.getApiLevel())
.compile()
.writeToZip();
}
diff --git a/src/test/java/com/android/tools/r8/enumunboxing/EnumUnboxingClassStaticizerTest.java b/src/test/java/com/android/tools/r8/enumunboxing/EnumUnboxingClassStaticizerTest.java
index b9b1e42..bba41af 100644
--- a/src/test/java/com/android/tools/r8/enumunboxing/EnumUnboxingClassStaticizerTest.java
+++ b/src/test/java/com/android/tools/r8/enumunboxing/EnumUnboxingClassStaticizerTest.java
@@ -53,7 +53,7 @@
.enableInliningAnnotations()
.addDontObfuscate() // For assertions.
.addOptionsModification(opt -> enableEnumOptions(opt, enumValueOptimization))
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::assertClassStaticized)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/enumunboxing/EnumUnboxingReturnNullTest.java b/src/test/java/com/android/tools/r8/enumunboxing/EnumUnboxingReturnNullTest.java
index 392807c..c1f38cf 100644
--- a/src/test/java/com/android/tools/r8/enumunboxing/EnumUnboxingReturnNullTest.java
+++ b/src/test/java/com/android/tools/r8/enumunboxing/EnumUnboxingReturnNullTest.java
@@ -48,7 +48,7 @@
.enableNeverClassInliningAnnotations()
.enableInliningAnnotations()
.addOptionsModification(opt -> enableEnumOptions(opt, enumValueOptimization))
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), classToTest)
.assertSuccessWithOutput(EXPECTED_RESULT);
diff --git a/src/test/java/com/android/tools/r8/enumunboxing/EnumUnboxingSideEffectClInitTest.java b/src/test/java/com/android/tools/r8/enumunboxing/EnumUnboxingSideEffectClInitTest.java
index 3475ecf..e00b204 100644
--- a/src/test/java/com/android/tools/r8/enumunboxing/EnumUnboxingSideEffectClInitTest.java
+++ b/src/test/java/com/android/tools/r8/enumunboxing/EnumUnboxingSideEffectClInitTest.java
@@ -41,7 +41,7 @@
.addEnumUnboxingInspector(inspector -> inspector.assertUnboxed(ENUM_CLASS))
.enableNeverClassInliningAnnotations()
.addOptionsModification(opt -> enableEnumOptions(opt, enumValueOptimization))
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), classToTest)
.assertSuccessWithOutputLines("0");
diff --git a/src/test/java/com/android/tools/r8/enumunboxing/EnumUnboxingVerticalClassMergeTest.java b/src/test/java/com/android/tools/r8/enumunboxing/EnumUnboxingVerticalClassMergeTest.java
index 6f53904..445eb6f 100644
--- a/src/test/java/com/android/tools/r8/enumunboxing/EnumUnboxingVerticalClassMergeTest.java
+++ b/src/test/java/com/android/tools/r8/enumunboxing/EnumUnboxingVerticalClassMergeTest.java
@@ -45,7 +45,7 @@
.enableInliningAnnotations()
.addDontObfuscate() // For assertions.
.addOptionsModification(opt -> enableEnumOptions(opt, enumValueOptimization))
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::assertVerticalClassMerged)
.run(parameters.getRuntime(), Main.class)
diff --git a/src/test/java/com/android/tools/r8/enumunboxing/EnumWithAssertionsDisabledStaticFieldTest.java b/src/test/java/com/android/tools/r8/enumunboxing/EnumWithAssertionsDisabledStaticFieldTest.java
index 9fcc1d0..3eed53c 100644
--- a/src/test/java/com/android/tools/r8/enumunboxing/EnumWithAssertionsDisabledStaticFieldTest.java
+++ b/src/test/java/com/android/tools/r8/enumunboxing/EnumWithAssertionsDisabledStaticFieldTest.java
@@ -72,7 +72,7 @@
})
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.enableRuntimeAssertions(enableRuntimeAssertions)
.run(parameters.getRuntime(), EnumWithAssertionsDisabledStaticFieldMainClass.class)
diff --git a/src/test/java/com/android/tools/r8/enumunboxing/EnumWithCheckNotNullUserUnboxingTest.java b/src/test/java/com/android/tools/r8/enumunboxing/EnumWithCheckNotNullUserUnboxingTest.java
index 3a28057..8166766 100644
--- a/src/test/java/com/android/tools/r8/enumunboxing/EnumWithCheckNotNullUserUnboxingTest.java
+++ b/src/test/java/com/android/tools/r8/enumunboxing/EnumWithCheckNotNullUserUnboxingTest.java
@@ -35,7 +35,7 @@
.addKeepRules(enumKeepRules.getKeepRules())
.addEnumUnboxingInspector(inspector -> inspector.assertUnboxed(MyEnum.class))
.enableInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines(
diff --git a/src/test/java/com/android/tools/r8/enumunboxing/EnumWithNonDefaultForwardingConstructorTest.java b/src/test/java/com/android/tools/r8/enumunboxing/EnumWithNonDefaultForwardingConstructorTest.java
index 926a7b0..67dd73e 100644
--- a/src/test/java/com/android/tools/r8/enumunboxing/EnumWithNonDefaultForwardingConstructorTest.java
+++ b/src/test/java/com/android/tools/r8/enumunboxing/EnumWithNonDefaultForwardingConstructorTest.java
@@ -51,7 +51,7 @@
.apply(this::addProgramClasses)
.addKeepMainRule(TestClass.class)
.addOptionsModification(options -> options.enableEnumUnboxing = enableEnumUnboxing)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutputLines("42");
diff --git a/src/test/java/com/android/tools/r8/enumunboxing/EnumWithStaticFieldUnboxingTest.java b/src/test/java/com/android/tools/r8/enumunboxing/EnumWithStaticFieldUnboxingTest.java
index 9e8e577..223c216 100644
--- a/src/test/java/com/android/tools/r8/enumunboxing/EnumWithStaticFieldUnboxingTest.java
+++ b/src/test/java/com/android/tools/r8/enumunboxing/EnumWithStaticFieldUnboxingTest.java
@@ -41,7 +41,7 @@
.addOptionsModification(opt -> enableEnumOptions(opt, enumValueOptimization))
.addEnumUnboxingInspector(
inspector -> inspector.assertUnboxed(EnumStaticFieldMain.EnumStaticField.class))
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), EnumStaticFieldMain.class)
.assertSuccess()
diff --git a/src/test/java/com/android/tools/r8/enumunboxing/EqualsCompareToEnumUnboxingTest.java b/src/test/java/com/android/tools/r8/enumunboxing/EqualsCompareToEnumUnboxingTest.java
index 4e38f3f..82689d3 100644
--- a/src/test/java/com/android/tools/r8/enumunboxing/EqualsCompareToEnumUnboxingTest.java
+++ b/src/test/java/com/android/tools/r8/enumunboxing/EqualsCompareToEnumUnboxingTest.java
@@ -42,7 +42,7 @@
.enableNeverClassInliningAnnotations()
.addKeepRules(enumKeepRules.getKeepRules())
.addOptionsModification(opt -> enableEnumOptions(opt, enumValueOptimization))
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), success)
.assertSuccess()
diff --git a/src/test/java/com/android/tools/r8/enumunboxing/FailingMethodEnumUnboxingTest.java b/src/test/java/com/android/tools/r8/enumunboxing/FailingMethodEnumUnboxingTest.java
index 52e4a53..46bc0d0 100644
--- a/src/test/java/com/android/tools/r8/enumunboxing/FailingMethodEnumUnboxingTest.java
+++ b/src/test/java/com/android/tools/r8/enumunboxing/FailingMethodEnumUnboxingTest.java
@@ -66,7 +66,7 @@
.enableNeverClassInliningAnnotations()
// TODO(b/173398086): uniqueMethodWithName() does not work with signature changes.
.addDontObfuscate()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::assertEnumsAsExpected);
for (Class<?> main : TESTS) {
diff --git a/src/test/java/com/android/tools/r8/enumunboxing/FieldPutEnumUnboxingTest.java b/src/test/java/com/android/tools/r8/enumunboxing/FieldPutEnumUnboxingTest.java
index fce366e..f69b26c 100644
--- a/src/test/java/com/android/tools/r8/enumunboxing/FieldPutEnumUnboxingTest.java
+++ b/src/test/java/com/android/tools/r8/enumunboxing/FieldPutEnumUnboxingTest.java
@@ -52,7 +52,7 @@
InstanceFieldPut.MyEnum.class, StaticFieldPut.MyEnum.class))
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addDontObfuscate()
.compile()
.inspect(
diff --git a/src/test/java/com/android/tools/r8/enumunboxing/InstanceFieldsEnumUnboxingTest.java b/src/test/java/com/android/tools/r8/enumunboxing/InstanceFieldsEnumUnboxingTest.java
index a493981..0f82ca4 100644
--- a/src/test/java/com/android/tools/r8/enumunboxing/InstanceFieldsEnumUnboxingTest.java
+++ b/src/test/java/com/android/tools/r8/enumunboxing/InstanceFieldsEnumUnboxingTest.java
@@ -76,7 +76,7 @@
.enableNeverClassInliningAnnotations()
.addKeepRules(enumKeepRules.getKeepRules())
.addOptionsModification(opt -> enableEnumOptions(opt, enumValueOptimization))
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile();
for (Class<?> main : TESTS) {
testClass(compile, main);
diff --git a/src/test/java/com/android/tools/r8/enumunboxing/InterfaceEnumUnboxingTest.java b/src/test/java/com/android/tools/r8/enumunboxing/InterfaceEnumUnboxingTest.java
index bcf2ec5..f4d76cf 100644
--- a/src/test/java/com/android/tools/r8/enumunboxing/InterfaceEnumUnboxingTest.java
+++ b/src/test/java/com/android/tools/r8/enumunboxing/InterfaceEnumUnboxingTest.java
@@ -71,7 +71,7 @@
.enableNeverClassInliningAnnotations()
.addKeepRules(enumKeepRules.getKeepRules())
.addOptionsModification(opt -> enableEnumOptions(opt, enumValueOptimization))
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile();
for (Class<?> main : TESTS) {
testClass(compile, main);
diff --git a/src/test/java/com/android/tools/r8/enumunboxing/JavaCGeneratedMethodTest.java b/src/test/java/com/android/tools/r8/enumunboxing/JavaCGeneratedMethodTest.java
index aaf0239..e2412b2 100644
--- a/src/test/java/com/android/tools/r8/enumunboxing/JavaCGeneratedMethodTest.java
+++ b/src/test/java/com/android/tools/r8/enumunboxing/JavaCGeneratedMethodTest.java
@@ -43,7 +43,7 @@
.enableNeverClassInliningAnnotations()
.addOptionsModification(opt -> enableEnumOptions(opt, enumValueOptimization))
.addOptionsModification(opt -> opt.testing.enumUnboxingRewriteJavaCGeneratedMethod = true)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), classToTest)
.assertSuccess()
diff --git a/src/test/java/com/android/tools/r8/enumunboxing/LambdaEnumUnboxingEmptyEnumObjectTest.java b/src/test/java/com/android/tools/r8/enumunboxing/LambdaEnumUnboxingEmptyEnumObjectTest.java
index 5f24fbe..d36e93c 100644
--- a/src/test/java/com/android/tools/r8/enumunboxing/LambdaEnumUnboxingEmptyEnumObjectTest.java
+++ b/src/test/java/com/android/tools/r8/enumunboxing/LambdaEnumUnboxingEmptyEnumObjectTest.java
@@ -48,7 +48,7 @@
inspector ->
inspector.assertUnboxedIf(
enumKeepRules.isNone() && parameters.getBackend().isDex(), MyEnum.class))
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("null");
diff --git a/src/test/java/com/android/tools/r8/enumunboxing/LambdaEnumUnboxingEmptyEnumTest.java b/src/test/java/com/android/tools/r8/enumunboxing/LambdaEnumUnboxingEmptyEnumTest.java
index 14eba8a..2964bde 100644
--- a/src/test/java/com/android/tools/r8/enumunboxing/LambdaEnumUnboxingEmptyEnumTest.java
+++ b/src/test/java/com/android/tools/r8/enumunboxing/LambdaEnumUnboxingEmptyEnumTest.java
@@ -46,7 +46,7 @@
.addOptionsModification(opt -> enableEnumOptions(opt, enumValueOptimization))
.addEnumUnboxingInspector(
inspector -> inspector.assertUnboxedIf(enumKeepRules.isNone(), MyEnum.class))
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("null");
diff --git a/src/test/java/com/android/tools/r8/enumunboxing/LambdaEnumUnboxingTest.java b/src/test/java/com/android/tools/r8/enumunboxing/LambdaEnumUnboxingTest.java
index b99986a..02605f6 100644
--- a/src/test/java/com/android/tools/r8/enumunboxing/LambdaEnumUnboxingTest.java
+++ b/src/test/java/com/android/tools/r8/enumunboxing/LambdaEnumUnboxingTest.java
@@ -4,7 +4,6 @@
package com.android.tools.r8.enumunboxing;
-import static org.junit.Assert.assertFalse;
import com.android.tools.r8.NeverClassInline;
import com.android.tools.r8.NeverInline;
@@ -44,7 +43,7 @@
.enableInliningAnnotations()
.addOptionsModification(opt -> enableEnumOptions(opt, enumValueOptimization))
.addEnumUnboxingInspector(inspector -> inspector.assertUnboxed(MyEnum.class))
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("0", "0", "1", "0", "0");
diff --git a/src/test/java/com/android/tools/r8/enumunboxing/LargeEnumUnboxingTest.java b/src/test/java/com/android/tools/r8/enumunboxing/LargeEnumUnboxingTest.java
index ca48de2..1624d46 100644
--- a/src/test/java/com/android/tools/r8/enumunboxing/LargeEnumUnboxingTest.java
+++ b/src/test/java/com/android/tools/r8/enumunboxing/LargeEnumUnboxingTest.java
@@ -100,7 +100,7 @@
.addEnumUnboxingInspector(inspector -> inspector.assertUnboxed(LargeEnum.class))
.enableNeverClassInliningAnnotations()
.addOptionsModification(opt -> enableEnumOptions(opt, enumValueOptimization))
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), mainClass)
.assertSuccessWithOutput(EXPECTED_RESULT);
diff --git a/src/test/java/com/android/tools/r8/enumunboxing/NullAssignmentToArrayArgEnumUnboxingTest.java b/src/test/java/com/android/tools/r8/enumunboxing/NullAssignmentToArrayArgEnumUnboxingTest.java
index fa5450f..f0050f2 100644
--- a/src/test/java/com/android/tools/r8/enumunboxing/NullAssignmentToArrayArgEnumUnboxingTest.java
+++ b/src/test/java/com/android/tools/r8/enumunboxing/NullAssignmentToArrayArgEnumUnboxingTest.java
@@ -41,7 +41,7 @@
// replacing the checkNotNull method should not be inlined.
.addOptionsModification(opt -> opt.inlinerOptions().enableInlining = false)
.addOptionsModification(opt -> enableEnumOptions(opt, enumValueOptimization))
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("false", "true", "npe", "npe");
diff --git a/src/test/java/com/android/tools/r8/enumunboxing/NullAssignmentToArrayTypeEnumUnboxingTest.java b/src/test/java/com/android/tools/r8/enumunboxing/NullAssignmentToArrayTypeEnumUnboxingTest.java
index 947121d..c790b9d 100644
--- a/src/test/java/com/android/tools/r8/enumunboxing/NullAssignmentToArrayTypeEnumUnboxingTest.java
+++ b/src/test/java/com/android/tools/r8/enumunboxing/NullAssignmentToArrayTypeEnumUnboxingTest.java
@@ -47,7 +47,7 @@
.addEnumUnboxingInspector(inspector -> inspector.assertUnboxed(MyEnum.class))
.enableInliningAnnotations()
.addOptionsModification(opt -> enableEnumOptions(opt, enumValueOptimization))
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector -> {
diff --git a/src/test/java/com/android/tools/r8/enumunboxing/NullCheckEnumUnboxingTest.java b/src/test/java/com/android/tools/r8/enumunboxing/NullCheckEnumUnboxingTest.java
index e8cc088..0d32bfd 100644
--- a/src/test/java/com/android/tools/r8/enumunboxing/NullCheckEnumUnboxingTest.java
+++ b/src/test/java/com/android/tools/r8/enumunboxing/NullCheckEnumUnboxingTest.java
@@ -48,7 +48,7 @@
.enableInliningAnnotations()
.addOptionsModification(opt -> enableEnumOptions(opt, enumValueOptimization))
.allowDiagnosticMessages()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), MainNullTest.class)
.assertSuccess()
diff --git a/src/test/java/com/android/tools/r8/enumunboxing/NullOutValueInvokeEnumUnboxingTest.java b/src/test/java/com/android/tools/r8/enumunboxing/NullOutValueInvokeEnumUnboxingTest.java
index 80eb9ab..63d7ca2 100644
--- a/src/test/java/com/android/tools/r8/enumunboxing/NullOutValueInvokeEnumUnboxingTest.java
+++ b/src/test/java/com/android/tools/r8/enumunboxing/NullOutValueInvokeEnumUnboxingTest.java
@@ -45,7 +45,7 @@
.enableNeverClassInliningAnnotations()
.enableInliningAnnotations()
.addOptionsModification(opt -> enableEnumOptions(opt, enumValueOptimization))
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), classToTest)
.assertSuccess()
diff --git a/src/test/java/com/android/tools/r8/enumunboxing/NullValuedFieldEnumUnboxingTest.java b/src/test/java/com/android/tools/r8/enumunboxing/NullValuedFieldEnumUnboxingTest.java
index db8a047..ed94e1c 100644
--- a/src/test/java/com/android/tools/r8/enumunboxing/NullValuedFieldEnumUnboxingTest.java
+++ b/src/test/java/com/android/tools/r8/enumunboxing/NullValuedFieldEnumUnboxingTest.java
@@ -34,7 +34,7 @@
.addKeepMainRule(Main.class)
.addKeepRules(enumKeepRules.getKeepRules())
.addEnumUnboxingInspector(inspector -> inspector.assertUnboxed(MyEnum.class))
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("a", "null");
diff --git a/src/test/java/com/android/tools/r8/enumunboxing/OrdinalHashCodeEnumUnboxingTest.java b/src/test/java/com/android/tools/r8/enumunboxing/OrdinalHashCodeEnumUnboxingTest.java
index 49b4f76..89e7565 100644
--- a/src/test/java/com/android/tools/r8/enumunboxing/OrdinalHashCodeEnumUnboxingTest.java
+++ b/src/test/java/com/android/tools/r8/enumunboxing/OrdinalHashCodeEnumUnboxingTest.java
@@ -45,7 +45,7 @@
.enableNeverClassInliningAnnotations()
.enableInliningAnnotations()
.addOptionsModification(opt -> enableEnumOptions(opt, enumValueOptimization))
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), classToTest)
.assertSuccess()
diff --git a/src/test/java/com/android/tools/r8/enumunboxing/OverloadingEnumUnboxingTest.java b/src/test/java/com/android/tools/r8/enumunboxing/OverloadingEnumUnboxingTest.java
index 5df98f1..d9e84f4 100644
--- a/src/test/java/com/android/tools/r8/enumunboxing/OverloadingEnumUnboxingTest.java
+++ b/src/test/java/com/android/tools/r8/enumunboxing/OverloadingEnumUnboxingTest.java
@@ -44,7 +44,7 @@
.enableNeverClassInliningAnnotations()
.enableInliningAnnotations()
.addOptionsModification(opt -> enableEnumOptions(opt, enumValueOptimization))
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), classToTest)
.assertSuccess()
diff --git a/src/test/java/com/android/tools/r8/enumunboxing/PhiEnumUnboxingTest.java b/src/test/java/com/android/tools/r8/enumunboxing/PhiEnumUnboxingTest.java
index 536d066..16708c9 100644
--- a/src/test/java/com/android/tools/r8/enumunboxing/PhiEnumUnboxingTest.java
+++ b/src/test/java/com/android/tools/r8/enumunboxing/PhiEnumUnboxingTest.java
@@ -42,7 +42,7 @@
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
.addOptionsModification(opt -> enableEnumOptions(opt, enumValueOptimization))
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), Phi.class)
.assertSuccess()
diff --git a/src/test/java/com/android/tools/r8/enumunboxing/PinnedEnumUnboxingTest.java b/src/test/java/com/android/tools/r8/enumunboxing/PinnedEnumUnboxingTest.java
index 6391a99..5c91391 100644
--- a/src/test/java/com/android/tools/r8/enumunboxing/PinnedEnumUnboxingTest.java
+++ b/src/test/java/com/android/tools/r8/enumunboxing/PinnedEnumUnboxingTest.java
@@ -50,7 +50,7 @@
MainWithKeptEnum.MyEnum.class, MainWithKeptEnumArray.MyEnum.class))
.enableNeverClassInliningAnnotations()
.addOptionsModification(opt -> enableEnumOptions(opt, enumValueOptimization))
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile();
for (Class<?> main : TESTS) {
compileResult.run(parameters.getRuntime(), main).assertSuccessWithOutputLines("0");
diff --git a/src/test/java/com/android/tools/r8/enumunboxing/PrivateEnumWithPrivateInvokeSpecialTest.java b/src/test/java/com/android/tools/r8/enumunboxing/PrivateEnumWithPrivateInvokeSpecialTest.java
index 3943993..e5b78cc 100644
--- a/src/test/java/com/android/tools/r8/enumunboxing/PrivateEnumWithPrivateInvokeSpecialTest.java
+++ b/src/test/java/com/android/tools/r8/enumunboxing/PrivateEnumWithPrivateInvokeSpecialTest.java
@@ -28,7 +28,7 @@
public void testR8() throws Exception {
testForR8(parameters.getBackend())
.addInnerClasses(getClass())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(Main.class)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("FOO");
diff --git a/src/test/java/com/android/tools/r8/enumunboxing/RedundantValuesCloneEnumUnboxingTest.java b/src/test/java/com/android/tools/r8/enumunboxing/RedundantValuesCloneEnumUnboxingTest.java
index 82c48eb..a12e9d1 100644
--- a/src/test/java/com/android/tools/r8/enumunboxing/RedundantValuesCloneEnumUnboxingTest.java
+++ b/src/test/java/com/android/tools/r8/enumunboxing/RedundantValuesCloneEnumUnboxingTest.java
@@ -33,7 +33,7 @@
.addInnerClasses(getClass())
.addKeepMainRule(Main.class)
.addEnumUnboxingInspector(inspector -> inspector.assertUnboxed(MyEnum.class))
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
// Verify that there are no calls to clone().
.inspect(
diff --git a/src/test/java/com/android/tools/r8/enumunboxing/StaticMethodsEnumUnboxingTest.java b/src/test/java/com/android/tools/r8/enumunboxing/StaticMethodsEnumUnboxingTest.java
index 43be887..4bd36c5 100644
--- a/src/test/java/com/android/tools/r8/enumunboxing/StaticMethodsEnumUnboxingTest.java
+++ b/src/test/java/com/android/tools/r8/enumunboxing/StaticMethodsEnumUnboxingTest.java
@@ -43,7 +43,7 @@
.enableNeverClassInliningAnnotations()
.enableInliningAnnotations()
.addOptionsModification(opt -> enableEnumOptions(opt, enumValueOptimization))
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), classToTest)
.assertSuccess()
diff --git a/src/test/java/com/android/tools/r8/enumunboxing/StringValueOfEnumUnboxingTest.java b/src/test/java/com/android/tools/r8/enumunboxing/StringValueOfEnumUnboxingTest.java
index 2211d08..d8c656d 100644
--- a/src/test/java/com/android/tools/r8/enumunboxing/StringValueOfEnumUnboxingTest.java
+++ b/src/test/java/com/android/tools/r8/enumunboxing/StringValueOfEnumUnboxingTest.java
@@ -41,7 +41,7 @@
.enableNeverClassInliningAnnotations()
.enableInliningAnnotations()
.addOptionsModification(opt -> enableEnumOptions(opt, enumValueOptimization))
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), classToTest)
.assertSuccess()
diff --git a/src/test/java/com/android/tools/r8/enumunboxing/SwitchEnumUnboxingTest.java b/src/test/java/com/android/tools/r8/enumunboxing/SwitchEnumUnboxingTest.java
index 8b67ed9..b5910da 100644
--- a/src/test/java/com/android/tools/r8/enumunboxing/SwitchEnumUnboxingTest.java
+++ b/src/test/java/com/android/tools/r8/enumunboxing/SwitchEnumUnboxingTest.java
@@ -51,7 +51,7 @@
.enableNeverClassInliningAnnotations()
.addDontObfuscate() // For assertions.
.addOptionsModification(opt -> enableEnumOptions(opt, enumValueOptimization))
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::assertSwitchPresentButSwitchMapRemoved)
.run(parameters.getRuntime(), classToTest)
diff --git a/src/test/java/com/android/tools/r8/enumunboxing/ToStringEnumUnboxingTest.java b/src/test/java/com/android/tools/r8/enumunboxing/ToStringEnumUnboxingTest.java
index 99e4e25..b427439 100644
--- a/src/test/java/com/android/tools/r8/enumunboxing/ToStringEnumUnboxingTest.java
+++ b/src/test/java/com/android/tools/r8/enumunboxing/ToStringEnumUnboxingTest.java
@@ -42,7 +42,7 @@
.enableNeverClassInliningAnnotations()
.addKeepRules(enumKeepRules.getKeepRules())
.addOptionsModification(opt -> enableEnumOptions(opt, enumValueOptimization))
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), success)
.assertSuccess()
diff --git a/src/test/java/com/android/tools/r8/enumunboxing/ToStringOverrideEnumUnboxingTest.java b/src/test/java/com/android/tools/r8/enumunboxing/ToStringOverrideEnumUnboxingTest.java
index d8d115c..82ffe50 100644
--- a/src/test/java/com/android/tools/r8/enumunboxing/ToStringOverrideEnumUnboxingTest.java
+++ b/src/test/java/com/android/tools/r8/enumunboxing/ToStringOverrideEnumUnboxingTest.java
@@ -42,7 +42,7 @@
.addOptionsModification(opt -> enableEnumOptions(opt, enumValueOptimization))
.addEnumUnboxingInspector(
inspector -> inspector.assertNotUnboxed(EnumNameToString.MyEnum.class))
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), success)
.assertSuccess()
diff --git a/src/test/java/com/android/tools/r8/enumunboxing/UnusedCaseEnumUnboxingTest.java b/src/test/java/com/android/tools/r8/enumunboxing/UnusedCaseEnumUnboxingTest.java
index 6a35396..6949986 100644
--- a/src/test/java/com/android/tools/r8/enumunboxing/UnusedCaseEnumUnboxingTest.java
+++ b/src/test/java/com/android/tools/r8/enumunboxing/UnusedCaseEnumUnboxingTest.java
@@ -41,7 +41,7 @@
.enableInliningAnnotations()
.addKeepRules(enumKeepRules.getKeepRules())
.addOptionsModification(opt -> enableEnumOptions(opt, enumValueOptimization))
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::assertFieldsRemoved)
.run(parameters.getRuntime(), Main.class)
diff --git a/src/test/java/com/android/tools/r8/enumunboxing/ValueOfEnumUnboxingFailureTest.java b/src/test/java/com/android/tools/r8/enumunboxing/ValueOfEnumUnboxingFailureTest.java
index 15bdcb7..e75d109 100644
--- a/src/test/java/com/android/tools/r8/enumunboxing/ValueOfEnumUnboxingFailureTest.java
+++ b/src/test/java/com/android/tools/r8/enumunboxing/ValueOfEnumUnboxingFailureTest.java
@@ -40,7 +40,7 @@
.enableNeverClassInliningAnnotations()
.addKeepRules(enumKeepRules.getKeepRules())
.addOptionsModification(opt -> enableEnumOptions(opt, enumValueOptimization))
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), success)
.assertSuccessWithOutput("VALUE1");
diff --git a/src/test/java/com/android/tools/r8/enumunboxing/ValueOfEnumUnboxingTest.java b/src/test/java/com/android/tools/r8/enumunboxing/ValueOfEnumUnboxingTest.java
index eabf368..f976adb 100644
--- a/src/test/java/com/android/tools/r8/enumunboxing/ValueOfEnumUnboxingTest.java
+++ b/src/test/java/com/android/tools/r8/enumunboxing/ValueOfEnumUnboxingTest.java
@@ -47,7 +47,7 @@
.enableNeverClassInliningAnnotations()
.addKeepRules(enumKeepRules.getKeepRules())
.addOptionsModification(opt -> enableEnumOptions(opt, enumValueOptimization))
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile();
for (Class<?> main : TESTS) {
compile
diff --git a/src/test/java/com/android/tools/r8/enumunboxing/ValueOfWithoutCastEnumUnboxingTest.java b/src/test/java/com/android/tools/r8/enumunboxing/ValueOfWithoutCastEnumUnboxingTest.java
index e213b3b..ca36164 100644
--- a/src/test/java/com/android/tools/r8/enumunboxing/ValueOfWithoutCastEnumUnboxingTest.java
+++ b/src/test/java/com/android/tools/r8/enumunboxing/ValueOfWithoutCastEnumUnboxingTest.java
@@ -44,7 +44,7 @@
.addEnumUnboxingInspector(inspector -> inspector.assertNotUnboxed(MyEnum.class))
.addOptionsModification(opt -> enableEnumOptions(opt, enumValueOptimization))
.enableInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("A");
diff --git a/src/test/java/com/android/tools/r8/enumunboxing/VirtualMethodOverrideEnumUnboxingTest.java b/src/test/java/com/android/tools/r8/enumunboxing/VirtualMethodOverrideEnumUnboxingTest.java
index 9dcd9cb..d14fe97 100644
--- a/src/test/java/com/android/tools/r8/enumunboxing/VirtualMethodOverrideEnumUnboxingTest.java
+++ b/src/test/java/com/android/tools/r8/enumunboxing/VirtualMethodOverrideEnumUnboxingTest.java
@@ -54,7 +54,7 @@
.enableNoVerticalClassMergingAnnotations()
.addOptionsModification(options -> enableEnumOptions(options, enumValueOptimization))
.addEnumUnboxingInspector(inspector -> inspector.assertUnboxed(MyEnum.class))
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/enumunboxing/VirtualMethodsAccessibilityErrorEnumUnboxingTest.java b/src/test/java/com/android/tools/r8/enumunboxing/VirtualMethodsAccessibilityErrorEnumUnboxingTest.java
index 8cb9018..49c69dc 100644
--- a/src/test/java/com/android/tools/r8/enumunboxing/VirtualMethodsAccessibilityErrorEnumUnboxingTest.java
+++ b/src/test/java/com/android/tools/r8/enumunboxing/VirtualMethodsAccessibilityErrorEnumUnboxingTest.java
@@ -67,7 +67,7 @@
.enableNeverClassInliningAnnotations()
.enableInliningAnnotations()
.addOptionsModification(opt -> enableEnumOptions(opt, enumValueOptimization))
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), TestClass.class)
.assertFailureWithErrorThatMatches(containsString("java.lang.IllegalAccessError"));
diff --git a/src/test/java/com/android/tools/r8/enumunboxing/VirtualMethodsEnumUnboxingTest.java b/src/test/java/com/android/tools/r8/enumunboxing/VirtualMethodsEnumUnboxingTest.java
index c24a4d9..273afcb 100644
--- a/src/test/java/com/android/tools/r8/enumunboxing/VirtualMethodsEnumUnboxingTest.java
+++ b/src/test/java/com/android/tools/r8/enumunboxing/VirtualMethodsEnumUnboxingTest.java
@@ -50,7 +50,7 @@
.enableNeverClassInliningAnnotations()
.enableInliningAnnotations()
.addOptionsModification(opt -> enableEnumOptions(opt, enumValueOptimization))
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), classToTest)
.assertSuccess()
diff --git a/src/test/java/com/android/tools/r8/enumunboxing/kotlin/SimpleKotlinEnumUnboxingTest.java b/src/test/java/com/android/tools/r8/enumunboxing/kotlin/SimpleKotlinEnumUnboxingTest.java
index eace966..fcbbf70 100644
--- a/src/test/java/com/android/tools/r8/enumunboxing/kotlin/SimpleKotlinEnumUnboxingTest.java
+++ b/src/test/java/com/android/tools/r8/enumunboxing/kotlin/SimpleKotlinEnumUnboxingTest.java
@@ -76,7 +76,7 @@
.addEnumUnboxingInspector(
inspector -> inspector.assertUnboxedIf(!kotlinParameters.isKotlinDev(), PKG + ".Color"))
.allowDiagnosticMessages()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspectDiagnosticMessages(
messages ->
diff --git a/src/test/java/com/android/tools/r8/examples/abstractmethodremoval/AbstractMethodRemovalTestRunner.java b/src/test/java/com/android/tools/r8/examples/abstractmethodremoval/AbstractMethodRemovalTestRunner.java
index 39d93b9..78e971c 100644
--- a/src/test/java/com/android/tools/r8/examples/abstractmethodremoval/AbstractMethodRemovalTestRunner.java
+++ b/src/test/java/com/android/tools/r8/examples/abstractmethodremoval/AbstractMethodRemovalTestRunner.java
@@ -63,7 +63,7 @@
testForR8(parameters.getBackend())
.addProgramClasses(getProgramClasses())
.addKeepMainRule(getMainClass())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), getMainClass())
.assertSuccessWithOutput(getExpected());
}
diff --git a/src/test/java/com/android/tools/r8/examples/newarray/NewArrayTestRunner.java b/src/test/java/com/android/tools/r8/examples/newarray/NewArrayTestRunner.java
index 219dbed..b36fa2c 100644
--- a/src/test/java/com/android/tools/r8/examples/newarray/NewArrayTestRunner.java
+++ b/src/test/java/com/android/tools/r8/examples/newarray/NewArrayTestRunner.java
@@ -91,7 +91,7 @@
assumeTrue(parameters.isDexRuntime());
testForD8()
.addProgramClassesAndInnerClasses(CLASS)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.setMode(mode)
.run(parameters.getRuntime(), CLASS)
.assertSuccessWithOutputLines(EXPECTED);
@@ -107,7 +107,7 @@
options ->
options.testing.enableMultiANewArrayDesugaringForClassFiles =
enableMultiANewArrayDesugaringForClassFiles)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.setMode(mode)
.run(parameters.getRuntime(), CLASS)
.assertSuccessWithOutputLines(EXPECTED);
diff --git a/src/test/java/com/android/tools/r8/files/AarInputTest.java b/src/test/java/com/android/tools/r8/files/AarInputTest.java
index 17c86eb..f712f17 100644
--- a/src/test/java/com/android/tools/r8/files/AarInputTest.java
+++ b/src/test/java/com/android/tools/r8/files/AarInputTest.java
@@ -54,7 +54,7 @@
} else {
testForD8()
.addProgramFiles(buildAar())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(inspector -> assertThat(inspector.clazz(TestClass.class), isPresent()))
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/graph/GenericSignatureTest.java b/src/test/java/com/android/tools/r8/graph/GenericSignatureTest.java
index 16daaac..4c92f65 100644
--- a/src/test/java/com/android/tools/r8/graph/GenericSignatureTest.java
+++ b/src/test/java/com/android/tools/r8/graph/GenericSignatureTest.java
@@ -65,7 +65,7 @@
GenericSignatureTestClassB.class,
GenericSignatureTestClassCY.class,
GenericSignatureTestClassCYY.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile();
AndroidApp app =
AndroidApp.builder(compileResult.getApp())
diff --git a/src/test/java/com/android/tools/r8/graph/InvokeSuperTest.java b/src/test/java/com/android/tools/r8/graph/InvokeSuperTest.java
index 5b2431d..4e8caaa 100644
--- a/src/test/java/com/android/tools/r8/graph/InvokeSuperTest.java
+++ b/src/test/java/com/android/tools/r8/graph/InvokeSuperTest.java
@@ -99,7 +99,7 @@
SubLevel2.class,
SubClassOfInvokerClass.class)
.addProgramClassFileData(InvokerClassDump.dumpVerifying())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(MainClass.class)
.run(parameters.getRuntime(), MainClass.class)
.assertSuccessWithOutput(EXPECTED);
@@ -148,7 +148,7 @@
SubLevel2.class,
SubClassOfInvokerClass.class)
.addProgramClassFileData(InvokerClassDump.dumpNonVerifying())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(MainClassFailing.class)
.addOptionsModification(o -> o.testing.allowTypeErrors = true)
.allowDiagnosticWarningMessages()
diff --git a/src/test/java/com/android/tools/r8/graph/genericsignature/FormalTypeParameterClassBoundPruneTest.java b/src/test/java/com/android/tools/r8/graph/genericsignature/FormalTypeParameterClassBoundPruneTest.java
index 68e1518..79cb85f 100644
--- a/src/test/java/com/android/tools/r8/graph/genericsignature/FormalTypeParameterClassBoundPruneTest.java
+++ b/src/test/java/com/android/tools/r8/graph/genericsignature/FormalTypeParameterClassBoundPruneTest.java
@@ -87,7 +87,7 @@
transformer(Interface.class).removeInnerClasses().transform())
.addKeepMainRule(Main.class)
.addKeepClassRules(Interface.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepAttributes(
ProguardKeepAttributes.SIGNATURE,
ProguardKeepAttributes.INNER_CLASSES,
diff --git a/src/test/java/com/android/tools/r8/graph/genericsignature/GenericSignatureAllowShrinkingTest.java b/src/test/java/com/android/tools/r8/graph/genericsignature/GenericSignatureAllowShrinkingTest.java
index be24a34..368dad3 100644
--- a/src/test/java/com/android/tools/r8/graph/genericsignature/GenericSignatureAllowShrinkingTest.java
+++ b/src/test/java/com/android/tools/r8/graph/genericsignature/GenericSignatureAllowShrinkingTest.java
@@ -40,7 +40,7 @@
public void testR8WithDirectKeep() throws Exception {
testForR8(parameters.getBackend())
.addInnerClasses(getClass())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepClassRules(Foo.class)
.addKeepRules("-keep class * extends " + Foo.class.getTypeName() + " { *; }")
.addKeepAttributes(ProguardKeepAttributes.SIGNATURE)
@@ -54,7 +54,7 @@
public void testR8AllowShrinking() throws Exception {
testForR8(parameters.getBackend())
.addInnerClasses(getClass())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepRules("-keep,allowshrinking class " + Foo.class.getTypeName() + " { *; }")
.addKeepRules(
"-keep,allowshrinking,allowobfuscation class * extends "
diff --git a/src/test/java/com/android/tools/r8/graph/genericsignature/GenericSignatureDontOptimizeTest.java b/src/test/java/com/android/tools/r8/graph/genericsignature/GenericSignatureDontOptimizeTest.java
index 94adea2..1ed331e 100644
--- a/src/test/java/com/android/tools/r8/graph/genericsignature/GenericSignatureDontOptimizeTest.java
+++ b/src/test/java/com/android/tools/r8/graph/genericsignature/GenericSignatureDontOptimizeTest.java
@@ -41,7 +41,7 @@
public void testR8() throws Exception {
testForR8(parameters.getBackend())
.addInnerClasses(getClass())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepAttributes(ProguardKeepAttributes.SIGNATURE)
.addKeepClassRules(Foo.class)
.addKeepMainRule(Main.class)
diff --git a/src/test/java/com/android/tools/r8/graph/genericsignature/GenericSignatureEnclosingTest.java b/src/test/java/com/android/tools/r8/graph/genericsignature/GenericSignatureEnclosingTest.java
index 5eccad7..3cf8451 100644
--- a/src/test/java/com/android/tools/r8/graph/genericsignature/GenericSignatureEnclosingTest.java
+++ b/src/test/java/com/android/tools/r8/graph/genericsignature/GenericSignatureEnclosingTest.java
@@ -49,7 +49,7 @@
.addKeepMainRule(Main.class)
.addKeepClassRules(Foo.class)
.addKeepAttributeSignature()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addOptionsModification(
options -> {
options.horizontalClassMergerOptions().disable();
diff --git a/src/test/java/com/android/tools/r8/graph/genericsignature/GenericSignatureInvalidInfoKeepTest.java b/src/test/java/com/android/tools/r8/graph/genericsignature/GenericSignatureInvalidInfoKeepTest.java
index b9248aa..878a682 100644
--- a/src/test/java/com/android/tools/r8/graph/genericsignature/GenericSignatureInvalidInfoKeepTest.java
+++ b/src/test/java/com/android/tools/r8/graph/genericsignature/GenericSignatureInvalidInfoKeepTest.java
@@ -41,7 +41,7 @@
transformer(A.class)
.setGenericSignature(MethodPredicate.onName("foo"), (String) null)
.transform())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(Main.class)
.compile()
// This tests that no info messages are generated due to us removing the generic parameters
diff --git a/src/test/java/com/android/tools/r8/graph/genericsignature/GenericSignatureKeepAttributesTest.java b/src/test/java/com/android/tools/r8/graph/genericsignature/GenericSignatureKeepAttributesTest.java
index efc246f..c1ae4f6 100644
--- a/src/test/java/com/android/tools/r8/graph/genericsignature/GenericSignatureKeepAttributesTest.java
+++ b/src/test/java/com/android/tools/r8/graph/genericsignature/GenericSignatureKeepAttributesTest.java
@@ -68,7 +68,7 @@
(isCompat ? testForR8Compat(parameters.getBackend()) : testForR8(parameters.getBackend()))
.addProgramClasses(Supplier.class, Predicate.class, Outer.class, Middle.class, Main.class)
.addProgramClassFileData(getClassFileData())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepAttributeSignature()
.addKeepAttributeInnerClassesAndEnclosingMethod()
.addKeepMainRule(Main.class)
diff --git a/src/test/java/com/android/tools/r8/graph/genericsignature/GenericSignatureKeepReferencesPruneTest.java b/src/test/java/com/android/tools/r8/graph/genericsignature/GenericSignatureKeepReferencesPruneTest.java
index f412cdf..082fece 100644
--- a/src/test/java/com/android/tools/r8/graph/genericsignature/GenericSignatureKeepReferencesPruneTest.java
+++ b/src/test/java/com/android/tools/r8/graph/genericsignature/GenericSignatureKeepReferencesPruneTest.java
@@ -68,7 +68,7 @@
.addProgramClasses(I.class, Foo.class, J.class, K.class, L.class)
.addProgramClassesAndInnerClasses(Main.class)
.addKeepClassAndMembersRules(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepAttributeSignature()
.addKeepAttributeInnerClassesAndEnclosingMethod()
.enableInliningAnnotations()
diff --git a/src/test/java/com/android/tools/r8/graph/genericsignature/GenericSignaturePrunedInterfacesKeepTest.java b/src/test/java/com/android/tools/r8/graph/genericsignature/GenericSignaturePrunedInterfacesKeepTest.java
index 0e09d6a..6d6b915 100644
--- a/src/test/java/com/android/tools/r8/graph/genericsignature/GenericSignaturePrunedInterfacesKeepTest.java
+++ b/src/test/java/com/android/tools/r8/graph/genericsignature/GenericSignaturePrunedInterfacesKeepTest.java
@@ -38,7 +38,7 @@
public void testR8() throws Exception {
testForR8(parameters.getBackend())
.addInnerClasses(getClass())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepAllClassesRule()
.addKeepAttributeSignature()
.addKeepAttributeInnerClassesAndEnclosingMethod()
diff --git a/src/test/java/com/android/tools/r8/graph/genericsignature/GenericSignaturePrunedInterfacesObfuscationTest.java b/src/test/java/com/android/tools/r8/graph/genericsignature/GenericSignaturePrunedInterfacesObfuscationTest.java
index 7cf462c..aac5da3 100644
--- a/src/test/java/com/android/tools/r8/graph/genericsignature/GenericSignaturePrunedInterfacesObfuscationTest.java
+++ b/src/test/java/com/android/tools/r8/graph/genericsignature/GenericSignaturePrunedInterfacesObfuscationTest.java
@@ -33,7 +33,7 @@
public void testR8() throws Exception {
testForR8Compat(parameters.getBackend())
.addInnerClasses(getClass())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(Main.class)
.addKeepClassRules(I.class, A.class)
.addKeepClassRulesWithAllowObfuscation(J.class)
diff --git a/src/test/java/com/android/tools/r8/graph/genericsignature/GenericSignaturePrunedInterfacesTest.java b/src/test/java/com/android/tools/r8/graph/genericsignature/GenericSignaturePrunedInterfacesTest.java
index 85cee97..2778dd0 100644
--- a/src/test/java/com/android/tools/r8/graph/genericsignature/GenericSignaturePrunedInterfacesTest.java
+++ b/src/test/java/com/android/tools/r8/graph/genericsignature/GenericSignaturePrunedInterfacesTest.java
@@ -39,7 +39,7 @@
public void testR8() throws Exception {
testForR8Compat(parameters.getBackend())
.addInnerClasses(getClass())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(Main.class)
.addKeepClassRules(I.class, J.class, A.class)
.addKeepAttributeSignature()
diff --git a/src/test/java/com/android/tools/r8/graph/genericsignature/GenericSignaturePrunedOuterRecursiveTest.java b/src/test/java/com/android/tools/r8/graph/genericsignature/GenericSignaturePrunedOuterRecursiveTest.java
index 79534a4..b0aaf3e 100644
--- a/src/test/java/com/android/tools/r8/graph/genericsignature/GenericSignaturePrunedOuterRecursiveTest.java
+++ b/src/test/java/com/android/tools/r8/graph/genericsignature/GenericSignaturePrunedOuterRecursiveTest.java
@@ -44,7 +44,7 @@
.addKeepMainRule(Main.class)
.addKeepAttributeSignature()
.addKeepAttributeInnerClassesAndEnclosingMethod()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addOptionsModification(options -> options.horizontalClassMergerOptions().disable())
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("Bar::enclosingMethod")
diff --git a/src/test/java/com/android/tools/r8/graph/genericsignature/GenericSignaturePrunedOuterTest.java b/src/test/java/com/android/tools/r8/graph/genericsignature/GenericSignaturePrunedOuterTest.java
index af2bb7f..c446ecf 100644
--- a/src/test/java/com/android/tools/r8/graph/genericsignature/GenericSignaturePrunedOuterTest.java
+++ b/src/test/java/com/android/tools/r8/graph/genericsignature/GenericSignaturePrunedOuterTest.java
@@ -44,7 +44,7 @@
.addKeepMainRule(Main.class)
.addKeepAttributeSignature()
.addKeepAttributeInnerClassesAndEnclosingMethod()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addOptionsModification(options -> options.horizontalClassMergerOptions().disable())
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines(
diff --git a/src/test/java/com/android/tools/r8/graph/genericsignature/GenericSignatureReflectiveInnerTest.java b/src/test/java/com/android/tools/r8/graph/genericsignature/GenericSignatureReflectiveInnerTest.java
index 3c32c7b..178b7bb 100644
--- a/src/test/java/com/android/tools/r8/graph/genericsignature/GenericSignatureReflectiveInnerTest.java
+++ b/src/test/java/com/android/tools/r8/graph/genericsignature/GenericSignatureReflectiveInnerTest.java
@@ -50,7 +50,7 @@
.addKeepAttributeSignature()
.addKeepClassRules(Foo.Bar.class)
.enableInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines(EXPECTED)
.inspect(
diff --git a/src/test/java/com/android/tools/r8/graph/genericsignature/GenericSignatureStaticMethodTest.java b/src/test/java/com/android/tools/r8/graph/genericsignature/GenericSignatureStaticMethodTest.java
index 05c8aa5..90e9febe 100644
--- a/src/test/java/com/android/tools/r8/graph/genericsignature/GenericSignatureStaticMethodTest.java
+++ b/src/test/java/com/android/tools/r8/graph/genericsignature/GenericSignatureStaticMethodTest.java
@@ -63,7 +63,7 @@
.addKeepAllClassesRule()
.addKeepAttributeSignature()
.addKeepAttributeInnerClassesAndEnclosingMethod()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines(EXPECTED);
}
diff --git a/src/test/java/com/android/tools/r8/graph/genericsignature/GenericSignatureVerticalMergeTest.java b/src/test/java/com/android/tools/r8/graph/genericsignature/GenericSignatureVerticalMergeTest.java
index a1cce6b..a715197 100644
--- a/src/test/java/com/android/tools/r8/graph/genericsignature/GenericSignatureVerticalMergeTest.java
+++ b/src/test/java/com/android/tools/r8/graph/genericsignature/GenericSignatureVerticalMergeTest.java
@@ -40,7 +40,7 @@
R8TestRunResult runResult =
testForR8Compat(parameters.getBackend())
.addInnerClasses(getClass())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(Main.class)
.addKeepClassRules(I.class, J.class)
.addKeepClassAndMembersRulesWithAllowObfuscation(Base.class)
diff --git a/src/test/java/com/android/tools/r8/graph/genericsignature/UnboundedFormalTypeGenericSignatureTest.java b/src/test/java/com/android/tools/r8/graph/genericsignature/UnboundedFormalTypeGenericSignatureTest.java
index 80939de..0c4edba 100644
--- a/src/test/java/com/android/tools/r8/graph/genericsignature/UnboundedFormalTypeGenericSignatureTest.java
+++ b/src/test/java/com/android/tools/r8/graph/genericsignature/UnboundedFormalTypeGenericSignatureTest.java
@@ -98,7 +98,7 @@
ProguardKeepAttributes.SIGNATURE,
ProguardKeepAttributes.INNER_CLASSES,
ProguardKeepAttributes.ENCLOSING_METHOD)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.allowDiagnosticInfoMessages()
.compile()
.apply(TestBase::verifyAllInfoFromGenericSignatureTypeParameterValidation)
@@ -124,7 +124,7 @@
ProguardKeepAttributes.SIGNATURE,
ProguardKeepAttributes.INNER_CLASSES,
ProguardKeepAttributes.ENCLOSING_METHOD)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.allowDiagnosticInfoMessages()
.compile()
.apply(TestBase::verifyAllInfoFromGenericSignatureTypeParameterValidation)
diff --git a/src/test/java/com/android/tools/r8/graph/genericsignature/UnknownClassInSignatureTest.java b/src/test/java/com/android/tools/r8/graph/genericsignature/UnknownClassInSignatureTest.java
index cf67f18..e754f95 100644
--- a/src/test/java/com/android/tools/r8/graph/genericsignature/UnknownClassInSignatureTest.java
+++ b/src/test/java/com/android/tools/r8/graph/genericsignature/UnknownClassInSignatureTest.java
@@ -55,7 +55,7 @@
ProguardKeepAttributes.SIGNATURE,
ProguardKeepAttributes.ENCLOSING_METHOD,
ProguardKeepAttributes.INNER_CLASSES)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.allowDiagnosticInfoMessages()
.compile()
.apply(TestBase::verifyExpectedInfoFromGenericSignatureSuperTypeValidation)
diff --git a/src/test/java/com/android/tools/r8/graph/initializedclasses/InitializedClassesInInstanceMethodsTest.java b/src/test/java/com/android/tools/r8/graph/initializedclasses/InitializedClassesInInstanceMethodsTest.java
index c77d3a3..aae9e11 100644
--- a/src/test/java/com/android/tools/r8/graph/initializedclasses/InitializedClassesInInstanceMethodsTest.java
+++ b/src/test/java/com/android/tools/r8/graph/initializedclasses/InitializedClassesInInstanceMethodsTest.java
@@ -56,7 +56,7 @@
.enableNeverClassInliningAnnotations()
.enableNoHorizontalClassMergingAnnotations()
.enableInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::verifyOutput)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/graph/invokespecial/InvokeSpecialForInvokeVirtualTest.java b/src/test/java/com/android/tools/r8/graph/invokespecial/InvokeSpecialForInvokeVirtualTest.java
index 41c7da1..4d28dba 100644
--- a/src/test/java/com/android/tools/r8/graph/invokespecial/InvokeSpecialForInvokeVirtualTest.java
+++ b/src/test/java/com/android/tools/r8/graph/invokespecial/InvokeSpecialForInvokeVirtualTest.java
@@ -51,7 +51,7 @@
.addProgramClasses(A.class, Main.class)
.addProgramClassFileData(getClassBWithTransformedInvoked())
.addKeepMainRule(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutput(EXPECTED);
}
diff --git a/src/test/java/com/android/tools/r8/graph/invokespecial/InvokeSpecialForNonDeclaredInvokeVirtualTest.java b/src/test/java/com/android/tools/r8/graph/invokespecial/InvokeSpecialForNonDeclaredInvokeVirtualTest.java
index 05e6c38..4ae689a 100644
--- a/src/test/java/com/android/tools/r8/graph/invokespecial/InvokeSpecialForNonDeclaredInvokeVirtualTest.java
+++ b/src/test/java/com/android/tools/r8/graph/invokespecial/InvokeSpecialForNonDeclaredInvokeVirtualTest.java
@@ -51,7 +51,7 @@
.addProgramClasses(A.class, B.class, Main.class)
.addProgramClassFileData(getClassCWithTransformedInvoked())
.addKeepMainRule(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutput(EXPECTED);
}
diff --git a/src/test/java/com/android/tools/r8/graph/invokespecial/InvokeSpecialInterfaceWithBridge2Test.java b/src/test/java/com/android/tools/r8/graph/invokespecial/InvokeSpecialInterfaceWithBridge2Test.java
index 7d666aa..f7f75b0 100644
--- a/src/test/java/com/android/tools/r8/graph/invokespecial/InvokeSpecialInterfaceWithBridge2Test.java
+++ b/src/test/java/com/android/tools/r8/graph/invokespecial/InvokeSpecialInterfaceWithBridge2Test.java
@@ -50,7 +50,7 @@
.addProgramClasses(I.class, A.class, Main.class)
.addProgramClassFileData(getClassWithTransformedInvoked())
.addKeepMainRule(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutput(EXPECTED);
}
diff --git a/src/test/java/com/android/tools/r8/graph/invokespecial/InvokeSpecialInterfaceWithBridge3Test.java b/src/test/java/com/android/tools/r8/graph/invokespecial/InvokeSpecialInterfaceWithBridge3Test.java
index 03aaab4..f0955fc 100644
--- a/src/test/java/com/android/tools/r8/graph/invokespecial/InvokeSpecialInterfaceWithBridge3Test.java
+++ b/src/test/java/com/android/tools/r8/graph/invokespecial/InvokeSpecialInterfaceWithBridge3Test.java
@@ -72,7 +72,7 @@
.addProgramClasses(I.class, A.class, Main.class)
.addProgramClassFileData(getClassWithTransformedInvoked())
.addKeepMainRule(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
// TODO(b/166210854): Runs but should have failed.
.assertSuccessWithOutput(EXPECTED);
diff --git a/src/test/java/com/android/tools/r8/graph/invokespecial/InvokeSpecialInterfaceWithBridgeTest.java b/src/test/java/com/android/tools/r8/graph/invokespecial/InvokeSpecialInterfaceWithBridgeTest.java
index 477532b..e89317f 100644
--- a/src/test/java/com/android/tools/r8/graph/invokespecial/InvokeSpecialInterfaceWithBridgeTest.java
+++ b/src/test/java/com/android/tools/r8/graph/invokespecial/InvokeSpecialInterfaceWithBridgeTest.java
@@ -48,7 +48,7 @@
.addProgramClasses(I.class, A.class, Main.class)
.addProgramClassFileData(getClassWithTransformedInvoked())
.addKeepMainRule(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("Hello World!");
}
diff --git a/src/test/java/com/android/tools/r8/graph/invokespecial/InvokeSpecialMissingInvokeVirtualTest.java b/src/test/java/com/android/tools/r8/graph/invokespecial/InvokeSpecialMissingInvokeVirtualTest.java
index fe03361..4e5b150 100644
--- a/src/test/java/com/android/tools/r8/graph/invokespecial/InvokeSpecialMissingInvokeVirtualTest.java
+++ b/src/test/java/com/android/tools/r8/graph/invokespecial/InvokeSpecialMissingInvokeVirtualTest.java
@@ -49,7 +49,7 @@
.addProgramClasses(A.class, Main.class)
.addProgramClassFileData(getClassWithTransformedInvoked())
.addKeepMainRule(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertFailureWithErrorThatMatches(containsString("NoSuchMethodError"));
}
diff --git a/src/test/java/com/android/tools/r8/graph/invokespecial/InvokeSpecialOnOtherInterfaceTest.java b/src/test/java/com/android/tools/r8/graph/invokespecial/InvokeSpecialOnOtherInterfaceTest.java
index d574d5a..475a8e7 100644
--- a/src/test/java/com/android/tools/r8/graph/invokespecial/InvokeSpecialOnOtherInterfaceTest.java
+++ b/src/test/java/com/android/tools/r8/graph/invokespecial/InvokeSpecialOnOtherInterfaceTest.java
@@ -58,7 +58,7 @@
.addProgramClassFileData(getClassWithTransformedInvoked())
.addKeepMainRule(Main.class)
.enableNoMethodStaticizingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
// TODO(b/144410139): Consider making this a compilation failure when generating DEX.
.applyIf(
diff --git a/src/test/java/com/android/tools/r8/graph/invokespecial/InvokeSpecialOnSameClassRecursionTest.java b/src/test/java/com/android/tools/r8/graph/invokespecial/InvokeSpecialOnSameClassRecursionTest.java
index 3ef9e29..784407a 100644
--- a/src/test/java/com/android/tools/r8/graph/invokespecial/InvokeSpecialOnSameClassRecursionTest.java
+++ b/src/test/java/com/android/tools/r8/graph/invokespecial/InvokeSpecialOnSameClassRecursionTest.java
@@ -44,7 +44,7 @@
.addProgramClasses(Main.class, B.class)
.addProgramClassFileData(getClassWithTransformedInvoked())
.addKeepMainRule(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("A.foo -1");
}
diff --git a/src/test/java/com/android/tools/r8/graph/invokespecial/InvokeSpecialOnSameClassTest.java b/src/test/java/com/android/tools/r8/graph/invokespecial/InvokeSpecialOnSameClassTest.java
index ffb5f37..e553660 100644
--- a/src/test/java/com/android/tools/r8/graph/invokespecial/InvokeSpecialOnSameClassTest.java
+++ b/src/test/java/com/android/tools/r8/graph/invokespecial/InvokeSpecialOnSameClassTest.java
@@ -40,13 +40,13 @@
@Test
public void testR8() throws Exception {
- testForR8(parameters.getBackend())
- .addProgramClasses(Main.class)
- .addProgramClassFileData(getClassWithTransformedInvoked())
- .addKeepMainRule(Main.class)
- .setMinApi(parameters.getApiLevel())
- .run(parameters.getRuntime(), Main.class)
- .assertSuccessWithOutputLines("Hello World!");
+ testForR8(parameters.getBackend())
+ .addProgramClasses(Main.class)
+ .addProgramClassFileData(getClassWithTransformedInvoked())
+ .addKeepMainRule(Main.class)
+ .setMinApi(parameters)
+ .run(parameters.getRuntime(), Main.class)
+ .assertSuccessWithOutputLines("Hello World!");
}
private byte[] getClassWithTransformedInvoked() throws IOException {
diff --git a/src/test/java/com/android/tools/r8/graph/invokespecial/InvokeSpecialOnSameInterfaceTest.java b/src/test/java/com/android/tools/r8/graph/invokespecial/InvokeSpecialOnSameInterfaceTest.java
index f57ce9b..dc129bb 100644
--- a/src/test/java/com/android/tools/r8/graph/invokespecial/InvokeSpecialOnSameInterfaceTest.java
+++ b/src/test/java/com/android/tools/r8/graph/invokespecial/InvokeSpecialOnSameInterfaceTest.java
@@ -44,7 +44,7 @@
.addProgramClasses(Main.class, A.class)
.addProgramClassFileData(getClassWithTransformedInvoked())
.addKeepMainRule(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("Hello World!");
}
diff --git a/src/test/java/com/android/tools/r8/graph/invokespecial/InvokeSpecialSuperVirtualTest.java b/src/test/java/com/android/tools/r8/graph/invokespecial/InvokeSpecialSuperVirtualTest.java
index 012dc0d..e3e14ac 100644
--- a/src/test/java/com/android/tools/r8/graph/invokespecial/InvokeSpecialSuperVirtualTest.java
+++ b/src/test/java/com/android/tools/r8/graph/invokespecial/InvokeSpecialSuperVirtualTest.java
@@ -50,7 +50,7 @@
.addProgramClasses(A.class, C.class, Main.class)
.addProgramClassFileData(getClassBWithTransformedInvoked())
.addKeepMainRule(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutput(EXPECTED_RESULT);
}
diff --git a/src/test/java/com/android/tools/r8/graph/invokespecial/InvokeSpecialToEnumUnboxedMethodTest.java b/src/test/java/com/android/tools/r8/graph/invokespecial/InvokeSpecialToEnumUnboxedMethodTest.java
index b9ee0f5..1dd345e 100644
--- a/src/test/java/com/android/tools/r8/graph/invokespecial/InvokeSpecialToEnumUnboxedMethodTest.java
+++ b/src/test/java/com/android/tools/r8/graph/invokespecial/InvokeSpecialToEnumUnboxedMethodTest.java
@@ -31,7 +31,7 @@
public void testR8() throws Exception {
testForR8Compat(parameters.getBackend())
.addInnerClasses(getClass())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(Main.class)
.enableInliningAnnotations()
.run(parameters.getRuntime(), Main.class)
diff --git a/src/test/java/com/android/tools/r8/graph/invokespecial/InvokeSpecialToMergedVirtualMethodTest.java b/src/test/java/com/android/tools/r8/graph/invokespecial/InvokeSpecialToMergedVirtualMethodTest.java
index 0c6d1fc..41bd1d3 100644
--- a/src/test/java/com/android/tools/r8/graph/invokespecial/InvokeSpecialToMergedVirtualMethodTest.java
+++ b/src/test/java/com/android/tools/r8/graph/invokespecial/InvokeSpecialToMergedVirtualMethodTest.java
@@ -49,7 +49,7 @@
inspector
.assertMergedInto(MergeIntoA.class, MergeIntoA.class)
.assertNoOtherClassesMerged())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("A.foo()");
}
diff --git a/src/test/java/com/android/tools/r8/graph/invokespecial/InvokeSpecialToMissingMethodDeclaredInSuperClassTest.java b/src/test/java/com/android/tools/r8/graph/invokespecial/InvokeSpecialToMissingMethodDeclaredInSuperClassTest.java
index b0efb2d..6c4893b 100644
--- a/src/test/java/com/android/tools/r8/graph/invokespecial/InvokeSpecialToMissingMethodDeclaredInSuperClassTest.java
+++ b/src/test/java/com/android/tools/r8/graph/invokespecial/InvokeSpecialToMissingMethodDeclaredInSuperClassTest.java
@@ -64,7 +64,7 @@
}
inspector.assertNoOtherClassesMerged();
}))
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("A.foo()");
}
diff --git a/src/test/java/com/android/tools/r8/graph/invokespecial/InvokeSpecialToMissingMethodDeclaredInSuperInterfaceTest.java b/src/test/java/com/android/tools/r8/graph/invokespecial/InvokeSpecialToMissingMethodDeclaredInSuperInterfaceTest.java
index 8cf0a34..8cb9af1 100644
--- a/src/test/java/com/android/tools/r8/graph/invokespecial/InvokeSpecialToMissingMethodDeclaredInSuperInterfaceTest.java
+++ b/src/test/java/com/android/tools/r8/graph/invokespecial/InvokeSpecialToMissingMethodDeclaredInSuperInterfaceTest.java
@@ -46,7 +46,7 @@
.addProgramClasses(A.class, C.class, Main.class)
.addProgramClassFileData(getClassWithTransformedInvoked())
.addKeepMainRule(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("A.foo()");
}
diff --git a/src/test/java/com/android/tools/r8/graph/invokespecial/InvokeSpecialToSubclassTest.java b/src/test/java/com/android/tools/r8/graph/invokespecial/InvokeSpecialToSubclassTest.java
index 043dcb7..eec3a33 100644
--- a/src/test/java/com/android/tools/r8/graph/invokespecial/InvokeSpecialToSubclassTest.java
+++ b/src/test/java/com/android/tools/r8/graph/invokespecial/InvokeSpecialToSubclassTest.java
@@ -81,7 +81,7 @@
.addProgramClassFileData(getClassBWithTransformedInvoked(holder))
.addKeepMainRule(Main.class)
.allowDiagnosticWarningMessages(!isExpectedToSucceedWithJvm())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compileWithExpectedDiagnostics(
diagnostics -> {
if (!isExpectedToSucceedWithJvm()) {
diff --git a/src/test/java/com/android/tools/r8/graph/invokespecial/InvokeSpecialToSuperclassTest.java b/src/test/java/com/android/tools/r8/graph/invokespecial/InvokeSpecialToSuperclassTest.java
index 90c61eb..aa28e59 100644
--- a/src/test/java/com/android/tools/r8/graph/invokespecial/InvokeSpecialToSuperclassTest.java
+++ b/src/test/java/com/android/tools/r8/graph/invokespecial/InvokeSpecialToSuperclassTest.java
@@ -68,7 +68,7 @@
.addProgramClasses(S.class, A.class, EmptySubA.class, Main.class)
.addProgramClassFileData(getClassBWithTransformedInvoked(holder))
.addKeepMainRule(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines(getExpectedResult(true));
}
diff --git a/src/test/java/com/android/tools/r8/graph/invokespecial/InvokeSpecialToVirtualMethodTest.java b/src/test/java/com/android/tools/r8/graph/invokespecial/InvokeSpecialToVirtualMethodTest.java
index 830283a..8b5ed7d 100644
--- a/src/test/java/com/android/tools/r8/graph/invokespecial/InvokeSpecialToVirtualMethodTest.java
+++ b/src/test/java/com/android/tools/r8/graph/invokespecial/InvokeSpecialToVirtualMethodTest.java
@@ -51,7 +51,7 @@
testForD8()
.addProgramClasses(Base.class, Bar.class, TestClass.class)
.addProgramClassFileData(getFooTransform())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutput(EXPECTED);
}
@@ -61,7 +61,7 @@
testForR8(parameters.getBackend())
.addProgramClasses(Base.class, Bar.class, TestClass.class)
.addProgramClassFileData(getFooTransform())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(TestClass.class)
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutput(EXPECTED);
@@ -73,7 +73,7 @@
testForDX()
.addProgramClasses(Base.class, Bar.class, TestClass.class)
.addProgramClassFileData(getFooTransform())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), TestClass.class)
.assertFailureWithErrorThatMatches(containsString(getExpectedOutput()));
}
diff --git a/src/test/java/com/android/tools/r8/graph/invokespecial/MultipleInvokeSpecialOnSameClassTest.java b/src/test/java/com/android/tools/r8/graph/invokespecial/MultipleInvokeSpecialOnSameClassTest.java
index 7c934d8..46262f4 100644
--- a/src/test/java/com/android/tools/r8/graph/invokespecial/MultipleInvokeSpecialOnSameClassTest.java
+++ b/src/test/java/com/android/tools/r8/graph/invokespecial/MultipleInvokeSpecialOnSameClassTest.java
@@ -48,7 +48,7 @@
.addProgramClasses(Main.class)
.addProgramClassFileData(getClassWithTransformedInvoked())
.addKeepMainRule(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutput(EXPECTED_RESULT);
}
diff --git a/src/test/java/com/android/tools/r8/graph/invokevirtual/InvokeVirtualPrivateBaseWithDefaultDirectInvokeTest.java b/src/test/java/com/android/tools/r8/graph/invokevirtual/InvokeVirtualPrivateBaseWithDefaultDirectInvokeTest.java
index b217463..bc49ff9 100644
--- a/src/test/java/com/android/tools/r8/graph/invokevirtual/InvokeVirtualPrivateBaseWithDefaultDirectInvokeTest.java
+++ b/src/test/java/com/android/tools/r8/graph/invokevirtual/InvokeVirtualPrivateBaseWithDefaultDirectInvokeTest.java
@@ -49,7 +49,7 @@
public void testD8() throws Exception {
testForD8(parameters.getBackend())
.addInnerClasses(getClass())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.apply(r -> assertResultIsCorrect(r, false));
}
@@ -62,7 +62,7 @@
.addKeepMainRule(Main.class)
.addKeepClassAndMembersRules(I.class)
.enableNoVerticalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
// TODO(b/182189123): This should have the same behavior as D8.
.applyIf(
diff --git a/src/test/java/com/android/tools/r8/graph/invokevirtual/InvokeVirtualPrivateBaseWithDefaultTest.java b/src/test/java/com/android/tools/r8/graph/invokevirtual/InvokeVirtualPrivateBaseWithDefaultTest.java
index 4e39f6f..eb63443 100644
--- a/src/test/java/com/android/tools/r8/graph/invokevirtual/InvokeVirtualPrivateBaseWithDefaultTest.java
+++ b/src/test/java/com/android/tools/r8/graph/invokevirtual/InvokeVirtualPrivateBaseWithDefaultTest.java
@@ -43,7 +43,7 @@
public void testD8() throws Exception {
testForD8(parameters.getBackend())
.addInnerClasses(getClass())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.applyIf(
parameters.isCfRuntime()
@@ -61,7 +61,7 @@
.addKeepMainRule(Main.class)
.addKeepClassAndMembersRules(I.class)
.enableNoVerticalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), Main.class)
.assertFailureWithErrorThatThrows(IllegalAccessError.class);
diff --git a/src/test/java/com/android/tools/r8/inspection/FieldFlagsAndValueInspectionTest.java b/src/test/java/com/android/tools/r8/inspection/FieldFlagsAndValueInspectionTest.java
index d64be27..304594c 100644
--- a/src/test/java/com/android/tools/r8/inspection/FieldFlagsAndValueInspectionTest.java
+++ b/src/test/java/com/android/tools/r8/inspection/FieldFlagsAndValueInspectionTest.java
@@ -46,7 +46,7 @@
}
testForD8()
.addProgramClasses(TestClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.apply(b -> b.getBuilder().addOutputInspection(inspector -> inspection(inspector, false)))
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutput(EXPECTED);
@@ -58,7 +58,7 @@
testForR8(parameters.getBackend())
.addProgramClasses(TestClass.class)
.addKeepClassAndMembersRules(TestClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.apply(b -> b.getBuilder().addOutputInspection(inspector -> inspection(inspector, true)))
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutput(EXPECTED);
diff --git a/src/test/java/com/android/tools/r8/inspection/FieldValueTypesInspectionTest.java b/src/test/java/com/android/tools/r8/inspection/FieldValueTypesInspectionTest.java
index 0031885..5726780 100644
--- a/src/test/java/com/android/tools/r8/inspection/FieldValueTypesInspectionTest.java
+++ b/src/test/java/com/android/tools/r8/inspection/FieldValueTypesInspectionTest.java
@@ -55,7 +55,7 @@
}
testForD8()
.addProgramClasses(TestClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.apply(b -> b.getBuilder().addOutputInspection(this::inspection))
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutput(EXPECTED);
@@ -67,7 +67,7 @@
testForR8(parameters.getBackend())
.addProgramClasses(TestClass.class)
.addKeepClassAndMembersRules(TestClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.apply(b -> b.getBuilder().addOutputInspection(this::inspection))
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutput(EXPECTED);
diff --git a/src/test/java/com/android/tools/r8/inspection/InspectionApiTest.java b/src/test/java/com/android/tools/r8/inspection/InspectionApiTest.java
index 9f413d5..e419668 100644
--- a/src/test/java/com/android/tools/r8/inspection/InspectionApiTest.java
+++ b/src/test/java/com/android/tools/r8/inspection/InspectionApiTest.java
@@ -49,7 +49,7 @@
}
testForD8()
.addProgramClasses(TestClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.apply(b -> b.getBuilder().addOutputInspection(this::inspection))
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutput(EXPECTED);
@@ -61,7 +61,7 @@
testForR8(parameters.getBackend())
.addProgramClasses(TestClass.class)
.addKeepClassAndMembersRules(TestClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.apply(b -> b.getBuilder().addOutputInspection(this::inspection))
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutput(EXPECTED);
diff --git a/src/test/java/com/android/tools/r8/internal/GMSCoreLatestTest.java b/src/test/java/com/android/tools/r8/internal/GMSCoreLatestTest.java
index 60f6fa7..624fa02 100644
--- a/src/test/java/com/android/tools/r8/internal/GMSCoreLatestTest.java
+++ b/src/test/java/com/android/tools/r8/internal/GMSCoreLatestTest.java
@@ -112,7 +112,7 @@
+ "_gmscore__primes_bcdd2915GeneratedExtensionRegistryLite$Loader")
.allowDiagnosticMessages()
.allowUnusedProguardConfigurationRules()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.apply(configuration)
.compile()
.assertAllInfoMessagesMatch(
diff --git a/src/test/java/com/android/tools/r8/internal/GMSCoreV10Test.java b/src/test/java/com/android/tools/r8/internal/GMSCoreV10Test.java
index b09cb00..6229869 100644
--- a/src/test/java/com/android/tools/r8/internal/GMSCoreV10Test.java
+++ b/src/test/java/com/android/tools/r8/internal/GMSCoreV10Test.java
@@ -198,7 +198,7 @@
"com.android.internal.location.ProviderRequest")
.allowDiagnosticMessages()
.allowUnusedProguardConfigurationRules()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.apply(configuration)
.compile()
.assertAllInfoMessagesMatch(
diff --git a/src/test/java/com/android/tools/r8/internal/Regression127524985.java b/src/test/java/com/android/tools/r8/internal/Regression127524985.java
index 9b88d56..62134d4 100644
--- a/src/test/java/com/android/tools/r8/internal/Regression127524985.java
+++ b/src/test/java/com/android/tools/r8/internal/Regression127524985.java
@@ -56,7 +56,7 @@
assumeTrue(parameters.isDexRuntime());
testForD8()
.addProgramFiles(JAR)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), MAIN)
.assertSuccessWithOutput(EXPECTED);
@@ -73,7 +73,7 @@
.addKeepRules("-dontwarn")
.allowDiagnosticWarningMessages()
.addProgramFiles(JAR)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compileWithExpectedDiagnostics(
diagnostics ->
diagnostics.assertWarningsMatch(
diff --git a/src/test/java/com/android/tools/r8/internal/YouTubeV1719Test.java b/src/test/java/com/android/tools/r8/internal/YouTubeV1719Test.java
index c78212b..37e3e39 100644
--- a/src/test/java/com/android/tools/r8/internal/YouTubeV1719Test.java
+++ b/src/test/java/com/android/tools/r8/internal/YouTubeV1719Test.java
@@ -100,7 +100,7 @@
StringResource.fromFile(getDesugaredLibraryConfiguration()))
.build())
.release()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile();
// Compile desugared library using cf backend (without keep rules).
@@ -259,7 +259,7 @@
.addKeepRuleFiles(getDesugaredLibraryKeepRuleFiles(generatedKeepRules))
.apply(this::disableR8StrictMode)
.apply(this::disableR8TestingDefaults)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile();
}
diff --git a/src/test/java/com/android/tools/r8/internal/proto/Proto2BuilderOnlyReferencedFromDynamicMethodTest.java b/src/test/java/com/android/tools/r8/internal/proto/Proto2BuilderOnlyReferencedFromDynamicMethodTest.java
index dbde5fd..53e5b8a 100644
--- a/src/test/java/com/android/tools/r8/internal/proto/Proto2BuilderOnlyReferencedFromDynamicMethodTest.java
+++ b/src/test/java/com/android/tools/r8/internal/proto/Proto2BuilderOnlyReferencedFromDynamicMethodTest.java
@@ -51,7 +51,7 @@
.allowUnusedDontWarnPatterns()
.allowUnusedProguardConfigurationRules()
.enableProtoShrinking()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.assertAllInfoMessagesMatch(
containsString("Proguard configuration rule does not match anything"))
diff --git a/src/test/java/com/android/tools/r8/internal/proto/Proto2BuilderShrinkingTest.java b/src/test/java/com/android/tools/r8/internal/proto/Proto2BuilderShrinkingTest.java
index de44d1c..070e9e3 100644
--- a/src/test/java/com/android/tools/r8/internal/proto/Proto2BuilderShrinkingTest.java
+++ b/src/test/java/com/android/tools/r8/internal/proto/Proto2BuilderShrinkingTest.java
@@ -76,7 +76,7 @@
.allowUnusedProguardConfigurationRules()
.enableInliningAnnotations()
.enableProtoShrinking()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.assertAllInfoMessagesMatch(
containsString("Proguard configuration rule does not match anything"))
diff --git a/src/test/java/com/android/tools/r8/internal/proto/Proto2ShrinkingTest.java b/src/test/java/com/android/tools/r8/internal/proto/Proto2ShrinkingTest.java
index dbfb40f..55a961e 100644
--- a/src/test/java/com/android/tools/r8/internal/proto/Proto2ShrinkingTest.java
+++ b/src/test/java/com/android/tools/r8/internal/proto/Proto2ShrinkingTest.java
@@ -91,7 +91,7 @@
.enableProguardTestOptions()
.enableProtoShrinking()
.minification(enableMinification)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.assertAllInfoMessagesMatch(
containsString("Proguard configuration rule does not match anything"))
@@ -390,7 +390,7 @@
.allowUnusedProguardConfigurationRules()
.enableProtoShrinking()
.minification(enableMinification)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.assertAllInfoMessagesMatch(
containsString("Proguard configuration rule does not match anything"))
@@ -418,7 +418,7 @@
.allowUnusedProguardConfigurationRules()
.enableProtoShrinking()
.minification(enableMinification)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.assertAllInfoMessagesMatch(
containsString("Proguard configuration rule does not match anything"))
diff --git a/src/test/java/com/android/tools/r8/internal/proto/Proto3ShrinkingTest.java b/src/test/java/com/android/tools/r8/internal/proto/Proto3ShrinkingTest.java
index 0fa0a5b..b390c77 100644
--- a/src/test/java/com/android/tools/r8/internal/proto/Proto3ShrinkingTest.java
+++ b/src/test/java/com/android/tools/r8/internal/proto/Proto3ShrinkingTest.java
@@ -64,7 +64,7 @@
.allowUnusedProguardConfigurationRules()
.enableProtoShrinking()
.minification(enableMinification)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.assertAllInfoMessagesMatch(
containsString("Proguard configuration rule does not match anything"))
@@ -113,7 +113,7 @@
.allowUnusedProguardConfigurationRules()
.enableProtoShrinking()
.minification(enableMinification)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.assertAllInfoMessagesMatch(
containsString("Proguard configuration rule does not match anything"))
diff --git a/src/test/java/com/android/tools/r8/invalid/DuplicateDefinitionsTest.java b/src/test/java/com/android/tools/r8/invalid/DuplicateDefinitionsTest.java
index a52c762..5f6a8b5 100644
--- a/src/test/java/com/android/tools/r8/invalid/DuplicateDefinitionsTest.java
+++ b/src/test/java/com/android/tools/r8/invalid/DuplicateDefinitionsTest.java
@@ -48,7 +48,7 @@
testForD8(parameters.getBackend())
.addProgramClassFileData(jasminBuilder.buildClasses())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compileWithExpectedDiagnostics(
diagnostics ->
diagnostics
@@ -90,7 +90,7 @@
testForD8(parameters.getBackend())
.addProgramClassFileData(jasminBuilder.buildClasses())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compileWithExpectedDiagnostics(
diagnostics ->
diagnostics
diff --git a/src/test/java/com/android/tools/r8/invalid/DuplicateProgramTypesTest.java b/src/test/java/com/android/tools/r8/invalid/DuplicateProgramTypesTest.java
index 1efe38f..5b49da0 100644
--- a/src/test/java/com/android/tools/r8/invalid/DuplicateProgramTypesTest.java
+++ b/src/test/java/com/android/tools/r8/invalid/DuplicateProgramTypesTest.java
@@ -105,7 +105,7 @@
CompilationFailedException.class,
() ->
testForD8(parameters.getBackend())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.apply(b -> addDuplicateDefinitions(b.getBuilder()))
.compileWithExpectedDiagnostics(this::checkErrorDiagnostic));
}
@@ -113,7 +113,7 @@
@Test
public void testResolvedConflictD8() throws Exception {
testForD8(parameters.getBackend())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.apply(
b -> {
addDuplicateDefinitions(b.getBuilder());
@@ -126,7 +126,7 @@
@Test
public void testResolvedConflictR8() throws Exception {
testForR8(parameters.getBackend())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(TestClass.class)
.apply(
b -> {
@@ -143,7 +143,7 @@
CompilationFailedException.class,
() ->
testForD8(parameters.getBackend())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.apply(
b -> {
addDuplicateDefinitions(b.getBuilder());
@@ -158,7 +158,7 @@
CompilationFailedException.class,
() ->
testForR8(parameters.getBackend())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(TestClass.class)
.apply(
b -> {
diff --git a/src/test/java/com/android/tools/r8/ir/DebugLocalStackMapTest.java b/src/test/java/com/android/tools/r8/ir/DebugLocalStackMapTest.java
index ddda774..a429447 100644
--- a/src/test/java/com/android/tools/r8/ir/DebugLocalStackMapTest.java
+++ b/src/test/java/com/android/tools/r8/ir/DebugLocalStackMapTest.java
@@ -40,7 +40,7 @@
public void testInvalidDebugLocals() throws Exception {
testForD8(parameters.getBackend())
.addProgramClassFileData(TestKtDump.dump())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compileWithExpectedDiagnostics(
diagnostics -> {
diagnostics.assertInfosMatch(
diff --git a/src/test/java/com/android/tools/r8/ir/DebugLocalStartOutsideRangeTest.java b/src/test/java/com/android/tools/r8/ir/DebugLocalStartOutsideRangeTest.java
index ac6d2dd..4a18e70 100644
--- a/src/test/java/com/android/tools/r8/ir/DebugLocalStartOutsideRangeTest.java
+++ b/src/test/java/com/android/tools/r8/ir/DebugLocalStartOutsideRangeTest.java
@@ -40,7 +40,7 @@
public void testD8() throws CompilationFailedException {
testForD8(parameters.getBackend())
.addProgramClassFileData(dump())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compileWithExpectedDiagnostics(
diagnostics -> {
diagnostics.assertNoWarningsMatch(
diff --git a/src/test/java/com/android/tools/r8/ir/DebugLocalStartRangeInLinearBlockWithFrameTest.java b/src/test/java/com/android/tools/r8/ir/DebugLocalStartRangeInLinearBlockWithFrameTest.java
index 0b3e53b..dd8b04f 100644
--- a/src/test/java/com/android/tools/r8/ir/DebugLocalStartRangeInLinearBlockWithFrameTest.java
+++ b/src/test/java/com/android/tools/r8/ir/DebugLocalStartRangeInLinearBlockWithFrameTest.java
@@ -36,7 +36,7 @@
public void testD8() throws Exception {
testForD8(parameters.getBackend())
.addProgramClassFileData(AbstractAjaxCallbackDump.dump())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile();
}
diff --git a/src/test/java/com/android/tools/r8/ir/DebugLocalSynchronizedBlockTest.java b/src/test/java/com/android/tools/r8/ir/DebugLocalSynchronizedBlockTest.java
index f6be937..e01092e 100644
--- a/src/test/java/com/android/tools/r8/ir/DebugLocalSynchronizedBlockTest.java
+++ b/src/test/java/com/android/tools/r8/ir/DebugLocalSynchronizedBlockTest.java
@@ -30,7 +30,7 @@
public void testD8() throws Exception {
testForD8(parameters.getBackend())
.addProgramClasses(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("Hello World!");
}
diff --git a/src/test/java/com/android/tools/r8/ir/DebugLocalWithoutStackMapTypeTest.java b/src/test/java/com/android/tools/r8/ir/DebugLocalWithoutStackMapTypeTest.java
index 0326e06..904d3cc 100644
--- a/src/test/java/com/android/tools/r8/ir/DebugLocalWithoutStackMapTypeTest.java
+++ b/src/test/java/com/android/tools/r8/ir/DebugLocalWithoutStackMapTypeTest.java
@@ -37,7 +37,7 @@
public void testD8() throws Exception {
testForD8(parameters.getBackend())
.addProgramClassFileData(MainDump.dump())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("addSuppressed");
}
diff --git a/src/test/java/com/android/tools/r8/ir/analysis/AnalysisTestBase.java b/src/test/java/com/android/tools/r8/ir/analysis/AnalysisTestBase.java
index 0f596b1..a970247 100644
--- a/src/test/java/com/android/tools/r8/ir/analysis/AnalysisTestBase.java
+++ b/src/test/java/com/android/tools/r8/ir/analysis/AnalysisTestBase.java
@@ -37,7 +37,7 @@
D8TestCompileResult compileResult =
testForD8()
.release()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addProgramClasses(clazz)
.addTestingAnnotationsAsProgramClasses()
.compile();
@@ -66,7 +66,7 @@
D8TestCompileResult compileResult =
testForD8()
.release()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addProgramClasses(classes)
.addTestingAnnotationsAsProgramClasses()
.compile();
diff --git a/src/test/java/com/android/tools/r8/ir/analysis/fieldaccess/FieldBitAccessInfoTest.java b/src/test/java/com/android/tools/r8/ir/analysis/fieldaccess/FieldBitAccessInfoTest.java
index 8c83a79..2cdeffd 100644
--- a/src/test/java/com/android/tools/r8/ir/analysis/fieldaccess/FieldBitAccessInfoTest.java
+++ b/src/test/java/com/android/tools/r8/ir/analysis/fieldaccess/FieldBitAccessInfoTest.java
@@ -63,7 +63,7 @@
testForR8(parameters.getBackend())
.addProgramClasses(TestClass.class)
.addKeepMainRule(TestClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutputLines(
diff --git a/src/test/java/com/android/tools/r8/ir/analysis/sideeffect/AnonymousObjectWithFinalizeTest.java b/src/test/java/com/android/tools/r8/ir/analysis/sideeffect/AnonymousObjectWithFinalizeTest.java
index 7337693..cdb232d 100644
--- a/src/test/java/com/android/tools/r8/ir/analysis/sideeffect/AnonymousObjectWithFinalizeTest.java
+++ b/src/test/java/com/android/tools/r8/ir/analysis/sideeffect/AnonymousObjectWithFinalizeTest.java
@@ -81,7 +81,7 @@
@Test
public void testR8() throws Exception {
testForR8(parameters.getBackend())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(TestClass.class)
.addProgramClassesAndInnerClasses(TestClass.class)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/ir/analysis/sideeffect/ArrayContentsDependOnEnvironmentTest.java b/src/test/java/com/android/tools/r8/ir/analysis/sideeffect/ArrayContentsDependOnEnvironmentTest.java
index adba889..72e6884 100644
--- a/src/test/java/com/android/tools/r8/ir/analysis/sideeffect/ArrayContentsDependOnEnvironmentTest.java
+++ b/src/test/java/com/android/tools/r8/ir/analysis/sideeffect/ArrayContentsDependOnEnvironmentTest.java
@@ -35,7 +35,7 @@
.addKeepMainRule(TestClass.class)
.enableAssumeNoSideEffectsAnnotations()
.enableInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutputLines("42");
diff --git a/src/test/java/com/android/tools/r8/ir/analysis/sideeffect/ArrayOfObjectsCreationCanBePostponedTest.java b/src/test/java/com/android/tools/r8/ir/analysis/sideeffect/ArrayOfObjectsCreationCanBePostponedTest.java
index c74f7e5..b9f7dcb 100644
--- a/src/test/java/com/android/tools/r8/ir/analysis/sideeffect/ArrayOfObjectsCreationCanBePostponedTest.java
+++ b/src/test/java/com/android/tools/r8/ir/analysis/sideeffect/ArrayOfObjectsCreationCanBePostponedTest.java
@@ -37,7 +37,7 @@
testForR8(parameters.getBackend())
.addInnerClasses(ArrayOfObjectsCreationCanBePostponedTest.class)
.addKeepMainRule(TestClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/ir/analysis/sideeffect/DeadConstructorWithCycleTest.java b/src/test/java/com/android/tools/r8/ir/analysis/sideeffect/DeadConstructorWithCycleTest.java
index e64fedd..8f46d1b 100644
--- a/src/test/java/com/android/tools/r8/ir/analysis/sideeffect/DeadConstructorWithCycleTest.java
+++ b/src/test/java/com/android/tools/r8/ir/analysis/sideeffect/DeadConstructorWithCycleTest.java
@@ -36,7 +36,7 @@
.addInnerClasses(DeadConstructorWithCycleTest.class)
.addKeepMainRule(TestClass.class)
.enableNeverClassInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(inspector -> assertThat(inspector.clazz(A.class), not(isPresent())))
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/ir/analysis/sideeffect/EnumClassInitializerCanBePostponedTest.java b/src/test/java/com/android/tools/r8/ir/analysis/sideeffect/EnumClassInitializerCanBePostponedTest.java
index 2399475..1e470f9 100644
--- a/src/test/java/com/android/tools/r8/ir/analysis/sideeffect/EnumClassInitializerCanBePostponedTest.java
+++ b/src/test/java/com/android/tools/r8/ir/analysis/sideeffect/EnumClassInitializerCanBePostponedTest.java
@@ -45,7 +45,7 @@
.addKeepMainRule(TestClass.class)
.addOptionsModification(options -> options.testing.enableSwitchToIfRewriting = false)
.enableInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/ir/analysis/sideeffect/EnumClassInitializerCannotBePostponedTest.java b/src/test/java/com/android/tools/r8/ir/analysis/sideeffect/EnumClassInitializerCannotBePostponedTest.java
index a9e6b3d..69774ee 100644
--- a/src/test/java/com/android/tools/r8/ir/analysis/sideeffect/EnumClassInitializerCannotBePostponedTest.java
+++ b/src/test/java/com/android/tools/r8/ir/analysis/sideeffect/EnumClassInitializerCannotBePostponedTest.java
@@ -31,7 +31,7 @@
testForR8(parameters.getBackend())
.addInnerClasses(EnumClassInitializerCannotBePostponedTest.class)
.addKeepMainRule(TestClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutputLines("Hello world!");
}
diff --git a/src/test/java/com/android/tools/r8/ir/analysis/sideeffect/InvokeMultiNewArraySideEffectTest.java b/src/test/java/com/android/tools/r8/ir/analysis/sideeffect/InvokeMultiNewArraySideEffectTest.java
index fbe9bd8..2e4f793 100644
--- a/src/test/java/com/android/tools/r8/ir/analysis/sideeffect/InvokeMultiNewArraySideEffectTest.java
+++ b/src/test/java/com/android/tools/r8/ir/analysis/sideeffect/InvokeMultiNewArraySideEffectTest.java
@@ -39,7 +39,7 @@
.addInnerClasses(InvokeMultiNewArraySideEffectTest.class)
.addKeepMainRule(TestClass.class)
.enableNoHorizontalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector -> {
diff --git a/src/test/java/com/android/tools/r8/ir/analysis/sideeffect/PutObjectWithFinalizeTest.java b/src/test/java/com/android/tools/r8/ir/analysis/sideeffect/PutObjectWithFinalizeTest.java
index ffce57c..7ca343e 100644
--- a/src/test/java/com/android/tools/r8/ir/analysis/sideeffect/PutObjectWithFinalizeTest.java
+++ b/src/test/java/com/android/tools/r8/ir/analysis/sideeffect/PutObjectWithFinalizeTest.java
@@ -48,7 +48,7 @@
.enableInliningAnnotations()
.enableNoHorizontalClassMergingAnnotations()
.enableNoVerticalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector -> {
diff --git a/src/test/java/com/android/tools/r8/ir/analysis/sideeffect/SingletonClassInitializerPatternCanBePostponedTest.java b/src/test/java/com/android/tools/r8/ir/analysis/sideeffect/SingletonClassInitializerPatternCanBePostponedTest.java
index 31c7346..4ef9896 100644
--- a/src/test/java/com/android/tools/r8/ir/analysis/sideeffect/SingletonClassInitializerPatternCanBePostponedTest.java
+++ b/src/test/java/com/android/tools/r8/ir/analysis/sideeffect/SingletonClassInitializerPatternCanBePostponedTest.java
@@ -40,7 +40,7 @@
.addInnerClasses(SingletonClassInitializerPatternCanBePostponedTest.class)
.addKeepMainRule(TestClass.class)
.enableMemberValuePropagationAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/ir/analysis/sideeffect/SingletonClassInitializerPatternCannotBePostponedTest.java b/src/test/java/com/android/tools/r8/ir/analysis/sideeffect/SingletonClassInitializerPatternCannotBePostponedTest.java
index 61047fe..183a2bd 100644
--- a/src/test/java/com/android/tools/r8/ir/analysis/sideeffect/SingletonClassInitializerPatternCannotBePostponedTest.java
+++ b/src/test/java/com/android/tools/r8/ir/analysis/sideeffect/SingletonClassInitializerPatternCannotBePostponedTest.java
@@ -37,7 +37,7 @@
testForR8(parameters.getBackend())
.addInnerClasses(SingletonClassInitializerPatternCannotBePostponedTest.class)
.addKeepMainRule(TestClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/ir/analysis/sideeffect/SingletonClassInitializerWithInstancePutCanBePostponedTest.java b/src/test/java/com/android/tools/r8/ir/analysis/sideeffect/SingletonClassInitializerWithInstancePutCanBePostponedTest.java
index abf1395..ce9bdd7 100644
--- a/src/test/java/com/android/tools/r8/ir/analysis/sideeffect/SingletonClassInitializerWithInstancePutCanBePostponedTest.java
+++ b/src/test/java/com/android/tools/r8/ir/analysis/sideeffect/SingletonClassInitializerWithInstancePutCanBePostponedTest.java
@@ -44,7 +44,7 @@
.enableInliningAnnotations()
.enableMemberValuePropagationAnnotations()
.enableNeverClassInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect)
.run(parameters.getRuntime(), Main.class)
diff --git a/src/test/java/com/android/tools/r8/ir/analysis/sideeffect/SingletonClassInitializerWithInstancePutCannotBePostponedTest.java b/src/test/java/com/android/tools/r8/ir/analysis/sideeffect/SingletonClassInitializerWithInstancePutCannotBePostponedTest.java
index 37f49fc..f9cf925 100644
--- a/src/test/java/com/android/tools/r8/ir/analysis/sideeffect/SingletonClassInitializerWithInstancePutCannotBePostponedTest.java
+++ b/src/test/java/com/android/tools/r8/ir/analysis/sideeffect/SingletonClassInitializerWithInstancePutCannotBePostponedTest.java
@@ -44,7 +44,7 @@
.enableInliningAnnotations()
.enableMemberValuePropagationAnnotations()
.enableNeverClassInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect)
.run(parameters.getRuntime(), Main.class)
diff --git a/src/test/java/com/android/tools/r8/ir/analysis/type/ConstrainedPrimitiveTypeTest.java b/src/test/java/com/android/tools/r8/ir/analysis/type/ConstrainedPrimitiveTypeTest.java
index 44de35e..fbb1c3d 100644
--- a/src/test/java/com/android/tools/r8/ir/analysis/type/ConstrainedPrimitiveTypeTest.java
+++ b/src/test/java/com/android/tools/r8/ir/analysis/type/ConstrainedPrimitiveTypeTest.java
@@ -47,7 +47,7 @@
.addInnerClasses(ConstrainedPrimitiveTypeTest.class)
.addKeepMainRule(TestClass.class)
.enableInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutput(expectedOutput);
}
diff --git a/src/test/java/com/android/tools/r8/ir/analysis/type/MissingClassesJoinTest.java b/src/test/java/com/android/tools/r8/ir/analysis/type/MissingClassesJoinTest.java
index ce06fd4..46679f0 100644
--- a/src/test/java/com/android/tools/r8/ir/analysis/type/MissingClassesJoinTest.java
+++ b/src/test/java/com/android/tools/r8/ir/analysis/type/MissingClassesJoinTest.java
@@ -58,7 +58,7 @@
testForD8()
// Intentionally not adding ASub2 as a program class.
.addProgramClasses(A.class, ASub1.class, Box.class, TestClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile();
testForRuntime(parameters)
@@ -78,7 +78,7 @@
.addDontWarn(ASub2.class)
.allowDiagnosticWarningMessages()
.enableNoVerticalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compileWithExpectedDiagnostics(
diagnostics -> {
if (allowTypeErrors) {
diff --git a/src/test/java/com/android/tools/r8/ir/analysis/type/NarrowingWithoutSubtypingTest.java b/src/test/java/com/android/tools/r8/ir/analysis/type/NarrowingWithoutSubtypingTest.java
index 403372c..343a944 100644
--- a/src/test/java/com/android/tools/r8/ir/analysis/type/NarrowingWithoutSubtypingTest.java
+++ b/src/test/java/com/android/tools/r8/ir/analysis/type/NarrowingWithoutSubtypingTest.java
@@ -47,7 +47,7 @@
options.testing.enableNarrowAndWideningingChecksInD8 = true;
options.testing.noLocalsTableOnInput = true;
})
- .setMinApi(parameters.getApiLevel());
+ .setMinApi(parameters);
if (readStackMap) {
d8TestBuilder
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/ir/conversion/StringSwitchConversionFromIfTest.java b/src/test/java/com/android/tools/r8/ir/conversion/StringSwitchConversionFromIfTest.java
index 7db7e04..d3852dc 100644
--- a/src/test/java/com/android/tools/r8/ir/conversion/StringSwitchConversionFromIfTest.java
+++ b/src/test/java/com/android/tools/r8/ir/conversion/StringSwitchConversionFromIfTest.java
@@ -56,7 +56,7 @@
// TODO(b/135560746): Add support for treating the keys of a string-switch instruction as an
// identifier name string.
.addDontObfuscate()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector -> {
diff --git a/src/test/java/com/android/tools/r8/ir/desugar/annotations/CovariantReturnTypeAnnotationTransformerTest.java b/src/test/java/com/android/tools/r8/ir/desugar/annotations/CovariantReturnTypeAnnotationTransformerTest.java
index 8967763..74e2738 100644
--- a/src/test/java/com/android/tools/r8/ir/desugar/annotations/CovariantReturnTypeAnnotationTransformerTest.java
+++ b/src/test/java/com/android/tools/r8/ir/desugar/annotations/CovariantReturnTypeAnnotationTransformerTest.java
@@ -163,7 +163,7 @@
testForD8(parameters.getBackend())
.addProgramClassFileData(input)
.addOptionsModification(options -> options.processCovariantReturnTypeAnnotations = true)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
// Compilation output does not contain annotations.
.inspect(inspector -> checkPresenceOfCovariantAnnotations(inspector, false))
@@ -174,7 +174,7 @@
testForD8(parameters.getBackend())
.addProgramFiles(output)
.addOptionsModification(options -> options.processCovariantReturnTypeAnnotations = true)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile();
}
@@ -184,7 +184,7 @@
testForD8(parameters.getBackend())
.addProgramClassFileData(input)
.addOptionsModification(options -> options.processCovariantReturnTypeAnnotations = option)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector -> {
@@ -201,7 +201,7 @@
testForD8(parameters.getBackend())
.addProgramClassFileData(input)
.addOptionsModification(options -> options.processCovariantReturnTypeAnnotations = option)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(inspector -> checkPresenceOfCovariantAnnotations(inspector, false))
.run(parameters.getRuntime(), Client.class.getCanonicalName())
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/AlwaysThrowNullTest.java b/src/test/java/com/android/tools/r8/ir/optimize/AlwaysThrowNullTest.java
index 28c90bf..8b46d0f 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/AlwaysThrowNullTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/AlwaysThrowNullTest.java
@@ -228,7 +228,7 @@
testForD8()
.release()
.addProgramClassesAndInnerClasses(MAIN)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), MAIN)
.assertSuccessWithOutput(JAVA_OUTPUT);
test(result, false);
@@ -244,7 +244,7 @@
.enableMemberValuePropagationAnnotations()
.addKeepMainRule(MAIN)
.addDontObfuscate()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), MAIN)
.assertSuccessWithOutput(JAVA_OUTPUT);
test(result, true);
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/B132749793.java b/src/test/java/com/android/tools/r8/ir/optimize/B132749793.java
index 0c73c27..34f0d16 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/B132749793.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/B132749793.java
@@ -31,10 +31,10 @@
@Test
public void test() throws Exception {
testForR8(parameters.getBackend())
- .addProgramClasses(TestB132749793.class, InterfaceWithStaticAndDefault.class,
- HasStaticField.class)
+ .addProgramClasses(
+ TestB132749793.class, InterfaceWithStaticAndDefault.class, HasStaticField.class)
.addKeepMainRule(TestB132749793.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), TestB132749793.class)
.assertSuccessWithOutputLines(EXPECTED);
}
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/B148366506.java b/src/test/java/com/android/tools/r8/ir/optimize/B148366506.java
index 1fa9b16..5563c0b 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/B148366506.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/B148366506.java
@@ -37,7 +37,7 @@
public void test() throws Exception {
testForD8()
.addProgramClassFileData(dump())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.setMode(compilationMode)
.compile();
}
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/B156470722.java b/src/test/java/com/android/tools/r8/ir/optimize/B156470722.java
index 57a7fb2..3047ac2 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/B156470722.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/B156470722.java
@@ -35,7 +35,7 @@
.addKeepMainRule(TestClass.class)
.enableInliningAnnotations()
.enableReprocessMethodAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutputLines("Hello world!");
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/B161735546.java b/src/test/java/com/android/tools/r8/ir/optimize/B161735546.java
index ee55c90..2c661cd 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/B161735546.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/B161735546.java
@@ -38,7 +38,7 @@
testForR8(parameters.getBackend())
.addInnerClasses(B161735546.class)
.addKeepMainRule(TestClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutputLines("1", "2", "3");
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/DefaultInterfaceIssue143628636Test.java b/src/test/java/com/android/tools/r8/ir/optimize/DefaultInterfaceIssue143628636Test.java
index 50fbd54..5dfa087 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/DefaultInterfaceIssue143628636Test.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/DefaultInterfaceIssue143628636Test.java
@@ -47,7 +47,7 @@
.addInnerClasses(DefaultInterfaceIssue143628636Test.class)
.addKeepMainRule(TestClass.class)
.addKeepClassRules(I.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutputLines("2", "5");
}
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/InterfaceClInit.java b/src/test/java/com/android/tools/r8/ir/optimize/InterfaceClInit.java
index e1a323a..151425d 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/InterfaceClInit.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/InterfaceClInit.java
@@ -31,7 +31,7 @@
testForR8(parameters.getBackend())
.addProgramClasses(TestClass.class, InterfaceWithStaticBlock.class, UsedFromStatic.class)
.addKeepMainRule(TestClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutputLines(EXPECTED);
}
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/NonNullParamTest.java b/src/test/java/com/android/tools/r8/ir/optimize/NonNullParamTest.java
index c73086e..cba424a 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/NonNullParamTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/NonNullParamTest.java
@@ -73,7 +73,7 @@
options.inlinerOptions().simpleInliningInstructionLimit = 4;
})
.apply(configuration)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), mainClass)
.assertSuccessWithOutput(javaOutput)
.inspector();
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/ObjectsRequireNonNullTest.java b/src/test/java/com/android/tools/r8/ir/optimize/ObjectsRequireNonNullTest.java
index 843ceef..8daa314 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/ObjectsRequireNonNullTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/ObjectsRequireNonNullTest.java
@@ -112,7 +112,7 @@
testForD8()
.debug()
.addProgramClassesAndInnerClasses(MAIN)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), MAIN)
.assertSuccessWithOutput(JAVA_OUTPUT);
test(result, 2, 1);
@@ -121,7 +121,7 @@
testForD8()
.release()
.addProgramClassesAndInnerClasses(MAIN)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), MAIN)
.assertSuccessWithOutput(JAVA_OUTPUT);
test(result, 0, 1);
@@ -137,7 +137,7 @@
.enableMemberValuePropagationAnnotations()
.addKeepMainRule(MAIN)
.addDontObfuscate()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), MAIN)
.assertSuccessWithOutput(JAVA_OUTPUT);
test(result, 0, 0);
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/PruneNotNullBranchD8Test.java b/src/test/java/com/android/tools/r8/ir/optimize/PruneNotNullBranchD8Test.java
index ae08b92..95e24de 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/PruneNotNullBranchD8Test.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/PruneNotNullBranchD8Test.java
@@ -40,7 +40,7 @@
public void testD8() throws Exception {
testForD8(parameters.getBackend())
.addProgramClasses(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines(EXPECTED)
.inspect(
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/R8InliningTest.java b/src/test/java/com/android/tools/r8/ir/optimize/R8InliningTest.java
index 0e02656..6503576 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/R8InliningTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/R8InliningTest.java
@@ -138,7 +138,7 @@
.allowAccessModification(allowAccessModification)
.enableProguardTestOptions()
.addDontObfuscate()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.applyIf(
parameters.isCfRuntime(),
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/RedundantConstNumberRemovalTest.java b/src/test/java/com/android/tools/r8/ir/optimize/RedundantConstNumberRemovalTest.java
index 54fee4e..d23e107 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/RedundantConstNumberRemovalTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/RedundantConstNumberRemovalTest.java
@@ -66,7 +66,7 @@
.enableInliningAnnotations()
.addOptionsModification(
internalOptions -> internalOptions.enableRedundantConstNumberOptimization = true)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(TestClass.class)
.assertSuccessWithOutput(expectedOutput);
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/ShortenLiveRangesOfInstanceGetWithPhiUserRegressionTest.java b/src/test/java/com/android/tools/r8/ir/optimize/ShortenLiveRangesOfInstanceGetWithPhiUserRegressionTest.java
index 20b3e58..c03b852 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/ShortenLiveRangesOfInstanceGetWithPhiUserRegressionTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/ShortenLiveRangesOfInstanceGetWithPhiUserRegressionTest.java
@@ -30,7 +30,7 @@
testForR8(parameters.getBackend())
.addInnerClasses(getClass())
.addKeepMainRule(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("0", "1", "2");
}
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/SimplifyIfNotNullTest.java b/src/test/java/com/android/tools/r8/ir/optimize/SimplifyIfNotNullTest.java
index 868a400..cb57d9a 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/SimplifyIfNotNullTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/SimplifyIfNotNullTest.java
@@ -58,7 +58,7 @@
throws Exception {
CodeInspector codeInspector =
testForR8(parameters.getBackend())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addProgramClasses(testClass)
.addKeepRules("-keep class " + testClass.getCanonicalName() + " { *; }")
.apply(configuration)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/ThrowNPEWithMessageIfParameterIsNullTest.java b/src/test/java/com/android/tools/r8/ir/optimize/ThrowNPEWithMessageIfParameterIsNullTest.java
index 924278e..df91af6 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/ThrowNPEWithMessageIfParameterIsNullTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/ThrowNPEWithMessageIfParameterIsNullTest.java
@@ -32,7 +32,7 @@
.addInnerClasses(ThrowNPEWithMessageIfParameterIsNullTest.class)
.addKeepMainRule(TestClass.class)
.enableInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutputLines("Hello world!");
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/callsites/CallSiteOptimizationLibraryLambdaPropagationTest.java b/src/test/java/com/android/tools/r8/ir/optimize/callsites/CallSiteOptimizationLibraryLambdaPropagationTest.java
index 6f696b9..86bc3cb 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/callsites/CallSiteOptimizationLibraryLambdaPropagationTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/callsites/CallSiteOptimizationLibraryLambdaPropagationTest.java
@@ -39,7 +39,7 @@
.addKeepMainRule(TestClass.class)
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutputLines("A", "B");
}
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/callsites/CallSiteOptimizationPinnedMethodOverridePropagationTest.java b/src/test/java/com/android/tools/r8/ir/optimize/callsites/CallSiteOptimizationPinnedMethodOverridePropagationTest.java
index b65adaf..219c093 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/callsites/CallSiteOptimizationPinnedMethodOverridePropagationTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/callsites/CallSiteOptimizationPinnedMethodOverridePropagationTest.java
@@ -60,12 +60,12 @@
.enableNoHorizontalClassMergingAnnotations()
.enableInliningAnnotations()
.enableMemberValuePropagationAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile();
compiled.run(parameters.getRuntime(), Main2.class).assertSuccessWithOutputLines("Arg1");
testForD8()
.addProgramClasses(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.addRunClasspathFiles(compiled.writeToZip())
.run(parameters.getRuntime(), Main.class)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/callsites/CallSiteOptimizationProgramLambdaPropagationTest.java b/src/test/java/com/android/tools/r8/ir/optimize/callsites/CallSiteOptimizationProgramLambdaPropagationTest.java
index b0624b7..c698f2b 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/callsites/CallSiteOptimizationProgramLambdaPropagationTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/callsites/CallSiteOptimizationProgramLambdaPropagationTest.java
@@ -33,7 +33,7 @@
.addKeepMainRule(TestClass.class)
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutputLines("A", "B");
}
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/callsites/CallSiteOptimizationWithInvokeCustomTargetTest.java b/src/test/java/com/android/tools/r8/ir/optimize/callsites/CallSiteOptimizationWithInvokeCustomTargetTest.java
index 6654e42..0672de1 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/callsites/CallSiteOptimizationWithInvokeCustomTargetTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/callsites/CallSiteOptimizationWithInvokeCustomTargetTest.java
@@ -61,7 +61,7 @@
.addKeepMainRule(TestClass.class)
.addKeepMethodRules(methodFromMethod(TestClass.class.getDeclaredMethod("bar", int.class)))
.enableInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutput(EXPECTED)
.inspect(
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/callsites/CallSiteOptimizationWithLambdaTargetTest.java b/src/test/java/com/android/tools/r8/ir/optimize/callsites/CallSiteOptimizationWithLambdaTargetTest.java
index 5b039ad..e34aef9 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/callsites/CallSiteOptimizationWithLambdaTargetTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/callsites/CallSiteOptimizationWithLambdaTargetTest.java
@@ -33,7 +33,7 @@
.addKeepMainRule(TestClass.class)
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutputLines("true", "false");
}
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/callsites/HashCodeTest.java b/src/test/java/com/android/tools/r8/ir/optimize/callsites/HashCodeTest.java
index cf5ceb7..4b05591 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/callsites/HashCodeTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/callsites/HashCodeTest.java
@@ -36,7 +36,7 @@
.addOptionsModification(
o ->
o.testing.callSiteOptimizationInfoInspector = this::callSiteOptimizationInfoInspect)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), MAIN)
.assertSuccessWithOutputLines("10");
}
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/callsites/InvokeInterfaceWithRefinedReceiverTest.java b/src/test/java/com/android/tools/r8/ir/optimize/callsites/InvokeInterfaceWithRefinedReceiverTest.java
index 051b633..64d354d 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/callsites/InvokeInterfaceWithRefinedReceiverTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/callsites/InvokeInterfaceWithRefinedReceiverTest.java
@@ -56,7 +56,7 @@
o.enableDevirtualization = false;
o.testing.callSiteOptimizationInfoInspector = this::callSiteOptimizationInfoInspect;
})
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), MAIN)
.assertSuccessWithOutputLines("null", "C")
.inspect(this::inspect);
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/callsites/InvokeVirtualWithRefinedReceiverTest.java b/src/test/java/com/android/tools/r8/ir/optimize/callsites/InvokeVirtualWithRefinedReceiverTest.java
index 2127c35..6401e5b 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/callsites/InvokeVirtualWithRefinedReceiverTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/callsites/InvokeVirtualWithRefinedReceiverTest.java
@@ -51,7 +51,7 @@
.addOptionsModification(
o ->
o.testing.callSiteOptimizationInfoInspector = this::callSiteOptimizationInfoInspect)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), MAIN)
.assertSuccessWithOutputLines("null", "C")
.inspect(this::inspect);
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/callsites/KeptMethodTest.java b/src/test/java/com/android/tools/r8/ir/optimize/callsites/KeptMethodTest.java
index cb43b17..5ef0d19 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/callsites/KeptMethodTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/callsites/KeptMethodTest.java
@@ -47,7 +47,7 @@
.addOptionsModification(
o ->
o.testing.callSiteOptimizationInfoInspector = this::callSiteOptimizationInfoInspect)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), MAIN)
.assertSuccessWithOutputLines("non-null", "non-null")
.inspect(this::inspect);
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/callsites/LibraryMethodOverridesTest.java b/src/test/java/com/android/tools/r8/ir/optimize/callsites/LibraryMethodOverridesTest.java
index b0f6cc4..6733215 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/callsites/LibraryMethodOverridesTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/callsites/LibraryMethodOverridesTest.java
@@ -49,7 +49,7 @@
testForR8(parameters.getBackend())
.addProgramClasses(LibClass.class)
.addKeepClassAndMembersRules(LibClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile();
testForR8(parameters.getBackend())
.addProgramClasses(TestClass.class, CustomPredicate.class)
@@ -60,7 +60,7 @@
o.testing.callSiteOptimizationInfoInspector = this::callSiteOptimizationInfoInspect)
.enableInliningAnnotations()
.enableNoMethodStaticizingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.addRunClasspathFiles(libraryCompileResult.writeToZip())
.run(parameters.getRuntime(), MAIN)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/callsites/PropagationFromSiblingTest.java b/src/test/java/com/android/tools/r8/ir/optimize/callsites/PropagationFromSiblingTest.java
index ff75a24..82bf44c 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/callsites/PropagationFromSiblingTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/callsites/PropagationFromSiblingTest.java
@@ -36,7 +36,7 @@
.enableInliningAnnotations()
.enableNoVerticalClassMergingAnnotations()
.enableNeverClassInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutputLines("Hello world!");
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/callsites/WithStaticizerTest.java b/src/test/java/com/android/tools/r8/ir/optimize/callsites/WithStaticizerTest.java
index 8f500e1..94b2756 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/callsites/WithStaticizerTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/callsites/WithStaticizerTest.java
@@ -49,7 +49,7 @@
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
.enableNoHorizontalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), MAIN)
.assertSuccessWithOutputLines("Input")
.inspect(this::inspect);
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/callsites/constants/InvokeDirectNegativeTest.java b/src/test/java/com/android/tools/r8/ir/optimize/callsites/constants/InvokeDirectNegativeTest.java
index b35e0e3..d2ff0f5 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/callsites/constants/InvokeDirectNegativeTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/callsites/constants/InvokeDirectNegativeTest.java
@@ -47,7 +47,7 @@
.addOptionsModification(
o ->
o.testing.callSiteOptimizationInfoInspector = this::callSiteOptimizationInfoInspect)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), MAIN)
.assertSuccessWithOutputLines("null", "non-null")
.inspect(this::inspect);
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/callsites/constants/InvokeDirectPositiveTest.java b/src/test/java/com/android/tools/r8/ir/optimize/callsites/constants/InvokeDirectPositiveTest.java
index 47682c0..90a70f7 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/callsites/constants/InvokeDirectPositiveTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/callsites/constants/InvokeDirectPositiveTest.java
@@ -45,7 +45,7 @@
.enableNeverClassInliningAnnotations()
// TODO(b/173398086): uniqueMethodWithName() does not work with argument removal.
.addDontObfuscate()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), MAIN)
.assertSuccessWithOutputLines("non-null")
.inspect(this::inspect);
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/callsites/constants/InvokeInterfaceNegativeTest.java b/src/test/java/com/android/tools/r8/ir/optimize/callsites/constants/InvokeInterfaceNegativeTest.java
index 8e5efc5..042ceff 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/callsites/constants/InvokeInterfaceNegativeTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/callsites/constants/InvokeInterfaceNegativeTest.java
@@ -53,7 +53,7 @@
o.enableDevirtualization = false;
o.testing.callSiteOptimizationInfoInspector = this::callSiteOptimizationInfoInspect;
})
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), MAIN)
.assertSuccessWithOutputLines("null", "non-null")
.inspect(this::inspect);
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/callsites/constants/InvokeInterfacePositiveTest.java b/src/test/java/com/android/tools/r8/ir/optimize/callsites/constants/InvokeInterfacePositiveTest.java
index ca5b0e5..e36b07e 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/callsites/constants/InvokeInterfacePositiveTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/callsites/constants/InvokeInterfacePositiveTest.java
@@ -48,7 +48,7 @@
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
.enableNoHorizontalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), MAIN)
.assertSuccessWithOutputLines("non-null")
.inspect(this::inspect);
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/callsites/constants/InvokeStaticNegativeTest.java b/src/test/java/com/android/tools/r8/ir/optimize/callsites/constants/InvokeStaticNegativeTest.java
index 861720e..1746100 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/callsites/constants/InvokeStaticNegativeTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/callsites/constants/InvokeStaticNegativeTest.java
@@ -45,7 +45,7 @@
.addOptionsModification(
o ->
o.testing.callSiteOptimizationInfoInspector = this::callSiteOptimizationInfoInspect)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), MAIN)
.assertSuccessWithOutputLines("null", "non-null")
.inspect(this::inspect);
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/callsites/constants/InvokeStaticPositiveTest.java b/src/test/java/com/android/tools/r8/ir/optimize/callsites/constants/InvokeStaticPositiveTest.java
index a6b2376..575488c 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/callsites/constants/InvokeStaticPositiveTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/callsites/constants/InvokeStaticPositiveTest.java
@@ -43,7 +43,7 @@
.enableInliningAnnotations()
// TODO(b/173398086): uniqueMethodWithName() does not work with argument removal.
.addDontObfuscate()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), MAIN)
.assertSuccessWithOutputLines("non-null")
.inspect(this::inspect);
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/callsites/constants/InvokeVirtualNegativeTest.java b/src/test/java/com/android/tools/r8/ir/optimize/callsites/constants/InvokeVirtualNegativeTest.java
index 0567d5d..e86919e 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/callsites/constants/InvokeVirtualNegativeTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/callsites/constants/InvokeVirtualNegativeTest.java
@@ -49,7 +49,7 @@
.addOptionsModification(
o ->
o.testing.callSiteOptimizationInfoInspector = this::callSiteOptimizationInfoInspect)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), MAIN)
.assertSuccessWithOutputLines("null", "non-null", "null", "non-null")
.inspect(this::inspect);
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/callsites/constants/InvokeVirtualPositiveTest.java b/src/test/java/com/android/tools/r8/ir/optimize/callsites/constants/InvokeVirtualPositiveTest.java
index cb0a8e3..08d8ad6 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/callsites/constants/InvokeVirtualPositiveTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/callsites/constants/InvokeVirtualPositiveTest.java
@@ -49,7 +49,7 @@
.enableNoVerticalClassMergingAnnotations()
.enableNeverClassInliningAnnotations()
.enableInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), MAIN)
.assertSuccessWithOutputLines("non-null", "null")
.inspect(this::inspect);
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/callsites/dynamicupperboundtype/InvokeDirectNegativeTest.java b/src/test/java/com/android/tools/r8/ir/optimize/callsites/dynamicupperboundtype/InvokeDirectNegativeTest.java
index 5321514..1ec405c 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/callsites/dynamicupperboundtype/InvokeDirectNegativeTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/callsites/dynamicupperboundtype/InvokeDirectNegativeTest.java
@@ -46,7 +46,7 @@
.addOptionsModification(
o ->
o.testing.callSiteOptimizationInfoInspector = this::callSiteOptimizationInfoInspect)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), MAIN)
.assertSuccessWithOutputLines("Sub1", "Sub2")
.inspect(this::inspect);
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/callsites/dynamicupperboundtype/InvokeDirectPositiveTest.java b/src/test/java/com/android/tools/r8/ir/optimize/callsites/dynamicupperboundtype/InvokeDirectPositiveTest.java
index ad78a71..b27142b 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/callsites/dynamicupperboundtype/InvokeDirectPositiveTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/callsites/dynamicupperboundtype/InvokeDirectPositiveTest.java
@@ -53,7 +53,7 @@
.addOptionsModification(
o ->
o.testing.callSiteOptimizationInfoInspector = this::callSiteOptimizationInfoInspect)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), MAIN)
.assertSuccessWithOutputLines("Sub1")
.inspect(this::inspect);
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/callsites/dynamicupperboundtype/InvokeInterfaceNegativeTest.java b/src/test/java/com/android/tools/r8/ir/optimize/callsites/dynamicupperboundtype/InvokeInterfaceNegativeTest.java
index dafde62..a39622b 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/callsites/dynamicupperboundtype/InvokeInterfaceNegativeTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/callsites/dynamicupperboundtype/InvokeInterfaceNegativeTest.java
@@ -52,7 +52,7 @@
o.enableDevirtualization = false;
o.testing.callSiteOptimizationInfoInspector = this::callSiteOptimizationInfoInspect;
})
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), MAIN)
.assertSuccessWithOutputLines("Sub1", "Sub2")
.inspect(this::inspect);
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/callsites/dynamicupperboundtype/InvokeInterfacePositiveTest.java b/src/test/java/com/android/tools/r8/ir/optimize/callsites/dynamicupperboundtype/InvokeInterfacePositiveTest.java
index e2d2d9a..055c239 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/callsites/dynamicupperboundtype/InvokeInterfacePositiveTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/callsites/dynamicupperboundtype/InvokeInterfacePositiveTest.java
@@ -56,7 +56,7 @@
o.enableDevirtualization = false;
o.testing.callSiteOptimizationInfoInspector = this::callSiteOptimizationInfoInspect;
})
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), MAIN)
.assertSuccessWithOutputLines("A:Sub1", "B:Sub2")
.inspect(this::inspect);
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/callsites/dynamicupperboundtype/InvokeStaticNegativeTest.java b/src/test/java/com/android/tools/r8/ir/optimize/callsites/dynamicupperboundtype/InvokeStaticNegativeTest.java
index d57418e..7bdd14c 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/callsites/dynamicupperboundtype/InvokeStaticNegativeTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/callsites/dynamicupperboundtype/InvokeStaticNegativeTest.java
@@ -44,7 +44,7 @@
.addOptionsModification(
o ->
o.testing.callSiteOptimizationInfoInspector = this::callSiteOptimizationInfoInspect)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), MAIN)
.assertSuccessWithOutputLines("Sub1", "Sub2")
.inspect(this::inspect);
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/callsites/dynamicupperboundtype/InvokeStaticPositiveTest.java b/src/test/java/com/android/tools/r8/ir/optimize/callsites/dynamicupperboundtype/InvokeStaticPositiveTest.java
index fbc799b..5228de1 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/callsites/dynamicupperboundtype/InvokeStaticPositiveTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/callsites/dynamicupperboundtype/InvokeStaticPositiveTest.java
@@ -49,7 +49,7 @@
.addOptionsModification(
o ->
o.testing.callSiteOptimizationInfoInspector = this::callSiteOptimizationInfoInspect)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), MAIN)
.assertSuccessWithOutputLines("Sub1")
.inspect(this::inspect);
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/callsites/dynamicupperboundtype/InvokeVirtualNegativeTest.java b/src/test/java/com/android/tools/r8/ir/optimize/callsites/dynamicupperboundtype/InvokeVirtualNegativeTest.java
index a2325c8..fff9c9e 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/callsites/dynamicupperboundtype/InvokeVirtualNegativeTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/callsites/dynamicupperboundtype/InvokeVirtualNegativeTest.java
@@ -48,7 +48,7 @@
.addOptionsModification(
o ->
o.testing.callSiteOptimizationInfoInspector = this::callSiteOptimizationInfoInspect)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), MAIN)
.assertSuccessWithOutputLines("A:Sub1", "A:Sub2", "B:Sub1", "B:Sub2")
.inspect(this::inspect);
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/callsites/dynamicupperboundtype/InvokeVirtualPositiveTest.java b/src/test/java/com/android/tools/r8/ir/optimize/callsites/dynamicupperboundtype/InvokeVirtualPositiveTest.java
index d580a1b..fb37774 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/callsites/dynamicupperboundtype/InvokeVirtualPositiveTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/callsites/dynamicupperboundtype/InvokeVirtualPositiveTest.java
@@ -51,7 +51,7 @@
.addOptionsModification(
o ->
o.testing.callSiteOptimizationInfoInspector = this::callSiteOptimizationInfoInspect)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), MAIN)
.assertSuccessWithOutputLines("A:Sub1", "B:Sub1")
.inspect(this::inspect);
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/callsites/nullability/InvokeDirectNegativeTest.java b/src/test/java/com/android/tools/r8/ir/optimize/callsites/nullability/InvokeDirectNegativeTest.java
index a95bac2..edf69d4 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/callsites/nullability/InvokeDirectNegativeTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/callsites/nullability/InvokeDirectNegativeTest.java
@@ -47,7 +47,7 @@
.addOptionsModification(
o ->
o.testing.callSiteOptimizationInfoInspector = this::callSiteOptimizationInfoInspect)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), MAIN)
.assertSuccessWithOutputLines("null", "non-null")
.inspect(this::inspect);
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/callsites/nullability/InvokeDirectPositiveTest.java b/src/test/java/com/android/tools/r8/ir/optimize/callsites/nullability/InvokeDirectPositiveTest.java
index 94ba810..73539ac 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/callsites/nullability/InvokeDirectPositiveTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/callsites/nullability/InvokeDirectPositiveTest.java
@@ -46,7 +46,7 @@
.addOptionsModification(
o ->
o.testing.callSiteOptimizationInfoInspector = this::callSiteOptimizationInfoInspect)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), MAIN)
.assertSuccessWithOutputLines("non-null")
.inspect(this::inspect);
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/callsites/nullability/InvokeInterfaceNegativeTest.java b/src/test/java/com/android/tools/r8/ir/optimize/callsites/nullability/InvokeInterfaceNegativeTest.java
index 485b02e..10c0eec 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/callsites/nullability/InvokeInterfaceNegativeTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/callsites/nullability/InvokeInterfaceNegativeTest.java
@@ -53,7 +53,7 @@
o.enableDevirtualization = false;
o.testing.callSiteOptimizationInfoInspector = this::callSiteOptimizationInfoInspect;
})
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), MAIN)
.assertSuccessWithOutputLines("null", "A")
.inspect(this::inspect);
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/callsites/nullability/InvokeInterfacePositiveTest.java b/src/test/java/com/android/tools/r8/ir/optimize/callsites/nullability/InvokeInterfacePositiveTest.java
index 4f34bad..0f6710e 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/callsites/nullability/InvokeInterfacePositiveTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/callsites/nullability/InvokeInterfacePositiveTest.java
@@ -52,7 +52,7 @@
o.enableDevirtualization = false;
o.testing.callSiteOptimizationInfoInspector = this::callSiteOptimizationInfoInspect;
})
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), MAIN)
.assertSuccessWithOutputLines("A")
.inspect(this::inspect);
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/callsites/nullability/InvokeStaticNegativeTest.java b/src/test/java/com/android/tools/r8/ir/optimize/callsites/nullability/InvokeStaticNegativeTest.java
index 64f0588..0874b8b 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/callsites/nullability/InvokeStaticNegativeTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/callsites/nullability/InvokeStaticNegativeTest.java
@@ -43,7 +43,7 @@
.addOptionsModification(
o ->
o.testing.callSiteOptimizationInfoInspector = this::callSiteOptimizationInfoInspect)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), MAIN)
.assertSuccessWithOutputLines("null", "non-null")
.inspect(this::inspect);
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/callsites/nullability/InvokeStaticPositiveTest.java b/src/test/java/com/android/tools/r8/ir/optimize/callsites/nullability/InvokeStaticPositiveTest.java
index c81ec91..28bddd0 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/callsites/nullability/InvokeStaticPositiveTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/callsites/nullability/InvokeStaticPositiveTest.java
@@ -44,7 +44,7 @@
.addOptionsModification(
o ->
o.testing.callSiteOptimizationInfoInspector = this::callSiteOptimizationInfoInspect)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), MAIN)
.assertSuccessWithOutputLines("non-null")
.inspect(this::inspect);
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/callsites/nullability/InvokeVirtualCascadeTest.java b/src/test/java/com/android/tools/r8/ir/optimize/callsites/nullability/InvokeVirtualCascadeTest.java
index 3606473..4331310 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/callsites/nullability/InvokeVirtualCascadeTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/callsites/nullability/InvokeVirtualCascadeTest.java
@@ -43,7 +43,7 @@
.enableNoVerticalClassMergingAnnotations()
.enableNeverClassInliningAnnotations()
.enableInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), MAIN)
.assertSuccessWithOutputLines("A", "A", "B", "B")
.inspect(this::inspect);
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/callsites/nullability/InvokeVirtualNegativeTest.java b/src/test/java/com/android/tools/r8/ir/optimize/callsites/nullability/InvokeVirtualNegativeTest.java
index 9e4b9f5..0eb0506 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/callsites/nullability/InvokeVirtualNegativeTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/callsites/nullability/InvokeVirtualNegativeTest.java
@@ -49,7 +49,7 @@
.addOptionsModification(
o ->
o.testing.callSiteOptimizationInfoInspector = this::callSiteOptimizationInfoInspect)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), MAIN)
.assertSuccessWithOutputLines("null", "A", "null", "B")
.inspect(this::inspect);
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/callsites/nullability/InvokeVirtualPositiveTest.java b/src/test/java/com/android/tools/r8/ir/optimize/callsites/nullability/InvokeVirtualPositiveTest.java
index ecd71d8..e916249 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/callsites/nullability/InvokeVirtualPositiveTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/callsites/nullability/InvokeVirtualPositiveTest.java
@@ -49,7 +49,7 @@
.addOptionsModification(
o ->
o.testing.callSiteOptimizationInfoInspector = this::callSiteOptimizationInfoInspect)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), MAIN)
.assertSuccessWithOutputLines("A", "null")
.inspect(this::inspect);
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/canonicalization/ConstClassCanonicalizationMonitorTest.java b/src/test/java/com/android/tools/r8/ir/optimize/canonicalization/ConstClassCanonicalizationMonitorTest.java
index 11a24ea..5c769f0 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/canonicalization/ConstClassCanonicalizationMonitorTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/canonicalization/ConstClassCanonicalizationMonitorTest.java
@@ -37,7 +37,7 @@
public void testR8() throws Exception {
testForR8(parameters.getBackend())
.addInnerClasses(getClass())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepClassAndMembersRules(Main.class)
.enableInliningAnnotations()
.addKeepAttributeLineNumberTable()
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/canonicalization/ConstClassCanonicalizationTest.java b/src/test/java/com/android/tools/r8/ir/optimize/canonicalization/ConstClassCanonicalizationTest.java
index 5d32d7a..e4e224b 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/canonicalization/ConstClassCanonicalizationTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/canonicalization/ConstClassCanonicalizationTest.java
@@ -130,13 +130,13 @@
testForD8()
.release()
.addProgramClasses(IncrementalA.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.setProgramConsumer(new ArchiveConsumer(zipA))
.compile();
testForD8()
.release()
.addProgramClasses(IncrementalMain.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.addRunClasspathFiles(zipA)
.run(parameters.getRuntime(), IncrementalMain.class)
@@ -182,7 +182,7 @@
.debug()
.addProgramClassesAndInnerClasses(MAIN)
.addOptionsModification(InternalOptions::disableNameReflectionOptimization)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), MAIN)
.assertSuccessWithOutput(JAVA_OUTPUT),
CANONICALIZED_MAIN_COUNT,
@@ -199,7 +199,7 @@
.release()
.addProgramClassesAndInnerClasses(MAIN)
.addOptionsModification(InternalOptions::disableNameReflectionOptimization)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), MAIN)
.assertSuccessWithOutput(JAVA_OUTPUT),
CANONICALIZED_MAIN_COUNT,
@@ -216,7 +216,7 @@
.addKeepAttributeInnerClassesAndEnclosingMethod()
.addDontObfuscate()
.addOptionsModification(InternalOptions::disableNameReflectionOptimization)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), MAIN)
.assertSuccessWithOutput(isCompat ? JAVA_OUTPUT : "outer is null");
// The number of expected const-class instructions differs because constant canonicalization is
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/canonicalization/DexItemBasedConstStringCanonicalizationTest.java b/src/test/java/com/android/tools/r8/ir/optimize/canonicalization/DexItemBasedConstStringCanonicalizationTest.java
index 5ef0d45..6a48915 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/canonicalization/DexItemBasedConstStringCanonicalizationTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/canonicalization/DexItemBasedConstStringCanonicalizationTest.java
@@ -90,7 +90,7 @@
testForD8()
.debug()
.addProgramClasses(MAIN, CanonicalizationTestClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addOptionsModification(this::configure)
.run(parameters.getRuntime(), MAIN)
.assertSuccessWithOutput(JAVA_OUTPUT);
@@ -100,7 +100,7 @@
testForD8()
.release()
.addProgramClasses(MAIN, CanonicalizationTestClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addOptionsModification(this::configure)
.run(parameters.getRuntime(), MAIN)
.assertSuccessWithOutput(JAVA_OUTPUT);
@@ -114,7 +114,7 @@
.addProgramClasses(MAIN, CanonicalizationTestClass.class)
.addKeepMainRule(MAIN)
.minification(enableMinification)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addOptionsModification(this::configure)
.run(parameters.getRuntime(), MAIN)
.assertSuccessWithOutput(enableMinification ? RENAMED_OUTPUT : JAVA_OUTPUT);
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/canonicalization/EffectivelyFinalFieldCanonicalizationTest.java b/src/test/java/com/android/tools/r8/ir/optimize/canonicalization/EffectivelyFinalFieldCanonicalizationTest.java
index 59eff5b..27d18ab 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/canonicalization/EffectivelyFinalFieldCanonicalizationTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/canonicalization/EffectivelyFinalFieldCanonicalizationTest.java
@@ -42,7 +42,7 @@
.addKeepMainRule(TestClass.class)
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/canonicalization/EnumCanonicalizationTest.java b/src/test/java/com/android/tools/r8/ir/optimize/canonicalization/EnumCanonicalizationTest.java
index c2e5e06..f8d6f6f 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/canonicalization/EnumCanonicalizationTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/canonicalization/EnumCanonicalizationTest.java
@@ -40,7 +40,7 @@
testForR8(parameters.getBackend())
.addInnerClasses(EnumCanonicalizationTest.class)
.addKeepMainRule(TestClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/canonicalization/IllegalStaticGetCanonicalizationTest.java b/src/test/java/com/android/tools/r8/ir/optimize/canonicalization/IllegalStaticGetCanonicalizationTest.java
index fbec6ad..5f7f094 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/canonicalization/IllegalStaticGetCanonicalizationTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/canonicalization/IllegalStaticGetCanonicalizationTest.java
@@ -36,7 +36,7 @@
.addOptionsModification(options -> options.enableRedundantFieldLoadElimination = false)
.enableInliningAnnotations()
.enableReprocessClassInitializerAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutputLines("Hello!", "Hello!");
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/canonicalization/InstanceGetOnCheckCastCompareLongTest.java b/src/test/java/com/android/tools/r8/ir/optimize/canonicalization/InstanceGetOnCheckCastCompareLongTest.java
index f94bba3..af39e2f 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/canonicalization/InstanceGetOnCheckCastCompareLongTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/canonicalization/InstanceGetOnCheckCastCompareLongTest.java
@@ -48,7 +48,7 @@
.addProgramClassFileData(getTestClassWithRewrittenLongCompareToLCmp())
.addKeepMainRule(Main.class)
.addKeepClassRules(I.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.enableInliningAnnotations()
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines(EXPECTED);
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/canonicalization/InstanceGetOnNewInstanceCanonicalizationTest.java b/src/test/java/com/android/tools/r8/ir/optimize/canonicalization/InstanceGetOnNewInstanceCanonicalizationTest.java
index d8950eb..827c194 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/canonicalization/InstanceGetOnNewInstanceCanonicalizationTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/canonicalization/InstanceGetOnNewInstanceCanonicalizationTest.java
@@ -35,7 +35,7 @@
testForR8(parameters.getBackend())
.addInnerClasses(getClass())
.addKeepMainRule(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector -> {
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/canonicalization/InstanceGetOnPhiCanonicalizationTest.java b/src/test/java/com/android/tools/r8/ir/optimize/canonicalization/InstanceGetOnPhiCanonicalizationTest.java
index 8fafc8f..81d8f2a 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/canonicalization/InstanceGetOnPhiCanonicalizationTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/canonicalization/InstanceGetOnPhiCanonicalizationTest.java
@@ -35,7 +35,7 @@
testForR8(parameters.getBackend())
.addInnerClasses(getClass())
.addKeepMainRule(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector -> {
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/canonicalization/SingletonCanonicalizationWithApiLevelCheckTest.java b/src/test/java/com/android/tools/r8/ir/optimize/canonicalization/SingletonCanonicalizationWithApiLevelCheckTest.java
index bf78732..4610bfc 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/canonicalization/SingletonCanonicalizationWithApiLevelCheckTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/canonicalization/SingletonCanonicalizationWithApiLevelCheckTest.java
@@ -38,7 +38,7 @@
.addLibraryClasses(LibraryVersion.class, LibraryInterfaceAddedInApi1.class)
.addDefaultRuntimeLibrary(parameters)
.addKeepMainRule(TestClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.writeToZip();
@@ -47,7 +47,7 @@
.addProgramClasses(LibraryVersion.class, LibraryInterfaceAddedInApi1.class)
.addKeepAllClassesRule()
.addKeepRules(getAssumeValuesRule(1))
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.addRunClasspathFiles(program)
.run(parameters.getRuntime(), TestClass.class)
@@ -58,7 +58,7 @@
.addProgramClasses(LibraryVersion.class)
.addKeepAllClassesRule()
.addKeepRules(getAssumeValuesRule(0))
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.addRunClasspathFiles(program)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/canonicalization/StaticFinalLibraryFieldCanonicalizationTest.java b/src/test/java/com/android/tools/r8/ir/optimize/canonicalization/StaticFinalLibraryFieldCanonicalizationTest.java
index e46efd5..f838a34 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/canonicalization/StaticFinalLibraryFieldCanonicalizationTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/canonicalization/StaticFinalLibraryFieldCanonicalizationTest.java
@@ -39,7 +39,7 @@
testForR8(parameters.getBackend())
.addProgramClasses(TestClass.class)
.addKeepMainRule(TestClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/canonicalization/StringCanonicalizationTest.java b/src/test/java/com/android/tools/r8/ir/optimize/canonicalization/StringCanonicalizationTest.java
index 3aa8509..175e903 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/canonicalization/StringCanonicalizationTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/canonicalization/StringCanonicalizationTest.java
@@ -203,11 +203,7 @@
@Test
public void testR8Debug() throws Exception {
D8TestCompileResult result =
- testForD8()
- .debug()
- .addProgramClassesAndInnerClasses(MAIN)
- .setMinApi(parameters.getApiLevel())
- .compile();
+ testForD8().debug().addProgramClassesAndInnerClasses(MAIN).setMinApi(parameters).compile();
test(result, 2, 1, 1, 1, 1);
}
@@ -217,7 +213,7 @@
testForD8()
.release()
.addProgramClassesAndInnerClasses(MAIN)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile();
test(result, 1, 1, 1, 1, 0);
}
@@ -230,7 +226,7 @@
.enableProguardTestOptions()
.enableInliningAnnotations()
.addKeepMainRule(MessageLoader.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile();
test(result, 1, 1, 1, 1, 0);
}
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/checkcast/ArrayInterfaceArrayCheckCastTest.java b/src/test/java/com/android/tools/r8/ir/optimize/checkcast/ArrayInterfaceArrayCheckCastTest.java
index 7e8b480..607c30a 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/checkcast/ArrayInterfaceArrayCheckCastTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/checkcast/ArrayInterfaceArrayCheckCastTest.java
@@ -35,7 +35,7 @@
assumeTrue(parameters.isDexRuntime());
testForD8(parameters.getBackend())
.addInnerClasses(getClass())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutput(EXPECTED_OUTPUT);
}
@@ -46,7 +46,7 @@
.addInnerClasses(getClass())
.addKeepMainRule(TestClass.class)
.addKeepRules("-keep class ** { *; }")
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.allowStdoutMessages()
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutput(EXPECTED_OUTPUT);
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/checkcast/CastToUninstantiatedClassTest.java b/src/test/java/com/android/tools/r8/ir/optimize/checkcast/CastToUninstantiatedClassTest.java
index 895e6ab..e43e4b1 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/checkcast/CastToUninstantiatedClassTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/checkcast/CastToUninstantiatedClassTest.java
@@ -38,7 +38,7 @@
.addInnerClasses(getClass())
.addKeepMainRule(TestClass.class)
.enableInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(inspector -> assertThat(inspector.clazz(Uninstantiated.class), isAbsent()))
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/checkcast/CheckCastInterfaceArrayTest.java b/src/test/java/com/android/tools/r8/ir/optimize/checkcast/CheckCastInterfaceArrayTest.java
index 481bdcd..9887c3f 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/checkcast/CheckCastInterfaceArrayTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/checkcast/CheckCastInterfaceArrayTest.java
@@ -42,7 +42,7 @@
testForR8(parameters.getBackend())
.addInnerClasses(CheckCastInterfaceArrayTest.class)
.addKeepMainRule(TestClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addDontObfuscate()
.noTreeShaking()
.compile()
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/checkcast/CheckCastNullForTypeTest.java b/src/test/java/com/android/tools/r8/ir/optimize/checkcast/CheckCastNullForTypeTest.java
index 5dc2510..c0a57f7 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/checkcast/CheckCastNullForTypeTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/checkcast/CheckCastNullForTypeTest.java
@@ -47,7 +47,7 @@
public void testR8() throws Exception {
testForR8(parameters.getBackend())
.addProgramClasses(A.class, Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepClassAndMembersRules(Main.class)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutput(EXPECTED)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/checkcast/InterfaceArrayCheckCastTest.java b/src/test/java/com/android/tools/r8/ir/optimize/checkcast/InterfaceArrayCheckCastTest.java
index 2203de3..4899ef2 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/checkcast/InterfaceArrayCheckCastTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/checkcast/InterfaceArrayCheckCastTest.java
@@ -35,7 +35,7 @@
assumeTrue(parameters.isDexRuntime());
testForD8(parameters.getBackend())
.addInnerClasses(getClass())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutput(EXPECTED_OUTPUT);
}
@@ -46,7 +46,7 @@
.addInnerClasses(getClass())
.addKeepMainRule(TestClass.class)
.addKeepRules("-keep class ** { *; }")
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.allowStdoutMessages()
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutput(EXPECTED_OUTPUT);
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/checkcast/TrivialTypeTestsAfterBranchPruningTest.java b/src/test/java/com/android/tools/r8/ir/optimize/checkcast/TrivialTypeTestsAfterBranchPruningTest.java
index 659764a..be0d2eb 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/checkcast/TrivialTypeTestsAfterBranchPruningTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/checkcast/TrivialTypeTestsAfterBranchPruningTest.java
@@ -42,7 +42,7 @@
.addInnerClasses(TrivialTypeTestsAfterBranchPruningTest.class)
.addKeepMainRule(TestClass.class)
.enableInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/classinitializerdefaults/NonFinalFieldWithDefaultValueTest.java b/src/test/java/com/android/tools/r8/ir/optimize/classinitializerdefaults/NonFinalFieldWithDefaultValueTest.java
index 30dd4b4..ead61d9 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/classinitializerdefaults/NonFinalFieldWithDefaultValueTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/classinitializerdefaults/NonFinalFieldWithDefaultValueTest.java
@@ -44,7 +44,7 @@
public void testD8() throws Exception {
testForD8()
.addInnerClasses(NonFinalFieldWithDefaultValueTest.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
// Class initializer defaults optimization only runs in release mode.
.release()
.compile()
@@ -59,7 +59,7 @@
.addInnerClasses(NonFinalFieldWithDefaultValueTest.class)
.addKeepMainRule(TestClass.class)
.enableInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/classinliner/BuilderWithInheritanceTest.java b/src/test/java/com/android/tools/r8/ir/optimize/classinliner/BuilderWithInheritanceTest.java
index d158c7d..56cd42a 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/classinliner/BuilderWithInheritanceTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/classinliner/BuilderWithInheritanceTest.java
@@ -42,7 +42,7 @@
.addKeepMainRule(TestClass.class)
.enableInliningAnnotations()
.enableNoVerticalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutput("42")
.inspector();
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/classinliner/BuilderWithMethodOnParentClassTest.java b/src/test/java/com/android/tools/r8/ir/optimize/classinliner/BuilderWithMethodOnParentClassTest.java
index a8098cb..d0f27b2 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/classinliner/BuilderWithMethodOnParentClassTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/classinliner/BuilderWithMethodOnParentClassTest.java
@@ -41,7 +41,7 @@
.enableInliningAnnotations()
.enableMemberValuePropagationAnnotations()
.enableNoVerticalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/classinliner/BuilderWithNonArgumentFieldValueTest.java b/src/test/java/com/android/tools/r8/ir/optimize/classinliner/BuilderWithNonArgumentFieldValueTest.java
index 3fdb772..77cd34b 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/classinliner/BuilderWithNonArgumentFieldValueTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/classinliner/BuilderWithNonArgumentFieldValueTest.java
@@ -42,7 +42,7 @@
.addKeepMainRule(TestClass.class)
.addOptionsModification(options -> options.enableClassInlining = enableClassInlining)
.enableInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/classinliner/ClassInlineInstanceInitializerWithAccessibleStaticGetTest.java b/src/test/java/com/android/tools/r8/ir/optimize/classinliner/ClassInlineInstanceInitializerWithAccessibleStaticGetTest.java
index e603587..a3a8c1c 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/classinliner/ClassInlineInstanceInitializerWithAccessibleStaticGetTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/classinliner/ClassInlineInstanceInitializerWithAccessibleStaticGetTest.java
@@ -39,7 +39,7 @@
.addKeepMainRule(TestClass.class)
.enableInliningAnnotations()
.enableNoVerticalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/classinliner/ClassInlineInstanceInitializerWithCheckCastTest.java b/src/test/java/com/android/tools/r8/ir/optimize/classinliner/ClassInlineInstanceInitializerWithCheckCastTest.java
index 29a3cb6..59808af 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/classinliner/ClassInlineInstanceInitializerWithCheckCastTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/classinliner/ClassInlineInstanceInitializerWithCheckCastTest.java
@@ -39,7 +39,7 @@
.addKeepMainRule(TestClass.class)
.enableInliningAnnotations()
.enableNoVerticalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/classinliner/ClassInlineInstanceInitializerWithIfTest.java b/src/test/java/com/android/tools/r8/ir/optimize/classinliner/ClassInlineInstanceInitializerWithIfTest.java
index a39dd98..39a5372 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/classinliner/ClassInlineInstanceInitializerWithIfTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/classinliner/ClassInlineInstanceInitializerWithIfTest.java
@@ -39,7 +39,7 @@
.addKeepMainRule(TestClass.class)
.enableInliningAnnotations()
.enableNoVerticalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/classinliner/ClassInlineInstanceInitializerWithInaccessibleStaticGetTest.java b/src/test/java/com/android/tools/r8/ir/optimize/classinliner/ClassInlineInstanceInitializerWithInaccessibleStaticGetTest.java
index 4aaeda5..47f8ffa 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/classinliner/ClassInlineInstanceInitializerWithInaccessibleStaticGetTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/classinliner/ClassInlineInstanceInitializerWithInaccessibleStaticGetTest.java
@@ -42,7 +42,7 @@
.addKeepMainRule(TestClass.class)
.enableInliningAnnotations()
.enableNoHorizontalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/classinliner/ClassInlineInstanceInitializerWithIndirectEscapingReceiverTest.java b/src/test/java/com/android/tools/r8/ir/optimize/classinliner/ClassInlineInstanceInitializerWithIndirectEscapingReceiverTest.java
index d1e2e54..c398cf4 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/classinliner/ClassInlineInstanceInitializerWithIndirectEscapingReceiverTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/classinliner/ClassInlineInstanceInitializerWithIndirectEscapingReceiverTest.java
@@ -40,7 +40,7 @@
.enableInliningAnnotations()
.enableMemberValuePropagationAnnotations()
.enableNoVerticalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/classinliner/ClassInlineInstanceInitializerWithInstanceOfTest.java b/src/test/java/com/android/tools/r8/ir/optimize/classinliner/ClassInlineInstanceInitializerWithInstanceOfTest.java
index a0429d1..75257c8 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/classinliner/ClassInlineInstanceInitializerWithInstanceOfTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/classinliner/ClassInlineInstanceInitializerWithInstanceOfTest.java
@@ -39,7 +39,7 @@
.addKeepMainRule(TestClass.class)
.enableInliningAnnotations()
.enableNoVerticalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/classinliner/ClassInlineSingletonFieldOfOtherTypeTest.java b/src/test/java/com/android/tools/r8/ir/optimize/classinliner/ClassInlineSingletonFieldOfOtherTypeTest.java
index 18739a4..6b4654d 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/classinliner/ClassInlineSingletonFieldOfOtherTypeTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/classinliner/ClassInlineSingletonFieldOfOtherTypeTest.java
@@ -38,7 +38,7 @@
.addInnerClasses(ClassInlineSingletonFieldOfOtherTypeTest.class)
.addKeepMainRule(TestClass.class)
.enableInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/classinliner/ClassInlinerBuilderWithControlFlowTest.java b/src/test/java/com/android/tools/r8/ir/optimize/classinliner/ClassInlinerBuilderWithControlFlowTest.java
index 4adf9ef..93dba41 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/classinliner/ClassInlinerBuilderWithControlFlowTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/classinliner/ClassInlinerBuilderWithControlFlowTest.java
@@ -48,7 +48,7 @@
.addInnerClasses(ClassInlinerBuilderWithControlFlowTest.class)
.addKeepMainRule(TestClass.class)
.addDontObfuscate()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/classinliner/ClassInlinerBuilderWithMoreControlFlowTest.java b/src/test/java/com/android/tools/r8/ir/optimize/classinliner/ClassInlinerBuilderWithMoreControlFlowTest.java
index c0277d7..61c7fcb 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/classinliner/ClassInlinerBuilderWithMoreControlFlowTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/classinliner/ClassInlinerBuilderWithMoreControlFlowTest.java
@@ -41,7 +41,7 @@
.addInnerClasses(ClassInlinerBuilderWithMoreControlFlowTest.class)
.addKeepMainRule(TestClass.class)
.addDontObfuscate()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/classinliner/ClassInlinerCheckCastWithUnknownReturnTest.java b/src/test/java/com/android/tools/r8/ir/optimize/classinliner/ClassInlinerCheckCastWithUnknownReturnTest.java
index 50a2f54..47b2b99 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/classinliner/ClassInlinerCheckCastWithUnknownReturnTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/classinliner/ClassInlinerCheckCastWithUnknownReturnTest.java
@@ -38,7 +38,7 @@
.addInnerClasses(getClass())
.addKeepMainRule(Main.class)
.enableNeverSingleCallerInlineAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertFailureWithErrorThatThrows(ClassCastException.class)
.inspectFailure(
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/classinliner/ClassInlinerDirectWithUnknownReturnTest.java b/src/test/java/com/android/tools/r8/ir/optimize/classinliner/ClassInlinerDirectWithUnknownReturnTest.java
index 0da8e12..0bd9d3a 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/classinliner/ClassInlinerDirectWithUnknownReturnTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/classinliner/ClassInlinerDirectWithUnknownReturnTest.java
@@ -38,7 +38,7 @@
.addInnerClasses(getClass())
.addKeepMainRule(Main.class)
.enableNeverSingleCallerInlineAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("Hello World 0")
.inspect(
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/classinliner/ClassInlinerInstanceEscapeViaPhiTest.java b/src/test/java/com/android/tools/r8/ir/optimize/classinliner/ClassInlinerInstanceEscapeViaPhiTest.java
index 147d2ed..4b4497e 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/classinliner/ClassInlinerInstanceEscapeViaPhiTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/classinliner/ClassInlinerInstanceEscapeViaPhiTest.java
@@ -40,7 +40,7 @@
testForR8(parameters.getBackend())
.addInnerClasses(ClassInlinerInstanceEscapeViaPhiTest.class)
.addKeepMainRule(TestClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutputLines("false");
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/classinliner/ClassInlinerNullableStaticGetTest.java b/src/test/java/com/android/tools/r8/ir/optimize/classinliner/ClassInlinerNullableStaticGetTest.java
index 0a6e376..e1449ce 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/classinliner/ClassInlinerNullableStaticGetTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/classinliner/ClassInlinerNullableStaticGetTest.java
@@ -31,7 +31,7 @@
.addInnerClasses(getClass())
.addKeepMainRule(Main.class)
.enableNoVerticalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), Main.class)
.assertFailureWithErrorThatThrows(NullPointerException.class);
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/classinliner/ClassInlinerPhiDirectUserAfterInlineTest.java b/src/test/java/com/android/tools/r8/ir/optimize/classinliner/ClassInlinerPhiDirectUserAfterInlineTest.java
index 5cea9fa..84f5003 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/classinliner/ClassInlinerPhiDirectUserAfterInlineTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/classinliner/ClassInlinerPhiDirectUserAfterInlineTest.java
@@ -53,7 +53,7 @@
public void testNoClassInlining() throws Exception {
testForR8(parameters.getBackend())
.addInnerClasses(getClass())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(Main.class)
.addOptionsModification(
options -> {
@@ -70,7 +70,7 @@
public void testR8() throws Exception {
testForR8(parameters.getBackend())
.addInnerClasses(getClass())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(Main.class)
.addOptionsModification(
options -> {
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/classinliner/ClassInlinerSimplePairBuilderTest.java b/src/test/java/com/android/tools/r8/ir/optimize/classinliner/ClassInlinerSimplePairBuilderTest.java
index c0daee1..a78e0d3 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/classinliner/ClassInlinerSimplePairBuilderTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/classinliner/ClassInlinerSimplePairBuilderTest.java
@@ -62,7 +62,7 @@
.enableInliningAnnotations()
.enableNoHorizontalClassMergingAnnotations()
.addDontObfuscate()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/classinliner/ClassInlinerSimplePairBuilderWithMultipleBuildsTest.java b/src/test/java/com/android/tools/r8/ir/optimize/classinliner/ClassInlinerSimplePairBuilderWithMultipleBuildsTest.java
index 35dbdce..6218ee7 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/classinliner/ClassInlinerSimplePairBuilderWithMultipleBuildsTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/classinliner/ClassInlinerSimplePairBuilderWithMultipleBuildsTest.java
@@ -51,7 +51,7 @@
.addKeepMainRule(TestClass.class)
.enableAlwaysInliningAnnotations()
.addDontObfuscate()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/classinliner/ClassInlinerStaticGetDirectMonitorTest.java b/src/test/java/com/android/tools/r8/ir/optimize/classinliner/ClassInlinerStaticGetDirectMonitorTest.java
index c79c42e..d127c4e 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/classinliner/ClassInlinerStaticGetDirectMonitorTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/classinliner/ClassInlinerStaticGetDirectMonitorTest.java
@@ -41,7 +41,7 @@
.addInnerClasses(ClassInlinerStaticGetDirectMonitorTest.class)
.addKeepMainRule(TestClass.class)
.enableInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addDontObfuscate()
.compile()
.inspect(this::inspect)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/classinliner/ClassInlinerStaticGetExtraMethodMonitorTest.java b/src/test/java/com/android/tools/r8/ir/optimize/classinliner/ClassInlinerStaticGetExtraMethodMonitorTest.java
index a730b8a..fd23a54 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/classinliner/ClassInlinerStaticGetExtraMethodMonitorTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/classinliner/ClassInlinerStaticGetExtraMethodMonitorTest.java
@@ -40,7 +40,7 @@
.addInnerClasses(ClassInlinerStaticGetExtraMethodMonitorTest.class)
.addKeepMainRule(TestClass.class)
.enableInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addDontObfuscate()
.compile()
.inspect(this::inspect)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/classinliner/ClassInlinerStaticGetMonitorTest.java b/src/test/java/com/android/tools/r8/ir/optimize/classinliner/ClassInlinerStaticGetMonitorTest.java
index 32be199..d5e4138 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/classinliner/ClassInlinerStaticGetMonitorTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/classinliner/ClassInlinerStaticGetMonitorTest.java
@@ -40,7 +40,7 @@
.addInnerClasses(ClassInlinerStaticGetMonitorTest.class)
.addKeepMainRule(TestClass.class)
.enableInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addDontObfuscate()
.compile()
.inspect(this::inspect)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/classinliner/ClassInlinerTest.java b/src/test/java/com/android/tools/r8/ir/optimize/classinliner/ClassInlinerTest.java
index 6c30034..5ece012 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/classinliner/ClassInlinerTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/classinliner/ClassInlinerTest.java
@@ -100,7 +100,7 @@
.assertMergedInto(Iface2Impl.class, Iface1Impl.class))
.allowAccessModification()
.addDontObfuscate()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), main)
.assertSuccessWithOutput(javaOutput);
@@ -312,7 +312,7 @@
.allowAccessModification()
.enableInliningAnnotations()
.addDontObfuscate()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), main)
.assertSuccessWithOutput(javaOutput);
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/classinliner/ClassInlinerTupleBuilderConstructorsTest.java b/src/test/java/com/android/tools/r8/ir/optimize/classinliner/ClassInlinerTupleBuilderConstructorsTest.java
index 179c5ba..f4c6c2c 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/classinliner/ClassInlinerTupleBuilderConstructorsTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/classinliner/ClassInlinerTupleBuilderConstructorsTest.java
@@ -47,7 +47,7 @@
.addKeepMainRule(TestClass.class)
.enableAlwaysClassInlineAnnotations()
.addDontObfuscate()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/classinliner/ClassInlinerWithSimpleSuperTypeTest.java b/src/test/java/com/android/tools/r8/ir/optimize/classinliner/ClassInlinerWithSimpleSuperTypeTest.java
index 13a5fcc..017afd9 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/classinliner/ClassInlinerWithSimpleSuperTypeTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/classinliner/ClassInlinerWithSimpleSuperTypeTest.java
@@ -49,7 +49,7 @@
.addOptionsModification(options -> options.enableClassInlining = enableClassInlining)
.enableInliningAnnotations()
.enableNoVerticalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::verifyCandidateIsClassInlined)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/classinliner/ClassInliningOracleTest.java b/src/test/java/com/android/tools/r8/ir/optimize/classinliner/ClassInliningOracleTest.java
index e0bd65e..4a3c1bf 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/classinliner/ClassInliningOracleTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/classinliner/ClassInliningOracleTest.java
@@ -52,7 +52,7 @@
.enableNeverClassInliningAnnotations()
.enableNoVerticalClassMergingAnnotations()
.enableUnusedArgumentAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector -> {
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/classinliner/ClassInliningWithImpreciseReceiverTypeTest.java b/src/test/java/com/android/tools/r8/ir/optimize/classinliner/ClassInliningWithImpreciseReceiverTypeTest.java
index 973ae87..0fea5c1 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/classinliner/ClassInliningWithImpreciseReceiverTypeTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/classinliner/ClassInliningWithImpreciseReceiverTypeTest.java
@@ -34,7 +34,7 @@
.addKeepMainRule(TestClass.class)
.enableInliningAnnotations()
.enableNoVerticalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutputLines("C1", "C2");
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/classinliner/ConstructorWithNonTrivialControlFlowTest.java b/src/test/java/com/android/tools/r8/ir/optimize/classinliner/ConstructorWithNonTrivialControlFlowTest.java
index 9292441..7ce73e4 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/classinliner/ConstructorWithNonTrivialControlFlowTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/classinliner/ConstructorWithNonTrivialControlFlowTest.java
@@ -50,7 +50,7 @@
.addOptionsModification(options -> options.enableClassInlining = enableClassInlining)
.enableInliningAnnotations()
.enableMemberValuePropagationAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::verifyClassInliningRemovesCandidate)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/classinliner/EscapeFromParentConstructorTest.java b/src/test/java/com/android/tools/r8/ir/optimize/classinliner/EscapeFromParentConstructorTest.java
index 6f5ab71..ed6de58 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/classinliner/EscapeFromParentConstructorTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/classinliner/EscapeFromParentConstructorTest.java
@@ -39,7 +39,7 @@
.addKeepMainRule(TestClass.class)
.enableInliningAnnotations()
.enableNoVerticalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/classinliner/ExtraMethodNullTest.java b/src/test/java/com/android/tools/r8/ir/optimize/classinliner/ExtraMethodNullTest.java
index 9890166..e7df91f 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/classinliner/ExtraMethodNullTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/classinliner/ExtraMethodNullTest.java
@@ -31,7 +31,7 @@
testForR8(parameters.getBackend())
.addProgramClassesAndInnerClasses(One.class)
.addKeepMainRule(One.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), One.class)
.assertFailureWithErrorThatThrows(NullPointerException.class);
}
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/classinliner/IndirectInstanceOfUserInParentConstructorClassInliningTest.java b/src/test/java/com/android/tools/r8/ir/optimize/classinliner/IndirectInstanceOfUserInParentConstructorClassInliningTest.java
index d0e7d73..0fb3280 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/classinliner/IndirectInstanceOfUserInParentConstructorClassInliningTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/classinliner/IndirectInstanceOfUserInParentConstructorClassInliningTest.java
@@ -38,7 +38,7 @@
.addKeepMainRule(Main.class)
.enableInliningAnnotations()
.enableNoVerticalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect)
.run(parameters.getRuntime(), Main.class)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/classinliner/InstanceOfSpecializedMethodClassInlinerTest.java b/src/test/java/com/android/tools/r8/ir/optimize/classinliner/InstanceOfSpecializedMethodClassInlinerTest.java
index 125f3cd..58d8d4a 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/classinliner/InstanceOfSpecializedMethodClassInlinerTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/classinliner/InstanceOfSpecializedMethodClassInlinerTest.java
@@ -31,7 +31,7 @@
.addInnerClasses(getClass())
.addKeepMainRule(Main.class)
.enableInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("false", "true");
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/classinliner/KeptClassInliningTest.java b/src/test/java/com/android/tools/r8/ir/optimize/classinliner/KeptClassInliningTest.java
index c8d287b..be84e82 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/classinliner/KeptClassInliningTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/classinliner/KeptClassInliningTest.java
@@ -58,7 +58,7 @@
.addProgramClasses(KeptClass.class, Main.class)
.addKeepMainRule(Main.class)
.addKeepClassRules(KeptClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("used()")
.inspector();
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/classinliner/LibraryOverrideClassInliningTest.java b/src/test/java/com/android/tools/r8/ir/optimize/classinliner/LibraryOverrideClassInliningTest.java
index 463efbb..ccdad8a 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/classinliner/LibraryOverrideClassInliningTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/classinliner/LibraryOverrideClassInliningTest.java
@@ -94,7 +94,7 @@
Main.class, SimpleLibraryOverride.class, NonSimpleLibraryOverride.class)
.addKeepMainRule(Main.class)
.enableNoHorizontalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("running...", "Hello world!")
.inspector();
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/classinliner/StatefulSingletonClassInliningTest.java b/src/test/java/com/android/tools/r8/ir/optimize/classinliner/StatefulSingletonClassInliningTest.java
index 17ccc82..4c854a4 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/classinliner/StatefulSingletonClassInliningTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/classinliner/StatefulSingletonClassInliningTest.java
@@ -32,7 +32,7 @@
.addInnerClasses(StatefulSingletonClassInliningTest.class)
.addKeepMainRule(TestClass.class)
.enableInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutputLines("true");
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/classinliner/StatefulSingletonClassInliningWithStaticEscapeTest.java b/src/test/java/com/android/tools/r8/ir/optimize/classinliner/StatefulSingletonClassInliningWithStaticEscapeTest.java
index 681f958..b22fe07 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/classinliner/StatefulSingletonClassInliningWithStaticEscapeTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/classinliner/StatefulSingletonClassInliningWithStaticEscapeTest.java
@@ -33,7 +33,7 @@
.addInnerClasses(StatefulSingletonClassInliningWithStaticEscapeTest.class)
.addKeepMainRule(TestClass.class)
.enableInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutputLines("true");
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/classinliner/UnusedReturnValueTest.java b/src/test/java/com/android/tools/r8/ir/optimize/classinliner/UnusedReturnValueTest.java
index 2a2bb9e..c9f121b 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/classinliner/UnusedReturnValueTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/classinliner/UnusedReturnValueTest.java
@@ -32,7 +32,7 @@
.addInnerClasses(UnusedReturnValueTest.class)
.addKeepMainRule(TestClass.class)
.enableInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutputLines("Hello world!");
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/classinliner/cost/NonMaterializingFieldAccessesAfterClassInliningTest.java b/src/test/java/com/android/tools/r8/ir/optimize/classinliner/cost/NonMaterializingFieldAccessesAfterClassInliningTest.java
index 79d6062..2a71b26 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/classinliner/cost/NonMaterializingFieldAccessesAfterClassInliningTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/classinliner/cost/NonMaterializingFieldAccessesAfterClassInliningTest.java
@@ -45,7 +45,7 @@
parameters.isCfRuntime() ? 3 : 6)
.enableInliningAnnotations()
.enableNoHorizontalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/classinliner/nonpublicsubtype/ClassInlineNonPublicSubtypeTest.java b/src/test/java/com/android/tools/r8/ir/optimize/classinliner/nonpublicsubtype/ClassInlineNonPublicSubtypeTest.java
index 4292720..ce7a04f 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/classinliner/nonpublicsubtype/ClassInlineNonPublicSubtypeTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/classinliner/nonpublicsubtype/ClassInlineNonPublicSubtypeTest.java
@@ -45,7 +45,7 @@
.addInnerClasses(getClass())
.addProgramClassesAndInnerClasses(Utils.class)
.addKeepMainRule(TestClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutput(EXPECTED);
}
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/classmerger/vertical/ArrayPutToInterfaceWithObjectMergingTest.java b/src/test/java/com/android/tools/r8/ir/optimize/classmerger/vertical/ArrayPutToInterfaceWithObjectMergingTest.java
index 7141ad08..afd681c 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/classmerger/vertical/ArrayPutToInterfaceWithObjectMergingTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/classmerger/vertical/ArrayPutToInterfaceWithObjectMergingTest.java
@@ -72,7 +72,7 @@
}
})
.enableInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("A");
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/classmerger/vertical/InstancePutToInterfaceWithObjectMergingTest.java b/src/test/java/com/android/tools/r8/ir/optimize/classmerger/vertical/InstancePutToInterfaceWithObjectMergingTest.java
index aeca839..e53837f 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/classmerger/vertical/InstancePutToInterfaceWithObjectMergingTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/classmerger/vertical/InstancePutToInterfaceWithObjectMergingTest.java
@@ -73,7 +73,7 @@
}
})
.enableInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("A");
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/classmerger/vertical/NoLongerSyntheticAfterVerticalClassMergingTest.java b/src/test/java/com/android/tools/r8/ir/optimize/classmerger/vertical/NoLongerSyntheticAfterVerticalClassMergingTest.java
index 809c81a..ee727ae 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/classmerger/vertical/NoLongerSyntheticAfterVerticalClassMergingTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/classmerger/vertical/NoLongerSyntheticAfterVerticalClassMergingTest.java
@@ -44,7 +44,7 @@
.addKeepMainRule(TestClass.class)
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/classmerger/vertical/ReturnObjectAsInterfaceMergingTest.java b/src/test/java/com/android/tools/r8/ir/optimize/classmerger/vertical/ReturnObjectAsInterfaceMergingTest.java
index f541549..743155f 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/classmerger/vertical/ReturnObjectAsInterfaceMergingTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/classmerger/vertical/ReturnObjectAsInterfaceMergingTest.java
@@ -74,7 +74,7 @@
}
})
.enableInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("A");
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/classmerger/vertical/StaticPutToInterfaceWithObjectMergingTest.java b/src/test/java/com/android/tools/r8/ir/optimize/classmerger/vertical/StaticPutToInterfaceWithObjectMergingTest.java
index bfc7276..e584000 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/classmerger/vertical/StaticPutToInterfaceWithObjectMergingTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/classmerger/vertical/StaticPutToInterfaceWithObjectMergingTest.java
@@ -73,7 +73,7 @@
}
})
.enableInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("A");
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/commonsubexpressionelimination/TrivialPhiAfterCommonSubexpressionEliminationTest.java b/src/test/java/com/android/tools/r8/ir/optimize/commonsubexpressionelimination/TrivialPhiAfterCommonSubexpressionEliminationTest.java
index c238466..7b9df33 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/commonsubexpressionelimination/TrivialPhiAfterCommonSubexpressionEliminationTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/commonsubexpressionelimination/TrivialPhiAfterCommonSubexpressionEliminationTest.java
@@ -30,7 +30,7 @@
testForR8(parameters.getBackend())
.addInnerClasses(TrivialPhiAfterCommonSubexpressionEliminationTest.class)
.addKeepMainRule(TestClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutputLines("42");
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/devirtualize/DevirtualizeLibrarySuperTest.java b/src/test/java/com/android/tools/r8/ir/optimize/devirtualize/DevirtualizeLibrarySuperTest.java
index f3d1079..22d1742 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/devirtualize/DevirtualizeLibrarySuperTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/devirtualize/DevirtualizeLibrarySuperTest.java
@@ -40,7 +40,7 @@
.addLibraryClasses(Library.class, LibraryOverride.class, LibraryBoundary.class)
.addDefaultRuntimeLibrary(parameters)
.addProgramClasses(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(Main.class)
.enableInliningAnnotations()
.compile()
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/devirtualize/DevirtualizeWithCatchHandlersTest.java b/src/test/java/com/android/tools/r8/ir/optimize/devirtualize/DevirtualizeWithCatchHandlersTest.java
index a126f0f..4f1e6c4 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/devirtualize/DevirtualizeWithCatchHandlersTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/devirtualize/DevirtualizeWithCatchHandlersTest.java
@@ -38,7 +38,7 @@
" " + Uninstantiated.class.getTypeName() + " get();",
"}")
.enableInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("A");
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/devirtualize/DevirtualizerNonNullRewritingTest.java b/src/test/java/com/android/tools/r8/ir/optimize/devirtualize/DevirtualizerNonNullRewritingTest.java
index 28a973c..f3c2850 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/devirtualize/DevirtualizerNonNullRewritingTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/devirtualize/DevirtualizerNonNullRewritingTest.java
@@ -47,7 +47,7 @@
.addKeepMainRule(TestClass.class)
.enableInliningAnnotations()
.enableNoVerticalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutput(EXPECTED_OUTPUT);
}
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/devirtualize/InvokeInterfaceToInvokeVirtualTest.java b/src/test/java/com/android/tools/r8/ir/optimize/devirtualize/InvokeInterfaceToInvokeVirtualTest.java
index 2a88107..6266032 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/devirtualize/InvokeInterfaceToInvokeVirtualTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/devirtualize/InvokeInterfaceToInvokeVirtualTest.java
@@ -55,7 +55,7 @@
options ->
options.inlinerOptions().enableInliningOfInvokesWithNullableReceivers = false)
.enableNoHorizontalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines(EXPECTED_OUTPUT)
.inspector();
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/devirtualize/InvokeSuperToInvokeVirtualTest.java b/src/test/java/com/android/tools/r8/ir/optimize/devirtualize/InvokeSuperToInvokeVirtualTest.java
index 82e963b..f3ffd4d 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/devirtualize/InvokeSuperToInvokeVirtualTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/devirtualize/InvokeSuperToInvokeVirtualTest.java
@@ -46,7 +46,7 @@
.enableNoMethodStaticizingAnnotations()
.enableNoVerticalClassMergingAnnotations()
.enableNeverClassInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/devirtualize/PackagePrivateOverrideDeVirtualizerTest.java b/src/test/java/com/android/tools/r8/ir/optimize/devirtualize/PackagePrivateOverrideDeVirtualizerTest.java
index 33da30f..10601a3 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/devirtualize/PackagePrivateOverrideDeVirtualizerTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/devirtualize/PackagePrivateOverrideDeVirtualizerTest.java
@@ -51,7 +51,7 @@
.addProgramClassFileData(
getSubViewModelInAnotherPackage(), getRewrittenSubViewModelInMain())
.addKeepMainRule(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.enableInliningAnnotations()
.enableNoVerticalClassMergingAnnotations()
.enableNeverClassInliningAnnotations()
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/devirtualize/PrivateOverridePublicizerDevirtualizerTest.java b/src/test/java/com/android/tools/r8/ir/optimize/devirtualize/PrivateOverridePublicizerDevirtualizerTest.java
index a0bbdb1..a0ca28f 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/devirtualize/PrivateOverridePublicizerDevirtualizerTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/devirtualize/PrivateOverridePublicizerDevirtualizerTest.java
@@ -54,7 +54,7 @@
.addKeepMainRule(Main.class)
.allowAccessModification()
.addDontObfuscate()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector -> {
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/dynamictype/DynamicTypeOptimizationTest.java b/src/test/java/com/android/tools/r8/ir/optimize/dynamictype/DynamicTypeOptimizationTest.java
index daed986..42fc8b1 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/dynamictype/DynamicTypeOptimizationTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/dynamictype/DynamicTypeOptimizationTest.java
@@ -47,7 +47,7 @@
.enableInliningAnnotations()
.enableNoMethodStaticizingAnnotations()
.enableNoReturnTypeStrengtheningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/dynamictype/DynamicUpperBoundWithEffectivelyFinalTest.java b/src/test/java/com/android/tools/r8/ir/optimize/dynamictype/DynamicUpperBoundWithEffectivelyFinalTest.java
index 5393409..a9525d1 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/dynamictype/DynamicUpperBoundWithEffectivelyFinalTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/dynamictype/DynamicUpperBoundWithEffectivelyFinalTest.java
@@ -38,7 +38,7 @@
.addKeepMainRule(Main.class)
.addKeepClassRules(Final.class)
.addKeepClassAndMembersRules(Base.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
.run(parameters.getRuntime(), Main.class)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/extrasubclasses/AbstractClassAlsoImplementedByMissingClassTest.java b/src/test/java/com/android/tools/r8/ir/optimize/extrasubclasses/AbstractClassAlsoImplementedByMissingClassTest.java
index 03c69b1..3e0e9b7 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/extrasubclasses/AbstractClassAlsoImplementedByMissingClassTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/extrasubclasses/AbstractClassAlsoImplementedByMissingClassTest.java
@@ -53,7 +53,7 @@
.addKeepRules(
"-keep class " + A.class.getTypeName() + " { void <init>(); void kept(); }")
.enableNeverClassInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect)
.writeToZip();
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/extrasubclasses/AbstractClassOnlyImplementedByMissingClassTest.java b/src/test/java/com/android/tools/r8/ir/optimize/extrasubclasses/AbstractClassOnlyImplementedByMissingClassTest.java
index 470ab2b..e9a2350 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/extrasubclasses/AbstractClassOnlyImplementedByMissingClassTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/extrasubclasses/AbstractClassOnlyImplementedByMissingClassTest.java
@@ -44,7 +44,7 @@
// of
// A after the R8 compilation.
.addKeepRules("-keep class " + A.class.getTypeName() + " { void <init>(); void m(); }")
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.writeToZip();
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/extrasubclasses/InterfaceAlsoImplementedByMissingClassTest.java b/src/test/java/com/android/tools/r8/ir/optimize/extrasubclasses/InterfaceAlsoImplementedByMissingClassTest.java
index c073c8b..5c4d199 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/extrasubclasses/InterfaceAlsoImplementedByMissingClassTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/extrasubclasses/InterfaceAlsoImplementedByMissingClassTest.java
@@ -51,7 +51,7 @@
// I after the R8 compilation.
.addKeepRules("-keep class " + I.class.getTypeName() + " { void kept(); }")
.enableNeverClassInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect)
.writeToZip();
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/extrasubclasses/InterfaceOnlyImplementedByMissingClassTest.java b/src/test/java/com/android/tools/r8/ir/optimize/extrasubclasses/InterfaceOnlyImplementedByMissingClassTest.java
index 2ccc4e0..7075c1c 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/extrasubclasses/InterfaceOnlyImplementedByMissingClassTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/extrasubclasses/InterfaceOnlyImplementedByMissingClassTest.java
@@ -44,7 +44,7 @@
// the
// R8 compilation.
.addKeepRules("-keep class " + I.class.getTypeName() + " { void m(); }")
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.writeToZip();
;
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/fields/FieldAnalysisTest.java b/src/test/java/com/android/tools/r8/ir/optimize/fields/FieldAnalysisTest.java
index 4089f0e..1f57f0d 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/fields/FieldAnalysisTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/fields/FieldAnalysisTest.java
@@ -41,7 +41,7 @@
@Test
public void testR8() throws Exception {
testForR8(parameters.getBackend())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addInnerClasses(FieldAnalysisTest.class)
.addKeepMainRule(Main.class)
.enableInliningAnnotations()
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/fields/NonFinalFinalFieldTest.java b/src/test/java/com/android/tools/r8/ir/optimize/fields/NonFinalFinalFieldTest.java
index d8cdbc5..4303c5d 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/fields/NonFinalFinalFieldTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/fields/NonFinalFinalFieldTest.java
@@ -50,7 +50,7 @@
.addProgramClassFileData(getProgramClassFileData())
.addKeepMainRule(TestClass.class)
.enableNeverClassInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutputLines("2", "2", "2");
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/fields/SwitchOnConstantClassIdAfterBranchPruningTest.java b/src/test/java/com/android/tools/r8/ir/optimize/fields/SwitchOnConstantClassIdAfterBranchPruningTest.java
index 8c029a5..0a044c5 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/fields/SwitchOnConstantClassIdAfterBranchPruningTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/fields/SwitchOnConstantClassIdAfterBranchPruningTest.java
@@ -45,7 +45,7 @@
inspector -> inspector.assertIsCompleteMergeGroup(A.class, B.class, C.class))
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addDontObfuscate()
.compile()
.inspect(
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/fields/SwitchOnNonConstantClassIdAfterBranchPruningTest.java b/src/test/java/com/android/tools/r8/ir/optimize/fields/SwitchOnNonConstantClassIdAfterBranchPruningTest.java
index 88efb9c..b5770c7 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/fields/SwitchOnNonConstantClassIdAfterBranchPruningTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/fields/SwitchOnNonConstantClassIdAfterBranchPruningTest.java
@@ -45,7 +45,7 @@
inspector -> inspector.assertIsCompleteMergeGroup(A.class, B.class, C.class))
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addDontObfuscate()
.compile()
.inspect(
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/ifs/ConstClassComparisonTest.java b/src/test/java/com/android/tools/r8/ir/optimize/ifs/ConstClassComparisonTest.java
index 6b8cb68..64e262c 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/ifs/ConstClassComparisonTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/ifs/ConstClassComparisonTest.java
@@ -40,7 +40,7 @@
testForR8(parameters.getBackend())
.addInnerClasses(ConstClassComparisonTest.class)
.addKeepMainRule(TestClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/ifs/EnumAliasComparisonTest.java b/src/test/java/com/android/tools/r8/ir/optimize/ifs/EnumAliasComparisonTest.java
index aa60b25..efc88a8 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/ifs/EnumAliasComparisonTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/ifs/EnumAliasComparisonTest.java
@@ -40,7 +40,7 @@
testForR8(parameters.getBackend())
.addInnerClasses(EnumAliasComparisonTest.class)
.addKeepMainRule(TestClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/ifs/EnumComparisonTest.java b/src/test/java/com/android/tools/r8/ir/optimize/ifs/EnumComparisonTest.java
index 94d775b..59445b0 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/ifs/EnumComparisonTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/ifs/EnumComparisonTest.java
@@ -39,7 +39,7 @@
testForR8(parameters.getBackend())
.addInnerClasses(EnumComparisonTest.class)
.addKeepMainRule(TestClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/ifs/IfThrowNullPointerExceptionTest.java b/src/test/java/com/android/tools/r8/ir/optimize/ifs/IfThrowNullPointerExceptionTest.java
index 4b60883..ea3a8ec 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/ifs/IfThrowNullPointerExceptionTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/ifs/IfThrowNullPointerExceptionTest.java
@@ -57,7 +57,7 @@
testForD8()
.addInnerClasses(IfThrowNullPointerExceptionTest.class)
.release()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect)
.run(parameters.getRuntime(), TestClass.class)
@@ -69,7 +69,7 @@
testForR8(parameters.getBackend())
.addInnerClasses(IfThrowNullPointerExceptionTest.class)
.addKeepClassAndMembersRules(TestClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/ifs/SemiTrivialPhiBranchTest.java b/src/test/java/com/android/tools/r8/ir/optimize/ifs/SemiTrivialPhiBranchTest.java
index 1225b7f..41e8b13 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/ifs/SemiTrivialPhiBranchTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/ifs/SemiTrivialPhiBranchTest.java
@@ -39,7 +39,7 @@
.addInnerClasses(SemiTrivialPhiBranchTest.class)
.addKeepMainRule(TestClass.class)
.enableInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/ifs/TrivialObjectEqualsTest.java b/src/test/java/com/android/tools/r8/ir/optimize/ifs/TrivialObjectEqualsTest.java
index 3d520ac..59f9402 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/ifs/TrivialObjectEqualsTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/ifs/TrivialObjectEqualsTest.java
@@ -37,7 +37,7 @@
assumeTrue(parameters.isDexRuntime());
testForD8(parameters.getBackend())
.addInnerClasses(getClass())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector ->
@@ -54,7 +54,7 @@
.addInnerClasses(getClass())
.addKeepMainRule(Main.class)
.enableInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector ->
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/inliner/AvoidInliningRecursiveMethodTest.java b/src/test/java/com/android/tools/r8/ir/optimize/inliner/AvoidInliningRecursiveMethodTest.java
index d231fdf..8b066c8 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/inliner/AvoidInliningRecursiveMethodTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/inliner/AvoidInliningRecursiveMethodTest.java
@@ -40,7 +40,7 @@
.addInnerClasses(AvoidInliningRecursiveMethodTest.class)
.addKeepMainRule(TestClass.class)
.enableInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/inliner/DoubleInliningNullCheckTest.java b/src/test/java/com/android/tools/r8/ir/optimize/inliner/DoubleInliningNullCheckTest.java
index bf9b044..a0a3bcb 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/inliner/DoubleInliningNullCheckTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/inliner/DoubleInliningNullCheckTest.java
@@ -37,7 +37,7 @@
.addInnerClasses(DoubleInliningNullCheckTest.class)
.addKeepMainRule(TestClass.class)
.addDontObfuscate()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutputLines("true")
.inspect(
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/inliner/InlineCatchHandlerWithLibraryTypeTest.java b/src/test/java/com/android/tools/r8/ir/optimize/inliner/InlineCatchHandlerWithLibraryTypeTest.java
index 7387f3a..ea19697 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/inliner/InlineCatchHandlerWithLibraryTypeTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/inliner/InlineCatchHandlerWithLibraryTypeTest.java
@@ -100,7 +100,7 @@
.addProgramClasses(TestClass.class)
.addProgramClassFileData(getClassWithCatchHandler())
.addKeepMainRule(TestClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
// Use the latest library so that all of the exceptions are defined.
.addLibraryFiles(ToolHelper.getAndroidJar(AndroidApiLevel.LATEST))
.compile()
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/inliner/InlineCatchHandlerWithProgramTypeTest.java b/src/test/java/com/android/tools/r8/ir/optimize/inliner/InlineCatchHandlerWithProgramTypeTest.java
index bcb4b9b..0127ae4 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/inliner/InlineCatchHandlerWithProgramTypeTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/inliner/InlineCatchHandlerWithProgramTypeTest.java
@@ -37,7 +37,7 @@
.addInnerClasses(InlineCatchHandlerWithProgramTypeTest.class)
.addKeepMainRule(TestClass.class)
.enableInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutputLines("Done...")
.inspect(this::checkInlined);
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/inliner/InlineFunctionalInterfaceMethodImplementedByLambdasTest.java b/src/test/java/com/android/tools/r8/ir/optimize/inliner/InlineFunctionalInterfaceMethodImplementedByLambdasTest.java
index 587795f..441f149 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/inliner/InlineFunctionalInterfaceMethodImplementedByLambdasTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/inliner/InlineFunctionalInterfaceMethodImplementedByLambdasTest.java
@@ -38,7 +38,7 @@
.addInnerClasses(InlineFunctionalInterfaceMethodImplementedByLambdasTest.class)
.addKeepMainRule(TestClass.class)
.enableNeverClassInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/inliner/InlineInvokeWithNullableReceiverTest.java b/src/test/java/com/android/tools/r8/ir/optimize/inliner/InlineInvokeWithNullableReceiverTest.java
index 94c8213..e1aca00 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/inliner/InlineInvokeWithNullableReceiverTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/inliner/InlineInvokeWithNullableReceiverTest.java
@@ -46,7 +46,7 @@
testForR8(parameters.getBackend())
.addInnerClasses(InlineInvokeWithNullableReceiverTest.class)
.addKeepMainRule(TestClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::verifyMethodHasBeenInlined);
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/inliner/InlineLibraryInterfaceMethodTest.java b/src/test/java/com/android/tools/r8/ir/optimize/inliner/InlineLibraryInterfaceMethodTest.java
index 2dee8a7..5204a8f 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/inliner/InlineLibraryInterfaceMethodTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/inliner/InlineLibraryInterfaceMethodTest.java
@@ -28,10 +28,10 @@
return getTestParameters().withDexRuntime(DexVm.ART_DEFAULT.getVersion()).build();
}
- private final TestParameters testParameters;
+ private final TestParameters parameters;
- public InlineLibraryInterfaceMethodTest(TestParameters testParameters) {
- this.testParameters = testParameters;
+ public InlineLibraryInterfaceMethodTest(TestParameters parameters) {
+ this.parameters = parameters;
}
@Test
@@ -41,7 +41,7 @@
private long println = 0;
}
Counts counts = new Counts();
- TestRuntime testRuntime = testParameters.getRuntime();
+ TestRuntime testRuntime = parameters.getRuntime();
testForR8(Backend.DEX)
.addInnerClasses(InlineLibraryInterfaceMethodTest.class)
.addKeepMainRule(TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/inliner/InlineSynchronizedMethodTest.java b/src/test/java/com/android/tools/r8/ir/optimize/inliner/InlineSynchronizedMethodTest.java
index d2e9063..966355a 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/inliner/InlineSynchronizedMethodTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/inliner/InlineSynchronizedMethodTest.java
@@ -35,7 +35,7 @@
testForR8(parameters.getBackend())
.addInnerClasses(InlineSynchronizedMethodTest.class)
.addKeepMainRule(TestClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutput(EXPECTED)
.inspect(
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/inliner/InlineSynchronizedTest.java b/src/test/java/com/android/tools/r8/ir/optimize/inliner/InlineSynchronizedTest.java
index 7fd5b34..101f5bc 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/inliner/InlineSynchronizedTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/inliner/InlineSynchronizedTest.java
@@ -41,7 +41,7 @@
.addKeepMainRule(TestClass.class)
.enableNeverClassInliningAnnotations()
.enableInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector -> {
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/inliner/InlineSynthesizedLambdaClass.java b/src/test/java/com/android/tools/r8/ir/optimize/inliner/InlineSynthesizedLambdaClass.java
index dbc7c5b..c85c817 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/inliner/InlineSynthesizedLambdaClass.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/inliner/InlineSynthesizedLambdaClass.java
@@ -42,7 +42,7 @@
.addKeepMainRule(Lambda.class)
.allowAccessModification()
.addDontObfuscate()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Lambda.class)
.assertSuccessWithOutput(javaOutput)
.inspector();
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/inliner/InlinerShouldNotInlineDefinitelyNullTest.java b/src/test/java/com/android/tools/r8/ir/optimize/inliner/InlinerShouldNotInlineDefinitelyNullTest.java
index 960e3d9..5a639f8 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/inliner/InlinerShouldNotInlineDefinitelyNullTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/inliner/InlinerShouldNotInlineDefinitelyNullTest.java
@@ -61,7 +61,7 @@
.addKeepMainRule(Main.class)
.addKeepAllAttributes()
.addKeepClassRules(A.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector -> {
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/inliner/InliningAfterClassInitializationTest.java b/src/test/java/com/android/tools/r8/ir/optimize/inliner/InliningAfterClassInitializationTest.java
index c93ceea..e083014 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/inliner/InliningAfterClassInitializationTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/inliner/InliningAfterClassInitializationTest.java
@@ -230,7 +230,7 @@
.enableConstantArgumentAnnotations()
.enableUnusedArgumentAnnotations()
.enableInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), mainClass)
.assertSuccessWithOutput(expectedOutput)
.inspector();
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/inliner/InliningFromCurrentClassTest.java b/src/test/java/com/android/tools/r8/ir/optimize/inliner/InliningFromCurrentClassTest.java
index 448a7b7..9557ac0 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/inliner/InliningFromCurrentClassTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/inliner/InliningFromCurrentClassTest.java
@@ -55,7 +55,7 @@
.addKeepMainRule(TestClass.class)
.enableInliningAnnotations()
.enableNoVerticalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutput(expectedOutput)
.inspector();
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/inliner/InliningIntoVisibilityBridgeTest.java b/src/test/java/com/android/tools/r8/ir/optimize/inliner/InliningIntoVisibilityBridgeTest.java
index 19806fb..4498fe9 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/inliner/InliningIntoVisibilityBridgeTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/inliner/InliningIntoVisibilityBridgeTest.java
@@ -58,7 +58,7 @@
.applyIf(neverInline, R8TestBuilder::enableInliningAnnotations)
.enableNoVerticalClassMergingAnnotations()
.enableProguardTestOptions()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutput(expectedOutput);
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/inliner/InterfaceInvokeWithObjectReceiverInliningTest.java b/src/test/java/com/android/tools/r8/ir/optimize/inliner/InterfaceInvokeWithObjectReceiverInliningTest.java
index 3aaa789..95d2925 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/inliner/InterfaceInvokeWithObjectReceiverInliningTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/inliner/InterfaceInvokeWithObjectReceiverInliningTest.java
@@ -84,7 +84,7 @@
inspector.assertNoClassesMerged();
}
})
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutput(EXPECTED);
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/inliner/LibraryOverrideInliningTest.java b/src/test/java/com/android/tools/r8/ir/optimize/inliner/LibraryOverrideInliningTest.java
index dea2a26..5e30ce8 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/inliner/LibraryOverrideInliningTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/inliner/LibraryOverrideInliningTest.java
@@ -39,7 +39,7 @@
.addInnerClasses(LibraryOverrideInliningTest.class)
.addKeepMainRule(TestClass.class)
.enableNeverClassInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector -> {
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/inliner/Regress131349148.java b/src/test/java/com/android/tools/r8/ir/optimize/inliner/Regress131349148.java
index a1cf0e5..38eddf9 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/inliner/Regress131349148.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/inliner/Regress131349148.java
@@ -52,7 +52,7 @@
testForR8(parameters.getBackend())
.addProgramClasses(TestClass.class, ClassWithCatchReflectiveOperation.class)
.addKeepMainRule(TestClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), TestClass.class)
.assertSuccess();
@@ -107,7 +107,7 @@
.addKeepMainRule(TestClassCallingMethodWithNonExisting.class)
.addDontWarn(NonExistingException.class)
.allowDiagnosticWarningMessages()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.apply(r8TestBuilderConsumer)
.compileWithExpectedDiagnostics(
diagnostics ->
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/inliner/Regress134304597/TestRunner.java b/src/test/java/com/android/tools/r8/ir/optimize/inliner/Regress134304597/TestRunner.java
index 668fef7..a12c931 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/inliner/Regress134304597/TestRunner.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/inliner/Regress134304597/TestRunner.java
@@ -3,11 +3,9 @@
// BSD-style license that can be found in the LICENSE file.
package com.android.tools.r8.ir.optimize.inliner.Regress134304597;
-import com.android.tools.r8.R8TestRunResult;
import com.android.tools.r8.TestBase;
import com.android.tools.r8.TestParameters;
import com.android.tools.r8.TestParametersCollection;
-import com.android.tools.r8.utils.AndroidApiLevel;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
@@ -32,7 +30,7 @@
testForR8(parameters.getBackend())
.addProgramClasses(Main.class)
.addProgramClassFileData(TestDump.dump())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(Main.class)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("true");
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/inliner/Regress199142666.java b/src/test/java/com/android/tools/r8/ir/optimize/inliner/Regress199142666.java
index 7f77799..2e0ed92 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/inliner/Regress199142666.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/inliner/Regress199142666.java
@@ -44,7 +44,7 @@
.addProgramClassFileData(getVirtualAAsStaticA())
.addKeepMainRule(HasInvalidStaticCall.class)
.addKeepMethodRules(StaticA.class, "void foo()")
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), HasInvalidStaticCall.class)
// TODO(b/199142666): We should consider if we want to inline in this case (there are no
// verification errors)
@@ -63,7 +63,7 @@
.addProgramClassFileData(getVirtualAAsStaticA())
.addKeepMainRule(TargetHasInvalidStaticCall.class)
.addKeepMethodRules(StaticA.class, "void foo()")
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), TargetHasInvalidStaticCall.class)
.assertSuccessWithEmptyOutput()
.inspect(
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/inliner/SingleTargetAfterInliningTest.java b/src/test/java/com/android/tools/r8/ir/optimize/inliner/SingleTargetAfterInliningTest.java
index 9fae6b0..69ad5cc 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/inliner/SingleTargetAfterInliningTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/inliner/SingleTargetAfterInliningTest.java
@@ -53,7 +53,7 @@
.enableNeverClassInliningAnnotations()
.enableNoHorizontalClassMergingAnnotations()
.enableSideEffectAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/inliner/SingleTargetFromExactReceiverTypeTest.java b/src/test/java/com/android/tools/r8/ir/optimize/inliner/SingleTargetFromExactReceiverTypeTest.java
index 4dcba65..ba3cc5a 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/inliner/SingleTargetFromExactReceiverTypeTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/inliner/SingleTargetFromExactReceiverTypeTest.java
@@ -52,7 +52,7 @@
.enableAlwaysInliningAnnotations()
.enableNeverClassInliningAnnotations()
.enableInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::verifyOnlyCanBeInlinedHasBeenInlined)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/inliner/StaticInvokeWithMultipleObjectsForInterfaceTypesTest.java b/src/test/java/com/android/tools/r8/ir/optimize/inliner/StaticInvokeWithMultipleObjectsForInterfaceTypesTest.java
index 7bc991e..b4f7d98 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/inliner/StaticInvokeWithMultipleObjectsForInterfaceTypesTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/inliner/StaticInvokeWithMultipleObjectsForInterfaceTypesTest.java
@@ -78,7 +78,7 @@
R8TestBuilder::addNoVerticalClassMergingAnnotations,
R8TestBuilder::enableNoVerticalClassMergingAnnotations)
.enableNoHorizontalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("0", "0");
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/inliner/SyntheticInitClassPositionTest.java b/src/test/java/com/android/tools/r8/ir/optimize/inliner/SyntheticInitClassPositionTest.java
index fe6ef20..1b7f91c 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/inliner/SyntheticInitClassPositionTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/inliner/SyntheticInitClassPositionTest.java
@@ -51,7 +51,7 @@
.addKeepMainRule(Main.class)
.addKeepAttributeLineNumberTable()
.addKeepAttributeSourceFile()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertFailureWithErrorThatThrows(ExceptionInInitializerError.class)
.inspectStackTrace(stackTrace -> assertThat(stackTrace, isSame(expectedStackTrace)));
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/inliner/SyntheticInlineNullCheckPositionTest.java b/src/test/java/com/android/tools/r8/ir/optimize/inliner/SyntheticInlineNullCheckPositionTest.java
index a10e302..0b56c68 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/inliner/SyntheticInlineNullCheckPositionTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/inliner/SyntheticInlineNullCheckPositionTest.java
@@ -64,7 +64,7 @@
.addKeepMainRule(Main.class)
.addKeepAttributeLineNumberTable()
.addKeepAttributeSourceFile()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), Main.class)
.assertFailureWithErrorThatThrows(NullPointerException.class)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/inliner/conditionalsimpleinlining/ConditionalSimpleInliningTestBase.java b/src/test/java/com/android/tools/r8/ir/optimize/inliner/conditionalsimpleinlining/ConditionalSimpleInliningTestBase.java
index 61c9edc..2645e5b 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/inliner/conditionalsimpleinlining/ConditionalSimpleInliningTestBase.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/inliner/conditionalsimpleinlining/ConditionalSimpleInliningTestBase.java
@@ -7,10 +7,8 @@
import com.android.tools.r8.R8FullTestBuilder;
import com.android.tools.r8.TestBase;
import com.android.tools.r8.TestParameters;
-import com.android.tools.r8.ir.optimize.Inliner;
import com.android.tools.r8.utils.BooleanUtils;
import com.android.tools.r8.utils.InternalOptions;
-import com.android.tools.r8.utils.SetUtils;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
@@ -34,9 +32,7 @@
}
public void configure(R8FullTestBuilder testBuilder) {
- testBuilder
- .addOptionsModification(this::enableSimpleInliningConstraints)
- .setMinApi(parameters.getApiLevel());
+ testBuilder.addOptionsModification(this::enableSimpleInliningConstraints).setMinApi(parameters);
}
private void enableSimpleInliningConstraints(InternalOptions options) {
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/inliner/conditionalsimpleinlining/ConditionalSimpleInliningWithEnumUnboxingTest.java b/src/test/java/com/android/tools/r8/ir/optimize/inliner/conditionalsimpleinlining/ConditionalSimpleInliningWithEnumUnboxingTest.java
index 7eb5882..a384897 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/inliner/conditionalsimpleinlining/ConditionalSimpleInliningWithEnumUnboxingTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/inliner/conditionalsimpleinlining/ConditionalSimpleInliningWithEnumUnboxingTest.java
@@ -29,7 +29,7 @@
.addKeepMainRule(TestClass.class)
.apply(this::configure)
.addEnumUnboxingInspector(inspector -> inspector.assertUnboxed(EnumUnboxingCandidate.class))
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutputLines("Hello world!");
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/inliner/conditionalsimpleinlining/NopInliningConstraintTest.java b/src/test/java/com/android/tools/r8/ir/optimize/inliner/conditionalsimpleinlining/NopInliningConstraintTest.java
index 96f9184..ef87e00 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/inliner/conditionalsimpleinlining/NopInliningConstraintTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/inliner/conditionalsimpleinlining/NopInliningConstraintTest.java
@@ -42,7 +42,7 @@
.enableInliningAnnotations()
// TODO(b/173398086): uniqueMethodWithName() does not work with argument removal.
.addDontObfuscate()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector -> {
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/inliner/interfacemethods/InlineDefaultInterfaceMethodTest.java b/src/test/java/com/android/tools/r8/ir/optimize/inliner/interfacemethods/InlineDefaultInterfaceMethodTest.java
index 247781d..27816da 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/inliner/interfacemethods/InlineDefaultInterfaceMethodTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/inliner/interfacemethods/InlineDefaultInterfaceMethodTest.java
@@ -40,7 +40,7 @@
testForR8(parameters.getBackend())
.addInnerClasses(InlineDefaultInterfaceMethodTest.class)
.addKeepMainRule(TestClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.enableNeverClassInliningAnnotations()
.enableNoVerticalClassMergingAnnotations()
.addDontObfuscate()
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/inliner/interfacemethods/InlineStaticInterfaceMethodTest.java b/src/test/java/com/android/tools/r8/ir/optimize/inliner/interfacemethods/InlineStaticInterfaceMethodTest.java
index 49dee4b..4e1bc46 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/inliner/interfacemethods/InlineStaticInterfaceMethodTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/inliner/interfacemethods/InlineStaticInterfaceMethodTest.java
@@ -38,7 +38,7 @@
testForR8(parameters.getBackend())
.addInnerClasses(InlineStaticInterfaceMethodTest.class)
.addKeepMainRule(TestClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutput(expectedOutput)
.inspector();
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/inliner/sync/InlineConstructorsWithMonitors.java b/src/test/java/com/android/tools/r8/ir/optimize/inliner/sync/InlineConstructorsWithMonitors.java
index 052398d..95d44b0 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/inliner/sync/InlineConstructorsWithMonitors.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/inliner/sync/InlineConstructorsWithMonitors.java
@@ -40,7 +40,7 @@
testForR8(parameters.getBackend())
.addInnerClasses(InlineConstructorsWithMonitors.class)
.addKeepMainRule(TestClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutputLines("monitor", "monitor2")
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/inliner/sync/InlineStaticSynchronizedMethodTest.java b/src/test/java/com/android/tools/r8/ir/optimize/inliner/sync/InlineStaticSynchronizedMethodTest.java
index 569652a..482ed74 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/inliner/sync/InlineStaticSynchronizedMethodTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/inliner/sync/InlineStaticSynchronizedMethodTest.java
@@ -43,7 +43,7 @@
testForR8(parameters.getBackend())
.addInnerClasses(InlineStaticSynchronizedMethodTest.class)
.addKeepMainRule(TestClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::verifySynchronizedMethodsAreInlined)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/inliner/sync/InlineWithMonitorInConstructorInline.java b/src/test/java/com/android/tools/r8/ir/optimize/inliner/sync/InlineWithMonitorInConstructorInline.java
index 96120c6..4f701cd 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/inliner/sync/InlineWithMonitorInConstructorInline.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/inliner/sync/InlineWithMonitorInConstructorInline.java
@@ -38,7 +38,7 @@
testForR8(parameters.getBackend())
.addInnerClasses(InlineWithMonitorInConstructorInline.class)
.addKeepMainRule(TestClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), TestClass.class)
.inspect(this::inspect)
.assertSuccessWithOutputLines("foo", "monitor", "bar", "monitor2");
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/inliner/sync/InlinerMonitorEnterValuesThresholdTest.java b/src/test/java/com/android/tools/r8/ir/optimize/inliner/sync/InlinerMonitorEnterValuesThresholdTest.java
index 3ae6d3d..72f8a2d 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/inliner/sync/InlinerMonitorEnterValuesThresholdTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/inliner/sync/InlinerMonitorEnterValuesThresholdTest.java
@@ -44,7 +44,7 @@
.addKeepMainRule(TestClass.class)
.addOptionsModification(
options -> options.inlinerOptions().inliningMonitorEnterValuesAllowance = threshold)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), TestClass.class)
.inspect(this::inspect)
.assertSuccessWithOutputLines("Hello world!");
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/instanceofremoval/ArrayInstanceOfCloneableAndSerializableTest.java b/src/test/java/com/android/tools/r8/ir/optimize/instanceofremoval/ArrayInstanceOfCloneableAndSerializableTest.java
index fc8ca51..67f1601 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/instanceofremoval/ArrayInstanceOfCloneableAndSerializableTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/instanceofremoval/ArrayInstanceOfCloneableAndSerializableTest.java
@@ -46,7 +46,7 @@
testForD8()
.addProgramClasses(Main.class)
.release()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector -> {
@@ -67,7 +67,7 @@
testForR8(parameters.getBackend())
.addProgramClasses(Main.class)
.addKeepMainRule(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector -> {
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/instanceofremoval/InstanceOfRemovalTest.java b/src/test/java/com/android/tools/r8/ir/optimize/instanceofremoval/InstanceOfRemovalTest.java
index aa2e06a..f0e2bbb 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/instanceofremoval/InstanceOfRemovalTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/instanceofremoval/InstanceOfRemovalTest.java
@@ -159,7 +159,7 @@
.addProgramClasses(A.class, B.class, TestClass.class)
.addKeepMainRule(TestClass.class)
.enableInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutput(expected)
.inspector();
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/instanceofremoval/InstanceOfToNullCheckRewritingTest.java b/src/test/java/com/android/tools/r8/ir/optimize/instanceofremoval/InstanceOfToNullCheckRewritingTest.java
index d51649b..8c1a93a 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/instanceofremoval/InstanceOfToNullCheckRewritingTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/instanceofremoval/InstanceOfToNullCheckRewritingTest.java
@@ -34,7 +34,7 @@
.addInnerClasses(getClass())
.addKeepMainRule(Main.class)
.enableNoVerticalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(inspector -> assertThat(inspector.clazz(I.class), isPresent()))
.run(parameters.getRuntime(), Main.class)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/instanceofremoval/ZipFileInstanceOfAutoCloseableTest.java b/src/test/java/com/android/tools/r8/ir/optimize/instanceofremoval/ZipFileInstanceOfAutoCloseableTest.java
index ea167e3..9e1b444 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/instanceofremoval/ZipFileInstanceOfAutoCloseableTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/instanceofremoval/ZipFileInstanceOfAutoCloseableTest.java
@@ -81,7 +81,7 @@
assumeTrue(parameters.isDexRuntime());
testForD8()
.addInnerClasses(ZipFileInstanceOfAutoCloseableTest.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addLibraryFiles(getAndroidJar())
.run(parameters.getRuntime(), TestClass.class, getZipFile())
.assertSuccessWithOutput(expectedOutput());
@@ -92,7 +92,7 @@
testForR8(parameters.getBackend())
.addInnerClasses(ZipFileInstanceOfAutoCloseableTest.class)
.addKeepMainRule(TestClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addLibraryFiles(getAndroidJar())
.run(parameters.getRuntime(), TestClass.class, getZipFile())
.assertSuccessWithOutput(expectedOutput());
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/interfaces/OpenInterfaceCheckCastTest.java b/src/test/java/com/android/tools/r8/ir/optimize/interfaces/OpenInterfaceCheckCastTest.java
index c756f8c..b7b638e 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/interfaces/OpenInterfaceCheckCastTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/interfaces/OpenInterfaceCheckCastTest.java
@@ -50,7 +50,7 @@
testForD8(parameters.getBackend())
.addProgramClasses(getProgramClasses())
.addProgramClassFileData(getTransformedMainClass())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines(getExpectedOutputLines());
}
@@ -66,7 +66,7 @@
.enableInliningAnnotations()
// TODO(b/214496607): I should not be merged into A in the first place, since I is open.
.enableNoVerticalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines(getExpectedOutputLines());
}
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/interfaces/OpenInterfaceInliningTest.java b/src/test/java/com/android/tools/r8/ir/optimize/interfaces/OpenInterfaceInliningTest.java
index 4eaa6a4..7ff6f8c 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/interfaces/OpenInterfaceInliningTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/interfaces/OpenInterfaceInliningTest.java
@@ -49,7 +49,7 @@
testForD8(parameters.getBackend())
.addProgramClasses(getProgramClasses())
.addProgramClassFileData(getTransformedMainClass())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines(getExpectedOutputLines());
}
@@ -69,7 +69,7 @@
.enableNoHorizontalClassMergingAnnotations()
// TODO(b/214496607): I should not be merged into A in the first place, since I is open.
.enableNoVerticalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines(getExpectedOutputLines());
}
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/interfaces/OpenInterfaceInstanceofTest.java b/src/test/java/com/android/tools/r8/ir/optimize/interfaces/OpenInterfaceInstanceofTest.java
index dac3848..bfc71f7 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/interfaces/OpenInterfaceInstanceofTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/interfaces/OpenInterfaceInstanceofTest.java
@@ -50,7 +50,7 @@
testForD8(parameters.getBackend())
.addProgramClasses(getProgramClasses())
.addProgramClassFileData(getTransformedMainClass())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines(getExpectedOutputLines());
}
@@ -66,7 +66,7 @@
.enableInliningAnnotations()
// TODO(b/214496607): I should not be merged into A in the first place, since I is open.
.enableNoVerticalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines(getExpectedOutputLines());
}
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/interfaces/OpenUninstantiatedInterfaceAlwaysNullTest.java b/src/test/java/com/android/tools/r8/ir/optimize/interfaces/OpenUninstantiatedInterfaceAlwaysNullTest.java
index 816da5a..e9d1879 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/interfaces/OpenUninstantiatedInterfaceAlwaysNullTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/interfaces/OpenUninstantiatedInterfaceAlwaysNullTest.java
@@ -48,7 +48,7 @@
testForD8(parameters.getBackend())
.addProgramClasses(getProgramClasses())
.addProgramClassFileData(getTransformedMainClass())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines(getExpectedOutputLines());
}
@@ -63,7 +63,7 @@
options -> options.getOpenClosedInterfacesOptions().suppressAllOpenInterfaces())
// TODO(b/214496607): I should not be merged into A in the first place, since I is open.
.enableNoVerticalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines(getExpectedOutputLines());
}
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/interfaces/OpenUninstantiatedInterfaceInstanceofTest.java b/src/test/java/com/android/tools/r8/ir/optimize/interfaces/OpenUninstantiatedInterfaceInstanceofTest.java
index 07b765f..a278c14 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/interfaces/OpenUninstantiatedInterfaceInstanceofTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/interfaces/OpenUninstantiatedInterfaceInstanceofTest.java
@@ -49,7 +49,7 @@
testForD8(parameters.getBackend())
.addProgramClasses(getProgramClasses())
.addProgramClassFileData(getTransformedMainClass())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines(getExpectedOutputLines());
}
@@ -63,7 +63,7 @@
.addOptionsModification(
options -> options.getOpenClosedInterfacesOptions().suppressAllOpenInterfaces())
.enableInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines(getExpectedOutputLines());
}
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/lambda/LambdaMethodInliningTest.java b/src/test/java/com/android/tools/r8/ir/optimize/lambda/LambdaMethodInliningTest.java
index 35eb0d0..2cba33b 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/lambda/LambdaMethodInliningTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/lambda/LambdaMethodInliningTest.java
@@ -45,7 +45,7 @@
.addOptionsModification(options -> options.enableClassInlining = false)
// TODO(b/173398086): Horizontal class merging breaks uniqueMethodWithName().
.addDontObfuscate()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/library/BooleanParseBooleanTest.java b/src/test/java/com/android/tools/r8/ir/optimize/library/BooleanParseBooleanTest.java
index 400e662..57307d5 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/library/BooleanParseBooleanTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/library/BooleanParseBooleanTest.java
@@ -43,7 +43,7 @@
testForD8()
.addProgramClasses(TestClass.class)
.release()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect)
.run(parameters.getRuntime(), TestClass.class)
@@ -56,7 +56,7 @@
.addProgramClasses(TestClass.class)
.addKeepMainRule(TestClass.class)
.enableInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/library/BooleanValueOfTest.java b/src/test/java/com/android/tools/r8/ir/optimize/library/BooleanValueOfTest.java
index a260221..7b9b401 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/library/BooleanValueOfTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/library/BooleanValueOfTest.java
@@ -41,7 +41,7 @@
.addInnerClasses(BooleanValueOfTest.class)
.addKeepMainRule(TestClass.class)
.enableInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/library/ObjectsEqualsTest.java b/src/test/java/com/android/tools/r8/ir/optimize/library/ObjectsEqualsTest.java
index 6e09e0c..4c08575 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/library/ObjectsEqualsTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/library/ObjectsEqualsTest.java
@@ -47,7 +47,7 @@
.addInnerClasses(getClass())
.addKeepMainRule(Main.class)
.enableInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector -> {
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/library/ObjectsHashCodeTest.java b/src/test/java/com/android/tools/r8/ir/optimize/library/ObjectsHashCodeTest.java
index 680be9d..cb25096 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/library/ObjectsHashCodeTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/library/ObjectsHashCodeTest.java
@@ -43,7 +43,7 @@
.addKeepMainRule(Main.class)
.enableNeverClassInliningAnnotations()
.enableInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector -> {
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/library/ObjectsIsNullTest.java b/src/test/java/com/android/tools/r8/ir/optimize/library/ObjectsIsNullTest.java
index 9053ad5..72e7f09 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/library/ObjectsIsNullTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/library/ObjectsIsNullTest.java
@@ -40,7 +40,7 @@
.addInnerClasses(getClass())
.addKeepMainRule(Main.class)
.enableInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector -> {
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/library/ObjectsNonNullTest.java b/src/test/java/com/android/tools/r8/ir/optimize/library/ObjectsNonNullTest.java
index e1b3b14..48a53d4 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/library/ObjectsNonNullTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/library/ObjectsNonNullTest.java
@@ -40,7 +40,7 @@
.addInnerClasses(getClass())
.addKeepMainRule(Main.class)
.enableInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector -> {
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/library/ObjectsRequireNonNullElseGetTest.java b/src/test/java/com/android/tools/r8/ir/optimize/library/ObjectsRequireNonNullElseGetTest.java
index a2391f0..5ef4915 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/library/ObjectsRequireNonNullElseGetTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/library/ObjectsRequireNonNullElseGetTest.java
@@ -44,7 +44,7 @@
public void testD8() throws Exception {
testForD8(parameters.getBackend())
.addProgramClassFileData(getProgramClassFileData())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("Foo", "Bar", "Expected NPE");
@@ -56,7 +56,7 @@
.addProgramClassFileData(getProgramClassFileData())
.addKeepMainRule(Main.class)
.enableInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector -> {
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/library/ObjectsRequireNonNullElseTest.java b/src/test/java/com/android/tools/r8/ir/optimize/library/ObjectsRequireNonNullElseTest.java
index 7b4ed4b..bea88f5 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/library/ObjectsRequireNonNullElseTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/library/ObjectsRequireNonNullElseTest.java
@@ -39,7 +39,7 @@
public void testD8() throws Exception {
testForD8(parameters.getBackend())
.addProgramClassFileData(getProgramClassFileData())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("Foo", "Bar", "Expected NPE");
@@ -51,7 +51,7 @@
.addProgramClassFileData(getProgramClassFileData())
.addKeepMainRule(Main.class)
.enableInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector -> {
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/library/ObjectsToStringWithNullDefaultTest.java b/src/test/java/com/android/tools/r8/ir/optimize/library/ObjectsToStringWithNullDefaultTest.java
index aed86f3..2b56cb3 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/library/ObjectsToStringWithNullDefaultTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/library/ObjectsToStringWithNullDefaultTest.java
@@ -45,7 +45,7 @@
.addInnerClasses(getClass())
.addKeepMainRule(Main.class)
.enableInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector -> {
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/library/PrunedClassNameComparisonTest.java b/src/test/java/com/android/tools/r8/ir/optimize/library/PrunedClassNameComparisonTest.java
index 9d6fe46..e1c7b5c 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/library/PrunedClassNameComparisonTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/library/PrunedClassNameComparisonTest.java
@@ -38,7 +38,7 @@
.addInnerClasses(PrunedClassNameComparisonTest.class)
.addKeepMainRule(TestClass.class)
.enableInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/logging/AndroidLogRemovalTest.java b/src/test/java/com/android/tools/r8/ir/optimize/logging/AndroidLogRemovalTest.java
index 0031ca2..e6b8679 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/logging/AndroidLogRemovalTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/logging/AndroidLogRemovalTest.java
@@ -41,7 +41,7 @@
.addProgramClassFileData(
transformer(Log.class).setClassDescriptor("Landroid/util/Log;").transform())
.addKeepAllClassesRule()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.writeToZip();
@@ -61,7 +61,7 @@
.addLibraryFiles(libraryFile, runtimeJar(parameters.getBackend()))
.addKeepMainRule(TestClass.class)
.addKeepRules("-maximumremovedandroidloglevel " + maxRemovedAndroidLogLevel)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.addRunClasspathFiles(libraryFile)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/logging/CustomLoggingFrameworkRemovalTest.java b/src/test/java/com/android/tools/r8/ir/optimize/logging/CustomLoggingFrameworkRemovalTest.java
index c1957f4..1708de9 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/logging/CustomLoggingFrameworkRemovalTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/logging/CustomLoggingFrameworkRemovalTest.java
@@ -54,7 +54,7 @@
.enableAssumeNoClassInitializationSideEffectsAnnotations()
.enableAssumeNoSideEffectsAnnotations()
.enableInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addDontObfuscate()
.compile()
.inspect(
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/loops/LoopWith0Iterations.java b/src/test/java/com/android/tools/r8/ir/optimize/loops/LoopWith0Iterations.java
index 4e3011e..384b89c 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/loops/LoopWith0Iterations.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/loops/LoopWith0Iterations.java
@@ -32,7 +32,7 @@
@Test
public void testLoopRemoved() throws Exception {
testForR8(parameters.getBackend())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addProgramClasses(Main.class)
.addKeepMainRule(Main.class)
.enableInliningAnnotations()
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/loops/LoopWith1Iterations.java b/src/test/java/com/android/tools/r8/ir/optimize/loops/LoopWith1Iterations.java
index 9190a4c..3e6abfc 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/loops/LoopWith1Iterations.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/loops/LoopWith1Iterations.java
@@ -30,7 +30,7 @@
@Test
public void testLoopRemoved() throws Exception {
testForR8(parameters.getBackend())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addProgramClasses(Main.class)
.addKeepMainRule(Main.class)
.enableInliningAnnotations()
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/loops/LoopWith1IterationsEscape.java b/src/test/java/com/android/tools/r8/ir/optimize/loops/LoopWith1IterationsEscape.java
index f8260c0..c8682e3 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/loops/LoopWith1IterationsEscape.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/loops/LoopWith1IterationsEscape.java
@@ -29,7 +29,7 @@
@Test
public void testLoopRemoved() throws Exception {
testForR8(parameters.getBackend())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addProgramClasses(Main.class)
.addKeepMainRule(Main.class)
.enableInliningAnnotations()
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/AssumeInstanceFieldValueTest.java b/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/AssumeInstanceFieldValueTest.java
index acb9b0b..933feba 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/AssumeInstanceFieldValueTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/AssumeInstanceFieldValueTest.java
@@ -47,7 +47,7 @@
"-assumenosideeffects class " + Config.class.getTypeName() + " {",
" boolean alwaysTrueNoSideEffects return true;",
"}")
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/AssumeNotNullTest.java b/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/AssumeNotNullTest.java
index fda891e..cb0e949 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/AssumeNotNullTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/AssumeNotNullTest.java
@@ -53,7 +53,7 @@
" java.lang.Object INSTANCE return 1;",
"}")
.enableInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector -> {
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/B135918413.java b/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/B135918413.java
index 7c521aa..677435b 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/B135918413.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/B135918413.java
@@ -43,7 +43,7 @@
.addInnerClasses(B135918413.class)
.addKeepMainRule(TestClass.class)
.enableInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/B143686595.java b/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/B143686595.java
index 4f95f4d..28c4638 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/B143686595.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/B143686595.java
@@ -32,7 +32,7 @@
testForR8(parameters.getBackend())
.addProgramClasses(I.class)
.addKeepClassAndMembersRules(I.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile();
testForR8(parameters.getBackend())
@@ -40,7 +40,7 @@
.addClasspathClasses(I.class)
.addKeepMainRule(TestClass.class)
.enableInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.addRunClasspathFiles(libraryResult.writeToZip())
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/B149468959.java b/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/B149468959.java
index dff369b..dbdfa1a 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/B149468959.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/B149468959.java
@@ -30,7 +30,7 @@
testForR8(parameters.getBackend())
.addInnerClasses(B149468959.class)
.addKeepMainRule(TestClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutputLines("A");
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/ClassInitializerDefaultsPropagationTest.java b/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/ClassInitializerDefaultsPropagationTest.java
index 28f75a7..40676a3 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/ClassInitializerDefaultsPropagationTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/ClassInitializerDefaultsPropagationTest.java
@@ -38,7 +38,7 @@
testForR8(parameters.getBackend())
.addProgramClasses(TestClass.class)
.addKeepMainRule(TestClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/ConstClassMemberValuePropagationTest.java b/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/ConstClassMemberValuePropagationTest.java
index d44418c..ea0ac68 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/ConstClassMemberValuePropagationTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/ConstClassMemberValuePropagationTest.java
@@ -42,7 +42,7 @@
.addInnerClasses(ConstClassMemberValuePropagationTest.class)
.addKeepMainRule(TestClass.class)
.enableInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/ConstructorWithExceptionalControlFlowTest.java b/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/ConstructorWithExceptionalControlFlowTest.java
index e662d29..36c2a1f 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/ConstructorWithExceptionalControlFlowTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/ConstructorWithExceptionalControlFlowTest.java
@@ -33,7 +33,7 @@
.addInnerClasses(ConstructorWithExceptionalControlFlowTest.class)
.addKeepMainRule(TestClass.class)
.enableInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutputLines("false");
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/EnumMemberValuePropagationTest.java b/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/EnumMemberValuePropagationTest.java
index a73e55f..4364815 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/EnumMemberValuePropagationTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/EnumMemberValuePropagationTest.java
@@ -42,7 +42,7 @@
.addInnerClasses(EnumMemberValuePropagationTest.class)
.addKeepMainRule(TestClass.class)
.enableInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/EscapeBeforeStaticPutTest.java b/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/EscapeBeforeStaticPutTest.java
index d8cf4f3..8b1a223 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/EscapeBeforeStaticPutTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/EscapeBeforeStaticPutTest.java
@@ -32,7 +32,7 @@
.addInnerClasses(EscapeBeforeStaticPutTest.class)
.addKeepMainRule(TestClass.class)
.enableInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutputLines("Hello world!");
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/FieldReadForWriteTest.java b/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/FieldReadForWriteTest.java
index c0d3be4..572020d 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/FieldReadForWriteTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/FieldReadForWriteTest.java
@@ -38,7 +38,7 @@
.addHorizontallyMergedClassesInspector(
HorizontallyMergedClassesInspector::assertNoClassesMerged)
.enableNoHorizontalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(inspector -> assertThat(inspector.clazz(anim.class), isAbsent()));
}
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/FieldWithDefaultValueAssignmentAfterDefaultsOptimizationTest.java b/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/FieldWithDefaultValueAssignmentAfterDefaultsOptimizationTest.java
index 8943139..479f261 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/FieldWithDefaultValueAssignmentAfterDefaultsOptimizationTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/FieldWithDefaultValueAssignmentAfterDefaultsOptimizationTest.java
@@ -39,7 +39,7 @@
.addKeepMainRule(TestClass.class)
.addOptionsModification(options -> options.testing.waveModifier = this::waveModifier)
.enableInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutputLines("42");
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/FieldWithDefaultValueAssignmentTest.java b/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/FieldWithDefaultValueAssignmentTest.java
index 54a69c1..dd89026 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/FieldWithDefaultValueAssignmentTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/FieldWithDefaultValueAssignmentTest.java
@@ -38,7 +38,7 @@
.addInnerClasses(FieldWithDefaultValueAssignmentTest.class)
.addKeepMainRule(TestClass.class)
.enableInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/FieldWriteBeforeFieldReadTest.java b/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/FieldWriteBeforeFieldReadTest.java
index 5b50028..a603d83 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/FieldWriteBeforeFieldReadTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/FieldWriteBeforeFieldReadTest.java
@@ -67,7 +67,7 @@
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
.enableNeverReprocessMethodAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/FinalFieldWithDefaultValueAssignmentPropagationTest.java b/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/FinalFieldWithDefaultValueAssignmentPropagationTest.java
index 6cbacd6..3cd865a 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/FinalFieldWithDefaultValueAssignmentPropagationTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/FinalFieldWithDefaultValueAssignmentPropagationTest.java
@@ -42,7 +42,7 @@
.addInnerClasses(FinalFieldWithDefaultValueAssignmentPropagationTest.class)
.addKeepMainRule(TestClass.class)
.enableInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/FinalFieldWithMultipleWritesTest.java b/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/FinalFieldWithMultipleWritesTest.java
index 26fde45..c207678 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/FinalFieldWithMultipleWritesTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/FinalFieldWithMultipleWritesTest.java
@@ -48,7 +48,7 @@
.addProgramClasses(Main.class)
.addProgramClassFileData(getTransformedClass())
.addKeepMainRule(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("0", "1", "2", "2");
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/InstanceFieldValuePropagationTest.java b/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/InstanceFieldValuePropagationTest.java
index 752e0c6..9fdff7c 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/InstanceFieldValuePropagationTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/InstanceFieldValuePropagationTest.java
@@ -43,7 +43,7 @@
.addKeepMainRule(TestClass.class)
.enableNeverClassInliningAnnotations()
.enableInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/InstanceFieldValuePropagationWithMultipleInstanceInitializersTest.java b/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/InstanceFieldValuePropagationWithMultipleInstanceInitializersTest.java
index 2ef6259..899e8ce 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/InstanceFieldValuePropagationWithMultipleInstanceInitializersTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/InstanceFieldValuePropagationWithMultipleInstanceInitializersTest.java
@@ -41,7 +41,7 @@
.addInnerClasses(InstanceFieldValuePropagationWithMultipleInstanceInitializersTest.class)
.addKeepMainRule(TestClass.class)
.enableNeverClassInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/LibraryFieldPropagationTest.java b/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/LibraryFieldPropagationTest.java
index 99de3f5..5dc5532 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/LibraryFieldPropagationTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/LibraryFieldPropagationTest.java
@@ -72,7 +72,7 @@
withAssumeValuesRule
? "-assumevalues class java.lang.Thread { public int MIN_PRIORITY return 1; }"
: "")
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::verifyFieldValueNotPropagated)
.run(parameters.getRuntime(), MAIN)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/MemberValuePropagationOfNullValueTest.java b/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/MemberValuePropagationOfNullValueTest.java
index 8e7674c..92d42df 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/MemberValuePropagationOfNullValueTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/MemberValuePropagationOfNullValueTest.java
@@ -33,7 +33,7 @@
parameters.assumeR8TestParameters();
testForR8(parameters.getBackend())
.addProgramClasses(Main.class, A.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
.addKeepMainRule(Main.class)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/MemberValuePropagationWithClassInitializationTest.java b/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/MemberValuePropagationWithClassInitializationTest.java
index 2a2eb77..a2b92fa 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/MemberValuePropagationWithClassInitializationTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/MemberValuePropagationWithClassInitializationTest.java
@@ -43,7 +43,7 @@
.addInnerClasses(MemberValuePropagationWithClassInitializationTest.class)
.addKeepMainRule(TestClass.class)
.enableInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/NonFinalFieldWithDefaultValueAssignmentPropagationTest.java b/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/NonFinalFieldWithDefaultValueAssignmentPropagationTest.java
index 611bf52..eb85bb7 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/NonFinalFieldWithDefaultValueAssignmentPropagationTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/NonFinalFieldWithDefaultValueAssignmentPropagationTest.java
@@ -44,7 +44,7 @@
.addKeepMainRule(TestClass.class)
.enableNeverClassInliningAnnotations()
.enableInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/NonFinalFieldWithNonDefaultValueAssignmentPropagationTest.java b/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/NonFinalFieldWithNonDefaultValueAssignmentPropagationTest.java
index e9fd562..eff93c1 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/NonFinalFieldWithNonDefaultValueAssignmentPropagationTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/NonFinalFieldWithNonDefaultValueAssignmentPropagationTest.java
@@ -43,7 +43,7 @@
.addKeepMainRule(TestClass.class)
.enableNeverClassInliningAnnotations()
.enableInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/NonNullStaticFieldTest.java b/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/NonNullStaticFieldTest.java
index bcd9e04..147f955 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/NonNullStaticFieldTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/NonNullStaticFieldTest.java
@@ -41,7 +41,7 @@
.addProgramClasses(TestClass.class)
.addKeepMainRule(TestClass.class)
.enableInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::verifyMainIsEmpty)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/SdkIntMemberValuePropagationTest.java b/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/SdkIntMemberValuePropagationTest.java
index 59aca75..3441921 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/SdkIntMemberValuePropagationTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/SdkIntMemberValuePropagationTest.java
@@ -88,7 +88,7 @@
.addProgramClassFileData(getTransformedMainClass())
.addLibraryClassFileData(getTransformedBuildVERSIONClass())
.addLibraryFiles(parameters.getDefaultRuntimeLibrary())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(inspector -> verifyOutput(inspector, Compiler.D8))
.addRunClasspathClassFileData(getTransformedBuildVERSIONClass())
@@ -104,7 +104,7 @@
.addKeepRules(rule.getRule())
.addLibraryClassFileData(getTransformedBuildVERSIONClass())
.addLibraryFiles(parameters.getDefaultRuntimeLibrary())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(inspector -> verifyOutput(inspector, Compiler.R8))
.addRunClasspathClassFileData(getTransformedBuildVERSIONClass())
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/StatePropagationTest.java b/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/StatePropagationTest.java
index f4b90ed..11ef583 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/StatePropagationTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/StatePropagationTest.java
@@ -38,7 +38,7 @@
testForR8(parameters.getBackend())
.addInnerClasses(StatePropagationTest.class)
.addKeepMainRule(TestClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
.compile()
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/StaticFieldAssignedOnlyInInstanceConstructorTest.java b/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/StaticFieldAssignedOnlyInInstanceConstructorTest.java
index 6b69ae8..659bf4b 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/StaticFieldAssignedOnlyInInstanceConstructorTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/StaticFieldAssignedOnlyInInstanceConstructorTest.java
@@ -31,7 +31,7 @@
testForR8(parameters.getBackend())
.addInnerClasses(StaticFieldAssignedOnlyInInstanceConstructorTest.class)
.addKeepMainRule(TestClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutputLines("0");
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/ValuePropagationWithCatchHandlersTest.java b/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/ValuePropagationWithCatchHandlersTest.java
index 32dbb5d..c50f8d7 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/ValuePropagationWithCatchHandlersTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/ValuePropagationWithCatchHandlersTest.java
@@ -31,7 +31,7 @@
testForR8(parameters.getBackend())
.addInnerClasses(getClass())
.addKeepMainRule(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("Woops!");
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/fields/FieldInitializedByConstantArgumentForwardingConstructorTest.java b/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/fields/FieldInitializedByConstantArgumentForwardingConstructorTest.java
index 1aa4d4b..2ec6a5f 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/fields/FieldInitializedByConstantArgumentForwardingConstructorTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/fields/FieldInitializedByConstantArgumentForwardingConstructorTest.java
@@ -40,7 +40,7 @@
.addKeepMainRule(TestClass.class)
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/fields/FieldInitializedByConstantArgumentMultipleConstructorsTest.java b/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/fields/FieldInitializedByConstantArgumentMultipleConstructorsTest.java
index 2de70ea..8950ca5 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/fields/FieldInitializedByConstantArgumentMultipleConstructorsTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/fields/FieldInitializedByConstantArgumentMultipleConstructorsTest.java
@@ -40,7 +40,7 @@
.addKeepMainRule(TestClass.class)
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/fields/FieldInitializedByConstantArgumentSubtypeTest.java b/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/fields/FieldInitializedByConstantArgumentSubtypeTest.java
index e9a9f9e..06bbb0e 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/fields/FieldInitializedByConstantArgumentSubtypeTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/fields/FieldInitializedByConstantArgumentSubtypeTest.java
@@ -40,7 +40,7 @@
.addKeepMainRule(TestClass.class)
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/fields/FieldInitializedByConstantArgumentTest.java b/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/fields/FieldInitializedByConstantArgumentTest.java
index d0698d2..2f596f5 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/fields/FieldInitializedByConstantArgumentTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/fields/FieldInitializedByConstantArgumentTest.java
@@ -40,7 +40,7 @@
.addKeepMainRule(TestClass.class)
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/fields/FieldInitializedByConstantInOneConstructorTest.java b/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/fields/FieldInitializedByConstantInOneConstructorTest.java
index 3710a80..8234afa 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/fields/FieldInitializedByConstantInOneConstructorTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/fields/FieldInitializedByConstantInOneConstructorTest.java
@@ -40,7 +40,7 @@
.addKeepMainRule(TestClass.class)
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/fields/FieldInitializedByDifferentConstantsInMultipleConstructorsTest.java b/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/fields/FieldInitializedByDifferentConstantsInMultipleConstructorsTest.java
index 8eced2c..6d49b19 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/fields/FieldInitializedByDifferentConstantsInMultipleConstructorsTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/fields/FieldInitializedByDifferentConstantsInMultipleConstructorsTest.java
@@ -40,7 +40,7 @@
.addKeepMainRule(TestClass.class)
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/fields/FieldInitializedByNonConstantArgumentInForwardingConstructorTest.java b/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/fields/FieldInitializedByNonConstantArgumentInForwardingConstructorTest.java
index cc6c98c..af6cdd3 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/fields/FieldInitializedByNonConstantArgumentInForwardingConstructorTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/fields/FieldInitializedByNonConstantArgumentInForwardingConstructorTest.java
@@ -41,7 +41,7 @@
.addKeepMainRule(TestClass.class)
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/fields/FieldInitializedByNonConstantArgumentInSuperConstructorTest.java b/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/fields/FieldInitializedByNonConstantArgumentInSuperConstructorTest.java
index 8634896..90e9fc6 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/fields/FieldInitializedByNonConstantArgumentInSuperConstructorTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/fields/FieldInitializedByNonConstantArgumentInSuperConstructorTest.java
@@ -42,7 +42,7 @@
.enableInliningAnnotations()
.enableNoVerticalClassMergingAnnotations()
.enableNeverClassInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/fields/FieldInitializedByNonConstantArgumentTest.java b/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/fields/FieldInitializedByNonConstantArgumentTest.java
index d0e1260..3da2065 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/fields/FieldInitializedByNonConstantArgumentTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/fields/FieldInitializedByNonConstantArgumentTest.java
@@ -40,7 +40,7 @@
.addKeepMainRule(TestClass.class)
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/fields/FieldInitializedBySameConstantInMultipleConstructorsTest.java b/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/fields/FieldInitializedBySameConstantInMultipleConstructorsTest.java
index 1dba47d..fd6ee99 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/fields/FieldInitializedBySameConstantInMultipleConstructorsTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/fields/FieldInitializedBySameConstantInMultipleConstructorsTest.java
@@ -40,7 +40,7 @@
.addKeepMainRule(TestClass.class)
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/fields/FieldTypeStrengtheningCollisionTest.java b/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/fields/FieldTypeStrengtheningCollisionTest.java
index 4a7aae0..868e19a 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/fields/FieldTypeStrengtheningCollisionTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/fields/FieldTypeStrengtheningCollisionTest.java
@@ -43,7 +43,7 @@
"-keep class " + Main.class.getTypeName() + " { " + A.class.getTypeName() + " f; }")
.enableInliningAnnotations()
.addDontObfuscate()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector -> {
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/fields/FieldTypeStrengtheningTest.java b/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/fields/FieldTypeStrengtheningTest.java
index 5e553e4..d0395eb 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/fields/FieldTypeStrengtheningTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/fields/FieldTypeStrengtheningTest.java
@@ -37,7 +37,7 @@
.addInnerClasses(getClass())
.addKeepMainRule(Main.class)
.enableInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector -> {
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/fields/TargetedButNotLiveLambdaAfterDevirtualizationTest.java b/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/fields/TargetedButNotLiveLambdaAfterDevirtualizationTest.java
index 999e2f4..c421dcc 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/fields/TargetedButNotLiveLambdaAfterDevirtualizationTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/fields/TargetedButNotLiveLambdaAfterDevirtualizationTest.java
@@ -32,7 +32,7 @@
.addInnerClasses(getClass())
.addKeepMainRule(Main.class)
.enableInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithEmptyOutput();
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/fields/singleton/SingletonFieldValuePropagationEnumTest.java b/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/fields/singleton/SingletonFieldValuePropagationEnumTest.java
index 6fbed5e..bb64b0e 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/fields/singleton/SingletonFieldValuePropagationEnumTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/fields/singleton/SingletonFieldValuePropagationEnumTest.java
@@ -36,7 +36,7 @@
testForR8(parameters.getBackend())
.addInnerClasses(SingletonFieldValuePropagationEnumTest.class)
.addKeepMainRule(TestClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/fields/singleton/SingletonFieldValuePropagationEnumWithSubclassTest.java b/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/fields/singleton/SingletonFieldValuePropagationEnumWithSubclassTest.java
index 3989c55..657d32e 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/fields/singleton/SingletonFieldValuePropagationEnumWithSubclassTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/fields/singleton/SingletonFieldValuePropagationEnumWithSubclassTest.java
@@ -36,7 +36,7 @@
testForR8(parameters.getBackend())
.addInnerClasses(SingletonFieldValuePropagationEnumWithSubclassTest.class)
.addKeepMainRule(TestClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/fields/singleton/SingletonFieldValuePropagationTest.java b/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/fields/singleton/SingletonFieldValuePropagationTest.java
index 3c78f04..b4b7476 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/fields/singleton/SingletonFieldValuePropagationTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/fields/singleton/SingletonFieldValuePropagationTest.java
@@ -36,7 +36,7 @@
testForR8(parameters.getBackend())
.addInnerClasses(SingletonFieldValuePropagationTest.class)
.addKeepMainRule(TestClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/nonnull/NonNullFieldAccessTest.java b/src/test/java/com/android/tools/r8/ir/optimize/nonnull/NonNullFieldAccessTest.java
index eec914f..1690b0b 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/nonnull/NonNullFieldAccessTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/nonnull/NonNullFieldAccessTest.java
@@ -39,7 +39,7 @@
.addProgramClasses(TestClass.class)
.addKeepMainRule(TestClass.class)
.enableInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::verifyNonNullPropagation)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/nonnull/NullCheckWithCatchHandlerTest.java b/src/test/java/com/android/tools/r8/ir/optimize/nonnull/NullCheckWithCatchHandlerTest.java
index 3e58794..34fcd54 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/nonnull/NullCheckWithCatchHandlerTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/nonnull/NullCheckWithCatchHandlerTest.java
@@ -30,7 +30,7 @@
testForR8(parameters.getBackend())
.addProgramClasses(Main.class)
.addKeepMainRule(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithEmptyOutput();
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/nonnull/RequireNonNullTest.java b/src/test/java/com/android/tools/r8/ir/optimize/nonnull/RequireNonNullTest.java
index 557be25..d03556e 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/nonnull/RequireNonNullTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/nonnull/RequireNonNullTest.java
@@ -43,7 +43,7 @@
.addKeepMainRule(TestClass.class)
.addLibraryFiles(ToolHelper.getAndroidJar(AndroidApiLevel.P))
.enableInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/outliner/OutlineFromDefaultInterfaceMethodTest.java b/src/test/java/com/android/tools/r8/ir/optimize/outliner/OutlineFromDefaultInterfaceMethodTest.java
index 8418f9c..04a08bc 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/outliner/OutlineFromDefaultInterfaceMethodTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/outliner/OutlineFromDefaultInterfaceMethodTest.java
@@ -56,7 +56,7 @@
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
.noHorizontalClassMergingOfSynthetics()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/outliner/OutlineFromStaticInterfaceMethodTest.java b/src/test/java/com/android/tools/r8/ir/optimize/outliner/OutlineFromStaticInterfaceMethodTest.java
index 2bbb1b6..6b669de 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/outliner/OutlineFromStaticInterfaceMethodTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/outliner/OutlineFromStaticInterfaceMethodTest.java
@@ -51,7 +51,7 @@
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
.noHorizontalClassMergingOfSynthetics()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/outliner/OutlineInstructionWithRepeatedOperandTest.java b/src/test/java/com/android/tools/r8/ir/optimize/outliner/OutlineInstructionWithRepeatedOperandTest.java
index f7208bd..698244c 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/outliner/OutlineInstructionWithRepeatedOperandTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/outliner/OutlineInstructionWithRepeatedOperandTest.java
@@ -37,7 +37,7 @@
options.outline.threshold = 2;
})
.enableInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("0", "0");
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/outliner/OutlineMappingInformationTest.java b/src/test/java/com/android/tools/r8/ir/optimize/outliner/OutlineMappingInformationTest.java
index 2d5abb5..6fb199c 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/outliner/OutlineMappingInformationTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/outliner/OutlineMappingInformationTest.java
@@ -73,7 +73,7 @@
.addHorizontallyMergedClassesInspector(
HorizontallyMergedClassesInspector::assertNoClassesMerged)
.enableInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(
parameters.getRuntime(),
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/outliner/OutlineWithInlineMappingInformationTest.java b/src/test/java/com/android/tools/r8/ir/optimize/outliner/OutlineWithInlineMappingInformationTest.java
index a177c41..5781633 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/outliner/OutlineWithInlineMappingInformationTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/outliner/OutlineWithInlineMappingInformationTest.java
@@ -72,7 +72,7 @@
.addHorizontallyMergedClassesInspector(
HorizontallyMergedClassesInspector::assertNoClassesMerged)
.enableInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(
parameters.getRuntime(),
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/outliner/OutlinesWithNonNullTest.java b/src/test/java/com/android/tools/r8/ir/optimize/outliner/OutlinesWithNonNullTest.java
index 69b56ce..125dfb3 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/outliner/OutlinesWithNonNullTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/outliner/OutlinesWithNonNullTest.java
@@ -49,7 +49,7 @@
.enableInliningAnnotations()
.addProgramClasses(TestArg.class, TestClassWithNonNullOnOneSide.class)
.addKeepMainRule(TestClassWithNonNullOnOneSide.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.allowAccessModification()
.addDontObfuscate()
.addOptionsModification(
@@ -70,7 +70,7 @@
.enableInliningAnnotations()
.addProgramClasses(TestArg.class, TestClassWithNonNullOnBothSides.class)
.addKeepMainRule(TestClassWithNonNullOnBothSides.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.allowAccessModification()
.addDontObfuscate()
.addOptionsModification(
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/outliner/arraytypes/OutlinesWithClassArrayTypeArguments.java b/src/test/java/com/android/tools/r8/ir/optimize/outliner/arraytypes/OutlinesWithClassArrayTypeArguments.java
index 7325c71..e3ebf92 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/outliner/arraytypes/OutlinesWithClassArrayTypeArguments.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/outliner/arraytypes/OutlinesWithClassArrayTypeArguments.java
@@ -62,7 +62,7 @@
.enableInliningAnnotations()
.addInnerClasses(OutlinesWithClassArrayTypeArguments.class)
.addKeepMainRule(TestClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addDontObfuscate()
.addOptionsModification(
options -> {
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/outliner/arraytypes/OutlinesWithInterfaceArrayTypeArguments.java b/src/test/java/com/android/tools/r8/ir/optimize/outliner/arraytypes/OutlinesWithInterfaceArrayTypeArguments.java
index 7b7c6c3..1b306ff 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/outliner/arraytypes/OutlinesWithInterfaceArrayTypeArguments.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/outliner/arraytypes/OutlinesWithInterfaceArrayTypeArguments.java
@@ -76,7 +76,7 @@
.addKeepMainRule(TestClass.class)
.addKeepClassAndMembersRules(ClassImplementingIface.class)
.addKeepClassAndMembersRules(OtherClassImplementingIface.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addDontObfuscate()
.addOptionsModification(
options -> {
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/outliner/b112247415/B112247415.java b/src/test/java/com/android/tools/r8/ir/optimize/outliner/b112247415/B112247415.java
index 9b5e916..9f3c53d 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/outliner/b112247415/B112247415.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/outliner/b112247415/B112247415.java
@@ -83,7 +83,7 @@
CodeInspector inspector =
testForR8(parameters.getBackend())
.addDontObfuscate()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addProgramClassesAndInnerClasses(TestClass.class)
.addKeepMainRule(TestClass.class)
.addOptionsModification(
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/outliner/b133215941/B133215941.java b/src/test/java/com/android/tools/r8/ir/optimize/outliner/b133215941/B133215941.java
index fcada92..2e56247 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/outliner/b133215941/B133215941.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/outliner/b133215941/B133215941.java
@@ -69,7 +69,7 @@
.addInnerClasses(B133215941.class)
.addKeepMainRule(TestClass.class)
.addKeepClassAndMembersRules(ClassWithStaticMethod.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addDontObfuscate()
.addOptionsModification(options -> options.outline.threshold = 2)
.compile()
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/outliner/b149971007/B149971007.java b/src/test/java/com/android/tools/r8/ir/optimize/outliner/b149971007/B149971007.java
index ee43078..7b02aea 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/outliner/b149971007/B149971007.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/outliner/b149971007/B149971007.java
@@ -92,7 +92,7 @@
.addProgramClasses(TestClass.class, FeatureAPI.class, FeatureClass.class)
.addKeepClassAndMembersRules(TestClass.class)
.addKeepClassAndMembersRules(FeatureClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addOptionsModification(options -> options.outline.threshold = 2)
.compile();
@@ -144,7 +144,7 @@
.addProgramClasses(TestClass.class, FeatureAPI.class)
.addKeepClassAndMembersRules(TestClass.class)
.addKeepClassAndMembersRules(FeatureClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addFeatureSplit(
builder -> simpleSplitProvider(builder, featureCode, temp, FeatureClass.class))
.addOptionsModification(options -> options.outline.threshold = 2)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/outliner/classtypes/B134462736.java b/src/test/java/com/android/tools/r8/ir/optimize/outliner/classtypes/B134462736.java
index 29690ea..676461e 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/outliner/classtypes/B134462736.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/outliner/classtypes/B134462736.java
@@ -70,7 +70,7 @@
.addKeepMainRule(TestClass.class)
.enableConstantArgumentAnnotations()
.enableNoMethodStaticizingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addDontObfuscate()
.addOptionsModification(
options -> {
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/outliner/primitivetypes/PrimitiveTypesTest.java b/src/test/java/com/android/tools/r8/ir/optimize/outliner/primitivetypes/PrimitiveTypesTest.java
index 81f4c01..5711f19 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/outliner/primitivetypes/PrimitiveTypesTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/outliner/primitivetypes/PrimitiveTypesTest.java
@@ -79,7 +79,7 @@
.addProgramClasses(testClass)
.addProgramClasses(MyStringBuilder.class)
.addKeepMainRule(testClass)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addDontObfuscate()
.addOptionsModification(
options -> {
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/redundantarraygetelimination/RedundantArrayGetEliminationTest.java b/src/test/java/com/android/tools/r8/ir/optimize/redundantarraygetelimination/RedundantArrayGetEliminationTest.java
index 95b0a58..d460ee8 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/redundantarraygetelimination/RedundantArrayGetEliminationTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/redundantarraygetelimination/RedundantArrayGetEliminationTest.java
@@ -40,7 +40,7 @@
testForD8(parameters.getBackend())
.addInnerClasses(getClass())
.release()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect)
.run(parameters.getRuntime(), Main.class)
@@ -52,7 +52,7 @@
testForR8(parameters.getBackend())
.addInnerClasses(getClass())
.addKeepClassAndMembersRules(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect)
.run(parameters.getRuntime(), Main.class)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/redundantcatchrethrowelimination/RedundantCatchRethrowEliminationTest.java b/src/test/java/com/android/tools/r8/ir/optimize/redundantcatchrethrowelimination/RedundantCatchRethrowEliminationTest.java
index 7f7ef6d..22cd122 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/redundantcatchrethrowelimination/RedundantCatchRethrowEliminationTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/redundantcatchrethrowelimination/RedundantCatchRethrowEliminationTest.java
@@ -56,7 +56,7 @@
testForD8(parameters.getBackend())
.addProgramClasses(Main.class, TrivialClosableContext.class, ClosableContext.class)
.release()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutput(EXPECTED)
.inspect(this::inspectD8);
@@ -68,7 +68,7 @@
.addProgramClasses(Main.class, TrivialClosableContext.class, ClosableContext.class)
.addKeepMainRule(Main.class)
.enableInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutput(EXPECTED)
.inspect(this::inspectR8);
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/redundantfieldloadelimination/FieldReadBeforeOtherwiseRedundantStoreTest.java b/src/test/java/com/android/tools/r8/ir/optimize/redundantfieldloadelimination/FieldReadBeforeOtherwiseRedundantStoreTest.java
index 6f8b296..1aaf694 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/redundantfieldloadelimination/FieldReadBeforeOtherwiseRedundantStoreTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/redundantfieldloadelimination/FieldReadBeforeOtherwiseRedundantStoreTest.java
@@ -33,7 +33,7 @@
public void test() throws Exception {
testForD8()
.addInnerClasses(FieldReadBeforeOtherwiseRedundantStoreTest.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.setMode(mode)
.compile()
.run(parameters.getRuntime(), Main.class)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/redundantfieldloadelimination/InstanceFieldLoadsSeparatedByInvokeCustomTest.java b/src/test/java/com/android/tools/r8/ir/optimize/redundantfieldloadelimination/InstanceFieldLoadsSeparatedByInvokeCustomTest.java
index 974a4fc..03dc2aa 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/redundantfieldloadelimination/InstanceFieldLoadsSeparatedByInvokeCustomTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/redundantfieldloadelimination/InstanceFieldLoadsSeparatedByInvokeCustomTest.java
@@ -4,7 +4,6 @@
package com.android.tools.r8.ir.optimize.redundantfieldloadelimination;
-import static org.hamcrest.CoreMatchers.containsString;
import com.android.tools.r8.TestBase;
import com.android.tools.r8.TestParameters;
@@ -44,7 +43,7 @@
testForR8(parameters.getBackend())
.addProgramClassFileData(InstanceFieldLoadsSeparatedByInvokeCustomTestClassGenerator.dump())
.addKeepAllClassesRule()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), "InstanceFieldLoadsSeparatedByInvokeCustomTestClass")
.assertSuccess();
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/redundantfieldloadelimination/RedundantFieldLoadEliminationMeetTest.java b/src/test/java/com/android/tools/r8/ir/optimize/redundantfieldloadelimination/RedundantFieldLoadEliminationMeetTest.java
index 776df6b..0a4c399 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/redundantfieldloadelimination/RedundantFieldLoadEliminationMeetTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/redundantfieldloadelimination/RedundantFieldLoadEliminationMeetTest.java
@@ -35,7 +35,7 @@
testForR8(parameters.getBackend())
.addInnerClasses(RedundantFieldLoadEliminationMeetTest.class)
.addKeepMainRule(TestClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/redundantfieldloadelimination/RedundantFinalInstanceFieldLoadAfterStoreTest.java b/src/test/java/com/android/tools/r8/ir/optimize/redundantfieldloadelimination/RedundantFinalInstanceFieldLoadAfterStoreTest.java
index 6ea3dcf..ef902bc 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/redundantfieldloadelimination/RedundantFinalInstanceFieldLoadAfterStoreTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/redundantfieldloadelimination/RedundantFinalInstanceFieldLoadAfterStoreTest.java
@@ -48,7 +48,7 @@
.enableInliningAnnotations()
.enableMemberValuePropagationAnnotations()
.enableNeverClassInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/redundantfieldloadelimination/RedundantFinalStaticFieldLoadAfterStoreTest.java b/src/test/java/com/android/tools/r8/ir/optimize/redundantfieldloadelimination/RedundantFinalStaticFieldLoadAfterStoreTest.java
index 1bbe682..978727f 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/redundantfieldloadelimination/RedundantFinalStaticFieldLoadAfterStoreTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/redundantfieldloadelimination/RedundantFinalStaticFieldLoadAfterStoreTest.java
@@ -42,7 +42,7 @@
.addKeepMainRule(TestClass.class)
.enableInliningAnnotations()
.enableMemberValuePropagationAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/redundantfieldloadelimination/RedundantInitClassBeforeInvokeStaticTest.java b/src/test/java/com/android/tools/r8/ir/optimize/redundantfieldloadelimination/RedundantInitClassBeforeInvokeStaticTest.java
index 99a6045..1ef7518 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/redundantfieldloadelimination/RedundantInitClassBeforeInvokeStaticTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/redundantfieldloadelimination/RedundantInitClassBeforeInvokeStaticTest.java
@@ -37,7 +37,7 @@
.addInnerClasses(getClass())
.addKeepMainRule(Main.class)
.enableInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector -> {
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/redundantfieldloadelimination/RedundantInstanceFieldLoadAfterStoreTest.java b/src/test/java/com/android/tools/r8/ir/optimize/redundantfieldloadelimination/RedundantInstanceFieldLoadAfterStoreTest.java
index 25987d2..bccec6b 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/redundantfieldloadelimination/RedundantInstanceFieldLoadAfterStoreTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/redundantfieldloadelimination/RedundantInstanceFieldLoadAfterStoreTest.java
@@ -38,7 +38,7 @@
.addInnerClasses(RedundantInstanceFieldLoadAfterStoreTest.class)
.addKeepMainRule(TestClass.class)
.enableNeverClassInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector -> {
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/redundantfieldloadelimination/RedundantStaticFieldLoadAfterStoreTest.java b/src/test/java/com/android/tools/r8/ir/optimize/redundantfieldloadelimination/RedundantStaticFieldLoadAfterStoreTest.java
index 0ea210f..4dc9696 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/redundantfieldloadelimination/RedundantStaticFieldLoadAfterStoreTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/redundantfieldloadelimination/RedundantStaticFieldLoadAfterStoreTest.java
@@ -39,7 +39,7 @@
testForR8(parameters.getBackend())
.addInnerClasses(RedundantStaticFieldLoadAfterStoreTest.class)
.addKeepMainRule(TestClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector -> {
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/redundantfieldloadelimination/RedundantStaticFieldStoreBeforeStoreTest.java b/src/test/java/com/android/tools/r8/ir/optimize/redundantfieldloadelimination/RedundantStaticFieldStoreBeforeStoreTest.java
index d885356..f60b75d 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/redundantfieldloadelimination/RedundantStaticFieldStoreBeforeStoreTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/redundantfieldloadelimination/RedundantStaticFieldStoreBeforeStoreTest.java
@@ -38,7 +38,7 @@
.addInnerClasses(getClass())
.addKeepMainRule(Main.class)
.enableInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector -> {
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/redundantfieldloadelimination/ThrowingInstructionBeforeOtherwiseRedundantInstanceStoreTest.java b/src/test/java/com/android/tools/r8/ir/optimize/redundantfieldloadelimination/ThrowingInstructionBeforeOtherwiseRedundantInstanceStoreTest.java
index 4c3f07d..a61dd8b 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/redundantfieldloadelimination/ThrowingInstructionBeforeOtherwiseRedundantInstanceStoreTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/redundantfieldloadelimination/ThrowingInstructionBeforeOtherwiseRedundantInstanceStoreTest.java
@@ -33,7 +33,7 @@
public void test() throws Exception {
testForD8()
.addInnerClasses(getClass())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("1");
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/redundantfieldloadelimination/ThrowingInstructionBeforeOtherwiseRedundantStaticStoreTest.java b/src/test/java/com/android/tools/r8/ir/optimize/redundantfieldloadelimination/ThrowingInstructionBeforeOtherwiseRedundantStaticStoreTest.java
index 60a0b34..b0fdfcc 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/redundantfieldloadelimination/ThrowingInstructionBeforeOtherwiseRedundantStaticStoreTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/redundantfieldloadelimination/ThrowingInstructionBeforeOtherwiseRedundantStaticStoreTest.java
@@ -33,7 +33,7 @@
public void test() throws Exception {
testForD8()
.addInnerClasses(getClass())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("1");
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/reflection/ForNameInterfaceTest.java b/src/test/java/com/android/tools/r8/ir/optimize/reflection/ForNameInterfaceTest.java
index 31f8463..817463a 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/reflection/ForNameInterfaceTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/reflection/ForNameInterfaceTest.java
@@ -51,7 +51,7 @@
.addInnerClasses(ForNameInterfaceTest.class)
.addKeepMainRule(Main.class)
.minification(false)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines(
"com.android.tools.r8.ir.optimize.reflection.ForNameInterfaceTest$I",
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/reflection/ForNameTest.java b/src/test/java/com/android/tools/r8/ir/optimize/reflection/ForNameTest.java
index 2e36ba3..9252053 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/reflection/ForNameTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/reflection/ForNameTest.java
@@ -119,7 +119,7 @@
testForD8()
.debug()
.addProgramClassesAndInnerClasses(MAIN)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), MAIN)
.assertSuccessWithOutput(JAVA_OUTPUT);
test(result, 4, 0);
@@ -129,7 +129,7 @@
testForD8()
.release()
.addProgramClassesAndInnerClasses(MAIN)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), MAIN)
.assertSuccessWithOutput(JAVA_OUTPUT);
test(result, 4, 0);
@@ -146,7 +146,7 @@
.addKeepAllClassesRule()
.addKeepAttributes("EnclosingMethod", "InnerClasses")
.addDontObfuscate()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), MAIN);
test(result, 4, 0);
@@ -158,7 +158,7 @@
.addKeepAllClassesRule()
.addKeepAttributes("EnclosingMethod", "InnerClasses")
.addDontObfuscate()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), MAIN)
.assertSuccessWithOutput(JAVA_OUTPUT);
test(result, 1, 3);
@@ -170,7 +170,7 @@
.addKeepMainRule(MAIN)
.addKeepAllClassesRuleWithAllowObfuscation()
.addKeepAttributes("EnclosingMethod", "InnerClasses")
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
// We are not checking output because it can't be matched due to minification. Just run.
.run(parameters.getRuntime(), MAIN);
test(result, 1, 3);
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/reflection/GetClassBaseAndSubTest.java b/src/test/java/com/android/tools/r8/ir/optimize/reflection/GetClassBaseAndSubTest.java
index 8190001..db24996 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/reflection/GetClassBaseAndSubTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/reflection/GetClassBaseAndSubTest.java
@@ -45,7 +45,7 @@
.addDontObfuscate()
.addInnerClasses(GetClassBaseAndSubTest.class)
.addKeepMainRule(TestClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutput(EXPECTED)
.inspect(
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/reflection/GetClassOnKeptClassTest.java b/src/test/java/com/android/tools/r8/ir/optimize/reflection/GetClassOnKeptClassTest.java
index 6e0e9e3..31ee955 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/reflection/GetClassOnKeptClassTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/reflection/GetClassOnKeptClassTest.java
@@ -49,7 +49,7 @@
.addProgramClasses(KeptClass.class, TestClass.class)
.addKeepMainRule(TestClass.class)
.addKeepClassRules(KeptClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.addRunClasspathFiles(buildOnDexRuntime(parameters, UnknownClass.class))
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/reflection/GetClassTest.java b/src/test/java/com/android/tools/r8/ir/optimize/reflection/GetClassTest.java
index a50261b..3ea7922 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/reflection/GetClassTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/reflection/GetClassTest.java
@@ -197,7 +197,7 @@
testForD8()
.setMode(mode)
.addInnerClasses(GetClassTest.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), MAIN)
.assertSuccessWithOutput(JAVA_OUTPUT)
.inspect(inspector -> test(inspector, true, 6, 0));
@@ -216,7 +216,7 @@
.enableNoHorizontalClassMergingAnnotations()
.addKeepMainRule(MAIN)
.addDontObfuscate()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), MAIN)
.assertSuccessWithOutput(JAVA_OUTPUT)
.inspect(
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/reflection/GetNameInClassInitializerTest.java b/src/test/java/com/android/tools/r8/ir/optimize/reflection/GetNameInClassInitializerTest.java
index 55afd12..c0333f0 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/reflection/GetNameInClassInitializerTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/reflection/GetNameInClassInitializerTest.java
@@ -68,7 +68,7 @@
.addKeepMainRule(MAIN)
.addKeepRules("-keep class **.GetNameClinit*")
.minification(enableMinification)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addOptionsModification(this::configure)
.run(parameters.getRuntime(), MAIN)
.assertSuccessWithOutput(JAVA_OUTPUT);
@@ -84,7 +84,7 @@
.addKeepMainRule(MAIN)
.addKeepRules("-keep,allowobfuscation class **.GetNameClinit*")
.minification(enableMinification)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addOptionsModification(this::configure)
.compile();
result
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/reflection/GetNameTest.java b/src/test/java/com/android/tools/r8/ir/optimize/reflection/GetNameTest.java
index 9b3b394..41c2d25 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/reflection/GetNameTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/reflection/GetNameTest.java
@@ -243,7 +243,7 @@
testForD8()
.debug()
.addProgramFiles(classPaths)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addOptionsModification(this::configure)
.run(parameters.getRuntime(), MAIN)
.assertSuccessWithOutput(JAVA_OUTPUT);
@@ -253,7 +253,7 @@
testForD8()
.release()
.addProgramFiles(classPaths)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addOptionsModification(this::configure)
.run(parameters.getRuntime(), MAIN)
.assertSuccessWithOutput(JAVA_OUTPUT);
@@ -272,7 +272,7 @@
.addKeepRules("-keepattributes InnerClasses,EnclosingMethod")
.addKeepRules("-printmapping " + createNewMappingPath().toAbsolutePath().toString())
.minification(enableMinification)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addOptionsModification(this::configure)
.compile()
.inspect(
@@ -299,7 +299,7 @@
.addKeepRules("-keepattributes InnerClasses,EnclosingMethod")
.addKeepRules("-printmapping " + createNewMappingPath().toAbsolutePath().toString())
.minification(enableMinification)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addOptionsModification(this::configure)
.compile()
.inspect(
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/reflection/GetSimpleNameTest.java b/src/test/java/com/android/tools/r8/ir/optimize/reflection/GetSimpleNameTest.java
index 581caa9..5ddb261 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/reflection/GetSimpleNameTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/reflection/GetSimpleNameTest.java
@@ -181,7 +181,7 @@
testForD8()
.debug()
.addProgramFiles(classPaths)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addOptionsModification(this::configure)
.run(parameters.getRuntime(), MAIN)
.assertSuccessWithOutput(JVM_OUTPUT);
@@ -191,7 +191,7 @@
testForD8()
.release()
.addProgramFiles(classPaths)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addOptionsModification(this::configure)
.run(parameters.getRuntime(), MAIN)
.assertSuccessWithOutput(JVM_OUTPUT);
@@ -207,7 +207,7 @@
.addKeepAllClassesRule()
.addKeepAttributeInnerClassesAndEnclosingMethod()
.minification(enableMinification)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addOptionsModification(this::configure)
.run(parameters.getRuntime(), MAIN)
.assertSuccessWithOutput(JVM_OUTPUT)
@@ -225,7 +225,7 @@
.addKeepRules("-keep class **.Outer*")
.addKeepAttributeInnerClassesAndEnclosingMethod()
.minification(enableMinification)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addOptionsModification(this::configure)
.run(parameters.getRuntime(), MAIN)
.assertSuccessWithOutput(OUTPUT_NO_ATTRIBUTES)
@@ -246,7 +246,7 @@
.addKeepRules("-keep,allowobfuscation class **.Outer*")
.addKeepAttributeInnerClassesAndEnclosingMethod()
.minification(enableMinification)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addOptionsModification(this::configure)
.run(parameters.getRuntime(), MAIN)
.applyIf(enableMinification, result -> result.assertSuccessWithOutput(RENAMED_OUTPUT))
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/reflection/InnerClassNameTestRunner.java b/src/test/java/com/android/tools/r8/ir/optimize/reflection/InnerClassNameTestRunner.java
index 374fb98..8a44abc 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/reflection/InnerClassNameTestRunner.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/reflection/InnerClassNameTestRunner.java
@@ -205,7 +205,7 @@
testForD8()
.addProgramClassFileData(InnerClassNameTestDump.dump(config, parameters))
.addOptionsModification(InternalOptions::disableNameReflectionOptimization)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile();
checkWarningsAboutMalformedAttribute(d8CompileResult);
D8TestRunResult d8RunResult = d8CompileResult.run(parameters.getRuntime(), MAIN_CLASS);
@@ -235,7 +235,7 @@
options.disableInnerClassSeparatorValidationWhenRepackaging = true;
options.disableNameReflectionOptimization();
})
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.apply(this::checkWarningsAboutMalformedAttribute);
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/reflection/TestClassForNameWhenSplit.java b/src/test/java/com/android/tools/r8/ir/optimize/reflection/TestClassForNameWhenSplit.java
index 813fdfc..1a605fc 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/reflection/TestClassForNameWhenSplit.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/reflection/TestClassForNameWhenSplit.java
@@ -48,7 +48,7 @@
Path featurePath = temp.newFile("feature1.zip").toPath();
testForR8(parameters.getBackend())
.addProgramClasses(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addFeatureSplit(
builder ->
SplitterTestBase.simpleSplitProvider(builder, featurePath, temp, Foobar.class))
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/staticizer/ClassStaticizerTest.java b/src/test/java/com/android/tools/r8/ir/optimize/staticizer/ClassStaticizerTest.java
index 9cf458d..93836c1 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/staticizer/ClassStaticizerTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/staticizer/ClassStaticizerTest.java
@@ -117,7 +117,7 @@
.addOptionsModification(this::configure)
.enableInliningAnnotations()
.enableNoHorizontalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), main)
.assertSuccessWithOutput(EXPECTED);
}
@@ -134,7 +134,7 @@
.addKeepAttributes("InnerClasses", "EnclosingMethod")
.addOptionsModification(this::configure)
.allowAccessModification()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), main)
.assertSuccessWithOutput(EXPECTED);
@@ -250,7 +250,7 @@
.allowAccessModification()
.addDontObfuscate()
.addOptionsModification(this::configure)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), main);
CodeInspector inspector = result.inspector();
@@ -289,7 +289,7 @@
.allowAccessModification()
.addDontObfuscate()
.addOptionsModification(this::configure)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), main)
.assertSuccessWithOutput(javaOutput);
@@ -414,7 +414,7 @@
.allowAccessModification()
.addDontObfuscate()
.addOptionsModification(this::configure)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), main)
.assertSuccessWithOutput(javaOutput);
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/staticizer/CompanionAsArgumentTest.java b/src/test/java/com/android/tools/r8/ir/optimize/staticizer/CompanionAsArgumentTest.java
index bb1849e..eded1e2 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/staticizer/CompanionAsArgumentTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/staticizer/CompanionAsArgumentTest.java
@@ -43,7 +43,7 @@
.addKeepMainRule(MAIN)
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), MAIN)
.assertSuccessWithOutputLines("Companion#foo(true)")
.inspect(this::inspect);
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/staticizer/CompanionClassWithNewInstanceUserTest.java b/src/test/java/com/android/tools/r8/ir/optimize/staticizer/CompanionClassWithNewInstanceUserTest.java
index 1e89087..defd650 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/staticizer/CompanionClassWithNewInstanceUserTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/staticizer/CompanionClassWithNewInstanceUserTest.java
@@ -36,7 +36,7 @@
.addInnerClasses(CompanionClassWithNewInstanceUserTest.class)
.addKeepMainRule(TestClass.class)
.enableInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/staticizer/EnumCompanionClassStaticizerTest.java b/src/test/java/com/android/tools/r8/ir/optimize/staticizer/EnumCompanionClassStaticizerTest.java
index a865bc2..a1475a1 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/staticizer/EnumCompanionClassStaticizerTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/staticizer/EnumCompanionClassStaticizerTest.java
@@ -44,7 +44,7 @@
.addOptionsModification(options -> options.enableEnumUnboxing = enableEnumUnboxing)
.enableNeverClassInliningAnnotations()
.enableInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/staticizer/HostWithStaticMethodTest.java b/src/test/java/com/android/tools/r8/ir/optimize/staticizer/HostWithStaticMethodTest.java
index 0fcb3ee..389f871 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/staticizer/HostWithStaticMethodTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/staticizer/HostWithStaticMethodTest.java
@@ -38,7 +38,7 @@
testForR8(parameters.getBackend())
.addProgramClasses(Outer.class, SingletonHolder.class, Main.class)
.addKeepMainRule(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.enableNeverClassInliningAnnotations()
.enableInliningAnnotations()
.run(parameters.getRuntime(), Main.class)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/staticizer/InstanceInsideCompanionTest.java b/src/test/java/com/android/tools/r8/ir/optimize/staticizer/InstanceInsideCompanionTest.java
index 1c1c5b5..e62b8e5 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/staticizer/InstanceInsideCompanionTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/staticizer/InstanceInsideCompanionTest.java
@@ -44,7 +44,7 @@
.addKeepMainRule(MAIN)
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), MAIN)
.assertSuccessWithOutputLines("Candidate#foo(false)");
// TODO(b/159174309): Disable inspection until fixed.
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/staticizer/InvokeStaticWithNullOutvalueTest.java b/src/test/java/com/android/tools/r8/ir/optimize/staticizer/InvokeStaticWithNullOutvalueTest.java
index 06397fc..7b7e52f 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/staticizer/InvokeStaticWithNullOutvalueTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/staticizer/InvokeStaticWithNullOutvalueTest.java
@@ -51,7 +51,7 @@
.enableMemberValuePropagationAnnotations()
.enableNeverClassInliningAnnotations()
.enableNoHorizontalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), MAIN)
.assertSuccessWithOutputLines("Companion#boo", "Companion#foo")
.inspect(this::inspect);
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/staticizer/SynchronizedCompanionMethodTest.java b/src/test/java/com/android/tools/r8/ir/optimize/staticizer/SynchronizedCompanionMethodTest.java
index 8df91f6..300eeb9 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/staticizer/SynchronizedCompanionMethodTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/staticizer/SynchronizedCompanionMethodTest.java
@@ -40,7 +40,7 @@
.addKeepMainRule(TestClass.class)
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/staticizer/b171642432/CompanionWithPhisTest.java b/src/test/java/com/android/tools/r8/ir/optimize/staticizer/b171642432/CompanionWithPhisTest.java
index a7624e7..15556c2 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/staticizer/b171642432/CompanionWithPhisTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/staticizer/b171642432/CompanionWithPhisTest.java
@@ -42,7 +42,7 @@
testForR8(parameters.getBackend())
.addProgramClasses(Main.class, CompanionUser.class)
.addProgramClassesAndInnerClasses(ClassWithCompanion.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.enableNeverClassInliningAnnotations()
.enableInliningAnnotations()
.addKeepMainRule(Main.class)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/string/InvokeInterfaceToStringEqualsTest.java b/src/test/java/com/android/tools/r8/ir/optimize/string/InvokeInterfaceToStringEqualsTest.java
index 2507e66..d7e060c 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/string/InvokeInterfaceToStringEqualsTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/string/InvokeInterfaceToStringEqualsTest.java
@@ -34,7 +34,7 @@
assumeTrue(parameters.isDexRuntime());
testForD8(parameters.getBackend())
.addProgramClassFileData(getTransformedMain(MainD8.class))
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), MainD8.class)
.assertSuccessWithOutputLines("false");
}
@@ -45,7 +45,7 @@
.addProgramClassFileData(getTransformedMain(MainR8.class))
.addKeepMainRule(MainR8.class)
.addDontOptimize()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), MainR8.class)
.assertSuccessWithOutputLines("false");
}
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/string/NameThenLengthTest.java b/src/test/java/com/android/tools/r8/ir/optimize/string/NameThenLengthTest.java
index b58fdd7..8ab1c9b 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/string/NameThenLengthTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/string/NameThenLengthTest.java
@@ -144,7 +144,7 @@
.debug()
.addProgramClasses(MAIN)
.addOptionsModification(this::configure)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), MAIN)
.assertSuccessWithOutput(JAVA_OUTPUT);
test(result, 2, 0, 2, 0);
@@ -154,7 +154,7 @@
.release()
.addProgramClasses(MAIN)
.addOptionsModification(this::configure)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), MAIN)
.assertSuccessWithOutput(JAVA_OUTPUT);
// TODO(b/125303292): NAME_LENGTH is still not computed at compile time.
@@ -170,7 +170,7 @@
.addKeepMainRule(MAIN)
.addDontObfuscate()
.addOptionsModification(this::configure)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), MAIN)
.assertSuccessWithOutput(JAVA_OUTPUT);
// No canonicalization in CF.
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/string/NestedStringBuilderTest.java b/src/test/java/com/android/tools/r8/ir/optimize/string/NestedStringBuilderTest.java
index 65d51c3..b9f5a86 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/string/NestedStringBuilderTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/string/NestedStringBuilderTest.java
@@ -39,7 +39,7 @@
testForR8(parameters.getBackend())
.addProgramClasses(MAIN)
.addKeepMainRule(MAIN)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), MAIN.getTypeName(), "$")
.assertSuccessWithOutput(EXPECTED)
.inspect(
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/string/ObjectsToStringOnLibraryClassTest.java b/src/test/java/com/android/tools/r8/ir/optimize/string/ObjectsToStringOnLibraryClassTest.java
index 3e852df..64e433e 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/string/ObjectsToStringOnLibraryClassTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/string/ObjectsToStringOnLibraryClassTest.java
@@ -37,7 +37,7 @@
testForR8(parameters.getBackend())
.addInnerClasses(getClass())
.addKeepMainRule(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector -> {
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/string/StringBuilderFullyInDoWhileLoopTest.java b/src/test/java/com/android/tools/r8/ir/optimize/string/StringBuilderFullyInDoWhileLoopTest.java
index 5cc664d..43cecf1 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/string/StringBuilderFullyInDoWhileLoopTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/string/StringBuilderFullyInDoWhileLoopTest.java
@@ -35,7 +35,7 @@
testForR8(parameters.getBackend())
.addInnerClasses(StringBuilderFullyInDoWhileLoopTest.class)
.addKeepMainRule(TestClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/string/StringBuilderPartiallyInDoWhileLoopTest.java b/src/test/java/com/android/tools/r8/ir/optimize/string/StringBuilderPartiallyInDoWhileLoopTest.java
index 62becf9..6bc2b4b 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/string/StringBuilderPartiallyInDoWhileLoopTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/string/StringBuilderPartiallyInDoWhileLoopTest.java
@@ -29,7 +29,7 @@
testForR8(parameters.getBackend())
.addInnerClasses(StringBuilderPartiallyInDoWhileLoopTest.class)
.addKeepMainRule(TestClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutputLines("000");
}
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/string/StringBuilderTests.java b/src/test/java/com/android/tools/r8/ir/optimize/string/StringBuilderTests.java
index 86fcb86..7464aec 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/string/StringBuilderTests.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/string/StringBuilderTests.java
@@ -197,7 +197,7 @@
private static R8TestCompileResult compileR8(TestParameters parameters) throws Exception {
return testForR8(getStaticTemp(), parameters.getBackend())
.addProgramClasses(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepClassAndMembersRules(Main.class)
.enableInliningAnnotations()
.compile();
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/string/StringBuilderWithAppendNullCharArrayTest.java b/src/test/java/com/android/tools/r8/ir/optimize/string/StringBuilderWithAppendNullCharArrayTest.java
index 44e69cf..8170df4 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/string/StringBuilderWithAppendNullCharArrayTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/string/StringBuilderWithAppendNullCharArrayTest.java
@@ -29,7 +29,7 @@
testForR8(parameters.getBackend())
.addInnerClasses(getClass())
.addKeepMainRule(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("testWithToString passed", "testWithoutToString passed");
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/string/StringBuilderWithConstantsBeforeAndInOpenEndedIfInLoopTest.java b/src/test/java/com/android/tools/r8/ir/optimize/string/StringBuilderWithConstantsBeforeAndInOpenEndedIfInLoopTest.java
index 67d3d66..d8e235d 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/string/StringBuilderWithConstantsBeforeAndInOpenEndedIfInLoopTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/string/StringBuilderWithConstantsBeforeAndInOpenEndedIfInLoopTest.java
@@ -35,7 +35,7 @@
.addOptionsModification(
options ->
options.itemFactory.libraryMethodsReturningReceiver = Sets.newIdentityHashSet())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), TestClass.class, "1", "3")
.assertSuccessWithOutputLines("0.1.2.3.");
}
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/string/StringBuilderWithConstantsBeforeAndInOpenEndedIfTest.java b/src/test/java/com/android/tools/r8/ir/optimize/string/StringBuilderWithConstantsBeforeAndInOpenEndedIfTest.java
index 4219d7f..0687b24 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/string/StringBuilderWithConstantsBeforeAndInOpenEndedIfTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/string/StringBuilderWithConstantsBeforeAndInOpenEndedIfTest.java
@@ -34,7 +34,7 @@
.addOptionsModification(
options ->
options.itemFactory.libraryMethodsReturningReceiver = Sets.newIdentityHashSet())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutputLines("foo");
}
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/string/StringBuilderWithEscapingAliasTest.java b/src/test/java/com/android/tools/r8/ir/optimize/string/StringBuilderWithEscapingAliasTest.java
index 2c61465..9a07555 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/string/StringBuilderWithEscapingAliasTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/string/StringBuilderWithEscapingAliasTest.java
@@ -35,7 +35,7 @@
.addOptionsModification(
options ->
options.itemFactory.libraryMethodsReturningReceiver = Sets.newIdentityHashSet())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutput(StringUtils.times(StringUtils.lines("Hello world!"), 2));
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/string/StringBuilderWithIfNullUserTest.java b/src/test/java/com/android/tools/r8/ir/optimize/string/StringBuilderWithIfNullUserTest.java
index 2d4b414..ce633cb 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/string/StringBuilderWithIfNullUserTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/string/StringBuilderWithIfNullUserTest.java
@@ -30,7 +30,7 @@
testForR8(parameters.getBackend())
.addInnerClasses(StringBuilderWithIfNullUserTest.class)
.addKeepMainRule(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("Hello world!");
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/string/StringBuilderWithIfUserTest.java b/src/test/java/com/android/tools/r8/ir/optimize/string/StringBuilderWithIfUserTest.java
index 14ba197..d8936b1 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/string/StringBuilderWithIfUserTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/string/StringBuilderWithIfUserTest.java
@@ -30,7 +30,7 @@
testForR8(parameters.getBackend())
.addInnerClasses(StringBuilderWithIfUserTest.class)
.addKeepMainRule(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("Hello world!");
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/string/StringBuilderWithIndirectMutationThroughAliasAfterEscapeTest.java b/src/test/java/com/android/tools/r8/ir/optimize/string/StringBuilderWithIndirectMutationThroughAliasAfterEscapeTest.java
index 011390f..bc356bf 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/string/StringBuilderWithIndirectMutationThroughAliasAfterEscapeTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/string/StringBuilderWithIndirectMutationThroughAliasAfterEscapeTest.java
@@ -33,7 +33,7 @@
testForR8(parameters.getBackend())
.addInnerClasses(getClass())
.addKeepClassAndMembersRules(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector -> {
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/string/StringBuilderWithIndirectMutationThroughNewInstanceTest.java b/src/test/java/com/android/tools/r8/ir/optimize/string/StringBuilderWithIndirectMutationThroughNewInstanceTest.java
index 4e249c7..ff01233 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/string/StringBuilderWithIndirectMutationThroughNewInstanceTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/string/StringBuilderWithIndirectMutationThroughNewInstanceTest.java
@@ -35,7 +35,7 @@
.addInnerClasses(getClass())
.addKeepMainRule(Main.class)
.enableReprocessMethodAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector -> {
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/string/StringBuilderWithIndirectMutationThroughPhiTest.java b/src/test/java/com/android/tools/r8/ir/optimize/string/StringBuilderWithIndirectMutationThroughPhiTest.java
index 92a4f9a..b448281 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/string/StringBuilderWithIndirectMutationThroughPhiTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/string/StringBuilderWithIndirectMutationThroughPhiTest.java
@@ -36,7 +36,7 @@
testForR8(parameters.getBackend())
.addInnerClasses(getClass())
.addKeepMainRule(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector -> {
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/string/StringBuilderWithIndirectMutationThroughStaticGetTest.java b/src/test/java/com/android/tools/r8/ir/optimize/string/StringBuilderWithIndirectMutationThroughStaticGetTest.java
index 4fe5357..c4ffc30 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/string/StringBuilderWithIndirectMutationThroughStaticGetTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/string/StringBuilderWithIndirectMutationThroughStaticGetTest.java
@@ -33,7 +33,7 @@
testForR8(parameters.getBackend())
.addInnerClasses(getClass())
.addKeepMainRule(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector -> {
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/string/StringBuilderWithIndirectMutationThroughStaticPutTest.java b/src/test/java/com/android/tools/r8/ir/optimize/string/StringBuilderWithIndirectMutationThroughStaticPutTest.java
index 913e8ce..faef7de 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/string/StringBuilderWithIndirectMutationThroughStaticPutTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/string/StringBuilderWithIndirectMutationThroughStaticPutTest.java
@@ -33,7 +33,7 @@
testForR8(parameters.getBackend())
.addInnerClasses(getClass())
.addKeepMainRule(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector -> {
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/string/StringBuilderWithIndirectPhiMutationThroughPhiOperandTest.java b/src/test/java/com/android/tools/r8/ir/optimize/string/StringBuilderWithIndirectPhiMutationThroughPhiOperandTest.java
index 14abc82..41187ac 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/string/StringBuilderWithIndirectPhiMutationThroughPhiOperandTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/string/StringBuilderWithIndirectPhiMutationThroughPhiOperandTest.java
@@ -36,7 +36,7 @@
testForR8(parameters.getBackend())
.addInnerClasses(getClass())
.addKeepMainRule(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector -> {
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/string/StringBuilderWithIndirectPhiReadThroughPhiOperandNewInstanceTest.java b/src/test/java/com/android/tools/r8/ir/optimize/string/StringBuilderWithIndirectPhiReadThroughPhiOperandNewInstanceTest.java
index 3747aa1..dafcc40 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/string/StringBuilderWithIndirectPhiReadThroughPhiOperandNewInstanceTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/string/StringBuilderWithIndirectPhiReadThroughPhiOperandNewInstanceTest.java
@@ -33,7 +33,7 @@
testForR8(parameters.getBackend())
.addInnerClasses(getClass())
.addKeepMainRule(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector -> {
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/string/StringBuilderWithIndirectPhiReadThroughPhiOperandToStringTest.java b/src/test/java/com/android/tools/r8/ir/optimize/string/StringBuilderWithIndirectPhiReadThroughPhiOperandToStringTest.java
index 9d667b2..340980f 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/string/StringBuilderWithIndirectPhiReadThroughPhiOperandToStringTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/string/StringBuilderWithIndirectPhiReadThroughPhiOperandToStringTest.java
@@ -33,7 +33,7 @@
testForR8(parameters.getBackend())
.addInnerClasses(getClass())
.addKeepMainRule(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector -> {
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/string/StringBuilderWithIndirectReadThroughPhiNewInstanceTest.java b/src/test/java/com/android/tools/r8/ir/optimize/string/StringBuilderWithIndirectReadThroughPhiNewInstanceTest.java
index b058539..afa17bd 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/string/StringBuilderWithIndirectReadThroughPhiNewInstanceTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/string/StringBuilderWithIndirectReadThroughPhiNewInstanceTest.java
@@ -33,7 +33,7 @@
testForR8(parameters.getBackend())
.addInnerClasses(getClass())
.addKeepMainRule(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector -> {
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/string/StringBuilderWithIndirectReadThroughPhiToStringTest.java b/src/test/java/com/android/tools/r8/ir/optimize/string/StringBuilderWithIndirectReadThroughPhiToStringTest.java
index b967cfc..fb9a345 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/string/StringBuilderWithIndirectReadThroughPhiToStringTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/string/StringBuilderWithIndirectReadThroughPhiToStringTest.java
@@ -33,7 +33,7 @@
testForR8(parameters.getBackend())
.addInnerClasses(getClass())
.addKeepMainRule(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector -> {
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/string/StringBuilderWithLoopTest.java b/src/test/java/com/android/tools/r8/ir/optimize/string/StringBuilderWithLoopTest.java
index 8cc98c4..93343e6 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/string/StringBuilderWithLoopTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/string/StringBuilderWithLoopTest.java
@@ -30,7 +30,7 @@
.addInnerClasses(getClass())
.addKeepMainRule(Main.class)
.addKeepClassAndMembersRules(Utils.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("1", "2");
}
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/string/StringBuilderWithNullInitTest.java b/src/test/java/com/android/tools/r8/ir/optimize/string/StringBuilderWithNullInitTest.java
index c367729..1c0d34a 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/string/StringBuilderWithNullInitTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/string/StringBuilderWithNullInitTest.java
@@ -29,7 +29,7 @@
testForR8(parameters.getBackend())
.addInnerClasses(getClass())
.addKeepMainRule(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("testWithToString passed", "testWithoutToString passed");
}
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/string/StringBuilderWithObjectsToStringTest.java b/src/test/java/com/android/tools/r8/ir/optimize/string/StringBuilderWithObjectsToStringTest.java
index c89ae2e..8b2823f 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/string/StringBuilderWithObjectsToStringTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/string/StringBuilderWithObjectsToStringTest.java
@@ -36,7 +36,7 @@
testForR8(parameters.getBackend())
.addInnerClasses(getClass())
.addKeepMainRule(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector -> {
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/string/StringBuilderWithStringValueOfTest.java b/src/test/java/com/android/tools/r8/ir/optimize/string/StringBuilderWithStringValueOfTest.java
index 8f83c04..d04d99a 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/string/StringBuilderWithStringValueOfTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/string/StringBuilderWithStringValueOfTest.java
@@ -35,7 +35,7 @@
testForR8(parameters.getBackend())
.addInnerClasses(getClass())
.addKeepMainRule(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector -> {
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/string/StringConcatAppendAppendNotNullTest.java b/src/test/java/com/android/tools/r8/ir/optimize/string/StringConcatAppendAppendNotNullTest.java
index 5cde367..7ed8a5f 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/string/StringConcatAppendAppendNotNullTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/string/StringConcatAppendAppendNotNullTest.java
@@ -44,7 +44,7 @@
public void testR8() throws Exception {
testForR8(parameters.getBackend())
.addProgramClasses(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(Main.class)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines(EXPECTED)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/string/StringConcatAppendAppendTest.java b/src/test/java/com/android/tools/r8/ir/optimize/string/StringConcatAppendAppendTest.java
index 3840d75..aa13e75 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/string/StringConcatAppendAppendTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/string/StringConcatAppendAppendTest.java
@@ -44,7 +44,7 @@
public void testR8() throws Exception {
testForR8(parameters.getBackend())
.addProgramClasses(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(Main.class)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines(EXPECTED)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/string/StringConcatAppendNotNullAppendConstantAppendNotNullTest.java b/src/test/java/com/android/tools/r8/ir/optimize/string/StringConcatAppendNotNullAppendConstantAppendNotNullTest.java
index 4646691..a8c6489 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/string/StringConcatAppendNotNullAppendConstantAppendNotNullTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/string/StringConcatAppendNotNullAppendConstantAppendNotNullTest.java
@@ -44,7 +44,7 @@
public void testR8() throws Exception {
testForR8(parameters.getBackend())
.addProgramClasses(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(Main.class)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines(EXPECTED)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/string/StringConcatAppendNotNullAppendNotNullTest.java b/src/test/java/com/android/tools/r8/ir/optimize/string/StringConcatAppendNotNullAppendNotNullTest.java
index cbe8fa7..7bfb61e 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/string/StringConcatAppendNotNullAppendNotNullTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/string/StringConcatAppendNotNullAppendNotNullTest.java
@@ -45,7 +45,7 @@
public void testR8() throws Exception {
testForR8(parameters.getBackend())
.addProgramClasses(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(Main.class)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines(EXPECTED)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/string/StringConcatAppendNotNullAppendTest.java b/src/test/java/com/android/tools/r8/ir/optimize/string/StringConcatAppendNotNullAppendTest.java
index 21b61f3..bb4ee58 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/string/StringConcatAppendNotNullAppendTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/string/StringConcatAppendNotNullAppendTest.java
@@ -44,7 +44,7 @@
public void testR8() throws Exception {
testForR8(parameters.getBackend())
.addProgramClasses(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(Main.class)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines(EXPECTED)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/string/StringConcatAppendNotNullTest.java b/src/test/java/com/android/tools/r8/ir/optimize/string/StringConcatAppendNotNullTest.java
index 8005ed5..43d5075 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/string/StringConcatAppendNotNullTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/string/StringConcatAppendNotNullTest.java
@@ -46,7 +46,7 @@
public void testR8() throws Exception {
testForR8(parameters.getBackend())
.addProgramClasses(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(Main.class)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines(EXPECTED)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/string/StringConcatAppendTest.java b/src/test/java/com/android/tools/r8/ir/optimize/string/StringConcatAppendTest.java
index 534591f..71fffbb 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/string/StringConcatAppendTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/string/StringConcatAppendTest.java
@@ -44,7 +44,7 @@
public void testR8() throws Exception {
testForR8(parameters.getBackend())
.addProgramClasses(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(Main.class)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines(EXPECTED)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/string/StringConcatConstantInitTest.java b/src/test/java/com/android/tools/r8/ir/optimize/string/StringConcatConstantInitTest.java
index 0f7d286..9624192 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/string/StringConcatConstantInitTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/string/StringConcatConstantInitTest.java
@@ -45,7 +45,7 @@
public void testR8() throws Exception {
testForR8(parameters.getBackend())
.addProgramClasses(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(Main.class)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines(EXPECTED)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/string/StringConcatImplicitToStringConcatConstantTest.java b/src/test/java/com/android/tools/r8/ir/optimize/string/StringConcatImplicitToStringConcatConstantTest.java
index 608c784..39198d7 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/string/StringConcatImplicitToStringConcatConstantTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/string/StringConcatImplicitToStringConcatConstantTest.java
@@ -44,7 +44,7 @@
public void testR8() throws Exception {
testForR8(parameters.getBackend())
.addProgramClasses(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(Main.class)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines(EXPECTED)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/string/StringConcatImplicitToStringConcatMultipleTest.java b/src/test/java/com/android/tools/r8/ir/optimize/string/StringConcatImplicitToStringConcatMultipleTest.java
index f05e84f..50ce1ac 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/string/StringConcatImplicitToStringConcatMultipleTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/string/StringConcatImplicitToStringConcatMultipleTest.java
@@ -44,7 +44,7 @@
public void testR8() throws Exception {
testForR8(parameters.getBackend())
.addProgramClasses(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(Main.class)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines(EXPECTED)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/string/StringConcatImplicitToStringConcatTest.java b/src/test/java/com/android/tools/r8/ir/optimize/string/StringConcatImplicitToStringConcatTest.java
index 4c9ec93..7e1bbec 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/string/StringConcatImplicitToStringConcatTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/string/StringConcatImplicitToStringConcatTest.java
@@ -44,7 +44,7 @@
public void testR8() throws Exception {
testForR8(parameters.getBackend())
.addProgramClasses(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(Main.class)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines(EXPECTED)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/string/StringConcatImplicitToStringSingleTest.java b/src/test/java/com/android/tools/r8/ir/optimize/string/StringConcatImplicitToStringSingleTest.java
index f42b6a5..5fbd746 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/string/StringConcatImplicitToStringSingleTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/string/StringConcatImplicitToStringSingleTest.java
@@ -44,7 +44,7 @@
public void testR8() throws Exception {
testForR8(parameters.getBackend())
.addProgramClasses(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(Main.class)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines(EXPECTED)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/string/StringConcatInitAppendNotNullTest.java b/src/test/java/com/android/tools/r8/ir/optimize/string/StringConcatInitAppendNotNullTest.java
index 3f6f896..0e750e0 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/string/StringConcatInitAppendNotNullTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/string/StringConcatInitAppendNotNullTest.java
@@ -44,7 +44,7 @@
public void testR8() throws Exception {
testForR8(parameters.getBackend())
.addProgramClasses(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(Main.class)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines(EXPECTED)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/string/StringConcatInitAppendTest.java b/src/test/java/com/android/tools/r8/ir/optimize/string/StringConcatInitAppendTest.java
index d7ace15..d82c668 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/string/StringConcatInitAppendTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/string/StringConcatInitAppendTest.java
@@ -44,7 +44,7 @@
public void testR8() throws Exception {
testForR8(parameters.getBackend())
.addProgramClasses(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(Main.class)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines(EXPECTED)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/string/StringConcatInitNotNullAppendNotNullTest.java b/src/test/java/com/android/tools/r8/ir/optimize/string/StringConcatInitNotNullAppendNotNullTest.java
index aca301c..d28b693 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/string/StringConcatInitNotNullAppendNotNullTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/string/StringConcatInitNotNullAppendNotNullTest.java
@@ -45,7 +45,7 @@
public void testR8() throws Exception {
testForR8(parameters.getBackend())
.addProgramClasses(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(Main.class)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines(EXPECTED)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/string/StringConcatInitNotNullAppendTest.java b/src/test/java/com/android/tools/r8/ir/optimize/string/StringConcatInitNotNullAppendTest.java
index 3579f20..358206a 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/string/StringConcatInitNotNullAppendTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/string/StringConcatInitNotNullAppendTest.java
@@ -44,7 +44,7 @@
public void testR8() throws Exception {
testForR8(parameters.getBackend())
.addProgramClasses(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(Main.class)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines(EXPECTED)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/string/StringConcatInitNotNullTest.java b/src/test/java/com/android/tools/r8/ir/optimize/string/StringConcatInitNotNullTest.java
index 4bb550e..cc14858 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/string/StringConcatInitNotNullTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/string/StringConcatInitNotNullTest.java
@@ -46,7 +46,7 @@
public void testR8() throws Exception {
testForR8(parameters.getBackend())
.addProgramClasses(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(Main.class)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines(EXPECTED)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/string/StringConcatInitTest.java b/src/test/java/com/android/tools/r8/ir/optimize/string/StringConcatInitTest.java
index 44aa31b3..4bcfe2d 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/string/StringConcatInitTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/string/StringConcatInitTest.java
@@ -44,7 +44,7 @@
public void testR8() throws Exception {
testForR8(parameters.getBackend())
.addProgramClasses(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(Main.class)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines(EXPECTED)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/string/StringConcatNoRewriteConstantsTest.java b/src/test/java/com/android/tools/r8/ir/optimize/string/StringConcatNoRewriteConstantsTest.java
index 33320dc..437f80a 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/string/StringConcatNoRewriteConstantsTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/string/StringConcatNoRewriteConstantsTest.java
@@ -46,7 +46,7 @@
public void testR8() throws Exception {
testForR8(parameters.getBackend())
.addProgramClasses(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(Main.class)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines(EXPECTED)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/string/StringConcatenationTest.java b/src/test/java/com/android/tools/r8/ir/optimize/string/StringConcatenationTest.java
index c015182..c0ab5c1 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/string/StringConcatenationTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/string/StringConcatenationTest.java
@@ -199,7 +199,7 @@
testForD8()
.debug()
.addProgramClasses(MAIN)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), MAIN)
.assertSuccessWithOutput(JAVA_OUTPUT),
false,
@@ -213,7 +213,7 @@
testForD8()
.release()
.addProgramClasses(MAIN)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), MAIN)
.assertSuccessWithOutput(JAVA_OUTPUT),
false,
@@ -230,7 +230,7 @@
.enableInliningAnnotations()
.addKeepMainRule(MAIN)
.addDontObfuscate()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), MAIN)
.assertSuccessWithOutput(JAVA_OUTPUT);
test(result, true, true);
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/string/StringIsEmptyTest.java b/src/test/java/com/android/tools/r8/ir/optimize/string/StringIsEmptyTest.java
index 381797b..1fa8045 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/string/StringIsEmptyTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/string/StringIsEmptyTest.java
@@ -81,7 +81,7 @@
testForD8()
.debug()
.addProgramClasses(MAIN)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addOptionsModification(this::configure)
.run(parameters.getRuntime(), MAIN)
.assertSuccessWithOutput(JAVA_OUTPUT);
@@ -91,7 +91,7 @@
testForD8()
.release()
.addProgramClasses(MAIN)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addOptionsModification(this::configure)
.run(parameters.getRuntime(), MAIN)
.assertSuccessWithOutput(JAVA_OUTPUT);
@@ -106,7 +106,7 @@
.enableProguardTestOptions()
.enableInliningAnnotations()
.addKeepMainRule(MAIN)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addOptionsModification(this::configure)
.run(parameters.getRuntime(), MAIN)
.assertSuccessWithOutput(JAVA_OUTPUT);
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/string/StringLengthTest.java b/src/test/java/com/android/tools/r8/ir/optimize/string/StringLengthTest.java
index b2927fb..108a919 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/string/StringLengthTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/string/StringLengthTest.java
@@ -75,7 +75,7 @@
testForD8()
.release()
.addProgramClasses(MAIN)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), MAIN);
result.assertSuccessWithOutput(JAVA_OUTPUT);
test(result, 1, 5);
@@ -84,7 +84,7 @@
testForD8()
.debug()
.addProgramClasses(MAIN)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), MAIN);
result.assertSuccessWithOutput(JAVA_OUTPUT);
test(result, 6, 1);
@@ -97,7 +97,7 @@
.addProgramClasses(MAIN)
.enableInliningAnnotations()
.addKeepMainRule(MAIN)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), MAIN)
.assertSuccessWithOutput(JAVA_OUTPUT);
test(result, 0, parameters.isDexRuntime() ? 6 : 7);
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/string/StringTrimTest.java b/src/test/java/com/android/tools/r8/ir/optimize/string/StringTrimTest.java
index cd7618d..881baa8 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/string/StringTrimTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/string/StringTrimTest.java
@@ -39,7 +39,7 @@
testForR8(parameters.getBackend())
.addProgramClasses(TestClass.class)
.addKeepMainRule(TestClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/string/StringValueOfTest.java b/src/test/java/com/android/tools/r8/ir/optimize/string/StringValueOfTest.java
index a302652..c39bbf6 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/string/StringValueOfTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/string/StringValueOfTest.java
@@ -112,7 +112,7 @@
.enableInliningAnnotations()
.enableMemberValuePropagationAnnotations()
.addKeepMainRule(MAIN)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addDontObfuscate()
.addOptionsModification(this::configure)
.compile()
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/string/UnusedStringBuilderFromCharSequenceWithAppendObjectTest.java b/src/test/java/com/android/tools/r8/ir/optimize/string/UnusedStringBuilderFromCharSequenceWithAppendObjectTest.java
index 8f1f58b..b47d228 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/string/UnusedStringBuilderFromCharSequenceWithAppendObjectTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/string/UnusedStringBuilderFromCharSequenceWithAppendObjectTest.java
@@ -31,7 +31,7 @@
testForR8(parameters.getBackend())
.addInnerClasses(getClass())
.addKeepMainRule(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLinesIf(
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/string/UnusedStringBuilderTest.java b/src/test/java/com/android/tools/r8/ir/optimize/string/UnusedStringBuilderTest.java
index 0dcda2d..6db55ef 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/string/UnusedStringBuilderTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/string/UnusedStringBuilderTest.java
@@ -34,7 +34,7 @@
testForR8(parameters.getBackend())
.addInnerClasses(UnusedStringBuilderTest.class)
.addKeepMainRule(TestClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/string/UnusedStringBuilderWithAppendDefinitelyNullObjectTest.java b/src/test/java/com/android/tools/r8/ir/optimize/string/UnusedStringBuilderWithAppendDefinitelyNullObjectTest.java
index f5f615d..ff2413f 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/string/UnusedStringBuilderWithAppendDefinitelyNullObjectTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/string/UnusedStringBuilderWithAppendDefinitelyNullObjectTest.java
@@ -36,7 +36,7 @@
testForR8(parameters.getBackend())
.addInnerClasses(getClass())
.addKeepMainRule(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector -> {
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/string/UnusedStringBuilderWithAppendMaybeNullObjectTest.java b/src/test/java/com/android/tools/r8/ir/optimize/string/UnusedStringBuilderWithAppendMaybeNullObjectTest.java
index 78c0a10..a279c1a 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/string/UnusedStringBuilderWithAppendMaybeNullObjectTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/string/UnusedStringBuilderWithAppendMaybeNullObjectTest.java
@@ -35,7 +35,7 @@
testForR8(parameters.getBackend())
.addInnerClasses(getClass())
.addKeepMainRule(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector -> {
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/string/UnusedStringBuilderWithAppendObjectSideEffectTest.java b/src/test/java/com/android/tools/r8/ir/optimize/string/UnusedStringBuilderWithAppendObjectSideEffectTest.java
index 934dfd2..63a9652 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/string/UnusedStringBuilderWithAppendObjectSideEffectTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/string/UnusedStringBuilderWithAppendObjectSideEffectTest.java
@@ -35,7 +35,7 @@
testForR8(parameters.getBackend())
.addInnerClasses(getClass())
.addKeepMainRule(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector -> {
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/string/UnusedStringBuilderWithAppendObjectTest.java b/src/test/java/com/android/tools/r8/ir/optimize/string/UnusedStringBuilderWithAppendObjectTest.java
index b8c0799..d6758b7 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/string/UnusedStringBuilderWithAppendObjectTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/string/UnusedStringBuilderWithAppendObjectTest.java
@@ -36,7 +36,7 @@
testForR8(parameters.getBackend())
.addInnerClasses(getClass())
.addKeepMainRule(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector -> {
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/switches/ConvertRemovedStringSwitchTest.java b/src/test/java/com/android/tools/r8/ir/optimize/switches/ConvertRemovedStringSwitchTest.java
index 3243171..1239133 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/switches/ConvertRemovedStringSwitchTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/switches/ConvertRemovedStringSwitchTest.java
@@ -45,7 +45,7 @@
testForR8(parameters.getBackend())
.addInnerClasses(ConvertRemovedStringSwitchTest.class)
.addKeepMainRule(TestClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect)
.run(parameters.getRuntime(), TestClass.class, "A", "B", "C", "D", "E")
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/switches/DeadSwitchCaseWithSharedTargetTest.java b/src/test/java/com/android/tools/r8/ir/optimize/switches/DeadSwitchCaseWithSharedTargetTest.java
index 6fd4739..ed06d12 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/switches/DeadSwitchCaseWithSharedTargetTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/switches/DeadSwitchCaseWithSharedTargetTest.java
@@ -34,7 +34,7 @@
"-assumevalues class " + Main.class.getTypeName() + " {",
" static int FIELD return 27..30;",
"}")
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("?", "?", "O", "P", "Q", "R", "?");
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/switches/StringSwitchCaseRemovalWithCompileTimeHashCodeTest.java b/src/test/java/com/android/tools/r8/ir/optimize/switches/StringSwitchCaseRemovalWithCompileTimeHashCodeTest.java
index 7660e79..cb4418e 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/switches/StringSwitchCaseRemovalWithCompileTimeHashCodeTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/switches/StringSwitchCaseRemovalWithCompileTimeHashCodeTest.java
@@ -49,7 +49,7 @@
assertTrue(options.minimumStringSwitchSize >= 3);
options.minimumStringSwitchSize = 2;
})
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutputLines("FOO")
.inspect(
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/switches/StringSwitchWitNonConstIdTest.java b/src/test/java/com/android/tools/r8/ir/optimize/switches/StringSwitchWitNonConstIdTest.java
index c993353..dfacc44 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/switches/StringSwitchWitNonConstIdTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/switches/StringSwitchWitNonConstIdTest.java
@@ -34,7 +34,7 @@
testForD8()
.addProgramClasses(Main.class)
.release()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("Foo", "Bar", "Baz", "Qux");
}
@@ -46,7 +46,7 @@
.addKeepMainRule(Main.class)
.enableInliningAnnotations()
.release()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("Foo", "Bar", "Baz", "Qux");
}
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/switches/StringSwitchWitNonIntermediateIdValueTest.java b/src/test/java/com/android/tools/r8/ir/optimize/switches/StringSwitchWitNonIntermediateIdValueTest.java
index 11a1e35..b562818 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/switches/StringSwitchWitNonIntermediateIdValueTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/switches/StringSwitchWitNonIntermediateIdValueTest.java
@@ -42,7 +42,7 @@
.addProgramClasses(Main.class)
.addOptionsModification(options -> options.minimumStringSwitchSize = 4)
.release()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::verifyRewrittenToIfs)
.run(parameters.getRuntime(), Main.class)
@@ -56,7 +56,7 @@
.addKeepMainRule(Main.class)
.addOptionsModification(options -> options.minimumStringSwitchSize = 4)
.enableInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::verifyRewrittenToIfs)
.run(parameters.getRuntime(), Main.class)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/switches/StringSwitchWithHashCollisionsTest.java b/src/test/java/com/android/tools/r8/ir/optimize/switches/StringSwitchWithHashCollisionsTest.java
index d4b6f89..a3231ab 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/switches/StringSwitchWithHashCollisionsTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/switches/StringSwitchWithHashCollisionsTest.java
@@ -40,7 +40,7 @@
.addInnerClasses(StringSwitchWithHashCollisionsTest.class)
.addKeepMainRule(TestClass.class)
.addOptionsModification(options -> assertTrue(options.minimumStringSwitchSize >= 3))
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(
parameters.getRuntime(),
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/switches/StringSwitchWithSameTargetTest.java b/src/test/java/com/android/tools/r8/ir/optimize/switches/StringSwitchWithSameTargetTest.java
index f035481..88dab48 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/switches/StringSwitchWithSameTargetTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/switches/StringSwitchWithSameTargetTest.java
@@ -38,7 +38,7 @@
assertTrue(options.minimumStringSwitchSize >= 3);
options.minimumStringSwitchSize = 2;
})
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), TestClass.class, "Hello", "_", "world!")
.assertSuccessWithOutput("Hello world!");
}
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/switches/SwitchCaseRemovalTest.java b/src/test/java/com/android/tools/r8/ir/optimize/switches/SwitchCaseRemovalTest.java
index a5eddd4..d3f2fed 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/switches/SwitchCaseRemovalTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/switches/SwitchCaseRemovalTest.java
@@ -59,7 +59,7 @@
})
.enableInliningAnnotations()
.enableMemberValuePropagationAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::verifyOutput)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/switches/SwitchMapCollectionWithoutStaticGetTest.java b/src/test/java/com/android/tools/r8/ir/optimize/switches/SwitchMapCollectionWithoutStaticGetTest.java
index f3bb8e7..55932e8 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/switches/SwitchMapCollectionWithoutStaticGetTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/switches/SwitchMapCollectionWithoutStaticGetTest.java
@@ -37,7 +37,7 @@
.addProgramClasses(TestClass.class, MyEnum.class)
.addProgramClassFileData(SwitchMapClassDump.dump())
.addKeepMainRule(TestClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutputLines("Hello world!");
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/switches/SwitchMapInvalidInitTest.java b/src/test/java/com/android/tools/r8/ir/optimize/switches/SwitchMapInvalidInitTest.java
index cb50223..d982870 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/switches/SwitchMapInvalidInitTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/switches/SwitchMapInvalidInitTest.java
@@ -37,7 +37,7 @@
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
.addInnerClasses(SwitchMapInvalidInitTest.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::assertNoSwitchMap)
.run(parameters.getRuntime(), Main.class)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/switches/SwitchMapInvalidOrdinalTest.java b/src/test/java/com/android/tools/r8/ir/optimize/switches/SwitchMapInvalidOrdinalTest.java
index 8c84a76..76be608 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/switches/SwitchMapInvalidOrdinalTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/switches/SwitchMapInvalidOrdinalTest.java
@@ -30,7 +30,7 @@
@Test
public void testD8() throws Exception {
testForD8()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addInnerClasses(SwitchMapInvalidOrdinalTest.class)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("a", "b", "0", "a");
@@ -46,7 +46,7 @@
+ " static <fields>; }")
.addInnerClasses(SwitchMapInvalidOrdinalTest.class)
.enableNeverClassInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), Main.class)
// When the code reaches the switch the first time, then the switch map int[] gets
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/switches/SwitchMapWithEnumDependencyTest.java b/src/test/java/com/android/tools/r8/ir/optimize/switches/SwitchMapWithEnumDependencyTest.java
index c533bbb..9994332 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/switches/SwitchMapWithEnumDependencyTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/switches/SwitchMapWithEnumDependencyTest.java
@@ -36,7 +36,7 @@
.addKeepMainRule(TestClass.class)
.addDontObfuscate()
.enableInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile();
compile
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/switches/SwitchMapWithMissingFieldTest.java b/src/test/java/com/android/tools/r8/ir/optimize/switches/SwitchMapWithMissingFieldTest.java
index 5489745..7cfab4c 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/switches/SwitchMapWithMissingFieldTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/switches/SwitchMapWithMissingFieldTest.java
@@ -49,7 +49,7 @@
.transform())
.addKeepMainRule(TestClass.class)
.addDontObfuscate()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutputLines("B", "D");
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/switches/SwitchMapWithSubtypesTest.java b/src/test/java/com/android/tools/r8/ir/optimize/switches/SwitchMapWithSubtypesTest.java
index d9180bd..dcef1db 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/switches/SwitchMapWithSubtypesTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/switches/SwitchMapWithSubtypesTest.java
@@ -38,7 +38,7 @@
.addKeepMainRule(TestClass.class)
.addDontObfuscate()
.enableInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile();
compile
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/switches/SwitchMapWithUnexpectedFieldTest.java b/src/test/java/com/android/tools/r8/ir/optimize/switches/SwitchMapWithUnexpectedFieldTest.java
index ec3c1ed..071b8ce 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/switches/SwitchMapWithUnexpectedFieldTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/switches/SwitchMapWithUnexpectedFieldTest.java
@@ -55,7 +55,7 @@
.transform())
.addKeepMainRule(TestClass.class)
.addDontObfuscate()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutputLines("B", "D");
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/typechecks/InstanceOfMethodSpecializationTest.java b/src/test/java/com/android/tools/r8/ir/optimize/typechecks/InstanceOfMethodSpecializationTest.java
index f258093..66e0b1f 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/typechecks/InstanceOfMethodSpecializationTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/typechecks/InstanceOfMethodSpecializationTest.java
@@ -55,7 +55,7 @@
.addInnerClasses(InstanceOfMethodSpecializationTest.class)
.addKeepMainRule(TestClass.class)
.enableNoHorizontalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/uninstantiatedtypes/B146957343.java b/src/test/java/com/android/tools/r8/ir/optimize/uninstantiatedtypes/B146957343.java
index 82755bc..df807b5 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/uninstantiatedtypes/B146957343.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/uninstantiatedtypes/B146957343.java
@@ -50,7 +50,7 @@
.addOptionsModification(
options -> options.getOpenClosedInterfacesOptions().suppressAllOpenInterfaces())
.enableInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("In A.f()");
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/uninstantiatedtypes/InterfaceMethodTest.java b/src/test/java/com/android/tools/r8/ir/optimize/uninstantiatedtypes/InterfaceMethodTest.java
index 91a886d..8ee5732 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/uninstantiatedtypes/InterfaceMethodTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/uninstantiatedtypes/InterfaceMethodTest.java
@@ -58,7 +58,7 @@
.enableNeverClassInliningAnnotations()
.enableNoVerticalClassMergingAnnotations()
.enableNoHorizontalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutput(expectedOutput)
.inspector();
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/uninstantiatedtypes/InvokeMethodWithNonNullParamCheckTest.java b/src/test/java/com/android/tools/r8/ir/optimize/uninstantiatedtypes/InvokeMethodWithNonNullParamCheckTest.java
index 80d38dc..0e1c220 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/uninstantiatedtypes/InvokeMethodWithNonNullParamCheckTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/uninstantiatedtypes/InvokeMethodWithNonNullParamCheckTest.java
@@ -88,7 +88,7 @@
// CatchHandlers(new A()).
options.enableClassInlining = false;
})
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutput(expected)
.inspector();
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/uninstantiatedtypes/InvokeMethodWithReceiverOptimizationTest.java b/src/test/java/com/android/tools/r8/ir/optimize/uninstantiatedtypes/InvokeMethodWithReceiverOptimizationTest.java
index 6457961..263a233 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/uninstantiatedtypes/InvokeMethodWithReceiverOptimizationTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/uninstantiatedtypes/InvokeMethodWithReceiverOptimizationTest.java
@@ -69,7 +69,7 @@
// TODO(b/120764902): The calls to getOriginalName() below does not work in presence of
// argument removal.
.addDontObfuscate()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutput(expected)
.inspector();
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/uninstantiatedtypes/LambdaInstantiatedTypeTest.java b/src/test/java/com/android/tools/r8/ir/optimize/uninstantiatedtypes/LambdaInstantiatedTypeTest.java
index 4119731..d07bff5 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/uninstantiatedtypes/LambdaInstantiatedTypeTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/uninstantiatedtypes/LambdaInstantiatedTypeTest.java
@@ -53,7 +53,7 @@
.addInnerClasses(LambdaInstantiatedTypeTest.class)
.addKeepMainRule(TestClass.class)
.enableInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutput(expected)
.inspector();
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/uninstantiatedtypes/ParameterRewritingTest.java b/src/test/java/com/android/tools/r8/ir/optimize/uninstantiatedtypes/ParameterRewritingTest.java
index 032b058..97f7fa7 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/uninstantiatedtypes/ParameterRewritingTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/uninstantiatedtypes/ParameterRewritingTest.java
@@ -57,7 +57,7 @@
.enableNoHorizontalClassMergingAnnotations()
.addOptionsModification(options -> options.enableClassInlining = false)
.addDontObfuscate()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutput(expected)
.inspector();
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/uninstantiatedtypes/PrivateInstanceMethodCollisionTest.java b/src/test/java/com/android/tools/r8/ir/optimize/uninstantiatedtypes/PrivateInstanceMethodCollisionTest.java
index 2c8e8ed..d47be6e 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/uninstantiatedtypes/PrivateInstanceMethodCollisionTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/uninstantiatedtypes/PrivateInstanceMethodCollisionTest.java
@@ -68,7 +68,7 @@
.enableNoMethodStaticizingAnnotations()
.minification(minification)
.allowAccessModification(allowAccessModification)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::verifyUninstantiatedArgumentsRemovedAndNoCollisions)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/uninstantiatedtypes/SynchronizedMethodTest.java b/src/test/java/com/android/tools/r8/ir/optimize/uninstantiatedtypes/SynchronizedMethodTest.java
index 99d3ae2..20bd115 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/uninstantiatedtypes/SynchronizedMethodTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/uninstantiatedtypes/SynchronizedMethodTest.java
@@ -51,7 +51,7 @@
.addKeepMainRule(TestClass.class)
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutput(expectedOutput)
.inspector();
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/uninstantiatedtypes/UninstantiatedAnnotatedArgumentsTest.java b/src/test/java/com/android/tools/r8/ir/optimize/uninstantiatedtypes/UninstantiatedAnnotatedArgumentsTest.java
index e46ce92..bc28fcb 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/uninstantiatedtypes/UninstantiatedAnnotatedArgumentsTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/uninstantiatedtypes/UninstantiatedAnnotatedArgumentsTest.java
@@ -73,7 +73,7 @@
.enableUnusedArgumentAnnotations()
// TODO(b/123060011): Mapping not working in presence of argument removal.
.minification(keepUninstantiatedArguments)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::verifyOutput)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/uninstantiatedtypes/VoidReturnTypeRewritingTest.java b/src/test/java/com/android/tools/r8/ir/optimize/uninstantiatedtypes/VoidReturnTypeRewritingTest.java
index 0665133..ee007c8 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/uninstantiatedtypes/VoidReturnTypeRewritingTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/uninstantiatedtypes/VoidReturnTypeRewritingTest.java
@@ -62,7 +62,7 @@
.enableNoHorizontalClassMergingAnnotations()
.addOptionsModification(options -> options.enableClassInlining = false)
.addDontObfuscate()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutput(expected)
.inspector();
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/unusedarguments/CollisionWithLibraryMethodsTest.java b/src/test/java/com/android/tools/r8/ir/optimize/unusedarguments/CollisionWithLibraryMethodsTest.java
index 9cdc693..44fd6bc 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/unusedarguments/CollisionWithLibraryMethodsTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/unusedarguments/CollisionWithLibraryMethodsTest.java
@@ -54,7 +54,7 @@
.enableNoMethodStaticizingAnnotations()
.enableInliningAnnotations()
.minification(minification)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::verify)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/unusedarguments/ConstantArgumentUpdateGenericSignatureTest.java b/src/test/java/com/android/tools/r8/ir/optimize/unusedarguments/ConstantArgumentUpdateGenericSignatureTest.java
index 2619ab8..2de2551 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/unusedarguments/ConstantArgumentUpdateGenericSignatureTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/unusedarguments/ConstantArgumentUpdateGenericSignatureTest.java
@@ -38,7 +38,7 @@
public void testR8() throws Exception {
testForR8Compat(parameters.getBackend())
.addInnerClasses(getClass())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepAttributeSignature()
.addKeepMainRule(Main.class)
.enableInliningAnnotations()
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/unusedarguments/ConstantArgumentWithUnusedArgumentUpdateGenericSignatureTest.java b/src/test/java/com/android/tools/r8/ir/optimize/unusedarguments/ConstantArgumentWithUnusedArgumentUpdateGenericSignatureTest.java
index ea624dc..e81f2f3 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/unusedarguments/ConstantArgumentWithUnusedArgumentUpdateGenericSignatureTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/unusedarguments/ConstantArgumentWithUnusedArgumentUpdateGenericSignatureTest.java
@@ -38,7 +38,7 @@
public void testR8() throws Exception {
testForR8Compat(parameters.getBackend())
.addInnerClasses(getClass())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepAttributeSignature()
.addKeepMainRule(Main.class)
.enableInliningAnnotations()
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/unusedarguments/EffectivelyUnusedNullableArgumentTest.java b/src/test/java/com/android/tools/r8/ir/optimize/unusedarguments/EffectivelyUnusedNullableArgumentTest.java
index 9b355fe..4e069d1 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/unusedarguments/EffectivelyUnusedNullableArgumentTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/unusedarguments/EffectivelyUnusedNullableArgumentTest.java
@@ -43,7 +43,7 @@
.enableNeverClassInliningAnnotations()
// TODO(b/173398086): uniqueMethodWithName() does not work with argument changes.
.addDontObfuscate()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector -> {
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/unusedarguments/PrivateInstanceMethodCollisionTest.java b/src/test/java/com/android/tools/r8/ir/optimize/unusedarguments/PrivateInstanceMethodCollisionTest.java
index abc1bd6..b6036fc 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/unusedarguments/PrivateInstanceMethodCollisionTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/unusedarguments/PrivateInstanceMethodCollisionTest.java
@@ -68,7 +68,7 @@
.enableNoMethodStaticizingAnnotations()
.minification(minification)
.allowAccessModification(allowAccessModification)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::verifyUnusedArgumentsRemovedAndNoCollisions)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/unusedarguments/StaticizeUpdateGenericSignatureTest.java b/src/test/java/com/android/tools/r8/ir/optimize/unusedarguments/StaticizeUpdateGenericSignatureTest.java
index da960e7..9304c8d 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/unusedarguments/StaticizeUpdateGenericSignatureTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/unusedarguments/StaticizeUpdateGenericSignatureTest.java
@@ -39,7 +39,7 @@
public void testR8() throws Exception {
testForR8Compat(parameters.getBackend())
.addInnerClasses(getClass())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepAttributeSignature()
.addKeepMainRule(Main.class)
.enableInliningAnnotations()
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/unusedarguments/UnusedAndUninstantiatedTypesTest.java b/src/test/java/com/android/tools/r8/ir/optimize/unusedarguments/UnusedAndUninstantiatedTypesTest.java
index 96577a4..c547395 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/unusedarguments/UnusedAndUninstantiatedTypesTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/unusedarguments/UnusedAndUninstantiatedTypesTest.java
@@ -41,7 +41,7 @@
.addDontObfuscate()
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::assertMethodsAreThere)
.run(parameters.getRuntime(), Main.class)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/unusedarguments/UnusedAnnotatedArgumentsTest.java b/src/test/java/com/android/tools/r8/ir/optimize/unusedarguments/UnusedAnnotatedArgumentsTest.java
index fd8e3ac..32e1403 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/unusedarguments/UnusedAnnotatedArgumentsTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/unusedarguments/UnusedAnnotatedArgumentsTest.java
@@ -71,7 +71,7 @@
.enableUnusedArgumentAnnotations(keepUnusedArguments)
// TODO(b/123060011): Mapping not working in presence of unused argument removal.
.minification(keepUnusedArguments)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::verifyOutput)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/unusedarguments/UnusedAnnotatedArgumentsWithMissingAnnotationsTest.java b/src/test/java/com/android/tools/r8/ir/optimize/unusedarguments/UnusedAnnotatedArgumentsWithMissingAnnotationsTest.java
index c074ee1..9b6f0c7 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/unusedarguments/UnusedAnnotatedArgumentsWithMissingAnnotationsTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/unusedarguments/UnusedAnnotatedArgumentsWithMissingAnnotationsTest.java
@@ -87,7 +87,7 @@
"-keepconstantarguments class Test$Inner? { void <init>(...); }")
.addKeepRuntimeVisibleParameterAnnotations()
.enableProguardTestOptions()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector -> {
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/unusedarguments/UnusedArgumentRemovalWithOverridingTest.java b/src/test/java/com/android/tools/r8/ir/optimize/unusedarguments/UnusedArgumentRemovalWithOverridingTest.java
index d595562..9a844ac 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/unusedarguments/UnusedArgumentRemovalWithOverridingTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/unusedarguments/UnusedArgumentRemovalWithOverridingTest.java
@@ -51,7 +51,7 @@
.enableInliningAnnotations()
.enableNoVerticalClassMergingAnnotations()
.minification(minification)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::verify)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/unusedarguments/UnusedArgumentUpdateGenericSignatureTest.java b/src/test/java/com/android/tools/r8/ir/optimize/unusedarguments/UnusedArgumentUpdateGenericSignatureTest.java
index 4ebb10e..8095785 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/unusedarguments/UnusedArgumentUpdateGenericSignatureTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/unusedarguments/UnusedArgumentUpdateGenericSignatureTest.java
@@ -39,7 +39,7 @@
public void testR8() throws Exception {
testForR8Compat(parameters.getBackend())
.addInnerClasses(getClass())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepAttributeSignature()
.addKeepMainRule(Main.class)
.enableInliningAnnotations()
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/unusedarguments/UnusedArgumentsCollisionMappingTest.java b/src/test/java/com/android/tools/r8/ir/optimize/unusedarguments/UnusedArgumentsCollisionMappingTest.java
index 8ccee13..77d917b 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/unusedarguments/UnusedArgumentsCollisionMappingTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/unusedarguments/UnusedArgumentsCollisionMappingTest.java
@@ -44,7 +44,7 @@
R8TestRunResult runResult =
testForR8(parameters.getBackend())
.addProgramClasses(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(Main.class)
.enableConstantArgumentAnnotations()
.enableInliningAnnotations()
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/unusedarguments/UnusedArgumentsCollisionTest.java b/src/test/java/com/android/tools/r8/ir/optimize/unusedarguments/UnusedArgumentsCollisionTest.java
index 1c59e0f..a4e68c7 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/unusedarguments/UnusedArgumentsCollisionTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/unusedarguments/UnusedArgumentsCollisionTest.java
@@ -63,7 +63,7 @@
.enableNoMethodStaticizingAnnotations()
.enableNoVerticalClassMergingAnnotations()
.minification(minification)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::verifyUnusedArgumentsRemovedAndNoCollisions)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/unusedarguments/UnusedArgumentsInMethodThatImplementsInterfaceMethodOnSubTest.java b/src/test/java/com/android/tools/r8/ir/optimize/unusedarguments/UnusedArgumentsInMethodThatImplementsInterfaceMethodOnSubTest.java
index 9a4d4d0..5c89f94 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/unusedarguments/UnusedArgumentsInMethodThatImplementsInterfaceMethodOnSubTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/unusedarguments/UnusedArgumentsInMethodThatImplementsInterfaceMethodOnSubTest.java
@@ -33,7 +33,7 @@
.addInnerClasses(UnusedArgumentsInMethodThatImplementsInterfaceMethodOnSubTest.class)
.addKeepMainRule(TestClass.class)
.enableNoVerticalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutputLines("Hello from A", "Hello from C");
}
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/unusedarguments/UnusedArgumentsInstanceConstructorTest.java b/src/test/java/com/android/tools/r8/ir/optimize/unusedarguments/UnusedArgumentsInstanceConstructorTest.java
index 3f23ccc..b763bb2 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/unusedarguments/UnusedArgumentsInstanceConstructorTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/unusedarguments/UnusedArgumentsInstanceConstructorTest.java
@@ -59,7 +59,7 @@
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
.enableNoHorizontalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutput(expectedOutput)
.inspector();
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/unusedarguments/UnusedArgumentsTestBase.java b/src/test/java/com/android/tools/r8/ir/optimize/unusedarguments/UnusedArgumentsTestBase.java
index 4a06340..49efe19 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/unusedarguments/UnusedArgumentsTestBase.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/unusedarguments/UnusedArgumentsTestBase.java
@@ -71,7 +71,7 @@
@Test
public void testR8() throws Throwable {
testForR8(parameters.getBackend())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addProgramClasses(getTestClass())
.addProgramClasses(getAdditionalClasses())
.addKeepMainRule(getTestClass())
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/unusedarguments/UnusedReceiverInUnboxedEnumTest.java b/src/test/java/com/android/tools/r8/ir/optimize/unusedarguments/UnusedReceiverInUnboxedEnumTest.java
index 0218614..6f08840 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/unusedarguments/UnusedReceiverInUnboxedEnumTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/unusedarguments/UnusedReceiverInUnboxedEnumTest.java
@@ -32,7 +32,7 @@
.addKeepMainRule(Main.class)
.addEnumUnboxingInspector(inspector -> inspector.assertUnboxed(MyEnum.class))
.enableInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), Main.class)
.assertFailureWithErrorThatThrows(NullPointerException.class);
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/unusedarguments/UnusedReceiverTest.java b/src/test/java/com/android/tools/r8/ir/optimize/unusedarguments/UnusedReceiverTest.java
index 6b9cb0a..1dd2145 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/unusedarguments/UnusedReceiverTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/unusedarguments/UnusedReceiverTest.java
@@ -37,7 +37,7 @@
.addInnerClasses(getClass())
.addKeepMainRule(Main.class)
.enableInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector -> {
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/unusedinterfaces/UnusedInterfaceRemovalPackageBoundaryTest.java b/src/test/java/com/android/tools/r8/ir/optimize/unusedinterfaces/UnusedInterfaceRemovalPackageBoundaryTest.java
index df6a58c..7f7305d 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/unusedinterfaces/UnusedInterfaceRemovalPackageBoundaryTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/unusedinterfaces/UnusedInterfaceRemovalPackageBoundaryTest.java
@@ -46,7 +46,7 @@
.addKeepClassRules(I_CLASS)
.enableNeverClassInliningAnnotations()
.enableNoVerticalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector -> {
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/unusedinterfaces/UnusedInterfaceRemovalTest.java b/src/test/java/com/android/tools/r8/ir/optimize/unusedinterfaces/UnusedInterfaceRemovalTest.java
index 8b958fd..934fa48 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/unusedinterfaces/UnusedInterfaceRemovalTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/unusedinterfaces/UnusedInterfaceRemovalTest.java
@@ -14,7 +14,6 @@
import com.android.tools.r8.TestBase;
import com.android.tools.r8.TestParameters;
import com.android.tools.r8.TestParametersCollection;
-import com.android.tools.r8.references.Reference;
import com.android.tools.r8.utils.codeinspector.ClassSubject;
import com.android.tools.r8.utils.codeinspector.CodeInspector;
import org.junit.Test;
@@ -43,7 +42,7 @@
.addKeepMainRule(TestClass.class)
.enableNoVerticalClassMergingAnnotations()
.enableNoHorizontalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/unusedinterfaces/UnusedInterfaceWithDefaultMethodTest.java b/src/test/java/com/android/tools/r8/ir/optimize/unusedinterfaces/UnusedInterfaceWithDefaultMethodTest.java
index fdefaac..b61819d 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/unusedinterfaces/UnusedInterfaceWithDefaultMethodTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/unusedinterfaces/UnusedInterfaceWithDefaultMethodTest.java
@@ -48,7 +48,7 @@
.enableNoHorizontalClassMergingAnnotations()
.enableNoParameterTypeStrengtheningAnnotations()
.enableNoVerticalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/ir/regalloc/B140588497.java b/src/test/java/com/android/tools/r8/ir/regalloc/B140588497.java
index 3503deb..82653f9 100644
--- a/src/test/java/com/android/tools/r8/ir/regalloc/B140588497.java
+++ b/src/test/java/com/android/tools/r8/ir/regalloc/B140588497.java
@@ -38,7 +38,7 @@
public void testD8() throws Exception {
testForD8()
.addInnerClasses(B140588497.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutputLines("012345")
.inspect(
diff --git a/src/test/java/com/android/tools/r8/jasmin/InvalidDebugInfoTests.java b/src/test/java/com/android/tools/r8/jasmin/InvalidDebugInfoTests.java
index 8591490..255264d 100644
--- a/src/test/java/com/android/tools/r8/jasmin/InvalidDebugInfoTests.java
+++ b/src/test/java/com/android/tools/r8/jasmin/InvalidDebugInfoTests.java
@@ -130,7 +130,7 @@
}
testForD8(parameters.getBackend())
.addProgramClassFileData(builder.buildClasses())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addOptionsModification(this::optionsModification)
.compileWithExpectedDiagnostics(
diagnostics -> {
@@ -196,7 +196,7 @@
testForD8(parameters.getBackend())
.addProgramClassFileData(builder.buildClasses())
.addOptionsModification(this::optionsModification)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compileWithExpectedDiagnostics(
diagnostics -> {
if (strict) {
@@ -252,7 +252,7 @@
}
testForD8(parameters.getBackend())
.addProgramClassFileData(builder.buildClasses())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addOptionsModification(this::optionsModification)
.compileWithExpectedDiagnostics(
diagnostics -> {
@@ -312,7 +312,7 @@
testForD8(parameters.getBackend())
.addProgramClassFileData(builder.buildClasses())
.addOptionsModification(this::optionsModification)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compileWithExpectedDiagnostics(this::assertInvalidTypeMessage)
.run(parameters.getRuntime(), clazz.name)
.assertSuccessWithOutput(expected)
@@ -371,7 +371,7 @@
testForD8(parameters.getBackend())
.addProgramClassFileData(builder.buildClasses())
.addOptionsModification(this::optionsModification)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compileWithExpectedDiagnostics(
diagnostics -> {
if (strict) {
@@ -438,7 +438,7 @@
testForD8(parameters.getBackend())
.addProgramClassFileData(builder.buildClasses())
.addOptionsModification(this::optionsModification)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compileWithExpectedDiagnostics(TestDiagnosticMessages::assertNoMessages)
.run(parameters.getRuntime(), clazz.name)
.assertSuccessWithOutput(expected)
diff --git a/src/test/java/com/android/tools/r8/jasmin/Regress65007724.java b/src/test/java/com/android/tools/r8/jasmin/Regress65007724.java
index 90660f4..a7ce95e 100644
--- a/src/test/java/com/android/tools/r8/jasmin/Regress65007724.java
+++ b/src/test/java/com/android/tools/r8/jasmin/Regress65007724.java
@@ -47,7 +47,7 @@
D8TestRunResult d8TestRunResult =
testForD8(parameters.getBackend())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addProgramClassFileData(builder.buildClasses())
.run(parameters.getRuntime(), clazz.name);
d8TestRunResult.assertSuccessWithOutput("Hello World!");
diff --git a/src/test/java/com/android/tools/r8/java_language/pattern_matching_for_instenceof/PattternMatchingForInstanceOfTest.java b/src/test/java/com/android/tools/r8/java_language/pattern_matching_for_instenceof/PattternMatchingForInstanceOfTest.java
index c762605..7030b32 100644
--- a/src/test/java/com/android/tools/r8/java_language/pattern_matching_for_instenceof/PattternMatchingForInstanceOfTest.java
+++ b/src/test/java/com/android/tools/r8/java_language/pattern_matching_for_instenceof/PattternMatchingForInstanceOfTest.java
@@ -48,7 +48,7 @@
}
testForD8(parameters.getBackend())
.addProgramFiles(JAR)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), MAIN)
.assertSuccessWithOutputLines(EXPECTED);
@@ -60,7 +60,7 @@
R8TestBuilder<?> builder =
testForR8(parameters.getBackend())
.addProgramFiles(JAR)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(MAIN);
if (parameters.getBackend().isDex()) {
builder.run(parameters.getRuntime(), MAIN).assertSuccessWithOutputLines(EXPECTED);
diff --git a/src/test/java/com/android/tools/r8/keepanno/KeepAccessFlagsOnFieldsTest.java b/src/test/java/com/android/tools/r8/keepanno/KeepAccessFlagsOnFieldsTest.java
index b48b7c7..5b9341f 100644
--- a/src/test/java/com/android/tools/r8/keepanno/KeepAccessFlagsOnFieldsTest.java
+++ b/src/test/java/com/android/tools/r8/keepanno/KeepAccessFlagsOnFieldsTest.java
@@ -64,7 +64,7 @@
@Test
public void testWithRuleExtraction() throws Exception {
testForR8(parameters.getBackend())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.enableExperimentalKeepAnnotations()
.addProgramClassFileData(getTargetClass())
.addProgramClassFileData(getMainClass())
diff --git a/src/test/java/com/android/tools/r8/keepanno/KeepAccessFlagsOnMembersTest.java b/src/test/java/com/android/tools/r8/keepanno/KeepAccessFlagsOnMembersTest.java
index d6eb3f2..b4cfea4 100644
--- a/src/test/java/com/android/tools/r8/keepanno/KeepAccessFlagsOnMembersTest.java
+++ b/src/test/java/com/android/tools/r8/keepanno/KeepAccessFlagsOnMembersTest.java
@@ -56,7 +56,7 @@
@Test
public void test() throws Exception {
testForR8(parameters.getBackend())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.enableExperimentalKeepAnnotations()
.addProgramClassFileData(getTargetClass())
.addProgramClassFileData(getMainClass())
diff --git a/src/test/java/com/android/tools/r8/keepanno/KeepAccessFlagsOnMethodsTest.java b/src/test/java/com/android/tools/r8/keepanno/KeepAccessFlagsOnMethodsTest.java
index de33e6d..663decd 100644
--- a/src/test/java/com/android/tools/r8/keepanno/KeepAccessFlagsOnMethodsTest.java
+++ b/src/test/java/com/android/tools/r8/keepanno/KeepAccessFlagsOnMethodsTest.java
@@ -65,7 +65,7 @@
@Test
public void test() throws Exception {
testForR8(parameters.getBackend())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.enableExperimentalKeepAnnotations()
.addProgramClassFileData(getTargetClass())
.addProgramClassFileData(getMainClass())
diff --git a/src/test/java/com/android/tools/r8/keepanno/KeepAccessVisibilityFlagsTest.java b/src/test/java/com/android/tools/r8/keepanno/KeepAccessVisibilityFlagsTest.java
index c2d5570..b71f282 100644
--- a/src/test/java/com/android/tools/r8/keepanno/KeepAccessVisibilityFlagsTest.java
+++ b/src/test/java/com/android/tools/r8/keepanno/KeepAccessVisibilityFlagsTest.java
@@ -77,7 +77,7 @@
.enableExperimentalKeepAnnotations()
.addProgramClasses(getInputClasses())
.addKeepMainRule(TestClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutput(EXPECTED)
.inspect(this::checkOutput);
diff --git a/src/test/java/com/android/tools/r8/keepanno/KeepAnnotationViaSuperTest.java b/src/test/java/com/android/tools/r8/keepanno/KeepAnnotationViaSuperTest.java
index 3c09bff..8bc36a5 100644
--- a/src/test/java/com/android/tools/r8/keepanno/KeepAnnotationViaSuperTest.java
+++ b/src/test/java/com/android/tools/r8/keepanno/KeepAnnotationViaSuperTest.java
@@ -58,7 +58,7 @@
.addProgramClasses(getInputClasses())
.addKeepMainRule(TestClass.class)
.addKeepRuntimeVisibleAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutput(EXPECTED)
.inspect(this::checkOutput);
diff --git a/src/test/java/com/android/tools/r8/keepanno/KeepBindingTest.java b/src/test/java/com/android/tools/r8/keepanno/KeepBindingTest.java
index cd00198..330e441 100644
--- a/src/test/java/com/android/tools/r8/keepanno/KeepBindingTest.java
+++ b/src/test/java/com/android/tools/r8/keepanno/KeepBindingTest.java
@@ -54,7 +54,7 @@
.addProgramClasses(getInputClasses())
.addKeepClassRules(A.class, B.class)
.addKeepMainRule(TestClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutput(EXPECTED)
.inspect(i -> checkOutput(i, true));
@@ -66,7 +66,7 @@
.enableExperimentalKeepAnnotations()
.addProgramClasses(getInputClasses())
.addKeepMainRule(TestClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutput(EXPECTED)
.inspect(i -> checkOutput(i, false));
diff --git a/src/test/java/com/android/tools/r8/keepanno/KeepClassApiTest.java b/src/test/java/com/android/tools/r8/keepanno/KeepClassApiTest.java
index 7c1b0f3..72e264b 100644
--- a/src/test/java/com/android/tools/r8/keepanno/KeepClassApiTest.java
+++ b/src/test/java/com/android/tools/r8/keepanno/KeepClassApiTest.java
@@ -58,7 +58,7 @@
testForR8(parameters.getBackend())
.enableExperimentalKeepAnnotations()
.addProgramClasses(getLibraryClasses())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::checkLibraryOutput)
.writeToZip();
@@ -66,7 +66,7 @@
testForD8(parameters.getBackend())
.addProgramClasses(getClientClasses())
.addProgramFiles(lib)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutput(EXPECTED);
}
diff --git a/src/test/java/com/android/tools/r8/keepanno/KeepEdgeAnnotationsTest.java b/src/test/java/com/android/tools/r8/keepanno/KeepEdgeAnnotationsTest.java
index 9f02b7c..7d6204b 100644
--- a/src/test/java/com/android/tools/r8/keepanno/KeepEdgeAnnotationsTest.java
+++ b/src/test/java/com/android/tools/r8/keepanno/KeepEdgeAnnotationsTest.java
@@ -238,7 +238,7 @@
.enableExperimentalKeepAnnotations()
.addProgramClassesAndInnerClasses(source)
.addKeepMainRule(source)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), source)
.assertSuccessWithOutput(getExpected());
}
diff --git a/src/test/java/com/android/tools/r8/keepanno/KeepFieldValueApiTest.java b/src/test/java/com/android/tools/r8/keepanno/KeepFieldValueApiTest.java
index 00d7d28..61c4e54 100644
--- a/src/test/java/com/android/tools/r8/keepanno/KeepFieldValueApiTest.java
+++ b/src/test/java/com/android/tools/r8/keepanno/KeepFieldValueApiTest.java
@@ -58,7 +58,7 @@
testForR8(parameters.getBackend())
.enableExperimentalKeepAnnotations()
.addProgramClasses(getLibraryClasses())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::checkLibraryOutput)
.writeToZip();
@@ -66,7 +66,7 @@
testForD8(parameters.getBackend())
.addProgramClasses(getClientClasses())
.addProgramFiles(lib)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutput(EXPECTED);
}
diff --git a/src/test/java/com/android/tools/r8/keepanno/KeepFooIfBarAnyClassTest.java b/src/test/java/com/android/tools/r8/keepanno/KeepFooIfBarAnyClassTest.java
index 82feaed..a0fcf93 100644
--- a/src/test/java/com/android/tools/r8/keepanno/KeepFooIfBarAnyClassTest.java
+++ b/src/test/java/com/android/tools/r8/keepanno/KeepFooIfBarAnyClassTest.java
@@ -51,7 +51,7 @@
.enableExperimentalKeepAnnotations()
.addProgramClasses(getInputClasses())
.addKeepMainRule(TestClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutput(EXPECTED)
.inspect(this::checkOutput);
diff --git a/src/test/java/com/android/tools/r8/keepanno/KeepFooIfBarSameClassTest.java b/src/test/java/com/android/tools/r8/keepanno/KeepFooIfBarSameClassTest.java
index f1f1f6b..71e58ea 100644
--- a/src/test/java/com/android/tools/r8/keepanno/KeepFooIfBarSameClassTest.java
+++ b/src/test/java/com/android/tools/r8/keepanno/KeepFooIfBarSameClassTest.java
@@ -53,7 +53,7 @@
.enableExperimentalKeepAnnotations()
.addProgramClasses(getInputClasses())
.addKeepMainRule(TestClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutput(EXPECTED)
.inspect(this::checkOutput);
diff --git a/src/test/java/com/android/tools/r8/keepanno/KeepMembersAccessFlagsTest.java b/src/test/java/com/android/tools/r8/keepanno/KeepMembersAccessFlagsTest.java
index c071aab..d221ad9 100644
--- a/src/test/java/com/android/tools/r8/keepanno/KeepMembersAccessFlagsTest.java
+++ b/src/test/java/com/android/tools/r8/keepanno/KeepMembersAccessFlagsTest.java
@@ -56,7 +56,7 @@
.enableExperimentalKeepAnnotations()
.addProgramClasses(getInputClasses())
.addKeepMainRule(TestClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutput(EXPECTED)
.inspect(this::checkOutput);
diff --git a/src/test/java/com/android/tools/r8/keepanno/KeepMembersApiTest.java b/src/test/java/com/android/tools/r8/keepanno/KeepMembersApiTest.java
index b8169ba..584aed9 100644
--- a/src/test/java/com/android/tools/r8/keepanno/KeepMembersApiTest.java
+++ b/src/test/java/com/android/tools/r8/keepanno/KeepMembersApiTest.java
@@ -58,7 +58,7 @@
testForR8(parameters.getBackend())
.enableExperimentalKeepAnnotations()
.addProgramClasses(getLibraryClasses())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::checkLibraryOutput)
.writeToZip();
@@ -66,7 +66,7 @@
testForD8(parameters.getBackend())
.addProgramClasses(getClientClasses())
.addProgramFiles(lib)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutput(EXPECTED);
}
diff --git a/src/test/java/com/android/tools/r8/keepanno/KeepMethodsAccessFlagsTest.java b/src/test/java/com/android/tools/r8/keepanno/KeepMethodsAccessFlagsTest.java
index 929eb99..864d59b 100644
--- a/src/test/java/com/android/tools/r8/keepanno/KeepMethodsAccessFlagsTest.java
+++ b/src/test/java/com/android/tools/r8/keepanno/KeepMethodsAccessFlagsTest.java
@@ -57,7 +57,7 @@
.enableExperimentalKeepAnnotations()
.addProgramClasses(getInputClasses())
.addKeepMainRule(TestClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutput(EXPECTED)
.inspect(this::checkOutput);
diff --git a/src/test/java/com/android/tools/r8/keepanno/KeepMethodsEmptyAccessFlagsTest.java b/src/test/java/com/android/tools/r8/keepanno/KeepMethodsEmptyAccessFlagsTest.java
index ac720ac..f854426 100644
--- a/src/test/java/com/android/tools/r8/keepanno/KeepMethodsEmptyAccessFlagsTest.java
+++ b/src/test/java/com/android/tools/r8/keepanno/KeepMethodsEmptyAccessFlagsTest.java
@@ -55,7 +55,7 @@
.enableExperimentalKeepAnnotations()
.addProgramClasses(getInputClasses())
.addKeepMainRule(TestClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutput(EXPECTED)
.inspect(this::checkOutput);
diff --git a/src/test/java/com/android/tools/r8/keepanno/KeepSameMethodTest.java b/src/test/java/com/android/tools/r8/keepanno/KeepSameMethodTest.java
index 0bf08bc..fc204d3 100644
--- a/src/test/java/com/android/tools/r8/keepanno/KeepSameMethodTest.java
+++ b/src/test/java/com/android/tools/r8/keepanno/KeepSameMethodTest.java
@@ -54,7 +54,7 @@
.enableExperimentalKeepAnnotations()
.addProgramClasses(getInputClasses())
.addKeepMainRule(TestClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
// The "all members" target will create an unused "all fields" rule.
.allowUnusedProguardConfigurationRules()
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/keepanno/KeepTargetClassAndMemberKindTest.java b/src/test/java/com/android/tools/r8/keepanno/KeepTargetClassAndMemberKindTest.java
index 8e78dda..6f28083 100644
--- a/src/test/java/com/android/tools/r8/keepanno/KeepTargetClassAndMemberKindTest.java
+++ b/src/test/java/com/android/tools/r8/keepanno/KeepTargetClassAndMemberKindTest.java
@@ -52,7 +52,7 @@
.enableExperimentalKeepAnnotations()
.addProgramClasses(getInputClasses())
.addKeepMainRule(TestClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.allowUnusedProguardConfigurationRules()
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutput(EXPECTED)
diff --git a/src/test/java/com/android/tools/r8/keepanno/KeepUsesReflectionAnnotationTest.java b/src/test/java/com/android/tools/r8/keepanno/KeepUsesReflectionAnnotationTest.java
index 39eea01..42a03b2 100644
--- a/src/test/java/com/android/tools/r8/keepanno/KeepUsesReflectionAnnotationTest.java
+++ b/src/test/java/com/android/tools/r8/keepanno/KeepUsesReflectionAnnotationTest.java
@@ -51,7 +51,7 @@
.enableExperimentalKeepAnnotations()
.addProgramClasses(getInputClasses())
.addKeepMainRule(TestClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.allowUnusedProguardConfigurationRules()
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutput(EXPECTED)
diff --git a/src/test/java/com/android/tools/r8/keepanno/KeepUsesReflectionAnnotationWithAdditionalPreconditionTest.java b/src/test/java/com/android/tools/r8/keepanno/KeepUsesReflectionAnnotationWithAdditionalPreconditionTest.java
index 05c742a..65e7382 100644
--- a/src/test/java/com/android/tools/r8/keepanno/KeepUsesReflectionAnnotationWithAdditionalPreconditionTest.java
+++ b/src/test/java/com/android/tools/r8/keepanno/KeepUsesReflectionAnnotationWithAdditionalPreconditionTest.java
@@ -51,7 +51,7 @@
.enableExperimentalKeepAnnotations()
.addProgramClasses(getInputClasses())
.addKeepMainRule(TestClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutput(EXPECTED)
.inspect(this::checkOutput);
diff --git a/src/test/java/com/android/tools/r8/keepanno/KeepUsesReflectionFieldAnnotationTest.java b/src/test/java/com/android/tools/r8/keepanno/KeepUsesReflectionFieldAnnotationTest.java
index 5177150..1ca85a9 100644
--- a/src/test/java/com/android/tools/r8/keepanno/KeepUsesReflectionFieldAnnotationTest.java
+++ b/src/test/java/com/android/tools/r8/keepanno/KeepUsesReflectionFieldAnnotationTest.java
@@ -51,7 +51,7 @@
.enableExperimentalKeepAnnotations()
.addProgramClasses(getInputClasses())
.addKeepMainRule(TestClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutput(EXPECTED)
.inspect(this::checkOutput);
diff --git a/src/test/java/com/android/tools/r8/keepanno/KeepUsesReflectionOnFieldTest.java b/src/test/java/com/android/tools/r8/keepanno/KeepUsesReflectionOnFieldTest.java
index ace719a..47613a0 100644
--- a/src/test/java/com/android/tools/r8/keepanno/KeepUsesReflectionOnFieldTest.java
+++ b/src/test/java/com/android/tools/r8/keepanno/KeepUsesReflectionOnFieldTest.java
@@ -53,7 +53,7 @@
.enableExperimentalKeepAnnotations()
.addProgramClasses(getInputClasses())
.addKeepMainRule(TestClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.apply(
c -> {
diff --git a/src/test/java/com/android/tools/r8/kotlin/KotlinIntrinsicsInlineChainTest.java b/src/test/java/com/android/tools/r8/kotlin/KotlinIntrinsicsInlineChainTest.java
index 9fdb8ca..fde9d75 100644
--- a/src/test/java/com/android/tools/r8/kotlin/KotlinIntrinsicsInlineChainTest.java
+++ b/src/test/java/com/android/tools/r8/kotlin/KotlinIntrinsicsInlineChainTest.java
@@ -61,7 +61,7 @@
.addKeepMainRule(MAIN)
.allowAccessModification(allowAccessModification)
.allowDiagnosticWarningMessages()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addDontObfuscate()
.apply(ApiModelingTestHelper::enableApiCallerIdentification)
.compile()
diff --git a/src/test/java/com/android/tools/r8/kotlin/KotlinIntrinsicsInlineTest.java b/src/test/java/com/android/tools/r8/kotlin/KotlinIntrinsicsInlineTest.java
index b0f4980..8ab102d 100644
--- a/src/test/java/com/android/tools/r8/kotlin/KotlinIntrinsicsInlineTest.java
+++ b/src/test/java/com/android/tools/r8/kotlin/KotlinIntrinsicsInlineTest.java
@@ -64,7 +64,7 @@
.allowAccessModification(allowAccessModification)
.allowDiagnosticWarningMessages()
.addDontObfuscate()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.assertAllWarningMessagesMatch(equalTo("Resource 'META-INF/MANIFEST.MF' already exists."))
.inspect(
@@ -119,7 +119,7 @@
.allowAccessModification(allowAccessModification)
.allowDiagnosticWarningMessages()
.addDontObfuscate()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.assertAllWarningMessagesMatch(equalTo("Resource 'META-INF/MANIFEST.MF' already exists."))
.inspect(
diff --git a/src/test/java/com/android/tools/r8/kotlin/lambda/JStyleKotlinLambdaMergingWithEnumUnboxingTest.java b/src/test/java/com/android/tools/r8/kotlin/lambda/JStyleKotlinLambdaMergingWithEnumUnboxingTest.java
index c6885f3..9524063 100644
--- a/src/test/java/com/android/tools/r8/kotlin/lambda/JStyleKotlinLambdaMergingWithEnumUnboxingTest.java
+++ b/src/test/java/com/android/tools/r8/kotlin/lambda/JStyleKotlinLambdaMergingWithEnumUnboxingTest.java
@@ -47,7 +47,7 @@
.addEnumUnboxingInspector(inspector -> inspector.assertUnboxed(EnumUnboxingCandidate.class))
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("Lambda1.method()", "Lambda2.method()");
diff --git a/src/test/java/com/android/tools/r8/kotlin/lambda/KStyleKotlinLambdaMergingWithEnumUnboxingTest.java b/src/test/java/com/android/tools/r8/kotlin/lambda/KStyleKotlinLambdaMergingWithEnumUnboxingTest.java
index a3e5c28..f3ef27b 100644
--- a/src/test/java/com/android/tools/r8/kotlin/lambda/KStyleKotlinLambdaMergingWithEnumUnboxingTest.java
+++ b/src/test/java/com/android/tools/r8/kotlin/lambda/KStyleKotlinLambdaMergingWithEnumUnboxingTest.java
@@ -52,7 +52,7 @@
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
.addDontObfuscate()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.assertAllWarningMessagesMatch(equalTo("Resource 'META-INF/MANIFEST.MF' already exists."))
.run(parameters.getRuntime(), Main.class)
diff --git a/src/test/java/com/android/tools/r8/kotlin/lambda/KotlinLambdaMergerValidationTest.java b/src/test/java/com/android/tools/r8/kotlin/lambda/KotlinLambdaMergerValidationTest.java
index 3d0fa60..79aef01 100644
--- a/src/test/java/com/android/tools/r8/kotlin/lambda/KotlinLambdaMergerValidationTest.java
+++ b/src/test/java/com/android/tools/r8/kotlin/lambda/KotlinLambdaMergerValidationTest.java
@@ -51,7 +51,7 @@
.addProgramFiles(ktClasses, kotlinc.getKotlinAnnotationJar())
.addKeepMainRule("**.B143165163Kt")
.allowDiagnosticWarningMessages()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.assertAllWarningMessagesMatch(equalTo("Resource 'META-INF/MANIFEST.MF' already exists."))
.addRunClasspathFiles(kotlinc.getKotlinStdlibJar())
@@ -74,7 +74,7 @@
.addProgramFiles(ktClasses)
.addKeepMainRule("**.B143165163Kt")
.allowDiagnosticWarningMessages()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.assertAllWarningMessagesMatch(equalTo("Resource 'META-INF/MANIFEST.MF' already exists."))
.run(parameters.getRuntime(), pkg + ".B143165163Kt")
diff --git a/src/test/java/com/android/tools/r8/kotlin/lambda/KotlinLambdaMergingCapturesKotlinStyleTest.java b/src/test/java/com/android/tools/r8/kotlin/lambda/KotlinLambdaMergingCapturesKotlinStyleTest.java
index a1adb7a..063691c 100644
--- a/src/test/java/com/android/tools/r8/kotlin/lambda/KotlinLambdaMergingCapturesKotlinStyleTest.java
+++ b/src/test/java/com/android/tools/r8/kotlin/lambda/KotlinLambdaMergingCapturesKotlinStyleTest.java
@@ -78,7 +78,7 @@
.addHorizontallyMergedClassesInspector(this::inspect)
.allowAccessModification(allowAccessModification)
.allowDiagnosticWarningMessages()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.assertAllWarningMessagesMatch(
containsString("Resource 'META-INF/MANIFEST.MF' already exists."))
diff --git a/src/test/java/com/android/tools/r8/kotlin/lambda/KotlinLambdaMergingDebugTest.java b/src/test/java/com/android/tools/r8/kotlin/lambda/KotlinLambdaMergingDebugTest.java
index 69f454d..54b5c1f 100644
--- a/src/test/java/com/android/tools/r8/kotlin/lambda/KotlinLambdaMergingDebugTest.java
+++ b/src/test/java/com/android/tools/r8/kotlin/lambda/KotlinLambdaMergingDebugTest.java
@@ -47,7 +47,7 @@
compiledJars.getForConfiguration(kotlinc, kotlinParameters.getTargetVersion()),
kotlinc.getKotlinAnnotationJar())
.addProgramFiles(getJavaJarFile(FOLDER))
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(MAIN_CLASS)
.allowDiagnosticWarningMessages()
.compile()
diff --git a/src/test/java/com/android/tools/r8/kotlin/lambda/KotlinLambdaMergingKeepAttributesKotlinStyleTest.java b/src/test/java/com/android/tools/r8/kotlin/lambda/KotlinLambdaMergingKeepAttributesKotlinStyleTest.java
index 2ac2b7b..d884748 100644
--- a/src/test/java/com/android/tools/r8/kotlin/lambda/KotlinLambdaMergingKeepAttributesKotlinStyleTest.java
+++ b/src/test/java/com/android/tools/r8/kotlin/lambda/KotlinLambdaMergingKeepAttributesKotlinStyleTest.java
@@ -85,7 +85,7 @@
.addHorizontallyMergedClassesInspector(this::inspect)
.allowAccessModification(allowAccessModification)
.allowDiagnosticWarningMessages()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.assertAllWarningMessagesMatch(
containsString("Resource 'META-INF/MANIFEST.MF' already exists."))
diff --git a/src/test/java/com/android/tools/r8/kotlin/lambda/KotlinLambdaMergingSingletonTest.java b/src/test/java/com/android/tools/r8/kotlin/lambda/KotlinLambdaMergingSingletonTest.java
index 33e5cff..1b2fa95 100644
--- a/src/test/java/com/android/tools/r8/kotlin/lambda/KotlinLambdaMergingSingletonTest.java
+++ b/src/test/java/com/android/tools/r8/kotlin/lambda/KotlinLambdaMergingSingletonTest.java
@@ -78,7 +78,7 @@
.addHorizontallyMergedClassesInspector(this::inspect)
.allowAccessModification(allowAccessModification)
.allowDiagnosticWarningMessages()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.assertAllWarningMessagesMatch(
containsString("Resource 'META-INF/MANIFEST.MF' already exists."))
diff --git a/src/test/java/com/android/tools/r8/kotlin/lambda/KotlinLambdaMergingTrivialJavaStyleTest.java b/src/test/java/com/android/tools/r8/kotlin/lambda/KotlinLambdaMergingTrivialJavaStyleTest.java
index 4fad86a..948f074 100644
--- a/src/test/java/com/android/tools/r8/kotlin/lambda/KotlinLambdaMergingTrivialJavaStyleTest.java
+++ b/src/test/java/com/android/tools/r8/kotlin/lambda/KotlinLambdaMergingTrivialJavaStyleTest.java
@@ -79,7 +79,7 @@
.addHorizontallyMergedClassesInspector(this::inspect)
.allowAccessModification(allowAccessModification)
.allowDiagnosticWarningMessages()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.assertAllWarningMessagesMatch(
containsString("Resource 'META-INF/MANIFEST.MF' already exists."))
diff --git a/src/test/java/com/android/tools/r8/kotlin/lambda/KotlinLambdaMergingTrivialKotlinStyleTest.java b/src/test/java/com/android/tools/r8/kotlin/lambda/KotlinLambdaMergingTrivialKotlinStyleTest.java
index b7cc148..3dac45b 100644
--- a/src/test/java/com/android/tools/r8/kotlin/lambda/KotlinLambdaMergingTrivialKotlinStyleTest.java
+++ b/src/test/java/com/android/tools/r8/kotlin/lambda/KotlinLambdaMergingTrivialKotlinStyleTest.java
@@ -78,7 +78,7 @@
.addHorizontallyMergedClassesInspector(this::inspect)
.allowAccessModification(allowAccessModification)
.allowDiagnosticWarningMessages()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.assertAllWarningMessagesMatch(
containsString("Resource 'META-INF/MANIFEST.MF' already exists."))
diff --git a/src/test/java/com/android/tools/r8/kotlin/lambda/b148525512/B148525512.java b/src/test/java/com/android/tools/r8/kotlin/lambda/b148525512/B148525512.java
index 06915ec..65a77da 100644
--- a/src/test/java/com/android/tools/r8/kotlin/lambda/b148525512/B148525512.java
+++ b/src/test/java/com/android/tools/r8/kotlin/lambda/b148525512/B148525512.java
@@ -90,7 +90,7 @@
.assertIsCompleteMergeGroup(
"com.android.tools.r8.kotlin.lambda.b148525512.FeatureKt$feature$1",
"com.android.tools.r8.kotlin.lambda.b148525512.FeatureKt$feature$2"))
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addFeatureSplit(
builder ->
builder
diff --git a/src/test/java/com/android/tools/r8/kotlin/lambda/b159688129/LambdaGroupGCLimitTest.java b/src/test/java/com/android/tools/r8/kotlin/lambda/b159688129/LambdaGroupGCLimitTest.java
index e021fe5..c9c9e05 100644
--- a/src/test/java/com/android/tools/r8/kotlin/lambda/b159688129/LambdaGroupGCLimitTest.java
+++ b/src/test/java/com/android/tools/r8/kotlin/lambda/b159688129/LambdaGroupGCLimitTest.java
@@ -55,7 +55,7 @@
R8TestCompileResult compileResult =
testForR8(parameters.getBackend())
.addProgramFiles(getProgramFiles())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.apply(
builder -> {
for (int mainId = 0; mainId < LAMBDA_HOLDER_LIMIT; mainId++) {
diff --git a/src/test/java/com/android/tools/r8/kotlin/lambda/b159688129/LambdaSplitByCodeCorrectnessTest.java b/src/test/java/com/android/tools/r8/kotlin/lambda/b159688129/LambdaSplitByCodeCorrectnessTest.java
index a4f497f..7e3ba53 100644
--- a/src/test/java/com/android/tools/r8/kotlin/lambda/b159688129/LambdaSplitByCodeCorrectnessTest.java
+++ b/src/test/java/com/android/tools/r8/kotlin/lambda/b159688129/LambdaSplitByCodeCorrectnessTest.java
@@ -61,7 +61,7 @@
testForR8(parameters.getBackend())
.addProgramFiles(kotlinc.getKotlinStdlibJar(), kotlinc.getKotlinAnnotationJar())
.addProgramFiles(ktClasses)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(PKG_NAME + ".SimpleKt")
.applyIf(
splitGroup,
diff --git a/src/test/java/com/android/tools/r8/kotlin/metadata/MetadataPrunedFieldsTest.java b/src/test/java/com/android/tools/r8/kotlin/metadata/MetadataPrunedFieldsTest.java
index 81b06b4..4dd514b 100644
--- a/src/test/java/com/android/tools/r8/kotlin/metadata/MetadataPrunedFieldsTest.java
+++ b/src/test/java/com/android/tools/r8/kotlin/metadata/MetadataPrunedFieldsTest.java
@@ -51,7 +51,7 @@
.addKeepRules("-keep class kotlin.Metadata { *** pn(); }")
.addKeepMainRule(Main.class)
.allowDiagnosticWarningMessages()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepAttributes(ProguardKeepAttributes.RUNTIME_VISIBLE_ANNOTATIONS)
.addOptionsModification(
internalOptions -> {
diff --git a/src/test/java/com/android/tools/r8/kotlin/metadata/MetadataRewriteDependentKeepTest.java b/src/test/java/com/android/tools/r8/kotlin/metadata/MetadataRewriteDependentKeepTest.java
index a862b2c..ed3a438 100644
--- a/src/test/java/com/android/tools/r8/kotlin/metadata/MetadataRewriteDependentKeepTest.java
+++ b/src/test/java/com/android/tools/r8/kotlin/metadata/MetadataRewriteDependentKeepTest.java
@@ -43,7 +43,7 @@
public void testR8() throws CompilationFailedException, IOException, ExecutionException {
testForR8(parameters.getBackend())
.addProgramFiles(kotlinc.getKotlinStdlibJar(), kotlinc.getKotlinAnnotationJar())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepKotlinMetadata()
.addKeepRules(StringUtils.joinLines("-if class *.Metadata", "-keep class <1>.io.** { *; }"))
.allowDiagnosticWarningMessages()
diff --git a/src/test/java/com/android/tools/r8/kotlin/metadata/MetadataRewriteDoNotEmitValuesIfEmptyTest.java b/src/test/java/com/android/tools/r8/kotlin/metadata/MetadataRewriteDoNotEmitValuesIfEmptyTest.java
index d8a78c9..41f1f5d 100644
--- a/src/test/java/com/android/tools/r8/kotlin/metadata/MetadataRewriteDoNotEmitValuesIfEmptyTest.java
+++ b/src/test/java/com/android/tools/r8/kotlin/metadata/MetadataRewriteDoNotEmitValuesIfEmptyTest.java
@@ -45,7 +45,7 @@
public void testKotlinStdLib() throws Exception {
testForR8(parameters.getBackend())
.addProgramFiles(kotlinc.getKotlinStdlibJar(), kotlinc.getKotlinAnnotationJar())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepAllClassesRuleWithAllowObfuscation()
.addKeepKotlinMetadata()
.allowDiagnosticWarningMessages()
diff --git a/src/test/java/com/android/tools/r8/kotlin/metadata/MetadataRewriteInnerClassTest.java b/src/test/java/com/android/tools/r8/kotlin/metadata/MetadataRewriteInnerClassTest.java
index 452ca8a..30f82bf 100644
--- a/src/test/java/com/android/tools/r8/kotlin/metadata/MetadataRewriteInnerClassTest.java
+++ b/src/test/java/com/android/tools/r8/kotlin/metadata/MetadataRewriteInnerClassTest.java
@@ -84,6 +84,7 @@
@Test
public void testMetadataOuterRenamed() throws Exception {
+ parameters.assumeR8TestParameters();
Path mainJar =
testForR8(parameters.getBackend())
.addClasspathFiles(kotlinc.getKotlinStdlibJar())
@@ -94,7 +95,7 @@
.addKeepRules("-keep public class " + PKG_NESTED_REFLECT + ".Outer$Inner { *; }")
.addKeepMainRule(PKG_NESTED_REFLECT + ".MainKt")
.addKeepAttributes(ProguardKeepAttributes.RUNTIME_VISIBLE_ANNOTATIONS)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(inspector -> inspectPruned(inspector, true))
.writeToZip();
@@ -103,6 +104,7 @@
@Test
public void testMetadataOuterNotRenamed() throws Exception {
+ parameters.assumeR8TestParameters();
Path mainJar =
testForR8(parameters.getBackend())
.addClasspathFiles(kotlinc.getKotlinStdlibJar())
@@ -115,7 +117,7 @@
.addKeepRules("-keep public class " + PKG_NESTED_REFLECT + ".Outer$Inner { *; }")
.addKeepMainRule(PKG_NESTED_REFLECT + ".MainKt")
.addKeepAttributes(ProguardKeepAttributes.RUNTIME_VISIBLE_ANNOTATIONS)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(inspector -> inspectPruned(inspector, false))
.writeToZip();
@@ -130,7 +132,7 @@
: new ArchiveConsumer(output, true);
testForD8(parameters.getBackend())
.addProgramFiles(kotlinc.getKotlinStdlibJar(), kotlinc.getKotlinReflectJar(), jar)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.setProgramConsumer(programConsumer)
.addOptionsModification(
options -> {
diff --git a/src/test/java/com/android/tools/r8/kotlin/metadata/MetadataRewriteKeepTest.java b/src/test/java/com/android/tools/r8/kotlin/metadata/MetadataRewriteKeepTest.java
index ce9fba4..41004e5 100644
--- a/src/test/java/com/android/tools/r8/kotlin/metadata/MetadataRewriteKeepTest.java
+++ b/src/test/java/com/android/tools/r8/kotlin/metadata/MetadataRewriteKeepTest.java
@@ -41,7 +41,7 @@
public void testR8() throws Exception {
testForR8(parameters.getBackend())
.addProgramFiles(kotlinc.getKotlinStdlibJar(), kotlinc.getKotlinAnnotationJar())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepKotlinMetadata()
.addKeepRules("-keep class kotlin.io.** { *; }")
.allowDiagnosticWarningMessages()
@@ -54,7 +54,7 @@
public void testR8KeepIf() throws Exception {
testForR8(parameters.getBackend())
.addProgramFiles(kotlinc.getKotlinStdlibJar(), kotlinc.getKotlinAnnotationJar())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepRules("-keep class kotlin.io.** { *; }")
.addKeepRules("-if class *", "-keep class kotlin.Metadata { *; }")
.addKeepAttributes(ProguardKeepAttributes.RUNTIME_VISIBLE_ANNOTATIONS)
diff --git a/src/test/java/com/android/tools/r8/kotlin/metadata/MetadataRewritePassThroughTest.java b/src/test/java/com/android/tools/r8/kotlin/metadata/MetadataRewritePassThroughTest.java
index e06e1ba..2b28fe1 100644
--- a/src/test/java/com/android/tools/r8/kotlin/metadata/MetadataRewritePassThroughTest.java
+++ b/src/test/java/com/android/tools/r8/kotlin/metadata/MetadataRewritePassThroughTest.java
@@ -46,7 +46,7 @@
assumeFalse(parameters.isNoneRuntime());
testForR8(parameters.getBackend())
.addProgramFiles(kotlinc.getKotlinStdlibJar(), kotlinc.getKotlinAnnotationJar())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepAllClassesRule()
.addKeepKotlinMetadata()
.addKeepAttributes(
diff --git a/src/test/java/com/android/tools/r8/kotlin/metadata/MetadataStripTest.java b/src/test/java/com/android/tools/r8/kotlin/metadata/MetadataStripTest.java
index d74e3d2..366f611 100644
--- a/src/test/java/com/android/tools/r8/kotlin/metadata/MetadataStripTest.java
+++ b/src/test/java/com/android/tools/r8/kotlin/metadata/MetadataStripTest.java
@@ -56,7 +56,7 @@
.addKeepMainRule(mainClassName)
.addKeepKotlinMetadata()
.allowDiagnosticWarningMessages()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.allowUnusedDontWarnKotlinReflectJvmInternal(kotlinc.isNot(KOTLINC_1_3_72))
.allowUnusedDontWarnJavaLangClassValue(
kotlinc.getCompilerVersion().isGreaterThan(KOTLINC_1_7_0))
diff --git a/src/test/java/com/android/tools/r8/kotlin/metadata/MetadataVersionNumberBumpTest.java b/src/test/java/com/android/tools/r8/kotlin/metadata/MetadataVersionNumberBumpTest.java
index 3766300..6954d57 100644
--- a/src/test/java/com/android/tools/r8/kotlin/metadata/MetadataVersionNumberBumpTest.java
+++ b/src/test/java/com/android/tools/r8/kotlin/metadata/MetadataVersionNumberBumpTest.java
@@ -59,7 +59,7 @@
rewriteMetadataVersion(testBuilder::addProgramClassFileData, new int[] {1, 1, 16});
testBuilder
.addProgramFiles(kotlinc.getKotlinAnnotationJar())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addOptionsModification(options -> options.testing.keepMetadataInR8IfNotRewritten = false)
.addKeepAllClassesRuleWithAllowObfuscation()
.addKeepAttributes(ProguardKeepAttributes.RUNTIME_VISIBLE_ANNOTATIONS)
@@ -73,7 +73,7 @@
rewriteMetadataVersion(testBuilder::addProgramClassFileData, new int[] {1, 4, 0});
testBuilder
.addProgramFiles(kotlinc.getKotlinAnnotationJar())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepAllClassesRuleWithAllowObfuscation()
.addKeepAttributes(ProguardKeepAttributes.RUNTIME_VISIBLE_ANNOTATIONS)
.compile()
@@ -86,7 +86,7 @@
rewriteMetadataVersion(testBuilder::addProgramClassFileData, new int[] {1, 4, 2});
testBuilder
.addProgramFiles(kotlinc.getKotlinAnnotationJar())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepAllClassesRuleWithAllowObfuscation()
.addKeepAttributes(ProguardKeepAttributes.RUNTIME_VISIBLE_ANNOTATIONS)
.compile()
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 d591306..4292c7b 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
@@ -60,7 +60,7 @@
options.enableEnumValueOptimization = enableSwitchMapRemoval;
options.enableEnumSwitchMapRemoval = enableSwitchMapRemoval;
})
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addDontObfuscate()
// This will probably start failing when the CL
// https://github.com/JetBrains/kotlin/commit/79f6d4b590573e6adccd7e8899d3b15ddb42d185
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 89c268e..f5ab85d 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
@@ -76,7 +76,7 @@
.addProgramFiles(kotlinc.getKotlinStdlibJar())
.addProgramFiles(kotlinc.getKotlinReflectJar())
.setProgramConsumer(new ArchiveConsumer(output.toPath(), true))
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addOptionsModification(
options -> {
options.testing.enableD8ResourcesPassThrough = true;
@@ -95,7 +95,7 @@
.addProgramFiles(kotlinc.getKotlinReflectJar())
.addProgramFiles(kotlinc.getKotlinAnnotationJar())
.addLibraryFiles(ToolHelper.getAndroidJar(AndroidApiLevel.LATEST))
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepAllClassesRule()
.addKeepAttributes(ProguardKeepAttributes.RUNTIME_VISIBLE_ANNOTATIONS)
.allowDiagnosticMessages()
diff --git a/src/test/java/com/android/tools/r8/kotlin/reflection/ReflectiveConstructionWithInlineClassTest.java b/src/test/java/com/android/tools/r8/kotlin/reflection/ReflectiveConstructionWithInlineClassTest.java
index 9eecfaf..16be215 100644
--- a/src/test/java/com/android/tools/r8/kotlin/reflection/ReflectiveConstructionWithInlineClassTest.java
+++ b/src/test/java/com/android/tools/r8/kotlin/reflection/ReflectiveConstructionWithInlineClassTest.java
@@ -80,7 +80,7 @@
.addProgramFiles(compiledJars.getForConfiguration(kotlinc, targetVersion))
.addProgramFiles(kotlinc.getKotlinStdlibJar())
.addProgramFiles(kotlinc.getKotlinReflectJar())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addOptionsModification(
options -> {
options.testing.enableD8ResourcesPassThrough = true;
@@ -97,7 +97,7 @@
.addProgramFiles(kotlinc.getKotlinReflectJar())
.addProgramFiles(kotlinc.getKotlinAnnotationJar())
.addLibraryFiles(ToolHelper.getAndroidJar(AndroidApiLevel.LATEST))
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(MAIN_CLASS)
.addKeepClassAndMembersRules(PKG + ".Data")
// TODO(b/242158616): Figure out why this is necessary.
diff --git a/src/test/java/com/android/tools/r8/kotlin/sealed/SealedClassTest.java b/src/test/java/com/android/tools/r8/kotlin/sealed/SealedClassTest.java
index 0fa90c1..1e5175b 100644
--- a/src/test/java/com/android/tools/r8/kotlin/sealed/SealedClassTest.java
+++ b/src/test/java/com/android/tools/r8/kotlin/sealed/SealedClassTest.java
@@ -67,7 +67,7 @@
.addProgramFiles(compilationResults.getForConfiguration(kotlinc, targetVersion))
.addProgramFiles(kotlinc.getKotlinStdlibJar())
.addProgramFiles(kotlinc.getKotlinAnnotationJar())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.allowAccessModification()
.allowDiagnosticWarningMessages()
.addKeepMainRule(MAIN)
diff --git a/src/test/java/com/android/tools/r8/kotlin/stringplus/StringPlusTest.java b/src/test/java/com/android/tools/r8/kotlin/stringplus/StringPlusTest.java
index b3ba245..439a400 100644
--- a/src/test/java/com/android/tools/r8/kotlin/stringplus/StringPlusTest.java
+++ b/src/test/java/com/android/tools/r8/kotlin/stringplus/StringPlusTest.java
@@ -80,7 +80,7 @@
testForR8(parameters.getBackend())
.addProgramFiles(compilationResults.getForConfiguration(kotlinc, targetVersion))
.addProgramFiles(kotlinc.getKotlinAnnotationJar())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.allowAccessModification()
.allowDiagnosticWarningMessages()
.addKeepMainRule(MAIN)
diff --git a/src/test/java/com/android/tools/r8/maindexlist/MainDexCheckCastInstanceOfDependencyTest.java b/src/test/java/com/android/tools/r8/maindexlist/MainDexCheckCastInstanceOfDependencyTest.java
index 59cfae1..713be70 100644
--- a/src/test/java/com/android/tools/r8/maindexlist/MainDexCheckCastInstanceOfDependencyTest.java
+++ b/src/test/java/com/android/tools/r8/maindexlist/MainDexCheckCastInstanceOfDependencyTest.java
@@ -39,7 +39,7 @@
.addInnerClasses(getClass())
.addKeepAllClassesRule()
.addMainDexRules("-keep class " + Main.class.getTypeName() + " { void foo(); }")
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.collectMainDexClasses()
.compile()
.inspectMainDexClasses(
diff --git a/src/test/java/com/android/tools/r8/maindexlist/MainDexDevirtualizerTest.java b/src/test/java/com/android/tools/r8/maindexlist/MainDexDevirtualizerTest.java
index 69643e1..7576780 100644
--- a/src/test/java/com/android/tools/r8/maindexlist/MainDexDevirtualizerTest.java
+++ b/src/test/java/com/android/tools/r8/maindexlist/MainDexDevirtualizerTest.java
@@ -115,7 +115,7 @@
.enableNeverClassInliningAnnotations()
.addKeepMainRule(Main.class)
.addKeepClassRulesWithAllowObfuscation(I.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.applyIf(
parameters.isDexRuntime() && parameters.getDexRuntimeVersion().isDalvik(),
builder ->
diff --git a/src/test/java/com/android/tools/r8/maindexlist/MainDexListFromGenerateMainDexInliningSpuriousRootTest.java b/src/test/java/com/android/tools/r8/maindexlist/MainDexListFromGenerateMainDexInliningSpuriousRootTest.java
index f5aae43..0b04ddc 100644
--- a/src/test/java/com/android/tools/r8/maindexlist/MainDexListFromGenerateMainDexInliningSpuriousRootTest.java
+++ b/src/test/java/com/android/tools/r8/maindexlist/MainDexListFromGenerateMainDexInliningSpuriousRootTest.java
@@ -83,7 +83,7 @@
.collectMainDexClasses()
.enableInliningAnnotations()
.enableNoHorizontalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addDontObfuscate()
.allowDiagnosticMessages()
.compileWithExpectedDiagnostics(
diff --git a/src/test/java/com/android/tools/r8/maindexlist/MainDexListFromGenerateMainDexInliningTest.java b/src/test/java/com/android/tools/r8/maindexlist/MainDexListFromGenerateMainDexInliningTest.java
index b2f82c7..5c61a78 100644
--- a/src/test/java/com/android/tools/r8/maindexlist/MainDexListFromGenerateMainDexInliningTest.java
+++ b/src/test/java/com/android/tools/r8/maindexlist/MainDexListFromGenerateMainDexInliningTest.java
@@ -82,7 +82,7 @@
.enableInliningAnnotations()
.enableNoHorizontalClassMergingAnnotations()
.enableNoHorizontalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.allowDiagnosticMessages()
.compileWithExpectedDiagnostics(
diagnostics ->
diff --git a/src/test/java/com/android/tools/r8/maindexlist/MainDexListFromGenerateMainDexInliningWithTracingTest.java b/src/test/java/com/android/tools/r8/maindexlist/MainDexListFromGenerateMainDexInliningWithTracingTest.java
index 6f97deb..5a4d15c 100644
--- a/src/test/java/com/android/tools/r8/maindexlist/MainDexListFromGenerateMainDexInliningWithTracingTest.java
+++ b/src/test/java/com/android/tools/r8/maindexlist/MainDexListFromGenerateMainDexInliningWithTracingTest.java
@@ -86,7 +86,7 @@
.enableInliningAnnotations()
.enableNoHorizontalClassMergingAnnotations()
.addDontObfuscate()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.allowDiagnosticMessages()
.compileWithExpectedDiagnostics(
diagnostics ->
diff --git a/src/test/java/com/android/tools/r8/maindexlist/MainDexListFromGenerateMainHorizontalMergingTest.java b/src/test/java/com/android/tools/r8/maindexlist/MainDexListFromGenerateMainHorizontalMergingTest.java
index 6cc29ca..97d9c79 100644
--- a/src/test/java/com/android/tools/r8/maindexlist/MainDexListFromGenerateMainHorizontalMergingTest.java
+++ b/src/test/java/com/android/tools/r8/maindexlist/MainDexListFromGenerateMainHorizontalMergingTest.java
@@ -95,7 +95,7 @@
.collectMainDexClasses()
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addHorizontallyMergedClassesInspector(
horizontallyMergedClassesInspector -> {
horizontallyMergedClassesInspector.assertClassesNotMerged(B.class, A.class);
diff --git a/src/test/java/com/android/tools/r8/maindexlist/MainDexListFromGenerateMainVerticalMergingTest.java b/src/test/java/com/android/tools/r8/maindexlist/MainDexListFromGenerateMainVerticalMergingTest.java
index 82e102e..4dba7f0 100644
--- a/src/test/java/com/android/tools/r8/maindexlist/MainDexListFromGenerateMainVerticalMergingTest.java
+++ b/src/test/java/com/android/tools/r8/maindexlist/MainDexListFromGenerateMainVerticalMergingTest.java
@@ -97,7 +97,7 @@
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
.apply(testBuilder)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile();
CodeInspector inspector = compileResult.inspector();
diff --git a/src/test/java/com/android/tools/r8/maindexlist/MainDexListInliningTest.java b/src/test/java/com/android/tools/r8/maindexlist/MainDexListInliningTest.java
index 731d0ec..5e24bcf 100644
--- a/src/test/java/com/android/tools/r8/maindexlist/MainDexListInliningTest.java
+++ b/src/test/java/com/android/tools/r8/maindexlist/MainDexListInliningTest.java
@@ -49,7 +49,7 @@
.addMainDexListClasses(Main.class)
.collectMainDexClasses()
.enableNoHorizontalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.allowDiagnosticMessages()
.compileWithExpectedDiagnostics(
diagnostics ->
diff --git a/src/test/java/com/android/tools/r8/maindexlist/MainDexListMergeInRootTest.java b/src/test/java/com/android/tools/r8/maindexlist/MainDexListMergeInRootTest.java
index 45df36d..c425eff 100644
--- a/src/test/java/com/android/tools/r8/maindexlist/MainDexListMergeInRootTest.java
+++ b/src/test/java/com/android/tools/r8/maindexlist/MainDexListMergeInRootTest.java
@@ -38,7 +38,7 @@
testForR8(parameters.getBackend())
.addProgramClasses(OutsideMainDex.class, InsideA.class, InsideB.class, Main.class)
.addKeepClassAndMembersRules(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.enableNeverClassInliningAnnotations()
.enableNoHorizontalClassMergingAnnotations()
.enableInliningAnnotations()
diff --git a/src/test/java/com/android/tools/r8/maindexlist/MainDexListNoDirectDependenciesTest.java b/src/test/java/com/android/tools/r8/maindexlist/MainDexListNoDirectDependenciesTest.java
index e72cc3e..a26fe55 100644
--- a/src/test/java/com/android/tools/r8/maindexlist/MainDexListNoDirectDependenciesTest.java
+++ b/src/test/java/com/android/tools/r8/maindexlist/MainDexListNoDirectDependenciesTest.java
@@ -46,7 +46,7 @@
.addMainDexKeepClassRules(B.class)
.collectMainDexClasses()
.noTreeShaking()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.allowDiagnosticMessages()
.compileWithExpectedDiagnostics(
diagnostics ->
diff --git a/src/test/java/com/android/tools/r8/maindexlist/MainDexPrunedReferenceTest.java b/src/test/java/com/android/tools/r8/maindexlist/MainDexPrunedReferenceTest.java
index c10a7a6..a5a07c4 100644
--- a/src/test/java/com/android/tools/r8/maindexlist/MainDexPrunedReferenceTest.java
+++ b/src/test/java/com/android/tools/r8/maindexlist/MainDexPrunedReferenceTest.java
@@ -77,7 +77,7 @@
.enableNoHorizontalClassMergingAnnotations()
.addKeepMainRule(Main.class)
.addKeepClassRules(Outside.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.apply(configureMainDex)
.applyIf(
parameters.getDexRuntimeVersion().isDalvik(),
diff --git a/src/test/java/com/android/tools/r8/maindexlist/MainDexRemovedAnnotationIfTest.java b/src/test/java/com/android/tools/r8/maindexlist/MainDexRemovedAnnotationIfTest.java
index 5e0fa6b..790689e 100644
--- a/src/test/java/com/android/tools/r8/maindexlist/MainDexRemovedAnnotationIfTest.java
+++ b/src/test/java/com/android/tools/r8/maindexlist/MainDexRemovedAnnotationIfTest.java
@@ -45,7 +45,7 @@
testForR8(parameters.getBackend())
.addProgramClasses(MainDex.class, Inside.class, Main.class)
.addKeepClassAndMembersRules(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.enableInliningAnnotations()
.addMainDexRules(
"-if @" + MainDex.class.getTypeName() + " class *", "-keep class <1> { *; }")
diff --git a/src/test/java/com/android/tools/r8/maindexlist/MainDexRemovedAnnotationTest.java b/src/test/java/com/android/tools/r8/maindexlist/MainDexRemovedAnnotationTest.java
index 589a1e2..12bf7cd 100644
--- a/src/test/java/com/android/tools/r8/maindexlist/MainDexRemovedAnnotationTest.java
+++ b/src/test/java/com/android/tools/r8/maindexlist/MainDexRemovedAnnotationTest.java
@@ -46,7 +46,7 @@
testForR8(parameters.getBackend())
.addProgramClasses(MainDex.class, Inside.class, Dead.class, Main.class)
.addKeepClassAndMembersRules(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.enableInliningAnnotations()
.addMainDexRules("-keep @" + MainDex.class.getTypeName() + " class * { *; }")
.collectMainDexClasses()
diff --git a/src/test/java/com/android/tools/r8/maindexlist/MainDexRootIfRuleTest.java b/src/test/java/com/android/tools/r8/maindexlist/MainDexRootIfRuleTest.java
index 4520900..2f8d5fd 100644
--- a/src/test/java/com/android/tools/r8/maindexlist/MainDexRootIfRuleTest.java
+++ b/src/test/java/com/android/tools/r8/maindexlist/MainDexRootIfRuleTest.java
@@ -36,7 +36,7 @@
public void testR8() throws Exception {
testForR8(parameters.getBackend())
.addInnerClasses(getClass())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(Main.class)
.addKeepClassRules(R.class)
.addMainDexRules(
diff --git a/src/test/java/com/android/tools/r8/maindexlist/MainDexRulesAndListD8.java b/src/test/java/com/android/tools/r8/maindexlist/MainDexRulesAndListD8.java
index d80f45c..ae91c3d 100644
--- a/src/test/java/com/android/tools/r8/maindexlist/MainDexRulesAndListD8.java
+++ b/src/test/java/com/android/tools/r8/maindexlist/MainDexRulesAndListD8.java
@@ -51,7 +51,7 @@
public void test() throws Exception {
Path result =
testForD8(parameters.getBackend())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addInnerClasses(getClass())
.addMainDexRulesFiles(mainDexRules)
.addMainDexListFiles(mainDexList)
diff --git a/src/test/java/com/android/tools/r8/maindexlist/MainDexRuntimeAndProgramEnumInAnnotationTest.java b/src/test/java/com/android/tools/r8/maindexlist/MainDexRuntimeAndProgramEnumInAnnotationTest.java
index 9d5f2f1..23e5e95 100644
--- a/src/test/java/com/android/tools/r8/maindexlist/MainDexRuntimeAndProgramEnumInAnnotationTest.java
+++ b/src/test/java/com/android/tools/r8/maindexlist/MainDexRuntimeAndProgramEnumInAnnotationTest.java
@@ -92,7 +92,7 @@
testForD8(temp)
.addInnerClasses(getClass())
.addLibraryFiles(ToolHelper.getMostRecentAndroidJar())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.applyIf(
ignoreBootclasspathEnumsForMaindexTracing,
builder ->
diff --git a/src/test/java/com/android/tools/r8/maindexlist/MainDexSourceAndClassRetentionTest.java b/src/test/java/com/android/tools/r8/maindexlist/MainDexSourceAndClassRetentionTest.java
index 089f670..2e03410 100644
--- a/src/test/java/com/android/tools/r8/maindexlist/MainDexSourceAndClassRetentionTest.java
+++ b/src/test/java/com/android/tools/r8/maindexlist/MainDexSourceAndClassRetentionTest.java
@@ -78,7 +78,7 @@
testForD8(temp)
.addInnerClasses(getClass())
.addLibraryFiles(ToolHelper.getMostRecentAndroidJar())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.applyIf(
pruneNonVisibleAnnotationClasses,
builder -> {
diff --git a/src/test/java/com/android/tools/r8/maindexlist/MainDexUnusedArgumentRewriteWithLensTest.java b/src/test/java/com/android/tools/r8/maindexlist/MainDexUnusedArgumentRewriteWithLensTest.java
index 1143ca2..a8881a5 100644
--- a/src/test/java/com/android/tools/r8/maindexlist/MainDexUnusedArgumentRewriteWithLensTest.java
+++ b/src/test/java/com/android/tools/r8/maindexlist/MainDexUnusedArgumentRewriteWithLensTest.java
@@ -51,7 +51,7 @@
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
.enableNoMethodStaticizingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepClassRules(Dependency.class)
.addMainDexRules(
"-keep class " + A.class.getTypeName() + " { void foo(java.lang.Object,int); }")
diff --git a/src/test/java/com/android/tools/r8/maindexlist/MainDexWithSynthesizedClassesTest.java b/src/test/java/com/android/tools/r8/maindexlist/MainDexWithSynthesizedClassesTest.java
index 84d8eca..74404fe 100644
--- a/src/test/java/com/android/tools/r8/maindexlist/MainDexWithSynthesizedClassesTest.java
+++ b/src/test/java/com/android/tools/r8/maindexlist/MainDexWithSynthesizedClassesTest.java
@@ -66,7 +66,7 @@
testForD8()
.addInnerClasses(MainDexWithSynthesizedClassesTest.class)
.addMainDexKeepClassAndMemberRules(TestClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile();
checkCompilationResult(compileResult);
}
@@ -78,14 +78,14 @@
D8TestCompileResult intermediateResult =
testForD8()
.addInnerClasses(MainDexWithSynthesizedClassesTest.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.setIntermediate(true)
.compile();
D8TestCompileResult compileResult =
testForD8()
.addProgramFiles(intermediateResult.writeToZip())
.addMainDexKeepClassAndMemberRules(TestClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile();
checkCompilationResult(compileResult);
}
@@ -98,7 +98,7 @@
Path dexed =
testForD8()
.addInnerClasses(MainDexWithSynthesizedClassesTest.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compileWithExpectedDiagnostics(TestDiagnosticMessages::assertNoMessages)
.writeToZip();
@@ -114,7 +114,7 @@
testForD8()
.addProgramFiles(dexed)
.addMainDexListFiles(mainDexFile)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compileWithExpectedDiagnostics(TestDiagnosticMessages::assertNoMessages);
checkCompilationResult(compileResult);
}
@@ -137,7 +137,7 @@
.addInnerClasses(MainDexWithSynthesizedClassesTest.class)
.addMainDexListClasses(TestClass.class)
.addMainDexListFiles(mainDexFile)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compileWithExpectedDiagnostics(
diagnostics ->
diagnostics
@@ -170,7 +170,7 @@
R8TestCompileResult compileResult =
testForR8(parameters.getBackend())
.addInnerClasses(MainDexWithSynthesizedClassesTest.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addOptionsModification(o -> o.minimalMainDex = true)
.addMainDexListClasses(TestClass.class)
.addMainDexListFiles(mainDexFile)
diff --git a/src/test/java/com/android/tools/r8/maindexlist/warnings/MainDexWarningsTest.java b/src/test/java/com/android/tools/r8/maindexlist/warnings/MainDexWarningsTest.java
index 76e19f6..cb7e981 100644
--- a/src/test/java/com/android/tools/r8/maindexlist/warnings/MainDexWarningsTest.java
+++ b/src/test/java/com/android/tools/r8/maindexlist/warnings/MainDexWarningsTest.java
@@ -55,7 +55,7 @@
.addKeepMainRule(mainClass)
// Include main dex rule for class Static.
.addMainDexKeepClassRules(Main.class, Static.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::classStaticGone)
.assertNoMessages();
@@ -71,7 +71,7 @@
// Include explicit main dex entry for class Static.
.addMainDexListClasses(Static.class)
.allowDiagnosticWarningMessages()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::classStaticGone)
.assertOnlyWarnings()
@@ -92,7 +92,7 @@
.addMainDexKeepClassRules(Static2.class)
.addDontWarn(Static.class)
.allowDiagnosticWarningMessages()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::classStaticGone)
.assertOnlyWarnings()
diff --git a/src/test/java/com/android/tools/r8/mappingcompose/R8WithCfPcEncodingTest.java b/src/test/java/com/android/tools/r8/mappingcompose/R8WithCfPcEncodingTest.java
index 99ea77c..186eb92 100644
--- a/src/test/java/com/android/tools/r8/mappingcompose/R8WithCfPcEncodingTest.java
+++ b/src/test/java/com/android/tools/r8/mappingcompose/R8WithCfPcEncodingTest.java
@@ -43,7 +43,7 @@
public void testR8() throws Exception {
testForR8(parameters.getBackend())
.addProgramClasses(MainWithHelloWorld.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(MainWithHelloWorld.class)
.addKeepAttributeLineNumberTable()
.addOptionsModification(
diff --git a/src/test/java/com/android/tools/r8/memberrebinding/LibraryMemberRebindingInterfaceTest.java b/src/test/java/com/android/tools/r8/memberrebinding/LibraryMemberRebindingInterfaceTest.java
index d48f547..90d4305 100644
--- a/src/test/java/com/android/tools/r8/memberrebinding/LibraryMemberRebindingInterfaceTest.java
+++ b/src/test/java/com/android/tools/r8/memberrebinding/LibraryMemberRebindingInterfaceTest.java
@@ -98,7 +98,7 @@
AndroidApiLevel.B))
.apply(setMockApiLevelForMethod(LibraryC.class.getDeclaredMethod("m"), AndroidApiLevel.B))
.apply(setMockApiLevelForMethod(LibraryA.class.getDeclaredMethod("m"), AndroidApiLevel.N))
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector -> {
diff --git a/src/test/java/com/android/tools/r8/memberrebinding/LibraryMemberRebindingSuperTest.java b/src/test/java/com/android/tools/r8/memberrebinding/LibraryMemberRebindingSuperTest.java
index 1fade81..bd2532d 100644
--- a/src/test/java/com/android/tools/r8/memberrebinding/LibraryMemberRebindingSuperTest.java
+++ b/src/test/java/com/android/tools/r8/memberrebinding/LibraryMemberRebindingSuperTest.java
@@ -64,7 +64,7 @@
.apply(ApiModelingTestHelper::enableApiCallerIdentification)
.apply(ApiModelingTestHelper::disableOutliningAndStubbing)
.addKeepAllClassesRule()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.addRunClasspathClasses(LIBRARY_CLASSES)
.run(parameters.getRuntime(), Main.class)
diff --git a/src/test/java/com/android/tools/r8/memberrebinding/LibraryMemberRebindingTest.java b/src/test/java/com/android/tools/r8/memberrebinding/LibraryMemberRebindingTest.java
index ed90756..b07fd80 100644
--- a/src/test/java/com/android/tools/r8/memberrebinding/LibraryMemberRebindingTest.java
+++ b/src/test/java/com/android/tools/r8/memberrebinding/LibraryMemberRebindingTest.java
@@ -53,7 +53,7 @@
.addKeepMainRule(TestClass.class)
.addLibraryFiles(compileTimeLibrary)
.addDefaultRuntimeLibrary(parameters)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.apply(compileResult -> configureRunClasspath(compileResult, runtimeLibrary))
.run(parameters.getRuntime(), TestClass.class)
@@ -77,7 +77,6 @@
String[] exceptions) -> !name.equals("<init>"))
.transform())
.addKeepAllClassesRule()
- .setMinApi(parameters.getApiLevel())
.compile()
.writeToZip();
}
@@ -88,11 +87,7 @@
compileResult.addRunClasspathFiles(library);
} else {
compileResult.addRunClasspathFiles(
- testForD8()
- .addProgramFiles(library)
- .setMinApi(parameters.getApiLevel())
- .compile()
- .writeToZip());
+ testForD8().addProgramFiles(library).setMinApi(parameters).compile().writeToZip());
}
}
diff --git a/src/test/java/com/android/tools/r8/memberrebinding/MemberRebindingAmbiguousDispatchTest.java b/src/test/java/com/android/tools/r8/memberrebinding/MemberRebindingAmbiguousDispatchTest.java
index 2b41739..61b73d3 100644
--- a/src/test/java/com/android/tools/r8/memberrebinding/MemberRebindingAmbiguousDispatchTest.java
+++ b/src/test/java/com/android/tools/r8/memberrebinding/MemberRebindingAmbiguousDispatchTest.java
@@ -74,7 +74,7 @@
assumeFalse(desugaringWithoutSupport());
testForR8(parameters.getBackend())
.apply(this::setupInput)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(Main.class)
.run(parameters.getRuntime(), Main.class)
.apply(this::checkOutput);
@@ -89,7 +89,7 @@
() ->
testForR8(parameters.getBackend())
.apply(this::setupInput)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(Main.class)
.compileWithExpectedDiagnostics(
diagnostics ->
diff --git a/src/test/java/com/android/tools/r8/memberrebinding/MemberRebindingAmbiguousDispatchToLibraryTest.java b/src/test/java/com/android/tools/r8/memberrebinding/MemberRebindingAmbiguousDispatchToLibraryTest.java
index c6640f6..19956c7 100644
--- a/src/test/java/com/android/tools/r8/memberrebinding/MemberRebindingAmbiguousDispatchToLibraryTest.java
+++ b/src/test/java/com/android/tools/r8/memberrebinding/MemberRebindingAmbiguousDispatchToLibraryTest.java
@@ -60,7 +60,7 @@
public void testD8() throws Exception {
testForD8(parameters.getBackend())
.apply(this::setupInput)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.addRunClasspathClasses(SuperInterface.class)
.addRunClasspathClassFileData(getSuperClass())
@@ -73,7 +73,7 @@
parameters.assumeR8TestParameters();
testForR8(parameters.getBackend())
.apply(this::setupInput)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(Main.class)
.compile()
.addRunClasspathClasses(SuperInterface.class)
diff --git a/src/test/java/com/android/tools/r8/memberrebinding/MemberRebindingArrayTest.java b/src/test/java/com/android/tools/r8/memberrebinding/MemberRebindingArrayTest.java
index 62de8e6..c4c08fc 100644
--- a/src/test/java/com/android/tools/r8/memberrebinding/MemberRebindingArrayTest.java
+++ b/src/test/java/com/android/tools/r8/memberrebinding/MemberRebindingArrayTest.java
@@ -39,7 +39,7 @@
testForR8(parameters.getBackend())
.addProgramClassFileData(getMainWithRewrittenEqualsAndHashCode())
.addKeepMainRule(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addOptionsModification(
options -> options.apiModelingOptions().disableApiCallerIdentification())
.run(parameters.getRuntime(), Main.class)
diff --git a/src/test/java/com/android/tools/r8/memberrebinding/MemberRebindingBridgeRemovalTest.java b/src/test/java/com/android/tools/r8/memberrebinding/MemberRebindingBridgeRemovalTest.java
index 031440f..d8e0f19 100644
--- a/src/test/java/com/android/tools/r8/memberrebinding/MemberRebindingBridgeRemovalTest.java
+++ b/src/test/java/com/android/tools/r8/memberrebinding/MemberRebindingBridgeRemovalTest.java
@@ -44,7 +44,7 @@
.addKeepMainRule(TestClass.class)
.enableInliningAnnotations()
.enableNoVerticalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/memberrebinding/MemberRebindingConflictTest.java b/src/test/java/com/android/tools/r8/memberrebinding/MemberRebindingConflictTest.java
index 9d18387..917343c 100644
--- a/src/test/java/com/android/tools/r8/memberrebinding/MemberRebindingConflictTest.java
+++ b/src/test/java/com/android/tools/r8/memberrebinding/MemberRebindingConflictTest.java
@@ -50,7 +50,7 @@
.enableInliningAnnotations()
.enableNoVerticalClassMergingAnnotations()
.enableNeverClassInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutputLines("foo", "bar", "foo", "baz");
diff --git a/src/test/java/com/android/tools/r8/memberrebinding/MemberRebindingFrontierTest.java b/src/test/java/com/android/tools/r8/memberrebinding/MemberRebindingFrontierTest.java
index 2584946..d52a38e 100644
--- a/src/test/java/com/android/tools/r8/memberrebinding/MemberRebindingFrontierTest.java
+++ b/src/test/java/com/android/tools/r8/memberrebinding/MemberRebindingFrontierTest.java
@@ -39,7 +39,7 @@
.addProgramClasses(Main.class, ProgramClass.class)
.addDefaultRuntimeLibrary(parameters)
.addLibraryClasses(Base.class, I.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.apply(this::setupRunclasspath)
.run(parameters.getRuntime(), Main.class)
@@ -54,7 +54,7 @@
.addDefaultRuntimeLibrary(parameters)
.addLibraryClasses(I.class)
.addLibraryClassFileData(removeFooMethod(Base.class))
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepClassRules(ProgramClass.class)
.addKeepMainRule(Main.class)
.compile()
diff --git a/src/test/java/com/android/tools/r8/memberrebinding/MemberRebindingInvokeSuperAbstractTest.java b/src/test/java/com/android/tools/r8/memberrebinding/MemberRebindingInvokeSuperAbstractTest.java
index 41ccb91..eb4d99c 100644
--- a/src/test/java/com/android/tools/r8/memberrebinding/MemberRebindingInvokeSuperAbstractTest.java
+++ b/src/test/java/com/android/tools/r8/memberrebinding/MemberRebindingInvokeSuperAbstractTest.java
@@ -45,7 +45,7 @@
.addLibraryClasses(libraryClasses)
.addDefaultRuntimeLibrary(parameters)
.addProgramClasses(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(Main.class)
.enableInliningAnnotations()
.apply(ApiModelingTestHelper::enableApiCallerIdentification)
diff --git a/src/test/java/com/android/tools/r8/memberrebinding/MemberRebindingLibraryBridgeVerticallyMergeTest.java b/src/test/java/com/android/tools/r8/memberrebinding/MemberRebindingLibraryBridgeVerticallyMergeTest.java
index 786df4d..c34cfb2 100644
--- a/src/test/java/com/android/tools/r8/memberrebinding/MemberRebindingLibraryBridgeVerticallyMergeTest.java
+++ b/src/test/java/com/android/tools/r8/memberrebinding/MemberRebindingLibraryBridgeVerticallyMergeTest.java
@@ -45,7 +45,7 @@
.addProgramClasses(A.class, B.class, C.class, D.class, Main.class)
.addLibraryClasses(Lib.class)
.addDefaultRuntimeLibrary(parameters)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.addBootClasspathClasses(Lib.class)
.run(parameters.getRuntime(), Main.class)
@@ -58,7 +58,7 @@
.addProgramClasses(A.class, B.class, C.class, D.class, Main.class)
.addLibraryClasses(Lib.class)
.addDefaultRuntimeLibrary(parameters)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(Main.class)
.addKeepClassRules(C.class, D.class)
.enableInliningAnnotations()
diff --git a/src/test/java/com/android/tools/r8/memberrebinding/MemberRebindingRemoveInterfaceBridgeTest.java b/src/test/java/com/android/tools/r8/memberrebinding/MemberRebindingRemoveInterfaceBridgeTest.java
index 6d96680..2f37ad1 100644
--- a/src/test/java/com/android/tools/r8/memberrebinding/MemberRebindingRemoveInterfaceBridgeTest.java
+++ b/src/test/java/com/android/tools/r8/memberrebinding/MemberRebindingRemoveInterfaceBridgeTest.java
@@ -43,7 +43,7 @@
.addProgramClasses(A.class, B.class, I.class, J.class)
.addProgramClassFileData(
transformer(Main.class).setClassDescriptor(newMainDescriptor).transform())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(newMainTypeName)
.addKeepClassAndMembersRules(I.class)
.enableInliningAnnotations()
diff --git a/src/test/java/com/android/tools/r8/memberrebinding/MemberRebindingRemoveInterfaceBridgeWithSubTypeTest.java b/src/test/java/com/android/tools/r8/memberrebinding/MemberRebindingRemoveInterfaceBridgeWithSubTypeTest.java
index dd2f0c1..88b0902 100644
--- a/src/test/java/com/android/tools/r8/memberrebinding/MemberRebindingRemoveInterfaceBridgeWithSubTypeTest.java
+++ b/src/test/java/com/android/tools/r8/memberrebinding/MemberRebindingRemoveInterfaceBridgeWithSubTypeTest.java
@@ -45,7 +45,7 @@
.addProgramClasses(A.class, B.class, I.class)
.addProgramClassFileData(
transformer(Main.class).setClassDescriptor(newMainDescriptor).transform())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(newMainTypeName)
.addKeepClassAndMembersRules(I.class)
.enableInliningAnnotations()
diff --git a/src/test/java/com/android/tools/r8/memberrebinding/MemberRebindingRemoveInterfaceDefaultBridgeTest.java b/src/test/java/com/android/tools/r8/memberrebinding/MemberRebindingRemoveInterfaceDefaultBridgeTest.java
index 4036e4a..0de914f 100644
--- a/src/test/java/com/android/tools/r8/memberrebinding/MemberRebindingRemoveInterfaceDefaultBridgeTest.java
+++ b/src/test/java/com/android/tools/r8/memberrebinding/MemberRebindingRemoveInterfaceDefaultBridgeTest.java
@@ -45,7 +45,7 @@
.addProgramClasses(A.class, I.class, J.class)
.addProgramClassFileData(
transformer(Main.class).setClassDescriptor(newMainDescriptor).transform())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(newMainTypeName)
.addKeepClassAndMembersRules(I.class)
.enableInliningAnnotations()
diff --git a/src/test/java/com/android/tools/r8/memberrebinding/MemberRebindingRemoveStaticBridgeTest.java b/src/test/java/com/android/tools/r8/memberrebinding/MemberRebindingRemoveStaticBridgeTest.java
index 8bdaa09..1ef45c0 100644
--- a/src/test/java/com/android/tools/r8/memberrebinding/MemberRebindingRemoveStaticBridgeTest.java
+++ b/src/test/java/com/android/tools/r8/memberrebinding/MemberRebindingRemoveStaticBridgeTest.java
@@ -43,7 +43,7 @@
.addProgramClasses(A.class, B.class)
.addProgramClassFileData(
transformer(Main.class).setClassDescriptor(newMainDescriptor).transform())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(newMainTypeName)
.enableInliningAnnotations()
.enableNoVerticalClassMergingAnnotations()
diff --git a/src/test/java/com/android/tools/r8/memberrebinding/MemberRebindingRemoveVirtualBridgeDontShrinkTest.java b/src/test/java/com/android/tools/r8/memberrebinding/MemberRebindingRemoveVirtualBridgeDontShrinkTest.java
index c23c295..4f4a459 100644
--- a/src/test/java/com/android/tools/r8/memberrebinding/MemberRebindingRemoveVirtualBridgeDontShrinkTest.java
+++ b/src/test/java/com/android/tools/r8/memberrebinding/MemberRebindingRemoveVirtualBridgeDontShrinkTest.java
@@ -43,7 +43,7 @@
.addProgramClasses(A.class, B.class)
.addProgramClassFileData(
transformer(Main.class).setClassDescriptor(newMainDescriptor).transform())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(newMainTypeName)
.enableInliningAnnotations()
.addHorizontallyMergedClassesInspector(
diff --git a/src/test/java/com/android/tools/r8/memberrebinding/MemberRebindingRemoveVirtualBridgeTest.java b/src/test/java/com/android/tools/r8/memberrebinding/MemberRebindingRemoveVirtualBridgeTest.java
index f38e042..3266b5d 100644
--- a/src/test/java/com/android/tools/r8/memberrebinding/MemberRebindingRemoveVirtualBridgeTest.java
+++ b/src/test/java/com/android/tools/r8/memberrebinding/MemberRebindingRemoveVirtualBridgeTest.java
@@ -46,7 +46,7 @@
.addProgramClasses(A.class, B.class)
.addProgramClassFileData(
transformer(Main.class).setClassDescriptor(newMainDescriptor).transform())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(newMainTypeName)
.enableInliningAnnotations()
.enableNoVerticalClassMergingAnnotations()
diff --git a/src/test/java/com/android/tools/r8/memberrebinding/StaticFieldClassInitMemberRebindingTest.java b/src/test/java/com/android/tools/r8/memberrebinding/StaticFieldClassInitMemberRebindingTest.java
index 7ab14c7..88411bb 100644
--- a/src/test/java/com/android/tools/r8/memberrebinding/StaticFieldClassInitMemberRebindingTest.java
+++ b/src/test/java/com/android/tools/r8/memberrebinding/StaticFieldClassInitMemberRebindingTest.java
@@ -44,7 +44,7 @@
testForR8(parameters.getBackend())
.addProgramClassFileData(
getMainWithRewrittenDescriptors(), getAWithPackageFoo(), getBWithRewrittenDescriptors())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(Main.class)
.enableInliningAnnotations()
.run(parameters.getRuntime(), Main.class)
diff --git a/src/test/java/com/android/tools/r8/missingclasses/MissingClassesTestBase.java b/src/test/java/com/android/tools/r8/missingclasses/MissingClassesTestBase.java
index 73b6dfc..d2b8cb1 100644
--- a/src/test/java/com/android/tools/r8/missingclasses/MissingClassesTestBase.java
+++ b/src/test/java/com/android/tools/r8/missingclasses/MissingClassesTestBase.java
@@ -97,7 +97,7 @@
throws CompilationFailedException {
testForR8(parameters.getBackend())
.apply(configuration)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compileWithExpectedDiagnostics(diagnosticsConsumer);
}
diff --git a/src/test/java/com/android/tools/r8/naming/AdaptResourceFileNamesTest.java b/src/test/java/com/android/tools/r8/naming/AdaptResourceFileNamesTest.java
index 3897351..92404f0 100644
--- a/src/test/java/com/android/tools/r8/naming/AdaptResourceFileNamesTest.java
+++ b/src/test/java/com/android/tools/r8/naming/AdaptResourceFileNamesTest.java
@@ -280,7 +280,7 @@
.addDataResources(dataResources)
.addKeepRules(proguardConfig)
.apply(builderConsumer)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addOptionsModification(options -> options.dataResourceConsumer = dataResourceConsumer)
.compile();
if (proguardMapConsumer != null) {
diff --git a/src/test/java/com/android/tools/r8/naming/ClassNameMinifierOriginalClassNameTest.java b/src/test/java/com/android/tools/r8/naming/ClassNameMinifierOriginalClassNameTest.java
index bd76317..a5f2093 100644
--- a/src/test/java/com/android/tools/r8/naming/ClassNameMinifierOriginalClassNameTest.java
+++ b/src/test/java/com/android/tools/r8/naming/ClassNameMinifierOriginalClassNameTest.java
@@ -57,7 +57,7 @@
.addProgramClasses(A.class, B.class)
.addKeepClassAndMembersRulesWithAllowObfuscation(B.class)
.addKeepRules("-classobfuscationdictionary " + dictionary.toString(), "-keeppackagenames")
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector -> {
@@ -72,7 +72,7 @@
R8TestCompileResult libraryCompileResult = compilationResults.apply(parameters);
testForR8(parameters.getBackend())
.addProgramClasses(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(Main.class)
.addDontObfuscate()
.addClasspathClasses(A.class, B.class)
@@ -92,7 +92,7 @@
() ->
testForR8(parameters.getBackend())
.addProgramClasses(MainWithReferenceToNotMapped.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(MainWithReferenceToNotMapped.class)
.addDontObfuscate()
.addClasspathClasses(A.class, B.class)
diff --git a/src/test/java/com/android/tools/r8/naming/ClassObfuscationDictionaryDuplicateTest.java b/src/test/java/com/android/tools/r8/naming/ClassObfuscationDictionaryDuplicateTest.java
index 4683db2..da59930 100644
--- a/src/test/java/com/android/tools/r8/naming/ClassObfuscationDictionaryDuplicateTest.java
+++ b/src/test/java/com/android/tools/r8/naming/ClassObfuscationDictionaryDuplicateTest.java
@@ -55,7 +55,7 @@
.addKeepRules("-classobfuscationdictionary " + dictionary.toString())
.addKeepMainRule(C.class)
.addKeepClassRulesWithAllowObfuscation(A.class, B.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), C.class)
.assertSuccessWithOutput("HELLO WORLD!")
.inspect(
diff --git a/src/test/java/com/android/tools/r8/naming/CovariantReturnTypeInSubInterfaceTest.java b/src/test/java/com/android/tools/r8/naming/CovariantReturnTypeInSubInterfaceTest.java
index c38a414..f7d45d7 100644
--- a/src/test/java/com/android/tools/r8/naming/CovariantReturnTypeInSubInterfaceTest.java
+++ b/src/test/java/com/android/tools/r8/naming/CovariantReturnTypeInSubInterfaceTest.java
@@ -79,7 +79,7 @@
private void test() throws Exception {
testForR8(parameters.getBackend())
.addInnerClasses(CovariantReturnTypeInSubInterfaceTest.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(TestMain.class)
.addKeepRules(
"-keep,allowobfuscation class **.*$Super* { <methods>; }",
diff --git a/src/test/java/com/android/tools/r8/naming/DontUseMixedCaseClassNamesExistingClassTest.java b/src/test/java/com/android/tools/r8/naming/DontUseMixedCaseClassNamesExistingClassTest.java
index bb7e06d..6fa54e4 100644
--- a/src/test/java/com/android/tools/r8/naming/DontUseMixedCaseClassNamesExistingClassTest.java
+++ b/src/test/java/com/android/tools/r8/naming/DontUseMixedCaseClassNamesExistingClassTest.java
@@ -47,7 +47,7 @@
FileUtils.writeTextFile(dictionary, FINAL_CLASS_NAME);
testForR8(parameters.getBackend())
.addProgramClasses(A.class, Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepClassRulesWithAllowObfuscation(A.class)
.addKeepMainRule(Main.class)
.addKeepPackageNamesRule(Main.class.getPackage())
diff --git a/src/test/java/com/android/tools/r8/naming/EnumMinification.java b/src/test/java/com/android/tools/r8/naming/EnumMinification.java
index 95ff741..5b1d6f5 100644
--- a/src/test/java/com/android/tools/r8/naming/EnumMinification.java
+++ b/src/test/java/com/android/tools/r8/naming/EnumMinification.java
@@ -51,7 +51,7 @@
.addKeepMainRule(mainClass)
.addKeepRules("-neverinline enum * extends java.lang.Enum { valueOf(...); }")
.enableProguardTestOptions()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile();
}
diff --git a/src/test/java/com/android/tools/r8/naming/EnumMinificationKotlinTest.java b/src/test/java/com/android/tools/r8/naming/EnumMinificationKotlinTest.java
index 1d25958..99ee75f 100644
--- a/src/test/java/com/android/tools/r8/naming/EnumMinificationKotlinTest.java
+++ b/src/test/java/com/android/tools/r8/naming/EnumMinificationKotlinTest.java
@@ -60,7 +60,7 @@
.addKeepClassRulesWithAllowObfuscation(ENUM_CLASS_NAME)
.allowDiagnosticWarningMessages()
.minification(minify)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.assertAllWarningMessagesMatch(
equalTo("Resource 'META-INF/MANIFEST.MF' already exists."))
diff --git a/src/test/java/com/android/tools/r8/naming/FieldSharedParentMinificationTest.java b/src/test/java/com/android/tools/r8/naming/FieldSharedParentMinificationTest.java
index 28d39db..32c2841 100644
--- a/src/test/java/com/android/tools/r8/naming/FieldSharedParentMinificationTest.java
+++ b/src/test/java/com/android/tools/r8/naming/FieldSharedParentMinificationTest.java
@@ -34,7 +34,7 @@
public void testR8() throws Exception {
testForR8(parameters.getBackend())
.addInnerClasses(getClass())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(Main.class)
.addKeepClassAndMembersRulesWithAllowObfuscation(
I.class, J.class, A.class, B.class, C.class)
diff --git a/src/test/java/com/android/tools/r8/naming/ForNameRenamingTest.java b/src/test/java/com/android/tools/r8/naming/ForNameRenamingTest.java
index c69ecd0..2fddef4 100644
--- a/src/test/java/com/android/tools/r8/naming/ForNameRenamingTest.java
+++ b/src/test/java/com/android/tools/r8/naming/ForNameRenamingTest.java
@@ -40,7 +40,7 @@
.addInnerClasses(ForNameRenamingTest.class)
.addKeepMainRule(MAIN)
.addKeepClassRulesWithAllowObfuscation(Boo.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), MAIN)
.assertSuccessWithOutputLines("true")
.inspect(this::inspect);
diff --git a/src/test/java/com/android/tools/r8/naming/IdentifierMinifierTest.java b/src/test/java/com/android/tools/r8/naming/IdentifierMinifierTest.java
index dc7f93e..b31bff4 100644
--- a/src/test/java/com/android/tools/r8/naming/IdentifierMinifierTest.java
+++ b/src/test/java/com/android/tools/r8/naming/IdentifierMinifierTest.java
@@ -70,7 +70,7 @@
.addKeepRuleFiles(ListUtils.map(keepRulesFiles, Paths::get))
.allowDiagnosticWarningMessages(hasWarning)
.enableProguardTestOptions()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.applyIf(
hasWarning,
diff --git a/src/test/java/com/android/tools/r8/naming/IdentifierNameStringReprocessingTest.java b/src/test/java/com/android/tools/r8/naming/IdentifierNameStringReprocessingTest.java
index 4041e32..c73a65e 100644
--- a/src/test/java/com/android/tools/r8/naming/IdentifierNameStringReprocessingTest.java
+++ b/src/test/java/com/android/tools/r8/naming/IdentifierNameStringReprocessingTest.java
@@ -42,7 +42,7 @@
"}")
.enableMemberValuePropagationAnnotations()
.enableReprocessClassInitializerAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.apply(
runResult -> {
diff --git a/src/test/java/com/android/tools/r8/naming/InterfaceFieldMinificationTest.java b/src/test/java/com/android/tools/r8/naming/InterfaceFieldMinificationTest.java
index f72ffa2..ad294d3 100644
--- a/src/test/java/com/android/tools/r8/naming/InterfaceFieldMinificationTest.java
+++ b/src/test/java/com/android/tools/r8/naming/InterfaceFieldMinificationTest.java
@@ -40,7 +40,7 @@
.enableNeverClassInliningAnnotations()
.enableInliningAnnotations()
.enableNoVerticalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutput(expectedOutput);
}
diff --git a/src/test/java/com/android/tools/r8/naming/IntersectionLambdaTest.java b/src/test/java/com/android/tools/r8/naming/IntersectionLambdaTest.java
index 5b8dc11..8dc7ee7 100644
--- a/src/test/java/com/android/tools/r8/naming/IntersectionLambdaTest.java
+++ b/src/test/java/com/android/tools/r8/naming/IntersectionLambdaTest.java
@@ -46,7 +46,7 @@
.addInnerClasses(IntersectionLambdaTest.class)
.enableNoVerticalClassMergingAnnotations()
.addKeepMainRule(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines(EXPECTED);
}
diff --git a/src/test/java/com/android/tools/r8/naming/IntersectionWithInheritanceLambdaTest.java b/src/test/java/com/android/tools/r8/naming/IntersectionWithInheritanceLambdaTest.java
index f784a8f..b5d1a1c 100644
--- a/src/test/java/com/android/tools/r8/naming/IntersectionWithInheritanceLambdaTest.java
+++ b/src/test/java/com/android/tools/r8/naming/IntersectionWithInheritanceLambdaTest.java
@@ -44,7 +44,7 @@
testForR8(parameters.getBackend())
.addInnerClasses(IntersectionWithInheritanceLambdaTest.class)
.addKeepMainRule(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines(EXPECTED);
}
diff --git a/src/test/java/com/android/tools/r8/naming/InvalidObfuscationEntryTest.java b/src/test/java/com/android/tools/r8/naming/InvalidObfuscationEntryTest.java
index 8fd083f..29cfe82 100644
--- a/src/test/java/com/android/tools/r8/naming/InvalidObfuscationEntryTest.java
+++ b/src/test/java/com/android/tools/r8/naming/InvalidObfuscationEntryTest.java
@@ -66,7 +66,7 @@
.addKeepAllClassesRuleWithAllowObfuscation()
.addKeepMainRule(Main.class)
.allowDiagnosticInfoMessages()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.assertInfoMessageThatMatches(containsString("Invalid character"))
.run(parameters.getRuntime(), Main.class)
diff --git a/src/test/java/com/android/tools/r8/naming/LambdaRenamingTestRunner.java b/src/test/java/com/android/tools/r8/naming/LambdaRenamingTestRunner.java
index 484d133..ec8cd72 100644
--- a/src/test/java/com/android/tools/r8/naming/LambdaRenamingTestRunner.java
+++ b/src/test/java/com/android/tools/r8/naming/LambdaRenamingTestRunner.java
@@ -80,7 +80,7 @@
" public java.lang.Integer reservedMethod2();",
"}")
.debug()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.apply(
compileResult ->
diff --git a/src/test/java/com/android/tools/r8/naming/LibraryClassInheritingFromProgramClassNamingTest.java b/src/test/java/com/android/tools/r8/naming/LibraryClassInheritingFromProgramClassNamingTest.java
index a6c49e4..3144d00 100644
--- a/src/test/java/com/android/tools/r8/naming/LibraryClassInheritingFromProgramClassNamingTest.java
+++ b/src/test/java/com/android/tools/r8/naming/LibraryClassInheritingFromProgramClassNamingTest.java
@@ -38,7 +38,7 @@
public void testR8() throws ExecutionException, CompilationFailedException, IOException {
R8TestCompileResult libraryResult =
testForR8(parameters.getBackend())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addProgramClasses(LIBRARY_CLASSES)
.addProgramClasses(
I.class, Assert.class, TestCase.class, ApplicationTestCaseInProgram.class)
@@ -52,7 +52,7 @@
.addKeepClassAndMembersRulesWithAllowObfuscation(
I.class, Assert.class, TestCase.class, ApplicationTestCaseInProgram.class)
.addKeepMainRule(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.allowDiagnosticWarningMessages()
.compile()
.assertAllWarningMessagesMatch(
diff --git a/src/test/java/com/android/tools/r8/naming/MinificationMixedCaseAndNumbersTest.java b/src/test/java/com/android/tools/r8/naming/MinificationMixedCaseAndNumbersTest.java
index 5c050a6..fd8b808 100644
--- a/src/test/java/com/android/tools/r8/naming/MinificationMixedCaseAndNumbersTest.java
+++ b/src/test/java/com/android/tools/r8/naming/MinificationMixedCaseAndNumbersTest.java
@@ -57,7 +57,7 @@
.noTreeShaking()
.addKeepRules(
"-dontusemixedcaseclassnames", "-keeppackagenames com.android.tools.r8.naming")
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.inspect(
inspector -> {
diff --git a/src/test/java/com/android/tools/r8/naming/MinifierFieldSignatureTest.java b/src/test/java/com/android/tools/r8/naming/MinifierFieldSignatureTest.java
index 1e5b66c..7f92b4f 100644
--- a/src/test/java/com/android/tools/r8/naming/MinifierFieldSignatureTest.java
+++ b/src/test/java/com/android/tools/r8/naming/MinifierFieldSignatureTest.java
@@ -188,7 +188,7 @@
ProguardKeepAttributes.ENCLOSING_METHOD,
ProguardKeepAttributes.SIGNATURE)
.addKeepAllClassesRuleWithAllowObfuscation()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.allowDiagnosticMessages()
.addOptionsModification(
internalOptions ->
diff --git a/src/test/java/com/android/tools/r8/naming/MinifierMethodSignatureTest.java b/src/test/java/com/android/tools/r8/naming/MinifierMethodSignatureTest.java
index 9f693b0..9bf0f2e 100644
--- a/src/test/java/com/android/tools/r8/naming/MinifierMethodSignatureTest.java
+++ b/src/test/java/com/android/tools/r8/naming/MinifierMethodSignatureTest.java
@@ -177,7 +177,7 @@
ProguardKeepAttributes.ENCLOSING_METHOD,
ProguardKeepAttributes.SIGNATURE)
.addKeepAllClassesRuleWithAllowObfuscation()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addOptionsModification(
internalOptions ->
internalOptions.testing.disableMappingToOriginalProgramVerification = true)
diff --git a/src/test/java/com/android/tools/r8/naming/MinifyPackageWithKeepToPackagePrivateMemberTest.java b/src/test/java/com/android/tools/r8/naming/MinifyPackageWithKeepToPackagePrivateMemberTest.java
index 8064520..5d23c14 100644
--- a/src/test/java/com/android/tools/r8/naming/MinifyPackageWithKeepToPackagePrivateMemberTest.java
+++ b/src/test/java/com/android/tools/r8/naming/MinifyPackageWithKeepToPackagePrivateMemberTest.java
@@ -53,7 +53,7 @@
+ ReflectiveCallerOfA.class.getTypeName()
+ " { java.lang.String className; }")
.enableInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("Hello World!", "Hello World!");
}
diff --git a/src/test/java/com/android/tools/r8/naming/MinifyPackageWithKeepToPublicMemberTest.java b/src/test/java/com/android/tools/r8/naming/MinifyPackageWithKeepToPublicMemberTest.java
index 240506d..e8c958d 100644
--- a/src/test/java/com/android/tools/r8/naming/MinifyPackageWithKeepToPublicMemberTest.java
+++ b/src/test/java/com/android/tools/r8/naming/MinifyPackageWithKeepToPublicMemberTest.java
@@ -68,7 +68,7 @@
+ ReflectiveCallerOfA.class.getTypeName()
+ " { java.lang.String className; }")
.enableInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector -> {
diff --git a/src/test/java/com/android/tools/r8/naming/MissingReferenceNamingClashTest.java b/src/test/java/com/android/tools/r8/naming/MissingReferenceNamingClashTest.java
index 1082d2e..d447328 100644
--- a/src/test/java/com/android/tools/r8/naming/MissingReferenceNamingClashTest.java
+++ b/src/test/java/com/android/tools/r8/naming/MissingReferenceNamingClashTest.java
@@ -47,7 +47,7 @@
transformer(Anno.class)
.replaceClassDescriptorInMembers(descriptor(Missing.class), newDescriptor)
.transform())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(Main.class)
.addKeepClassAndMembersRules(Anno.class)
.addKeepClassRulesWithAllowObfuscation(A.class)
diff --git a/src/test/java/com/android/tools/r8/naming/NonMemberClassTest.java b/src/test/java/com/android/tools/r8/naming/NonMemberClassTest.java
index 5ce4bde..55497de 100644
--- a/src/test/java/com/android/tools/r8/naming/NonMemberClassTest.java
+++ b/src/test/java/com/android/tools/r8/naming/NonMemberClassTest.java
@@ -157,7 +157,7 @@
.addKeepRules(config.getKeepRules())
.addKeepAttributes("Signature", "InnerClasses", "EnclosingMethod")
.enableInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addOptionsModification(options -> options.enableClassInlining = false)
.compile()
.inspect(inspector -> config.inspect(false, inspector))
@@ -174,7 +174,7 @@
.addKeepAttributeInnerClassesAndEnclosingMethod()
.addKeepAttributeSignature()
.enableInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addOptionsModification(options -> options.enableClassInlining = false)
.compile()
.inspect(inspector -> config.inspect(true, inspector))
diff --git a/src/test/java/com/android/tools/r8/naming/OverloadedReservedFieldNamingTest.java b/src/test/java/com/android/tools/r8/naming/OverloadedReservedFieldNamingTest.java
index ea58f20..af32058 100644
--- a/src/test/java/com/android/tools/r8/naming/OverloadedReservedFieldNamingTest.java
+++ b/src/test/java/com/android/tools/r8/naming/OverloadedReservedFieldNamingTest.java
@@ -46,7 +46,7 @@
"-keep class " + A.class.getTypeName() + " { boolean a; }",
overloadAggressively ? "-overloadaggressively" : "")
.enableNoFieldTypeStrengtheningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::verifyAggressiveOverloading)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/naming/PackageMinificationWithDontOptimizeTest.java b/src/test/java/com/android/tools/r8/naming/PackageMinificationWithDontOptimizeTest.java
index 45c9f14..8959bb6 100644
--- a/src/test/java/com/android/tools/r8/naming/PackageMinificationWithDontOptimizeTest.java
+++ b/src/test/java/com/android/tools/r8/naming/PackageMinificationWithDontOptimizeTest.java
@@ -36,7 +36,7 @@
.addInnerClasses(getClass())
.addKeepMainRule(Main.class)
.addDontOptimize()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector -> {
diff --git a/src/test/java/com/android/tools/r8/naming/PackagePrivateAllowAccessModificationPackageTest.java b/src/test/java/com/android/tools/r8/naming/PackagePrivateAllowAccessModificationPackageTest.java
index 4be6559..e0fcc06 100644
--- a/src/test/java/com/android/tools/r8/naming/PackagePrivateAllowAccessModificationPackageTest.java
+++ b/src/test/java/com/android/tools/r8/naming/PackagePrivateAllowAccessModificationPackageTest.java
@@ -52,7 +52,7 @@
.enableNoHorizontalClassMergingAnnotations()
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector -> {
diff --git a/src/test/java/com/android/tools/r8/naming/PackagePrivateOverrideSameMethodNameTest.java b/src/test/java/com/android/tools/r8/naming/PackagePrivateOverrideSameMethodNameTest.java
index 2176526..a5687f1 100644
--- a/src/test/java/com/android/tools/r8/naming/PackagePrivateOverrideSameMethodNameTest.java
+++ b/src/test/java/com/android/tools/r8/naming/PackagePrivateOverrideSameMethodNameTest.java
@@ -60,7 +60,7 @@
testForR8(parameters.getBackend())
.addProgramClasses(ViewModel.class, SubViewModel.class, Main.class)
.addKeepMainRule(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
.minification(minification)
diff --git a/src/test/java/com/android/tools/r8/naming/RenameSourceFileRetraceTest.java b/src/test/java/com/android/tools/r8/naming/RenameSourceFileRetraceTest.java
index e62b1e0..b307545 100644
--- a/src/test/java/com/android/tools/r8/naming/RenameSourceFileRetraceTest.java
+++ b/src/test/java/com/android/tools/r8/naming/RenameSourceFileRetraceTest.java
@@ -74,7 +74,7 @@
.addProgramClasses(ClassToBeMinified.class, Main.class)
.addKeepAttributes(ProguardKeepAttributes.LINE_NUMBER_TABLE)
.addKeepMainRule(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.enableInliningAnnotations()
.run(parameters.getRuntime(), Main.class)
.assertFailureWithErrorThatMatches(containsString("ClassToBeMinified.foo()"))
@@ -96,7 +96,7 @@
.addKeepAttributes(ProguardKeepAttributes.LINE_NUMBER_TABLE)
.addKeepRules("-renamesourcefileattribute " + FILENAME_RENAME)
.addKeepMainRule(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.enableInliningAnnotations()
.run(parameters.getRuntime(), Main.class)
.assertFailureWithErrorThatMatches(containsString("ClassToBeMinified.foo()"))
diff --git a/src/test/java/com/android/tools/r8/naming/ReservedFieldNameInSubClassTest.java b/src/test/java/com/android/tools/r8/naming/ReservedFieldNameInSubClassTest.java
index 4994263..55c7103 100644
--- a/src/test/java/com/android/tools/r8/naming/ReservedFieldNameInSubClassTest.java
+++ b/src/test/java/com/android/tools/r8/naming/ReservedFieldNameInSubClassTest.java
@@ -60,7 +60,7 @@
+ C.class.getTypeName()
+ "{ java.lang.String a; }"
: "")
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutput(expectedOutput)
.inspector();
diff --git a/src/test/java/com/android/tools/r8/naming/adaptclassstrings/AdaptClassStringWithRepackagingTest.java b/src/test/java/com/android/tools/r8/naming/adaptclassstrings/AdaptClassStringWithRepackagingTest.java
index 06557fa..c3d4f65 100644
--- a/src/test/java/com/android/tools/r8/naming/adaptclassstrings/AdaptClassStringWithRepackagingTest.java
+++ b/src/test/java/com/android/tools/r8/naming/adaptclassstrings/AdaptClassStringWithRepackagingTest.java
@@ -30,7 +30,7 @@
public void testR8() throws Exception {
testForR8(parameters.getBackend())
.addInnerClasses(getClass())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(Main.class)
.addKeepRules("-repackageclasses ''")
.addKeepRules("-adaptclassstrings")
diff --git a/src/test/java/com/android/tools/r8/naming/adaptclassstrings/RepackageMinificationNameClashTest.java b/src/test/java/com/android/tools/r8/naming/adaptclassstrings/RepackageMinificationNameClashTest.java
index 1f23283..fb70b43 100644
--- a/src/test/java/com/android/tools/r8/naming/adaptclassstrings/RepackageMinificationNameClashTest.java
+++ b/src/test/java/com/android/tools/r8/naming/adaptclassstrings/RepackageMinificationNameClashTest.java
@@ -28,7 +28,7 @@
public void testR8() throws Exception {
testForR8(parameters.getBackend())
.addInnerClasses(getClass())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepRules("-repackageclasses ''")
.addKeepRules("-adaptclassstrings")
.addKeepClassRulesWithAllowObfuscation(Foo.class)
diff --git a/src/test/java/com/android/tools/r8/naming/applymapping/ApplyMappingAfterDevirtualizationTest.java b/src/test/java/com/android/tools/r8/naming/applymapping/ApplyMappingAfterDevirtualizationTest.java
index efb32a2..19b499a 100644
--- a/src/test/java/com/android/tools/r8/naming/applymapping/ApplyMappingAfterDevirtualizationTest.java
+++ b/src/test/java/com/android/tools/r8/naming/applymapping/ApplyMappingAfterDevirtualizationTest.java
@@ -114,7 +114,7 @@
.addKeepClassAndDefaultConstructor(LibClassB.class)
.addOptionsModification(options -> options.inlinerOptions().enableInlining = false)
.enableNoMethodStaticizingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile();
CodeInspector inspector = libraryResult.inspector();
@@ -131,7 +131,7 @@
.addProgramClasses(PROGRAM_CLASSES)
.addApplyMapping(libraryResult.getProguardMap())
.addClasspathClasses(CLASSPATH_CLASSES)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.addRunClasspathFiles(libraryResult.writeToZip())
.run(parameters.getRuntime(), ProgramClass.class)
@@ -147,7 +147,7 @@
LibClassA.class, LibClassB.class, LibInterfaceA.class)
.addOptionsModification(options -> options.inlinerOptions().enableInlining = false)
.enableNoMethodStaticizingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile();
CodeInspector inspector = libraryResult.inspector();
@@ -164,7 +164,7 @@
.addProgramClasses(PROGRAM_CLASSES)
.addApplyMapping(libraryResult.getProguardMap())
.addClasspathClasses(CLASSPATH_CLASSES)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.addRunClasspathFiles(libraryResult.writeToZip())
.run(parameters.getRuntime(), ProgramClass.class)
diff --git a/src/test/java/com/android/tools/r8/naming/applymapping/ApplyMappingAfterHorizontalMergingFieldTest.java b/src/test/java/com/android/tools/r8/naming/applymapping/ApplyMappingAfterHorizontalMergingFieldTest.java
index 3311270..fea21aa 100644
--- a/src/test/java/com/android/tools/r8/naming/applymapping/ApplyMappingAfterHorizontalMergingFieldTest.java
+++ b/src/test/java/com/android/tools/r8/naming/applymapping/ApplyMappingAfterHorizontalMergingFieldTest.java
@@ -93,7 +93,7 @@
.addProgramClasses(LIBRARY_CLASSES)
.addOptionsModification(options -> options.enableRedundantFieldLoadElimination = false)
.addKeepMainRule(LibraryMain.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile();
CodeInspector inspector = libraryResult.inspector();
@@ -110,7 +110,7 @@
.addLibraryClasses(LIBRARY_CLASSES)
.addDefaultRuntimeLibrary(parameters)
.addTestingAnnotationsAsLibraryClasses()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.addRunClasspathFiles(libraryResult.writeToZip())
.run(parameters.getRuntime(), ProgramClass.class)
diff --git a/src/test/java/com/android/tools/r8/naming/applymapping/ApplyMappingClassPathInterfaceInheritTest.java b/src/test/java/com/android/tools/r8/naming/applymapping/ApplyMappingClassPathInterfaceInheritTest.java
index 5270eab..8711bf7 100644
--- a/src/test/java/com/android/tools/r8/naming/applymapping/ApplyMappingClassPathInterfaceInheritTest.java
+++ b/src/test/java/com/android/tools/r8/naming/applymapping/ApplyMappingClassPathInterfaceInheritTest.java
@@ -46,7 +46,7 @@
minifyLibrary,
TestShrinkerBuilder::addKeepAllClassesRuleWithAllowObfuscation,
TestShrinkerBuilder::addKeepAllClassesRule)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile();
Path libraryJar = libraryResult.writeToZip();
testForR8(parameters.getBackend())
@@ -56,7 +56,7 @@
.addProgramClasses(Main.class)
.addKeepAllClassesRule()
.addApplyMapping(libraryResult.getProguardMap())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.addRunClasspathClasses(LibI.class)
.addRunClasspathFiles(libraryJar)
diff --git a/src/test/java/com/android/tools/r8/naming/applymapping/ApplyMappingDesugarLambdaTest.java b/src/test/java/com/android/tools/r8/naming/applymapping/ApplyMappingDesugarLambdaTest.java
index 29bf9fa..0dfe291 100644
--- a/src/test/java/com/android/tools/r8/naming/applymapping/ApplyMappingDesugarLambdaTest.java
+++ b/src/test/java/com/android/tools/r8/naming/applymapping/ApplyMappingDesugarLambdaTest.java
@@ -52,7 +52,7 @@
testForR8(parameters.getBackend())
.addProgramClasses(A.class)
.addKeepClassAndMembersRulesWithAllowObfuscation(A.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepRules(
"-keeppackagenames", "-classobfuscationdictionary " + dictionary.toString())
.compile()
@@ -68,7 +68,7 @@
testForD8()
.addProgramClasses(I.class, Main.class)
.addClasspathFiles(libraryPath)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class, EXPECTED)
.assertSuccessWithOutputLines(EXPECTED);
@@ -77,7 +77,7 @@
.addProgramClasses(I.class, Main.class)
.addKeepMainRule(Main.class)
.addKeepClassAndMembersRules(I.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addApplyMapping(libraryResult.getProguardMap())
.addOptionsModification(internalOptions -> internalOptions.enableClassInlining = false)
.addKeepRules("-classobfuscationdictionary " + dictionary.toString())
diff --git a/src/test/java/com/android/tools/r8/naming/applymapping/ApplyMappingExtendEmptyInterfaceTest.java b/src/test/java/com/android/tools/r8/naming/applymapping/ApplyMappingExtendEmptyInterfaceTest.java
index e16307b..33e74ea 100644
--- a/src/test/java/com/android/tools/r8/naming/applymapping/ApplyMappingExtendEmptyInterfaceTest.java
+++ b/src/test/java/com/android/tools/r8/naming/applymapping/ApplyMappingExtendEmptyInterfaceTest.java
@@ -54,7 +54,7 @@
.addProgramClasses(LibI.class, LibI2.class, LibI3.class, Runner.class)
.addKeepClassAndMembersRules(Runner.class)
.addKeepClassAndMembersRulesWithAllowObfuscation(LibI.class, LibI2.class, LibI3.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile();
testForR8(parameters.getBackend())
.addProgramClasses(TestI.class, TestA.class, Main.class)
@@ -62,7 +62,7 @@
.addKeepAllClassesRule()
.addApplyMapping(libCompileResult.getProguardMap())
.addRunClasspathFiles(libCompileResult.writeToZip())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("injectTestA", "injectObject");
}
diff --git a/src/test/java/com/android/tools/r8/naming/applymapping/ApplyMappingExtendInterfaceTest.java b/src/test/java/com/android/tools/r8/naming/applymapping/ApplyMappingExtendInterfaceTest.java
index c70d49c..0f6ec31 100644
--- a/src/test/java/com/android/tools/r8/naming/applymapping/ApplyMappingExtendInterfaceTest.java
+++ b/src/test/java/com/android/tools/r8/naming/applymapping/ApplyMappingExtendInterfaceTest.java
@@ -47,7 +47,7 @@
.addProgramClasses(LibI.class, Runner.class)
.addKeepClassAndMembersRules(Runner.class)
.addKeepClassAndMembersRulesWithAllowObfuscation(LibI.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile();
testForR8(parameters.getBackend())
.addProgramClasses(TestI.class, TestA.class, Main.class)
@@ -55,7 +55,7 @@
.addKeepAllClassesRule()
.addApplyMapping(libCompileResult.getProguardMap())
.addRunClasspathFiles(libCompileResult.writeToZip())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("injectTestA", "injectObject");
}
diff --git a/src/test/java/com/android/tools/r8/naming/applymapping/ApplyMappingInnerClassesPreserveTest.java b/src/test/java/com/android/tools/r8/naming/applymapping/ApplyMappingInnerClassesPreserveTest.java
index 2f7c01c..bf3d004 100644
--- a/src/test/java/com/android/tools/r8/naming/applymapping/ApplyMappingInnerClassesPreserveTest.java
+++ b/src/test/java/com/android/tools/r8/naming/applymapping/ApplyMappingInnerClassesPreserveTest.java
@@ -41,7 +41,7 @@
.addProgramClassesAndInnerClasses(InnerLibraryClass.class)
.addKeepAllClassesRuleWithAllowObfuscation()
.addKeepClassAndMembersRulesWithAllowObfuscation(InnerLibraryClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile();
testForR8(parameters.getBackend())
.addProgramClassesAndInnerClasses(ProgramClassWithSimpleLibraryReference.class)
@@ -49,7 +49,7 @@
.addKeepMainRule(ProgramClassWithSimpleLibraryReference.class)
.addApplyMapping(libraryCompileResult.getProguardMap())
.addKeepAttributes("EnclosingMethod", "InnerClasses")
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.noTreeShaking()
.compile()
.addRunClasspathFiles(libraryCompileResult.writeToZip())
diff --git a/src/test/java/com/android/tools/r8/naming/applymapping/ApplyMappingInterfaceClInitTest.java b/src/test/java/com/android/tools/r8/naming/applymapping/ApplyMappingInterfaceClInitTest.java
index de95714..97360c0 100644
--- a/src/test/java/com/android/tools/r8/naming/applymapping/ApplyMappingInterfaceClInitTest.java
+++ b/src/test/java/com/android/tools/r8/naming/applymapping/ApplyMappingInterfaceClInitTest.java
@@ -9,8 +9,6 @@
import static org.junit.Assert.assertTrue;
import com.android.tools.r8.CompilationFailedException;
-import com.android.tools.r8.NeverClassInline;
-import com.android.tools.r8.NeverInline;
import com.android.tools.r8.TestBase;
import com.android.tools.r8.TestParameters;
import com.android.tools.r8.TestParametersCollection;
@@ -19,7 +17,6 @@
import com.android.tools.r8.utils.codeinspector.CodeInspector;
import java.io.IOException;
import java.util.concurrent.ExecutionException;
-import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
@@ -47,7 +44,7 @@
.addKeepMainRule(Main.class)
.addKeepClassAndMembersRules(TestInterface.class)
.addApplyMapping("")
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.inspect(this::verifyNoRenamingOfClInit);
}
@@ -63,7 +60,7 @@
.addApplyMapping(
StringUtils.lines(
interfaceName + " -> " + interfaceName + ":", " void <clinit>() -> a"))
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.inspect(this::verifyNoRenamingOfClInit);
}
diff --git a/src/test/java/com/android/tools/r8/naming/applymapping/ApplyMappingInterfaceInvokeTest.java b/src/test/java/com/android/tools/r8/naming/applymapping/ApplyMappingInterfaceInvokeTest.java
index 8c7e804..da531ea 100644
--- a/src/test/java/com/android/tools/r8/naming/applymapping/ApplyMappingInterfaceInvokeTest.java
+++ b/src/test/java/com/android/tools/r8/naming/applymapping/ApplyMappingInterfaceInvokeTest.java
@@ -68,7 +68,7 @@
testForR8(parameters.getBackend())
.addProgramClasses(classPathClasses)
.addKeepAllClassesRuleWithAllowObfuscation()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile();
testForR8(parameters.getBackend())
.addClasspathClasses(classPathClasses)
@@ -76,7 +76,7 @@
.addDontObfuscate()
.noTreeShaking()
.addApplyMapping(libraryResult.getProguardMap())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.addRunClasspathFiles(libraryResult.writeToZip())
.run(parameters.getRuntime(), TestApp.class)
diff --git a/src/test/java/com/android/tools/r8/naming/applymapping/ApplyMappingKeepPrecedenceTest.java b/src/test/java/com/android/tools/r8/naming/applymapping/ApplyMappingKeepPrecedenceTest.java
index b0f1a96..288de80 100644
--- a/src/test/java/com/android/tools/r8/naming/applymapping/ApplyMappingKeepPrecedenceTest.java
+++ b/src/test/java/com/android/tools/r8/naming/applymapping/ApplyMappingKeepPrecedenceTest.java
@@ -92,7 +92,7 @@
.addKeepRules("-keepclassmembernames class " + B.class.getTypeName() + " { *; }")
.addKeepMainRule(Main.class)
.enableMemberValuePropagationAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines(
"What is the answer to life the universe and everything?", "42")
diff --git a/src/test/java/com/android/tools/r8/naming/applymapping/ApplyMappingLambdaRepackageTest.java b/src/test/java/com/android/tools/r8/naming/applymapping/ApplyMappingLambdaRepackageTest.java
index 6c799bd..58a6eff 100644
--- a/src/test/java/com/android/tools/r8/naming/applymapping/ApplyMappingLambdaRepackageTest.java
+++ b/src/test/java/com/android/tools/r8/naming/applymapping/ApplyMappingLambdaRepackageTest.java
@@ -33,7 +33,7 @@
R8TestRunResult firstRunResult =
testForR8(parameters.getBackend())
.addProgramClassesAndInnerClasses(Main.class, PackagePrivate.class, Foo.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(Main.class)
.addKeepRules("-repackageclasses foo")
.enableInliningAnnotations()
@@ -43,7 +43,7 @@
R8TestRunResult secondRunResult =
testForR8(parameters.getBackend())
.addProgramClassesAndInnerClasses(Main.class, PackagePrivate.class, Foo.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(Main.class)
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
diff --git a/src/test/java/com/android/tools/r8/naming/applymapping/ApplyMappingLibraryMemberRenamingTests.java b/src/test/java/com/android/tools/r8/naming/applymapping/ApplyMappingLibraryMemberRenamingTests.java
index 2657ae8..404c12d 100644
--- a/src/test/java/com/android/tools/r8/naming/applymapping/ApplyMappingLibraryMemberRenamingTests.java
+++ b/src/test/java/com/android/tools/r8/naming/applymapping/ApplyMappingLibraryMemberRenamingTests.java
@@ -78,7 +78,7 @@
.addProgramClasses(Dto.class, Interface.class, Main.class)
.addKeepClassAndMembersRules(Main.class)
.addKeepClassAndMembersRulesWithAllowObfuscation(Interface.class, Dto.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
codeInspector -> {
@@ -93,7 +93,7 @@
.addClasspathClasses(Dto.class, Interface.class, Main.class)
.addKeepAllClassesRule()
.addApplyMapping(libraryCompileResult.getProguardMap())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.addRunClasspathFiles(libraryCompileResult.writeToZip())
.run(parameters.getRuntime(), ClientTest.class)
diff --git a/src/test/java/com/android/tools/r8/naming/applymapping/ApplyMappingMinificationTest.java b/src/test/java/com/android/tools/r8/naming/applymapping/ApplyMappingMinificationTest.java
index afb0b75..f4158d2 100644
--- a/src/test/java/com/android/tools/r8/naming/applymapping/ApplyMappingMinificationTest.java
+++ b/src/test/java/com/android/tools/r8/naming/applymapping/ApplyMappingMinificationTest.java
@@ -102,7 +102,7 @@
.enableMemberValuePropagationAnnotations()
.enableNeverClassInliningAnnotations()
.addApplyMapping(StringUtils.lines(pgMap))
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), C.class)
.assertSuccessWithOutputLines("1", "2", "A.methodA", "A.methodB", "A.methodC", "B.foo")
.inspect(
diff --git a/src/test/java/com/android/tools/r8/naming/applymapping/ApplyMappingMissingInterfaceTest.java b/src/test/java/com/android/tools/r8/naming/applymapping/ApplyMappingMissingInterfaceTest.java
index 3eb80ae..9523fac 100644
--- a/src/test/java/com/android/tools/r8/naming/applymapping/ApplyMappingMissingInterfaceTest.java
+++ b/src/test/java/com/android/tools/r8/naming/applymapping/ApplyMappingMissingInterfaceTest.java
@@ -32,14 +32,14 @@
.addLibraryClasses(LibraryI.class)
.addDefaultRuntimeLibrary(parameters)
.addProgramClasses(ClassPathI.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepClassAndMembersRulesWithAllowObfuscation(ClassPathI.class)
.compile();
testForR8(parameters.getBackend())
.addClasspathClasses(ClassPathI.class)
.addProgramClasses(ProgramInterface.class, Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addApplyMapping(libraryCompileResult.getProguardMap())
.addKeepMainRule(Main.class)
.enableInliningAnnotations()
diff --git a/src/test/java/com/android/tools/r8/naming/applymapping/ApplyMappingMultipleInterfacesTest.java b/src/test/java/com/android/tools/r8/naming/applymapping/ApplyMappingMultipleInterfacesTest.java
index af6c004..92b44bc 100644
--- a/src/test/java/com/android/tools/r8/naming/applymapping/ApplyMappingMultipleInterfacesTest.java
+++ b/src/test/java/com/android/tools/r8/naming/applymapping/ApplyMappingMultipleInterfacesTest.java
@@ -95,7 +95,7 @@
testForR8(parameters.getBackend())
.addProgramClasses(I2Minified.class, I3Minified.class)
.addKeepAllClassesRule()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile();
testForR8(parameters.getBackend())
.addClasspathClasses(I2.class, I3.class)
@@ -112,7 +112,7 @@
+ I3Minified.class.getTypeName()
+ ":\n"
+ " java.lang.String foo(java.lang.String) -> a")
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.addRunClasspathFiles(libraryResult.writeToZip())
.run(parameters.getRuntime(), MainForImplements.class)
diff --git a/src/test/java/com/android/tools/r8/naming/applymapping/ApplyMappingNonMemberClassTest.java b/src/test/java/com/android/tools/r8/naming/applymapping/ApplyMappingNonMemberClassTest.java
index c65c1c9..c1a81d8 100644
--- a/src/test/java/com/android/tools/r8/naming/applymapping/ApplyMappingNonMemberClassTest.java
+++ b/src/test/java/com/android/tools/r8/naming/applymapping/ApplyMappingNonMemberClassTest.java
@@ -79,7 +79,7 @@
.allowAccessModification()
.enableInliningAnnotations()
.addApplyMapping(pgMap)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), "Main")
.assertSuccessWithOutput(StringUtils.lines("Anonymous run"));
}
@@ -98,7 +98,7 @@
.allowAccessModification()
.enableInliningAnnotations()
.addApplyMapping(pgMap)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), "Main")
.assertSuccessWithOutput(StringUtils.lines("Anonymous run"));
}
diff --git a/src/test/java/com/android/tools/r8/naming/applymapping/ApplyMappingOnLibraryPathTest.java b/src/test/java/com/android/tools/r8/naming/applymapping/ApplyMappingOnLibraryPathTest.java
index df6fe4d..25dbaa3 100644
--- a/src/test/java/com/android/tools/r8/naming/applymapping/ApplyMappingOnLibraryPathTest.java
+++ b/src/test/java/com/android/tools/r8/naming/applymapping/ApplyMappingOnLibraryPathTest.java
@@ -35,7 +35,7 @@
.addLibraryClasses(LibraryClass.class)
.addDefaultRuntimeLibrary(parameters)
.addProgramClasses(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addApplyMapping(typeName(LibraryClass.class) + " -> a.a:")
.addKeepMainRule(Main.class)
.compile()
diff --git a/src/test/java/com/android/tools/r8/naming/applymapping/ApplyMappingRepackagingTest.java b/src/test/java/com/android/tools/r8/naming/applymapping/ApplyMappingRepackagingTest.java
index 8b4f4e3..b5745b2 100644
--- a/src/test/java/com/android/tools/r8/naming/applymapping/ApplyMappingRepackagingTest.java
+++ b/src/test/java/com/android/tools/r8/naming/applymapping/ApplyMappingRepackagingTest.java
@@ -92,7 +92,7 @@
.enableMemberValuePropagationAnnotations()
.enableNeverClassInliningAnnotations()
.addApplyMapping(StringUtils.lines(pgMap))
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(C.class)
.addKeepRules("-repackageclasses")
.run(parameters.getRuntime(), C.class)
diff --git a/src/test/java/com/android/tools/r8/naming/applymapping/ApplyMappingSignatureTest.java b/src/test/java/com/android/tools/r8/naming/applymapping/ApplyMappingSignatureTest.java
index 5db4da0..075d30b 100644
--- a/src/test/java/com/android/tools/r8/naming/applymapping/ApplyMappingSignatureTest.java
+++ b/src/test/java/com/android/tools/r8/naming/applymapping/ApplyMappingSignatureTest.java
@@ -58,7 +58,7 @@
ProguardKeepAttributes.INNER_CLASSES,
ProguardKeepAttributes.ENCLOSING_METHOD)
.addApplyMapping(A.class.getTypeName() + " -> foo:")
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), SignatureTest.class)
.assertSuccessWithOutput("HELLO")
.inspect(
diff --git a/src/test/java/com/android/tools/r8/naming/applymapping/UnrelatedClasspathClassFieldAccessTest.java b/src/test/java/com/android/tools/r8/naming/applymapping/UnrelatedClasspathClassFieldAccessTest.java
index 4cb3b94..70cb77e 100644
--- a/src/test/java/com/android/tools/r8/naming/applymapping/UnrelatedClasspathClassFieldAccessTest.java
+++ b/src/test/java/com/android/tools/r8/naming/applymapping/UnrelatedClasspathClassFieldAccessTest.java
@@ -50,7 +50,7 @@
testForR8(parameters.getBackend())
.addProgramClasses(ClasspathClass.class)
.addKeepAllClassesRuleWithAllowObfuscation()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile();
testForR8(parameters.getBackend())
@@ -59,7 +59,7 @@
.addApplyMapping(classpath.getProguardMap())
.addKeepMainRule(ProgramClass.class)
.addRunClasspathFiles(classpath.writeToZip())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), ProgramClass.class)
.assertSuccessWithOutputLines("42");
}
diff --git a/src/test/java/com/android/tools/r8/naming/applymapping/UnrelatedClasspathClassIndirectFieldAccessTest.java b/src/test/java/com/android/tools/r8/naming/applymapping/UnrelatedClasspathClassIndirectFieldAccessTest.java
index f9397d8..b68d20c 100644
--- a/src/test/java/com/android/tools/r8/naming/applymapping/UnrelatedClasspathClassIndirectFieldAccessTest.java
+++ b/src/test/java/com/android/tools/r8/naming/applymapping/UnrelatedClasspathClassIndirectFieldAccessTest.java
@@ -52,7 +52,7 @@
testForR8(parameters.getBackend())
.addProgramClasses(ClasspathClassA.class, ClasspathClassB.class)
.addKeepAllClassesRuleWithAllowObfuscation()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile();
testForR8(parameters.getBackend())
@@ -61,7 +61,7 @@
.addApplyMapping(classpath.getProguardMap())
.addKeepMainRule(ProgramClass.class)
.addRunClasspathFiles(classpath.writeToZip())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), ProgramClass.class)
.assertSuccessWithOutputLines("42");
}
diff --git a/src/test/java/com/android/tools/r8/naming/applymapping/desugar/DefaultInterfaceMethodTest.java b/src/test/java/com/android/tools/r8/naming/applymapping/desugar/DefaultInterfaceMethodTest.java
index 18f0c96..a18cf8a 100644
--- a/src/test/java/com/android/tools/r8/naming/applymapping/desugar/DefaultInterfaceMethodTest.java
+++ b/src/test/java/com/android/tools/r8/naming/applymapping/desugar/DefaultInterfaceMethodTest.java
@@ -65,7 +65,7 @@
testForR8(parameters.getBackend())
.addProgramClasses(LibraryInterface.class, ProgramClass.class)
.addKeepMainRule(ProgramClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), ProgramClass.class)
.assertSuccessWithOutput(EXPECTED);
}
@@ -76,7 +76,7 @@
testForR8(parameters.getBackend())
.addProgramClasses(LibraryInterface.class)
.addKeepClassAndMembersRules(LibraryInterface.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile();
CodeInspector inspector = libraryResult.inspector();
assertThat(inspector.clazz(LibraryInterface.class), isPresent());
@@ -95,7 +95,7 @@
.addClasspathClasses(LibraryInterface.class)
.addApplyMapping(libraryResult.getProguardMap())
.addKeepMainRule(ProgramClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.addRunClasspathFiles(libraryResult.writeToZip())
.run(parameters.getRuntime(), ProgramClass.class)
diff --git a/src/test/java/com/android/tools/r8/naming/applymapping/desugar/StaticInterfaceMethodTest.java b/src/test/java/com/android/tools/r8/naming/applymapping/desugar/StaticInterfaceMethodTest.java
index 1dfd029..49fffdc 100644
--- a/src/test/java/com/android/tools/r8/naming/applymapping/desugar/StaticInterfaceMethodTest.java
+++ b/src/test/java/com/android/tools/r8/naming/applymapping/desugar/StaticInterfaceMethodTest.java
@@ -67,7 +67,7 @@
testForR8(parameters.getBackend())
.addProgramClasses(LibraryInterface.class, ProgramClass.class)
.addKeepMainRule(ProgramClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), ProgramClass.class)
.assertSuccessWithOutput(EXPECTED);
}
@@ -78,7 +78,7 @@
testForR8(parameters.getBackend())
.addProgramClasses(LibraryInterface.class)
.addKeepClassAndMembersRules(LibraryInterface.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile();
CodeInspector inspector = libraryResult.inspector();
ClassSubject libraryInterface = inspector.clazz(LibraryInterface.class);
@@ -101,7 +101,7 @@
.addClasspathClasses(LibraryInterface.class)
.addApplyMapping(libraryResult.getProguardMap())
.addKeepMainRule(ProgramClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.addRunClasspathFiles(libraryResult.writeToZip())
.run(parameters.getRuntime(), ProgramClass.class)
diff --git a/src/test/java/com/android/tools/r8/naming/applymapping/sourcelibrary/MemberResolutionAsmTest.java b/src/test/java/com/android/tools/r8/naming/applymapping/sourcelibrary/MemberResolutionAsmTest.java
index 20403fb..d38f2c4 100644
--- a/src/test/java/com/android/tools/r8/naming/applymapping/sourcelibrary/MemberResolutionAsmTest.java
+++ b/src/test/java/com/android/tools/r8/naming/applymapping/sourcelibrary/MemberResolutionAsmTest.java
@@ -101,7 +101,7 @@
CodeInspector codeInspector =
testForR8(parameters.getBackend())
.addProgramClassFileData(noMappingInputs())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(noMappingMain)
.addApplyMapping(pgMap)
.addOptionsModification(
@@ -194,7 +194,7 @@
R8TestCompileResult compileResult =
testForR8(parameters.getBackend())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addProgramClassFileData(swappingInputs())
.addKeepMainRule(swappingMain)
.addApplyMapping(pgMap)
diff --git a/src/test/java/com/android/tools/r8/naming/applymapping/sourcelibrary/MemberResolutionTest.java b/src/test/java/com/android/tools/r8/naming/applymapping/sourcelibrary/MemberResolutionTest.java
index 1a7919f..7fd2094 100644
--- a/src/test/java/com/android/tools/r8/naming/applymapping/sourcelibrary/MemberResolutionTest.java
+++ b/src/test/java/com/android/tools/r8/naming/applymapping/sourcelibrary/MemberResolutionTest.java
@@ -126,7 +126,7 @@
.enableMemberValuePropagationAnnotations()
.enableNoVerticalClassMergingAnnotations()
.addOptionsModification(options -> options.inlinerOptions().enableInlining = false)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), MemberResolutionTestMain.class)
.assertSuccessWithOutput(expectedOutput)
.inspector();
diff --git a/src/test/java/com/android/tools/r8/naming/arraytypes/ArrayTypesTest.java b/src/test/java/com/android/tools/r8/naming/arraytypes/ArrayTypesTest.java
index 031571e..74d750d 100644
--- a/src/test/java/com/android/tools/r8/naming/arraytypes/ArrayTypesTest.java
+++ b/src/test/java/com/android/tools/r8/naming/arraytypes/ArrayTypesTest.java
@@ -73,7 +73,7 @@
.addProgramClassFileData(generateTestClass())
.addKeepMainRule(Main.class)
.addKeepRules("-keep class " + generatedTestClassName + " { test(...); }")
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutput(expectedOutput);
}
@@ -104,7 +104,7 @@
.addKeepRules("-applymapping " + mappingFile.toAbsolutePath())
.addDontObfuscate()
.noTreeShaking()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutput(expectedOutput);
}
diff --git a/src/test/java/com/android/tools/r8/naming/b124357885/B124357885Test.java b/src/test/java/com/android/tools/r8/naming/b124357885/B124357885Test.java
index 7bf4064..4b3c35f 100644
--- a/src/test/java/com/android/tools/r8/naming/b124357885/B124357885Test.java
+++ b/src/test/java/com/android/tools/r8/naming/b124357885/B124357885Test.java
@@ -71,7 +71,7 @@
.enableInliningAnnotations()
.enableKeepUnusedReturnValueAnnotations()
.minification(minification)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector -> {
diff --git a/src/test/java/com/android/tools/r8/naming/b130791310/B130791310.java b/src/test/java/com/android/tools/r8/naming/b130791310/B130791310.java
index ba6fab5..27320eb 100644
--- a/src/test/java/com/android/tools/r8/naming/b130791310/B130791310.java
+++ b/src/test/java/com/android/tools/r8/naming/b130791310/B130791310.java
@@ -123,7 +123,7 @@
.addKeepClassAndMembersRules(MAIN)
.addKeepRules(RULES)
.addNeverClassInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.applyIf(
!enableClassMerging, builder -> builder.addKeepRules("-optimizations !class/merging/*"))
.compile()
@@ -137,7 +137,7 @@
.addKeepClassAndMembersRules(MAIN)
.addKeepRules(RULES)
.enableNeverClassInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addOptionsModification(o -> o.enableVerticalClassMerging = enableClassMerging)
.applyIf(
onlyForceInlining,
diff --git a/src/test/java/com/android/tools/r8/naming/b132460884/LocalClassRenamingTest.java b/src/test/java/com/android/tools/r8/naming/b132460884/LocalClassRenamingTest.java
index eb17213..8be4f0b 100644
--- a/src/test/java/com/android/tools/r8/naming/b132460884/LocalClassRenamingTest.java
+++ b/src/test/java/com/android/tools/r8/naming/b132460884/LocalClassRenamingTest.java
@@ -85,13 +85,14 @@
.addKeepAttributes("Signature", "InnerClasses")
.noTreeShaking()
.minification(enableMinification)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
- .inspect(inspector -> {
- ClassSubject local = inspector.clazz(TestMap.class.getName() + "$1LocalEntrySet");
- assertThat(local, isPresent());
- assertEquals(enableMinification, local.isRenamed());
- })
+ .inspect(
+ inspector -> {
+ ClassSubject local = inspector.clazz(TestMap.class.getName() + "$1LocalEntrySet");
+ assertThat(local, isPresent());
+ assertEquals(enableMinification, local.isRenamed());
+ })
.run(parameters.getRuntime(), TestMain.class)
.assertSuccessWithOutput(EXPECTED_OUTPUT);
}
diff --git a/src/test/java/com/android/tools/r8/naming/b139991218/TestRunner.java b/src/test/java/com/android/tools/r8/naming/b139991218/TestRunner.java
index 559f6a0..357b665 100644
--- a/src/test/java/com/android/tools/r8/naming/b139991218/TestRunner.java
+++ b/src/test/java/com/android/tools/r8/naming/b139991218/TestRunner.java
@@ -75,7 +75,7 @@
"com.android.tools.r8.naming.b139991218.Lambda1",
"com.android.tools.r8.naming.b139991218.Lambda2"))
.allowDiagnosticWarningMessages()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.assertAllWarningMessagesMatch(equalTo("Resource 'META-INF/MANIFEST.MF' already exists."))
.run(parameters.getRuntime(), Main.class)
diff --git a/src/test/java/com/android/tools/r8/naming/b155249069/DontUseMixedCaseClassNamesExistingClassPackageTest.java b/src/test/java/com/android/tools/r8/naming/b155249069/DontUseMixedCaseClassNamesExistingClassPackageTest.java
index 696704f..839c96d 100644
--- a/src/test/java/com/android/tools/r8/naming/b155249069/DontUseMixedCaseClassNamesExistingClassPackageTest.java
+++ b/src/test/java/com/android/tools/r8/naming/b155249069/DontUseMixedCaseClassNamesExistingClassPackageTest.java
@@ -61,7 +61,7 @@
transformer(com.android.tools.r8.naming.b155249069.A.A.class)
.setClassDescriptor(DescriptorUtils.javaTypeToDescriptor(renamedATypeName))
.transform())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
// Keep testpackage.A such that the package A is kept.
.addKeepClassRules(renamedATypeName)
.addKeepClassRulesWithAllowObfuscation(A.class)
diff --git a/src/test/java/com/android/tools/r8/naming/b173184123/ClassExtendsInterfaceNamingTest.java b/src/test/java/com/android/tools/r8/naming/b173184123/ClassExtendsInterfaceNamingTest.java
index 2de209b..36d0892 100644
--- a/src/test/java/com/android/tools/r8/naming/b173184123/ClassExtendsInterfaceNamingTest.java
+++ b/src/test/java/com/android/tools/r8/naming/b173184123/ClassExtendsInterfaceNamingTest.java
@@ -54,7 +54,7 @@
.addTestingAnnotationsAsProgramClasses()
.enableAssertions(false)
.useR8WithRelocatedDeps()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(Main.class)
.addKeepClassAndMembersRules(Interface.class)
.addKeepRules("-neverclassinline @com.android.tools.r8.NeverClassInline class *")
diff --git a/src/test/java/com/android/tools/r8/naming/identifiernamestring/ClassNameComparisonSwitchTest.java b/src/test/java/com/android/tools/r8/naming/identifiernamestring/ClassNameComparisonSwitchTest.java
index 81038cf..c9bb8c0 100644
--- a/src/test/java/com/android/tools/r8/naming/identifiernamestring/ClassNameComparisonSwitchTest.java
+++ b/src/test/java/com/android/tools/r8/naming/identifiernamestring/ClassNameComparisonSwitchTest.java
@@ -40,7 +40,7 @@
.addInnerClasses(ClassNameComparisonSwitchTest.class)
.addKeepMainRule(TestClass.class)
.enableInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::verifyClassesHaveBeenMinified)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/naming/identifiernamestring/ClassNameComparisonTest.java b/src/test/java/com/android/tools/r8/naming/identifiernamestring/ClassNameComparisonTest.java
index f37c70c..ba0b7ad 100644
--- a/src/test/java/com/android/tools/r8/naming/identifiernamestring/ClassNameComparisonTest.java
+++ b/src/test/java/com/android/tools/r8/naming/identifiernamestring/ClassNameComparisonTest.java
@@ -35,7 +35,7 @@
.addInnerClasses(ClassNameComparisonTest.class)
.addKeepMainRule(TestClass.class)
.enableNoHorizontalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutputLines("Hello!", "Hello " + B.class.getName() + "!");
diff --git a/src/test/java/com/android/tools/r8/naming/keeppackagenames/KeepPackageNameRootTest.java b/src/test/java/com/android/tools/r8/naming/keeppackagenames/KeepPackageNameRootTest.java
index e7c14ff..eaefba7 100644
--- a/src/test/java/com/android/tools/r8/naming/keeppackagenames/KeepPackageNameRootTest.java
+++ b/src/test/java/com/android/tools/r8/naming/keeppackagenames/KeepPackageNameRootTest.java
@@ -56,7 +56,7 @@
.transform())
.addKeepRules("-keeppackagenames foo.**")
.addKeepClassRulesWithAllowObfuscation("foo.Main")
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector -> {
diff --git a/src/test/java/com/android/tools/r8/naming/retrace/DesugarPrivateLambdaRetraceTest.java b/src/test/java/com/android/tools/r8/naming/retrace/DesugarPrivateLambdaRetraceTest.java
index 01f9b37..e21927b 100644
--- a/src/test/java/com/android/tools/r8/naming/retrace/DesugarPrivateLambdaRetraceTest.java
+++ b/src/test/java/com/android/tools/r8/naming/retrace/DesugarPrivateLambdaRetraceTest.java
@@ -80,7 +80,7 @@
testForD8(parameters.getBackend())
.setMode(CompilationMode.DEBUG)
.addInnerClasses(DesugarInterfaceInstanceLambdaRetrace.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.internalEnableMappingOutput()
.run(parameters.getRuntime(), DesugarInterfaceInstanceLambdaRetrace.Main.class)
.assertFailureWithErrorThatThrows(NullPointerException.class)
diff --git a/src/test/java/com/android/tools/r8/naming/retrace/LineDeltaTest.java b/src/test/java/com/android/tools/r8/naming/retrace/LineDeltaTest.java
index d91a506..de50d34 100644
--- a/src/test/java/com/android/tools/r8/naming/retrace/LineDeltaTest.java
+++ b/src/test/java/com/android/tools/r8/naming/retrace/LineDeltaTest.java
@@ -34,7 +34,7 @@
.addProgramClasses(LineDeltaTestClass.class)
.addKeepMainRule(LineDeltaTestClass.class)
.addKeepRules("-keepattributes LineNumberTable")
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector ->
diff --git a/src/test/java/com/android/tools/r8/naming/retrace/LineNumberRangeTest.java b/src/test/java/com/android/tools/r8/naming/retrace/LineNumberRangeTest.java
index 84f0389..14877dd 100644
--- a/src/test/java/com/android/tools/r8/naming/retrace/LineNumberRangeTest.java
+++ b/src/test/java/com/android/tools/r8/naming/retrace/LineNumberRangeTest.java
@@ -83,7 +83,7 @@
.addKeepMainRule(Main.class)
.addKeepAttributes(
ProguardKeepAttributes.SOURCE_FILE, ProguardKeepAttributes.LINE_NUMBER_TABLE)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addOptionsModification(
options -> {
options.inlinerOptions().enableInlining = false;
diff --git a/src/test/java/com/android/tools/r8/naming/retrace/RetraceInlineBranchTest.java b/src/test/java/com/android/tools/r8/naming/retrace/RetraceInlineBranchTest.java
index db9020d..0b70c65 100644
--- a/src/test/java/com/android/tools/r8/naming/retrace/RetraceInlineBranchTest.java
+++ b/src/test/java/com/android/tools/r8/naming/retrace/RetraceInlineBranchTest.java
@@ -53,7 +53,7 @@
public void testR8() throws Throwable {
testForR8(parameters.getBackend())
.addInnerClasses(getClass())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(Main.class)
.addKeepAttributeLineNumberTable()
.enableNeverClassInliningAnnotations()
diff --git a/src/test/java/com/android/tools/r8/naming/retrace/RetraceInlineConditionTest.java b/src/test/java/com/android/tools/r8/naming/retrace/RetraceInlineConditionTest.java
index 8362ed6..f912620 100644
--- a/src/test/java/com/android/tools/r8/naming/retrace/RetraceInlineConditionTest.java
+++ b/src/test/java/com/android/tools/r8/naming/retrace/RetraceInlineConditionTest.java
@@ -56,7 +56,7 @@
R8TestCompileResult compileResult =
testForR8(parameters.getBackend())
.addInnerClasses(getClass())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(Main.class)
.addKeepAttributeLineNumberTable()
.compile()
diff --git a/src/test/java/com/android/tools/r8/naming/retrace/RetraceInlineeWithNoSuchMethodErrorTest.java b/src/test/java/com/android/tools/r8/naming/retrace/RetraceInlineeWithNoSuchMethodErrorTest.java
index a68715a..739647f 100644
--- a/src/test/java/com/android/tools/r8/naming/retrace/RetraceInlineeWithNoSuchMethodErrorTest.java
+++ b/src/test/java/com/android/tools/r8/naming/retrace/RetraceInlineeWithNoSuchMethodErrorTest.java
@@ -77,7 +77,7 @@
.addKeepMainRule(Caller.class)
.addKeepAttributeLineNumberTable()
.addKeepAttributeSourceFile()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.enableInliningAnnotations()
.enableKeepUnusedReturnValueAnnotations()
.enableExperimentalMapFileVersion();
diff --git a/src/test/java/com/android/tools/r8/naming/retrace/RetraceInlineeWithNullCheckFollowingImplicitReceiverNullCheckTest.java b/src/test/java/com/android/tools/r8/naming/retrace/RetraceInlineeWithNullCheckFollowingImplicitReceiverNullCheckTest.java
index ea357c5..ec289e1 100644
--- a/src/test/java/com/android/tools/r8/naming/retrace/RetraceInlineeWithNullCheckFollowingImplicitReceiverNullCheckTest.java
+++ b/src/test/java/com/android/tools/r8/naming/retrace/RetraceInlineeWithNullCheckFollowingImplicitReceiverNullCheckTest.java
@@ -58,7 +58,7 @@
.enableExperimentalMapFileVersion()
.enableInliningAnnotations()
.enableNoMethodStaticizingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Caller.class)
.assertFailureWithErrorThatThrows(NullPointerException.class)
.inspectStackTrace(
diff --git a/src/test/java/com/android/tools/r8/naming/retrace/RetraceInlineeWithNullCheckInlinedTest.java b/src/test/java/com/android/tools/r8/naming/retrace/RetraceInlineeWithNullCheckInlinedTest.java
index 17e67fd..c83d545 100644
--- a/src/test/java/com/android/tools/r8/naming/retrace/RetraceInlineeWithNullCheckInlinedTest.java
+++ b/src/test/java/com/android/tools/r8/naming/retrace/RetraceInlineeWithNullCheckInlinedTest.java
@@ -59,7 +59,7 @@
.addKeepMainRule(Caller.class)
.addKeepAttributeLineNumberTable()
.addKeepAttributeSourceFile()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.enableInliningAnnotations()
.enableNoMethodStaticizingAnnotations()
.run(parameters.getRuntime(), Caller.class, getArgs())
diff --git a/src/test/java/com/android/tools/r8/naming/retrace/RetraceInlineeWithNullCheckSequenceTest.java b/src/test/java/com/android/tools/r8/naming/retrace/RetraceInlineeWithNullCheckSequenceTest.java
index bbc374b..511b906 100644
--- a/src/test/java/com/android/tools/r8/naming/retrace/RetraceInlineeWithNullCheckSequenceTest.java
+++ b/src/test/java/com/android/tools/r8/naming/retrace/RetraceInlineeWithNullCheckSequenceTest.java
@@ -49,7 +49,7 @@
.addKeepMainRule(Caller.class)
.addKeepAttributeLineNumberTable()
.addKeepAttributeSourceFile()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.enableInliningAnnotations()
.enableExperimentalMapFileVersion()
.run(parameters.getRuntime(), Caller.class)
diff --git a/src/test/java/com/android/tools/r8/naming/retrace/RetraceInlineeWithNullCheckTest.java b/src/test/java/com/android/tools/r8/naming/retrace/RetraceInlineeWithNullCheckTest.java
index 5dac751..af0616e 100644
--- a/src/test/java/com/android/tools/r8/naming/retrace/RetraceInlineeWithNullCheckTest.java
+++ b/src/test/java/com/android/tools/r8/naming/retrace/RetraceInlineeWithNullCheckTest.java
@@ -58,7 +58,7 @@
.addKeepMainRule(Caller.class)
.addKeepAttributeLineNumberTable()
.addKeepAttributeSourceFile()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.enableInliningAnnotations()
.run(parameters.getRuntime(), Caller.class, getArgs())
.assertFailureWithErrorThatThrows(NullPointerException.class)
diff --git a/src/test/java/com/android/tools/r8/naming/retrace/RetraceTestBase.java b/src/test/java/com/android/tools/r8/naming/retrace/RetraceTestBase.java
index b4b90a4..94117c5 100644
--- a/src/test/java/com/android/tools/r8/naming/retrace/RetraceTestBase.java
+++ b/src/test/java/com/android/tools/r8/naming/retrace/RetraceTestBase.java
@@ -61,7 +61,7 @@
.addKeepMainRule(getMainClass())
.addKeepRules(keepRules)
.apply(this::configure)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect)
.run(parameters.getRuntime(), getMainClass())
diff --git a/src/test/java/com/android/tools/r8/naming/retraceproguard/LineDeltaTest.java b/src/test/java/com/android/tools/r8/naming/retraceproguard/LineDeltaTest.java
index 273adb0..144b772 100644
--- a/src/test/java/com/android/tools/r8/naming/retraceproguard/LineDeltaTest.java
+++ b/src/test/java/com/android/tools/r8/naming/retraceproguard/LineDeltaTest.java
@@ -34,7 +34,7 @@
.addProgramClasses(LineDeltaTestClass.class)
.addKeepMainRule(LineDeltaTestClass.class)
.addKeepRules("-keepattributes LineNumberTable")
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector ->
diff --git a/src/test/java/com/android/tools/r8/naming/retraceproguard/RetraceTestBase.java b/src/test/java/com/android/tools/r8/naming/retraceproguard/RetraceTestBase.java
index 5475557..4769879 100644
--- a/src/test/java/com/android/tools/r8/naming/retraceproguard/RetraceTestBase.java
+++ b/src/test/java/com/android/tools/r8/naming/retraceproguard/RetraceTestBase.java
@@ -68,7 +68,7 @@
.addProgramClasses(getClasses())
.addKeepMainRule(getMainClass())
.addKeepRules(keepRules)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.apply(this::configure)
.compile()
.apply(compileResultConsumer)
diff --git a/src/test/java/com/android/tools/r8/naming/signature/GenericSignatureRenamingTest.java b/src/test/java/com/android/tools/r8/naming/signature/GenericSignatureRenamingTest.java
index 65445a7..12d315f 100644
--- a/src/test/java/com/android/tools/r8/naming/signature/GenericSignatureRenamingTest.java
+++ b/src/test/java/com/android/tools/r8/naming/signature/GenericSignatureRenamingTest.java
@@ -47,7 +47,7 @@
.addProgramClasses(Main.class)
.addProgramClassesAndInnerClasses(A.class, B.class, CY.class, CYY.class)
.setMode(CompilationMode.RELEASE)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.assertNoMessages()
.run(parameters.getRuntime(), Main.class)
@@ -90,7 +90,7 @@
.addProgramClasses(Main.class)
.addProgramClassesAndInnerClasses(A.class, B.class, CY.class, CYY.class)
.setMode(CompilationMode.RELEASE)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.assertNoMessages()
.run(parameters.getRuntime(), Main.class)
diff --git a/src/test/java/com/android/tools/r8/naming/signature/SignatureOfMergedClassesTest.java b/src/test/java/com/android/tools/r8/naming/signature/SignatureOfMergedClassesTest.java
index 5f58326..102af63 100644
--- a/src/test/java/com/android/tools/r8/naming/signature/SignatureOfMergedClassesTest.java
+++ b/src/test/java/com/android/tools/r8/naming/signature/SignatureOfMergedClassesTest.java
@@ -60,7 +60,7 @@
.addKeepMainRule(Main.class)
.addKeepClassRules(InterfaceToKeep.class, ImplI.class, K.class)
.addKeepAttributes("Signature, InnerClasses, EnclosingMethod, *Annotation*")
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addDontObfuscate()
.addOptionsModification(
internalOptions -> {
@@ -91,7 +91,7 @@
.addKeepMainRule(Foo.class)
.addKeepClassRules(InterfaceToKeep.class)
.addKeepAttributes("Signature, InnerClasses, EnclosingMethod, *Annotation*")
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addDontObfuscate()
.addOptionsModification(
internalOptions -> {
diff --git a/src/test/java/com/android/tools/r8/naming/sourcefile/StringPoolSizeWithLazyDexStringsTest.java b/src/test/java/com/android/tools/r8/naming/sourcefile/StringPoolSizeWithLazyDexStringsTest.java
index 8981bd9..4598b8a 100644
--- a/src/test/java/com/android/tools/r8/naming/sourcefile/StringPoolSizeWithLazyDexStringsTest.java
+++ b/src/test/java/com/android/tools/r8/naming/sourcefile/StringPoolSizeWithLazyDexStringsTest.java
@@ -44,7 +44,7 @@
testForR8(parameters.getBackend())
.addInnerClasses(StringPoolSizeWithLazyDexStringsTest.class)
.addKeepMainRule(TestClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
// Ensure we have a source file that depends on the hash.
.apply(
b ->
diff --git a/src/test/java/com/android/tools/r8/optimize/argumentpropagation/ArgumentPropagationToClassesOutsideLowerBoundTest.java b/src/test/java/com/android/tools/r8/optimize/argumentpropagation/ArgumentPropagationToClassesOutsideLowerBoundTest.java
index f8ad999..ac2a9bc 100644
--- a/src/test/java/com/android/tools/r8/optimize/argumentpropagation/ArgumentPropagationToClassesOutsideLowerBoundTest.java
+++ b/src/test/java/com/android/tools/r8/optimize/argumentpropagation/ArgumentPropagationToClassesOutsideLowerBoundTest.java
@@ -39,7 +39,7 @@
.addHorizontallyMergedClassesInspector(
HorizontallyMergedClassesInspector::assertNoClassesMerged)
.enableNoHorizontalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector -> {
diff --git a/src/test/java/com/android/tools/r8/optimize/argumentpropagation/CheckNotZeroMethodWithArgumentRemovalTest.java b/src/test/java/com/android/tools/r8/optimize/argumentpropagation/CheckNotZeroMethodWithArgumentRemovalTest.java
index c37dd30..c6b4a38 100644
--- a/src/test/java/com/android/tools/r8/optimize/argumentpropagation/CheckNotZeroMethodWithArgumentRemovalTest.java
+++ b/src/test/java/com/android/tools/r8/optimize/argumentpropagation/CheckNotZeroMethodWithArgumentRemovalTest.java
@@ -38,7 +38,7 @@
.addKeepMainRule(Main.class)
.addEnumUnboxingInspector(inspector -> inspector.assertUnboxed(MyEnum.class))
.enableInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector -> {
diff --git a/src/test/java/com/android/tools/r8/optimize/argumentpropagation/CollisionWithLibraryMethodAfterConstantParameterRemovalTest.java b/src/test/java/com/android/tools/r8/optimize/argumentpropagation/CollisionWithLibraryMethodAfterConstantParameterRemovalTest.java
index a8f51d2..ce38d50 100644
--- a/src/test/java/com/android/tools/r8/optimize/argumentpropagation/CollisionWithLibraryMethodAfterConstantParameterRemovalTest.java
+++ b/src/test/java/com/android/tools/r8/optimize/argumentpropagation/CollisionWithLibraryMethodAfterConstantParameterRemovalTest.java
@@ -43,7 +43,7 @@
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
.enableNoMethodStaticizingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector -> {
diff --git a/src/test/java/com/android/tools/r8/optimize/argumentpropagation/CompanionConstructorShakingTest.java b/src/test/java/com/android/tools/r8/optimize/argumentpropagation/CompanionConstructorShakingTest.java
index 023b012..01055a6 100644
--- a/src/test/java/com/android/tools/r8/optimize/argumentpropagation/CompanionConstructorShakingTest.java
+++ b/src/test/java/com/android/tools/r8/optimize/argumentpropagation/CompanionConstructorShakingTest.java
@@ -43,7 +43,7 @@
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
.enableNoHorizontalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector -> {
diff --git a/src/test/java/com/android/tools/r8/optimize/argumentpropagation/ConsistentMethodRenamingWithArgumentRemovalAndStaticizingTest.java b/src/test/java/com/android/tools/r8/optimize/argumentpropagation/ConsistentMethodRenamingWithArgumentRemovalAndStaticizingTest.java
index e8daac4..7aed499 100644
--- a/src/test/java/com/android/tools/r8/optimize/argumentpropagation/ConsistentMethodRenamingWithArgumentRemovalAndStaticizingTest.java
+++ b/src/test/java/com/android/tools/r8/optimize/argumentpropagation/ConsistentMethodRenamingWithArgumentRemovalAndStaticizingTest.java
@@ -36,7 +36,7 @@
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
.enableNoHorizontalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("A.m()", "B.m()");
}
diff --git a/src/test/java/com/android/tools/r8/optimize/argumentpropagation/ConstantReturnAfterArgumentPropagationTest.java b/src/test/java/com/android/tools/r8/optimize/argumentpropagation/ConstantReturnAfterArgumentPropagationTest.java
index 16ddb1f..50a99d0 100644
--- a/src/test/java/com/android/tools/r8/optimize/argumentpropagation/ConstantReturnAfterArgumentPropagationTest.java
+++ b/src/test/java/com/android/tools/r8/optimize/argumentpropagation/ConstantReturnAfterArgumentPropagationTest.java
@@ -37,7 +37,7 @@
.addInnerClasses(getClass())
.addKeepMainRule(Main.class)
.enableInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector -> {
diff --git a/src/test/java/com/android/tools/r8/optimize/argumentpropagation/ConstantUnboxedEnumArgumentTest.java b/src/test/java/com/android/tools/r8/optimize/argumentpropagation/ConstantUnboxedEnumArgumentTest.java
index b32997a..e77b1c2 100644
--- a/src/test/java/com/android/tools/r8/optimize/argumentpropagation/ConstantUnboxedEnumArgumentTest.java
+++ b/src/test/java/com/android/tools/r8/optimize/argumentpropagation/ConstantUnboxedEnumArgumentTest.java
@@ -40,7 +40,7 @@
.addKeepMainRule(Main.class)
.addEnumUnboxingInspector(inspector -> inspector.assertUnboxed(MyEnum.class))
.enableInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector -> {
diff --git a/src/test/java/com/android/tools/r8/optimize/argumentpropagation/EffectivelyFinalCompanionMethodsTest.java b/src/test/java/com/android/tools/r8/optimize/argumentpropagation/EffectivelyFinalCompanionMethodsTest.java
index dc9b490..06e148f 100644
--- a/src/test/java/com/android/tools/r8/optimize/argumentpropagation/EffectivelyFinalCompanionMethodsTest.java
+++ b/src/test/java/com/android/tools/r8/optimize/argumentpropagation/EffectivelyFinalCompanionMethodsTest.java
@@ -43,7 +43,7 @@
.enableNeverClassInliningAnnotations()
.enableNoHorizontalClassMergingAnnotations()
.addDontObfuscate()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector -> {
diff --git a/src/test/java/com/android/tools/r8/optimize/argumentpropagation/ImpreciseReceiverWithUnknownArgumentInformationWidenedToUnknownTest.java b/src/test/java/com/android/tools/r8/optimize/argumentpropagation/ImpreciseReceiverWithUnknownArgumentInformationWidenedToUnknownTest.java
index 5fe18a3..a6a966f 100644
--- a/src/test/java/com/android/tools/r8/optimize/argumentpropagation/ImpreciseReceiverWithUnknownArgumentInformationWidenedToUnknownTest.java
+++ b/src/test/java/com/android/tools/r8/optimize/argumentpropagation/ImpreciseReceiverWithUnknownArgumentInformationWidenedToUnknownTest.java
@@ -47,7 +47,7 @@
.addVerticallyMergedClassesInspector(
VerticallyMergedClassesInspector::assertNoClassesMerged)
.enableNoVerticalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("A");
diff --git a/src/test/java/com/android/tools/r8/optimize/argumentpropagation/InterfaceInvokeWithNonTrivialButImpreciseStaticTypeTest.java b/src/test/java/com/android/tools/r8/optimize/argumentpropagation/InterfaceInvokeWithNonTrivialButImpreciseStaticTypeTest.java
index c7ca4d0..67d36f3 100644
--- a/src/test/java/com/android/tools/r8/optimize/argumentpropagation/InterfaceInvokeWithNonTrivialButImpreciseStaticTypeTest.java
+++ b/src/test/java/com/android/tools/r8/optimize/argumentpropagation/InterfaceInvokeWithNonTrivialButImpreciseStaticTypeTest.java
@@ -9,7 +9,6 @@
import com.android.tools.r8.TestBase;
import com.android.tools.r8.TestParameters;
import com.android.tools.r8.TestParametersCollection;
-import com.android.tools.r8.references.Reference;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
@@ -34,7 +33,7 @@
.addKeepMainRule(Main.class)
.enableNoHorizontalClassMergingAnnotations()
.enableNoVerticalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("B");
}
diff --git a/src/test/java/com/android/tools/r8/optimize/argumentpropagation/MixedArgumentRemovalAndEnumUnboxingTest.java b/src/test/java/com/android/tools/r8/optimize/argumentpropagation/MixedArgumentRemovalAndEnumUnboxingTest.java
index 4b9ed0b..3b98d81 100644
--- a/src/test/java/com/android/tools/r8/optimize/argumentpropagation/MixedArgumentRemovalAndEnumUnboxingTest.java
+++ b/src/test/java/com/android/tools/r8/optimize/argumentpropagation/MixedArgumentRemovalAndEnumUnboxingTest.java
@@ -40,7 +40,7 @@
.addKeepMainRule(Main.class)
.addEnumUnboxingInspector(inspector -> inspector.assertUnboxed(MyEnum.class))
.enableInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector -> {
diff --git a/src/test/java/com/android/tools/r8/optimize/argumentpropagation/MonomorphicMethodWithUnusedReturnValueTest.java b/src/test/java/com/android/tools/r8/optimize/argumentpropagation/MonomorphicMethodWithUnusedReturnValueTest.java
index a4065e9..901e580 100644
--- a/src/test/java/com/android/tools/r8/optimize/argumentpropagation/MonomorphicMethodWithUnusedReturnValueTest.java
+++ b/src/test/java/com/android/tools/r8/optimize/argumentpropagation/MonomorphicMethodWithUnusedReturnValueTest.java
@@ -37,7 +37,7 @@
.addInnerClasses(getClass())
.addKeepMainRule(Main.class)
.enableInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector -> {
diff --git a/src/test/java/com/android/tools/r8/optimize/argumentpropagation/MonomorphicVirtualMethodTest.java b/src/test/java/com/android/tools/r8/optimize/argumentpropagation/MonomorphicVirtualMethodTest.java
index 434aeac..a7c9b69 100644
--- a/src/test/java/com/android/tools/r8/optimize/argumentpropagation/MonomorphicVirtualMethodTest.java
+++ b/src/test/java/com/android/tools/r8/optimize/argumentpropagation/MonomorphicVirtualMethodTest.java
@@ -44,7 +44,7 @@
.apply(ignore -> inspected.set()))
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("42");
diff --git a/src/test/java/com/android/tools/r8/optimize/argumentpropagation/MonomorphicVirtualMethodWithInterfaceMethodSiblingTest.java b/src/test/java/com/android/tools/r8/optimize/argumentpropagation/MonomorphicVirtualMethodWithInterfaceMethodSiblingTest.java
index e5b9f02..d5eb28da 100644
--- a/src/test/java/com/android/tools/r8/optimize/argumentpropagation/MonomorphicVirtualMethodWithInterfaceMethodSiblingTest.java
+++ b/src/test/java/com/android/tools/r8/optimize/argumentpropagation/MonomorphicVirtualMethodWithInterfaceMethodSiblingTest.java
@@ -58,7 +58,7 @@
.enableNeverClassInliningAnnotations()
.enableNoHorizontalClassMergingAnnotations()
.enableNoVerticalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("A: 42", "A: 42");
diff --git a/src/test/java/com/android/tools/r8/optimize/argumentpropagation/NullableCompanionConstructorShakingTest.java b/src/test/java/com/android/tools/r8/optimize/argumentpropagation/NullableCompanionConstructorShakingTest.java
index 25af8f6..ddf8448 100644
--- a/src/test/java/com/android/tools/r8/optimize/argumentpropagation/NullableCompanionConstructorShakingTest.java
+++ b/src/test/java/com/android/tools/r8/optimize/argumentpropagation/NullableCompanionConstructorShakingTest.java
@@ -44,7 +44,7 @@
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
.enableNoHorizontalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector -> {
diff --git a/src/test/java/com/android/tools/r8/optimize/argumentpropagation/ParameterTypeStrengtheningTest.java b/src/test/java/com/android/tools/r8/optimize/argumentpropagation/ParameterTypeStrengtheningTest.java
index 25e85cc..955136f 100644
--- a/src/test/java/com/android/tools/r8/optimize/argumentpropagation/ParameterTypeStrengtheningTest.java
+++ b/src/test/java/com/android/tools/r8/optimize/argumentpropagation/ParameterTypeStrengtheningTest.java
@@ -41,7 +41,7 @@
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
.enableNoHorizontalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector -> {
diff --git a/src/test/java/com/android/tools/r8/optimize/argumentpropagation/ParameterWithUnknownArgumentInformationWidenedToUnknownTest.java b/src/test/java/com/android/tools/r8/optimize/argumentpropagation/ParameterWithUnknownArgumentInformationWidenedToUnknownTest.java
index f7e759f..dc347a6 100644
--- a/src/test/java/com/android/tools/r8/optimize/argumentpropagation/ParameterWithUnknownArgumentInformationWidenedToUnknownTest.java
+++ b/src/test/java/com/android/tools/r8/optimize/argumentpropagation/ParameterWithUnknownArgumentInformationWidenedToUnknownTest.java
@@ -42,7 +42,7 @@
Reference.methodFromMethod(Main.class.getDeclaredMethod("test", A.class)))
.apply(ignore -> inspected.set()))
.enableInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines(null, "A");
diff --git a/src/test/java/com/android/tools/r8/optimize/argumentpropagation/PolymorphicMethodWithNullReceiverBoundTest.java b/src/test/java/com/android/tools/r8/optimize/argumentpropagation/PolymorphicMethodWithNullReceiverBoundTest.java
index 5ad2a81..776cf11 100644
--- a/src/test/java/com/android/tools/r8/optimize/argumentpropagation/PolymorphicMethodWithNullReceiverBoundTest.java
+++ b/src/test/java/com/android/tools/r8/optimize/argumentpropagation/PolymorphicMethodWithNullReceiverBoundTest.java
@@ -50,7 +50,7 @@
.addKeepMainRule(Main.class)
.enableNoHorizontalClassMergingAnnotations()
.enableNoVerticalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addOptionsModification(
options -> {
options.testing.cfByteCodePassThrough =
@@ -71,7 +71,7 @@
.addKeepMainRule(Main.class)
.enableNoHorizontalClassMergingAnnotations()
.enableNoVerticalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addOptionsModification(
options -> {
options.testing.cfByteCodePassThrough = method -> method.getName().startsWith("main");
diff --git a/src/test/java/com/android/tools/r8/optimize/argumentpropagation/PolymorphicMethodWithUnusedReturnValueTest.java b/src/test/java/com/android/tools/r8/optimize/argumentpropagation/PolymorphicMethodWithUnusedReturnValueTest.java
index 0a60d89..3c8f313 100644
--- a/src/test/java/com/android/tools/r8/optimize/argumentpropagation/PolymorphicMethodWithUnusedReturnValueTest.java
+++ b/src/test/java/com/android/tools/r8/optimize/argumentpropagation/PolymorphicMethodWithUnusedReturnValueTest.java
@@ -39,7 +39,7 @@
.addKeepMainRule(Main.class)
.enableNoHorizontalClassMergingAnnotations()
.enableNoVerticalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector -> {
diff --git a/src/test/java/com/android/tools/r8/optimize/argumentpropagation/ReturnTypeStrengtheningTest.java b/src/test/java/com/android/tools/r8/optimize/argumentpropagation/ReturnTypeStrengtheningTest.java
index bc4f81f..5d7ea50 100644
--- a/src/test/java/com/android/tools/r8/optimize/argumentpropagation/ReturnTypeStrengtheningTest.java
+++ b/src/test/java/com/android/tools/r8/optimize/argumentpropagation/ReturnTypeStrengtheningTest.java
@@ -43,7 +43,7 @@
.addKeepMainRule(Main.class)
.enableInliningAnnotations()
.enableNoVerticalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector -> {
diff --git a/src/test/java/com/android/tools/r8/optimize/argumentpropagation/StaticMethodWithConstantArgumentTest.java b/src/test/java/com/android/tools/r8/optimize/argumentpropagation/StaticMethodWithConstantArgumentTest.java
index 28cda6e..8802f3d 100644
--- a/src/test/java/com/android/tools/r8/optimize/argumentpropagation/StaticMethodWithConstantArgumentTest.java
+++ b/src/test/java/com/android/tools/r8/optimize/argumentpropagation/StaticMethodWithConstantArgumentTest.java
@@ -40,7 +40,7 @@
.addInnerClasses(getClass())
.addKeepMainRule(Main.class)
.enableInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector -> {
diff --git a/src/test/java/com/android/tools/r8/optimize/argumentpropagation/StaticMethodWithConstantArgumentThroughCallChainTest.java b/src/test/java/com/android/tools/r8/optimize/argumentpropagation/StaticMethodWithConstantArgumentThroughCallChainTest.java
index f8a4697..60d7702 100644
--- a/src/test/java/com/android/tools/r8/optimize/argumentpropagation/StaticMethodWithConstantArgumentThroughCallChainTest.java
+++ b/src/test/java/com/android/tools/r8/optimize/argumentpropagation/StaticMethodWithConstantArgumentThroughCallChainTest.java
@@ -40,7 +40,7 @@
.addInnerClasses(getClass())
.addKeepMainRule(Main.class)
.enableInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector -> {
diff --git a/src/test/java/com/android/tools/r8/optimize/argumentpropagation/UnboxedEnumUserInMethodWithConstantArgumentTest.java b/src/test/java/com/android/tools/r8/optimize/argumentpropagation/UnboxedEnumUserInMethodWithConstantArgumentTest.java
index dc2ff33..73d9f6b 100644
--- a/src/test/java/com/android/tools/r8/optimize/argumentpropagation/UnboxedEnumUserInMethodWithConstantArgumentTest.java
+++ b/src/test/java/com/android/tools/r8/optimize/argumentpropagation/UnboxedEnumUserInMethodWithConstantArgumentTest.java
@@ -40,7 +40,7 @@
.addKeepMainRule(Main.class)
.addEnumUnboxingInspector(inspector -> inspector.assertUnboxed(MyEnum.class))
.enableInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector -> {
diff --git a/src/test/java/com/android/tools/r8/optimize/argumentpropagation/UpwardsArgumentPropagationToResolvedMethodTest.java b/src/test/java/com/android/tools/r8/optimize/argumentpropagation/UpwardsArgumentPropagationToResolvedMethodTest.java
index 39a12ff..cd1f0d3 100644
--- a/src/test/java/com/android/tools/r8/optimize/argumentpropagation/UpwardsArgumentPropagationToResolvedMethodTest.java
+++ b/src/test/java/com/android/tools/r8/optimize/argumentpropagation/UpwardsArgumentPropagationToResolvedMethodTest.java
@@ -45,7 +45,7 @@
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
.enableNoHorizontalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector -> {
diff --git a/src/test/java/com/android/tools/r8/optimize/argumentpropagation/UpwardsInterfacePropagationToLibraryOrClasspathMethodTest.java b/src/test/java/com/android/tools/r8/optimize/argumentpropagation/UpwardsInterfacePropagationToLibraryOrClasspathMethodTest.java
index 685dcff..52b3beb 100644
--- a/src/test/java/com/android/tools/r8/optimize/argumentpropagation/UpwardsInterfacePropagationToLibraryOrClasspathMethodTest.java
+++ b/src/test/java/com/android/tools/r8/optimize/argumentpropagation/UpwardsInterfacePropagationToLibraryOrClasspathMethodTest.java
@@ -89,7 +89,7 @@
})
.addProgramClasses(PROGRAM_CLASSES)
.addKeepMainRule(TestClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.enableNoVerticalClassMergingAnnotations()
.enableNoHorizontalClassMergingAnnotations()
.enableNeverClassInliningAnnotations()
diff --git a/src/test/java/com/android/tools/r8/optimize/argumentpropagation/UpwardsInterfacePropagationToUnrelatedMethodTest.java b/src/test/java/com/android/tools/r8/optimize/argumentpropagation/UpwardsInterfacePropagationToUnrelatedMethodTest.java
index 44b319b..08ccec8 100644
--- a/src/test/java/com/android/tools/r8/optimize/argumentpropagation/UpwardsInterfacePropagationToUnrelatedMethodTest.java
+++ b/src/test/java/com/android/tools/r8/optimize/argumentpropagation/UpwardsInterfacePropagationToUnrelatedMethodTest.java
@@ -42,7 +42,7 @@
.addVerticallyMergedClassesInspector(
VerticallyMergedClassesInspector::assertNoClassesMerged)
.enableNoHorizontalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector -> {
diff --git a/src/test/java/com/android/tools/r8/optimize/argumentpropagation/VirtualMethodWithConstantArgumentThroughSiblingInterfaceMethodTest.java b/src/test/java/com/android/tools/r8/optimize/argumentpropagation/VirtualMethodWithConstantArgumentThroughSiblingInterfaceMethodTest.java
index b59861c..cd455cd 100644
--- a/src/test/java/com/android/tools/r8/optimize/argumentpropagation/VirtualMethodWithConstantArgumentThroughSiblingInterfaceMethodTest.java
+++ b/src/test/java/com/android/tools/r8/optimize/argumentpropagation/VirtualMethodWithConstantArgumentThroughSiblingInterfaceMethodTest.java
@@ -38,7 +38,7 @@
.addInnerClasses(getClass())
.addKeepMainRule(Main.class)
.enableNoVerticalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector -> {
diff --git a/src/test/java/com/android/tools/r8/optimize/finalize/FinalizeKeptClassTest.java b/src/test/java/com/android/tools/r8/optimize/finalize/FinalizeKeptClassTest.java
index b20a64b..6cdd049 100644
--- a/src/test/java/com/android/tools/r8/optimize/finalize/FinalizeKeptClassTest.java
+++ b/src/test/java/com/android/tools/r8/optimize/finalize/FinalizeKeptClassTest.java
@@ -36,7 +36,7 @@
testForR8(parameters.getBackend())
.addInnerClasses(getClass())
.addKeepMainRule(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector -> {
diff --git a/src/test/java/com/android/tools/r8/optimize/finalize/FinalizeKeptMethodTest.java b/src/test/java/com/android/tools/r8/optimize/finalize/FinalizeKeptMethodTest.java
index b9b9866..022105f 100644
--- a/src/test/java/com/android/tools/r8/optimize/finalize/FinalizeKeptMethodTest.java
+++ b/src/test/java/com/android/tools/r8/optimize/finalize/FinalizeKeptMethodTest.java
@@ -36,7 +36,7 @@
testForR8(parameters.getBackend())
.addInnerClasses(getClass())
.addKeepClassAndMembersRules(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector -> {
diff --git a/src/test/java/com/android/tools/r8/optimize/finalize/FinalizeSubclassTest.java b/src/test/java/com/android/tools/r8/optimize/finalize/FinalizeSubclassTest.java
index f71d961..d2b9094 100644
--- a/src/test/java/com/android/tools/r8/optimize/finalize/FinalizeSubclassTest.java
+++ b/src/test/java/com/android/tools/r8/optimize/finalize/FinalizeSubclassTest.java
@@ -42,7 +42,7 @@
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
.enableNoVerticalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector -> {
diff --git a/src/test/java/com/android/tools/r8/optimize/finalize/FinalizeVirtualMethodTest.java b/src/test/java/com/android/tools/r8/optimize/finalize/FinalizeVirtualMethodTest.java
index 5452c48..9b39998 100644
--- a/src/test/java/com/android/tools/r8/optimize/finalize/FinalizeVirtualMethodTest.java
+++ b/src/test/java/com/android/tools/r8/optimize/finalize/FinalizeVirtualMethodTest.java
@@ -41,7 +41,7 @@
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
.enableNoMethodStaticizingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector -> {
diff --git a/src/test/java/com/android/tools/r8/optimize/finalize/FinalizeVirtualMethodWithSiblingTest.java b/src/test/java/com/android/tools/r8/optimize/finalize/FinalizeVirtualMethodWithSiblingTest.java
index eb04b78..accb001 100644
--- a/src/test/java/com/android/tools/r8/optimize/finalize/FinalizeVirtualMethodWithSiblingTest.java
+++ b/src/test/java/com/android/tools/r8/optimize/finalize/FinalizeVirtualMethodWithSiblingTest.java
@@ -42,7 +42,7 @@
.enableInliningAnnotations()
.enableNoHorizontalClassMergingAnnotations()
.enableNoVerticalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector -> {
diff --git a/src/test/java/com/android/tools/r8/optimize/finalize/FinalizeVirtualOverrideTest.java b/src/test/java/com/android/tools/r8/optimize/finalize/FinalizeVirtualOverrideTest.java
index a91566e..a72df1f 100644
--- a/src/test/java/com/android/tools/r8/optimize/finalize/FinalizeVirtualOverrideTest.java
+++ b/src/test/java/com/android/tools/r8/optimize/finalize/FinalizeVirtualOverrideTest.java
@@ -42,7 +42,7 @@
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
.enableNoVerticalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector -> {
diff --git a/src/test/java/com/android/tools/r8/optimize/proto/ProtoNormalizationDestinationOverrideLibraryTest.java b/src/test/java/com/android/tools/r8/optimize/proto/ProtoNormalizationDestinationOverrideLibraryTest.java
index f58336a..a62b27a 100644
--- a/src/test/java/com/android/tools/r8/optimize/proto/ProtoNormalizationDestinationOverrideLibraryTest.java
+++ b/src/test/java/com/android/tools/r8/optimize/proto/ProtoNormalizationDestinationOverrideLibraryTest.java
@@ -44,7 +44,7 @@
.addProgramClasses(Main.class, ProgramClass.class, X.class)
.addDefaultRuntimeLibrary(parameters)
.addLibraryClasses(LibraryClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(Main.class)
.addDontObfuscate()
.enableInliningAnnotations()
diff --git a/src/test/java/com/android/tools/r8/optimize/proto/ProtoNormalizationDuplicateMethodTest.java b/src/test/java/com/android/tools/r8/optimize/proto/ProtoNormalizationDuplicateMethodTest.java
index c935224..b4f995d 100644
--- a/src/test/java/com/android/tools/r8/optimize/proto/ProtoNormalizationDuplicateMethodTest.java
+++ b/src/test/java/com/android/tools/r8/optimize/proto/ProtoNormalizationDuplicateMethodTest.java
@@ -40,7 +40,7 @@
public void testR8() throws Exception {
testForR8(parameters.getBackend())
.addInnerClasses(getClass())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(Main.class)
.addKeepMethodRules(
Reference.methodFromMethod(
diff --git a/src/test/java/com/android/tools/r8/optimize/proto/ProtoNormalizationEnumParameterTest.java b/src/test/java/com/android/tools/r8/optimize/proto/ProtoNormalizationEnumParameterTest.java
index 53912a8..2c688e9 100644
--- a/src/test/java/com/android/tools/r8/optimize/proto/ProtoNormalizationEnumParameterTest.java
+++ b/src/test/java/com/android/tools/r8/optimize/proto/ProtoNormalizationEnumParameterTest.java
@@ -33,7 +33,7 @@
public void testR8() throws Exception {
testForR8Compat(parameters.getBackend())
.addInnerClasses(getClass())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepClassAndMembersRules(Main.class)
.addKeepClassRules(CustomAnnotation.class)
.addKeepRuntimeVisibleParameterAnnotations()
diff --git a/src/test/java/com/android/tools/r8/optimize/proto/ProtoNormalizationIntroduceCollisionTest.java b/src/test/java/com/android/tools/r8/optimize/proto/ProtoNormalizationIntroduceCollisionTest.java
index 947e3e7..b81d98e 100644
--- a/src/test/java/com/android/tools/r8/optimize/proto/ProtoNormalizationIntroduceCollisionTest.java
+++ b/src/test/java/com/android/tools/r8/optimize/proto/ProtoNormalizationIntroduceCollisionTest.java
@@ -39,7 +39,7 @@
public void testR8() throws Exception {
testForR8(parameters.getBackend())
.addInnerClasses(getClass())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(Main.class)
.addKeepClassAndMembersRules(Base.class)
.enableInliningAnnotations()
diff --git a/src/test/java/com/android/tools/r8/optimize/proto/ProtoNormalizationWithInstanceInitializerCollisionTest.java b/src/test/java/com/android/tools/r8/optimize/proto/ProtoNormalizationWithInstanceInitializerCollisionTest.java
index 838e914..1910397 100644
--- a/src/test/java/com/android/tools/r8/optimize/proto/ProtoNormalizationWithInstanceInitializerCollisionTest.java
+++ b/src/test/java/com/android/tools/r8/optimize/proto/ProtoNormalizationWithInstanceInitializerCollisionTest.java
@@ -37,7 +37,7 @@
.addInnerClasses(getClass())
.addKeepMainRule(Main.class)
.enableNoHorizontalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector -> {
diff --git a/src/test/java/com/android/tools/r8/optimize/proto/ProtoNormalizationWithKeptMethodTest.java b/src/test/java/com/android/tools/r8/optimize/proto/ProtoNormalizationWithKeptMethodTest.java
index e90481a..cf5d688 100644
--- a/src/test/java/com/android/tools/r8/optimize/proto/ProtoNormalizationWithKeptMethodTest.java
+++ b/src/test/java/com/android/tools/r8/optimize/proto/ProtoNormalizationWithKeptMethodTest.java
@@ -42,7 +42,7 @@
.enableNoHorizontalClassMergingAnnotations()
// TODO(b/173398086): uniqueMethodWithName() does not work with proto changes.
.addDontObfuscate()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector -> {
diff --git a/src/test/java/com/android/tools/r8/optimize/proto/ProtoNormalizationWithKeptVirtualMethodTest.java b/src/test/java/com/android/tools/r8/optimize/proto/ProtoNormalizationWithKeptVirtualMethodTest.java
index 21723d9..fce20ed 100644
--- a/src/test/java/com/android/tools/r8/optimize/proto/ProtoNormalizationWithKeptVirtualMethodTest.java
+++ b/src/test/java/com/android/tools/r8/optimize/proto/ProtoNormalizationWithKeptVirtualMethodTest.java
@@ -41,7 +41,7 @@
.addKeepRules("-keepclassmembers class " + A.class.getTypeName() + " { void foo(...); }")
.enableInliningAnnotations()
.enableNoVerticalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector -> {
diff --git a/src/test/java/com/android/tools/r8/optimize/proto/ProtoNormalizationWithLibraryOverrideTest.java b/src/test/java/com/android/tools/r8/optimize/proto/ProtoNormalizationWithLibraryOverrideTest.java
index 1383fef..d39a33c 100644
--- a/src/test/java/com/android/tools/r8/optimize/proto/ProtoNormalizationWithLibraryOverrideTest.java
+++ b/src/test/java/com/android/tools/r8/optimize/proto/ProtoNormalizationWithLibraryOverrideTest.java
@@ -41,7 +41,7 @@
.enableInliningAnnotations()
// TODO(b/173398086): uniqueMethodWithName() does not work with proto changes.
.addDontObfuscate()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector -> {
diff --git a/src/test/java/com/android/tools/r8/optimize/proto/ProtoNormalizationWithParameterAnnotationsTest.java b/src/test/java/com/android/tools/r8/optimize/proto/ProtoNormalizationWithParameterAnnotationsTest.java
index 2e5098b..49433d7 100644
--- a/src/test/java/com/android/tools/r8/optimize/proto/ProtoNormalizationWithParameterAnnotationsTest.java
+++ b/src/test/java/com/android/tools/r8/optimize/proto/ProtoNormalizationWithParameterAnnotationsTest.java
@@ -48,7 +48,7 @@
.enableNoHorizontalClassMergingAnnotations()
// TODO(b/173398086): uniqueMethodWithName() does not work with proto changes.
.addDontObfuscate()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector -> {
diff --git a/src/test/java/com/android/tools/r8/optimize/proto/ProtoNormalizationWithVirtualMethodCollisionTest.java b/src/test/java/com/android/tools/r8/optimize/proto/ProtoNormalizationWithVirtualMethodCollisionTest.java
index c3997c9..9839be9 100644
--- a/src/test/java/com/android/tools/r8/optimize/proto/ProtoNormalizationWithVirtualMethodCollisionTest.java
+++ b/src/test/java/com/android/tools/r8/optimize/proto/ProtoNormalizationWithVirtualMethodCollisionTest.java
@@ -53,7 +53,7 @@
.enableNoVerticalClassMergingAnnotations()
.addDontObfuscate()
.addKeepClassAndMembersRules(B.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines(EXPECTED)
diff --git a/src/test/java/com/android/tools/r8/optimize/proto/ProtoNormalizationWithoutSharingTest.java b/src/test/java/com/android/tools/r8/optimize/proto/ProtoNormalizationWithoutSharingTest.java
index 546c7ce..8174c7b 100644
--- a/src/test/java/com/android/tools/r8/optimize/proto/ProtoNormalizationWithoutSharingTest.java
+++ b/src/test/java/com/android/tools/r8/optimize/proto/ProtoNormalizationWithoutSharingTest.java
@@ -39,7 +39,7 @@
.addKeepMainRule(Main.class)
.enableInliningAnnotations()
.enableNoHorizontalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector -> {
diff --git a/src/test/java/com/android/tools/r8/peephole/suffixsharing/IdenticalBlockSuffixSharingWithArrayTypesTest.java b/src/test/java/com/android/tools/r8/peephole/suffixsharing/IdenticalBlockSuffixSharingWithArrayTypesTest.java
index 86fd5d0..5a531a5 100644
--- a/src/test/java/com/android/tools/r8/peephole/suffixsharing/IdenticalBlockSuffixSharingWithArrayTypesTest.java
+++ b/src/test/java/com/android/tools/r8/peephole/suffixsharing/IdenticalBlockSuffixSharingWithArrayTypesTest.java
@@ -71,7 +71,7 @@
String expectedOutput = StringUtils.lines("42");
testForD8()
.addInnerClasses(IdenticalBlockSuffixSharingWithArrayTypesTest.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::verifyInstructionCount)
.run(parameters.getRuntime(), clazz)
@@ -87,7 +87,7 @@
.enableNeverClassInliningAnnotations()
.enableInliningAnnotations()
.enableNoHorizontalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::verifyInstructionCount)
.run(parameters.getRuntime(), clazz)
diff --git a/src/test/java/com/android/tools/r8/profile/art/NoSuchClassAndMethodProfileRewritingTest.java b/src/test/java/com/android/tools/r8/profile/art/NoSuchClassAndMethodProfileRewritingTest.java
index 7b598a1..9b3e9f4 100644
--- a/src/test/java/com/android/tools/r8/profile/art/NoSuchClassAndMethodProfileRewritingTest.java
+++ b/src/test/java/com/android/tools/r8/profile/art/NoSuchClassAndMethodProfileRewritingTest.java
@@ -36,7 +36,7 @@
.addInnerClasses(getClass())
.addKeepMainRule(Main.class)
.addArtProfileForRewriting(getArtProfile())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
// TODO(b/266178791): Emit a warning for each discarded item.
.compileWithExpectedDiagnostics(TestDiagnosticMessages::assertNoMessages)
.inspectResidualArtProfile(this::inspectResidualArtProfile)
diff --git a/src/test/java/com/android/tools/r8/profile/art/NonEmptyToEmptyProfileRewritingTest.java b/src/test/java/com/android/tools/r8/profile/art/NonEmptyToEmptyProfileRewritingTest.java
index 60e14df..2e53019 100644
--- a/src/test/java/com/android/tools/r8/profile/art/NonEmptyToEmptyProfileRewritingTest.java
+++ b/src/test/java/com/android/tools/r8/profile/art/NonEmptyToEmptyProfileRewritingTest.java
@@ -39,7 +39,7 @@
.addInnerClasses(getClass())
.addKeepMainRule(Main.class)
.addArtProfileForRewriting(getArtProfile())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect)
.inspectResidualArtProfile(this::inspectResidualArtProfile)
diff --git a/src/test/java/com/android/tools/r8/profile/art/completeness/ApiOutlineProfileRewritingTest.java b/src/test/java/com/android/tools/r8/profile/art/completeness/ApiOutlineProfileRewritingTest.java
index f8d9360..3cbba15 100644
--- a/src/test/java/com/android/tools/r8/profile/art/completeness/ApiOutlineProfileRewritingTest.java
+++ b/src/test/java/com/android/tools/r8/profile/art/completeness/ApiOutlineProfileRewritingTest.java
@@ -76,7 +76,7 @@
.addDefaultRuntimeLibrary(parameters)
.addArtProfileForRewriting(getArtProfile())
.apply(setMockApiLevelForClass(LibraryClass.class, classApiLevel))
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspectResidualArtProfile(this::inspectD8)
.applyIf(
@@ -96,7 +96,7 @@
.addKeepMainRule(Main.class)
.addArtProfileForRewriting(getArtProfile())
.apply(setMockApiLevelForClass(LibraryClass.class, classApiLevel))
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspectResidualArtProfile(this::inspectR8)
.applyIf(
diff --git a/src/test/java/com/android/tools/r8/profile/art/completeness/BackportProfileRewritingTest.java b/src/test/java/com/android/tools/r8/profile/art/completeness/BackportProfileRewritingTest.java
index 17d88d8..c3d0996 100644
--- a/src/test/java/com/android/tools/r8/profile/art/completeness/BackportProfileRewritingTest.java
+++ b/src/test/java/com/android/tools/r8/profile/art/completeness/BackportProfileRewritingTest.java
@@ -43,7 +43,7 @@
testForD8(parameters.getBackend())
.addInnerClasses(getClass())
.addArtProfileForRewriting(getArtProfile())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspectResidualArtProfile(this::inspectD8)
.run(parameters.getRuntime(), Main.class)
@@ -58,7 +58,7 @@
.addKeepMainRule(Main.class)
.addArtProfileForRewriting(getArtProfile())
.addOptionsModification(InlinerOptions::disableInlining)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspectResidualArtProfile(this::inspectR8)
.run(parameters.getRuntime(), Main.class)
diff --git a/src/test/java/com/android/tools/r8/profile/art/completeness/DefaultInterfaceMethodProfileRewritingTest.java b/src/test/java/com/android/tools/r8/profile/art/completeness/DefaultInterfaceMethodProfileRewritingTest.java
index 194269e..c5adb71 100644
--- a/src/test/java/com/android/tools/r8/profile/art/completeness/DefaultInterfaceMethodProfileRewritingTest.java
+++ b/src/test/java/com/android/tools/r8/profile/art/completeness/DefaultInterfaceMethodProfileRewritingTest.java
@@ -41,7 +41,7 @@
testForD8(parameters.getBackend())
.addInnerClasses(getClass())
.addArtProfileForRewriting(getArtProfile())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspectResidualArtProfile(this::inspectD8)
.run(parameters.getRuntime(), Main.class)
@@ -57,7 +57,7 @@
.addArtProfileForRewriting(getArtProfile())
.addOptionsModification(InlinerOptions::disableInlining)
.enableNoHorizontalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspectResidualArtProfile(this::inspectR8)
.run(parameters.getRuntime(), Main.class)
diff --git a/src/test/java/com/android/tools/r8/profile/art/completeness/EnumUnboxingUtilityMethodProfileRewritingTest.java b/src/test/java/com/android/tools/r8/profile/art/completeness/EnumUnboxingUtilityMethodProfileRewritingTest.java
index e74465b..04133ca 100644
--- a/src/test/java/com/android/tools/r8/profile/art/completeness/EnumUnboxingUtilityMethodProfileRewritingTest.java
+++ b/src/test/java/com/android/tools/r8/profile/art/completeness/EnumUnboxingUtilityMethodProfileRewritingTest.java
@@ -45,7 +45,7 @@
.addEnumUnboxingInspector(inspector -> inspector.assertUnboxed(MyEnum.class))
.addOptionsModification(InlinerOptions::disableInlining)
.noHorizontalClassMergingOfSynthetics()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspectResidualArtProfile(this::inspect)
.run(parameters.getRuntime(), Main.class)
diff --git a/src/test/java/com/android/tools/r8/profile/art/completeness/HorizontallyMergedConstructorMethodProfileRewritingTest.java b/src/test/java/com/android/tools/r8/profile/art/completeness/HorizontallyMergedConstructorMethodProfileRewritingTest.java
index 305047a..1c3a805 100644
--- a/src/test/java/com/android/tools/r8/profile/art/completeness/HorizontallyMergedConstructorMethodProfileRewritingTest.java
+++ b/src/test/java/com/android/tools/r8/profile/art/completeness/HorizontallyMergedConstructorMethodProfileRewritingTest.java
@@ -87,7 +87,7 @@
.addOptionsModification(
options -> options.callSiteOptimizationOptions().disableOptimization())
.enableNeverClassInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspectResidualArtProfile(artProfileInputOutput::inspect)
.run(parameters.getRuntime(), Main.class)
diff --git a/src/test/java/com/android/tools/r8/profile/art/completeness/HorizontallyMergedVirtualMethodProfileRewritingTest.java b/src/test/java/com/android/tools/r8/profile/art/completeness/HorizontallyMergedVirtualMethodProfileRewritingTest.java
index 28707d1..24c6d74 100644
--- a/src/test/java/com/android/tools/r8/profile/art/completeness/HorizontallyMergedVirtualMethodProfileRewritingTest.java
+++ b/src/test/java/com/android/tools/r8/profile/art/completeness/HorizontallyMergedVirtualMethodProfileRewritingTest.java
@@ -96,7 +96,7 @@
.addOptionsModification(InlinerOptions::setOnlyForceInlining)
.addOptionsModification(
options -> options.callSiteOptimizationOptions().disableOptimization())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspectResidualArtProfile(artProfileInputOutput::inspect)
.run(parameters.getRuntime(), Main.class)
diff --git a/src/test/java/com/android/tools/r8/profile/art/completeness/InvokeSpecialToVirtualMethodProfileRewritingTest.java b/src/test/java/com/android/tools/r8/profile/art/completeness/InvokeSpecialToVirtualMethodProfileRewritingTest.java
index 7125ddc..8bf0b7a 100644
--- a/src/test/java/com/android/tools/r8/profile/art/completeness/InvokeSpecialToVirtualMethodProfileRewritingTest.java
+++ b/src/test/java/com/android/tools/r8/profile/art/completeness/InvokeSpecialToVirtualMethodProfileRewritingTest.java
@@ -55,7 +55,7 @@
testForD8(parameters.getBackend())
.addProgramClassFileData(getTransformedMain())
.addArtProfileForRewriting(getArtProfile())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspectResidualArtProfile(this::inspect)
.run(parameters.getRuntime(), Main.class)
@@ -70,7 +70,7 @@
.addKeepMainRule(Main.class)
.addArtProfileForRewriting(getArtProfile())
.addOptionsModification(InlinerOptions::disableInlining)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspectResidualArtProfile(this::inspect)
.run(parameters.getRuntime(), Main.class)
diff --git a/src/test/java/com/android/tools/r8/profile/art/completeness/LambdaStaticLibraryMethodImplementationProfileRewritingTest.java b/src/test/java/com/android/tools/r8/profile/art/completeness/LambdaStaticLibraryMethodImplementationProfileRewritingTest.java
index ee456d0..2d38860 100644
--- a/src/test/java/com/android/tools/r8/profile/art/completeness/LambdaStaticLibraryMethodImplementationProfileRewritingTest.java
+++ b/src/test/java/com/android/tools/r8/profile/art/completeness/LambdaStaticLibraryMethodImplementationProfileRewritingTest.java
@@ -44,7 +44,7 @@
testForD8(parameters.getBackend())
.addInnerClasses(getClass())
.addArtProfileForRewriting(getArtProfile())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspectResidualArtProfile(this::inspectD8)
.run(parameters.getRuntime(), Main.class)
@@ -61,7 +61,7 @@
.addOptionsModification(InlinerOptions::disableInlining)
.addOptionsModification(
options -> options.callSiteOptimizationOptions().setEnableMethodStaticizing(false))
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspectResidualArtProfile(this::inspectR8)
.run(parameters.getRuntime(), Main.class)
diff --git a/src/test/java/com/android/tools/r8/profile/art/completeness/MovedPrivateInterfaceMethodProfileRewritingTest.java b/src/test/java/com/android/tools/r8/profile/art/completeness/MovedPrivateInterfaceMethodProfileRewritingTest.java
index f5106f6..97d29a4 100644
--- a/src/test/java/com/android/tools/r8/profile/art/completeness/MovedPrivateInterfaceMethodProfileRewritingTest.java
+++ b/src/test/java/com/android/tools/r8/profile/art/completeness/MovedPrivateInterfaceMethodProfileRewritingTest.java
@@ -54,7 +54,7 @@
.addProgramClasses(Main.class, A.class)
.addProgramClassFileData(getTransformedInterface())
.addArtProfileForRewriting(getArtProfile())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspectResidualArtProfile(this::inspectD8)
.run(parameters.getRuntime(), Main.class)
@@ -71,7 +71,7 @@
.addArtProfileForRewriting(getArtProfile())
.addOptionsModification(InlinerOptions::disableInlining)
.enableNoVerticalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspectResidualArtProfile(this::inspectR8)
.run(parameters.getRuntime(), Main.class)
diff --git a/src/test/java/com/android/tools/r8/profile/art/completeness/MovedStaticInterfaceMethodProfileRewritingTest.java b/src/test/java/com/android/tools/r8/profile/art/completeness/MovedStaticInterfaceMethodProfileRewritingTest.java
index 009966f..ec6d1e3 100644
--- a/src/test/java/com/android/tools/r8/profile/art/completeness/MovedStaticInterfaceMethodProfileRewritingTest.java
+++ b/src/test/java/com/android/tools/r8/profile/art/completeness/MovedStaticInterfaceMethodProfileRewritingTest.java
@@ -41,7 +41,7 @@
testForD8(parameters.getBackend())
.addInnerClasses(getClass())
.addArtProfileForRewriting(getArtProfile())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspectResidualArtProfile(this::inspectD8)
.run(parameters.getRuntime(), Main.class)
@@ -55,7 +55,7 @@
.addArtProfileForRewriting(
getArtProfileAfterDesugaring(
parameters.canUseDefaultAndStaticInterfaceMethodsWhenDesugaring()))
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspectResidualArtProfile(this::inspectD8)
.run(parameters.getRuntime(), Main.class)
@@ -70,7 +70,7 @@
.addKeepMainRule(Main.class)
.addArtProfileForRewriting(getArtProfile())
.enableInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspectResidualArtProfile(this::inspectR8)
.run(parameters.getRuntime(), Main.class)
@@ -87,7 +87,7 @@
getArtProfileAfterDesugaring(
parameters.isCfRuntime() || parameters.canUseDefaultAndStaticInterfaceMethods()))
.enableInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspectResidualArtProfile(this::inspectR8)
.run(parameters.getRuntime(), Main.class)
diff --git a/src/test/java/com/android/tools/r8/profile/art/completeness/NestBasedAccessBridgesProfileRewritingTest.java b/src/test/java/com/android/tools/r8/profile/art/completeness/NestBasedAccessBridgesProfileRewritingTest.java
index 59a7160..5551a32 100644
--- a/src/test/java/com/android/tools/r8/profile/art/completeness/NestBasedAccessBridgesProfileRewritingTest.java
+++ b/src/test/java/com/android/tools/r8/profile/art/completeness/NestBasedAccessBridgesProfileRewritingTest.java
@@ -59,7 +59,7 @@
testForD8(parameters.getBackend())
.addProgramClassFileData(getProgramClassFileData())
.addArtProfileForRewriting(getArtProfile())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspectResidualArtProfile(this::inspectD8)
.run(parameters.getRuntime(), Main.class)
@@ -76,7 +76,7 @@
.addArtProfileForRewriting(getArtProfile())
.addOptionsModification(InlinerOptions::disableInlining)
.addOptionsModification(options -> options.callSiteOptimizationOptions().setEnabled(false))
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspectResidualArtProfile(this::inspectR8)
.run(parameters.getRuntime(), Main.class)
diff --git a/src/test/java/com/android/tools/r8/profile/art/completeness/OutlineOptimizationProfileRewritingTest.java b/src/test/java/com/android/tools/r8/profile/art/completeness/OutlineOptimizationProfileRewritingTest.java
index 59e0636..1c0ac50 100644
--- a/src/test/java/com/android/tools/r8/profile/art/completeness/OutlineOptimizationProfileRewritingTest.java
+++ b/src/test/java/com/android/tools/r8/profile/art/completeness/OutlineOptimizationProfileRewritingTest.java
@@ -47,7 +47,7 @@
options.outline.threshold = 2;
options.outline.minSize = 2;
})
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspectResidualArtProfile(this::inspect)
.run(parameters.getRuntime(), Main.class)
diff --git a/src/test/java/com/android/tools/r8/profile/art/completeness/RecordProfileRewritingTest.java b/src/test/java/com/android/tools/r8/profile/art/completeness/RecordProfileRewritingTest.java
index f57ffd4..5f1886d 100644
--- a/src/test/java/com/android/tools/r8/profile/art/completeness/RecordProfileRewritingTest.java
+++ b/src/test/java/com/android/tools/r8/profile/art/completeness/RecordProfileRewritingTest.java
@@ -80,7 +80,7 @@
testForD8(parameters.getBackend())
.addProgramClassFileData(PROGRAM_DATA)
.addArtProfileForRewriting(getArtProfile())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile();
compileResult
.inspectResidualArtProfile(
@@ -110,7 +110,7 @@
testBuilder.addLibraryFiles(RecordTestUtils.getJdk15LibraryFiles(temp)))
.enableProguardTestOptions()
.noHorizontalClassMergingOfSynthetics()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile();
compileResult
.inspectResidualArtProfile(
diff --git a/src/test/java/com/android/tools/r8/profile/art/completeness/SyntheticLambdaClassProfileRewritingTest.java b/src/test/java/com/android/tools/r8/profile/art/completeness/SyntheticLambdaClassProfileRewritingTest.java
index b9ea5ed..385f94b 100644
--- a/src/test/java/com/android/tools/r8/profile/art/completeness/SyntheticLambdaClassProfileRewritingTest.java
+++ b/src/test/java/com/android/tools/r8/profile/art/completeness/SyntheticLambdaClassProfileRewritingTest.java
@@ -195,7 +195,7 @@
.addInnerClasses(getClass())
.addArtProfileForRewriting(artProfileInputOutput.getArtProfile())
.noHorizontalClassMergingOfSynthetics()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspectResidualArtProfile(this::inspectD8)
.run(parameters.getRuntime(), Main.class)
@@ -213,7 +213,7 @@
.addArtProfileForRewriting(artProfileInputOutput.getArtProfile())
.enableProguardTestOptions()
.noHorizontalClassMergingOfSynthetics()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspectResidualArtProfile(this::inspectR8)
.run(parameters.getRuntime(), Main.class)
diff --git a/src/test/java/com/android/tools/r8/profile/art/completeness/TwrCloseResourceDuplicationProfileRewritingTest.java b/src/test/java/com/android/tools/r8/profile/art/completeness/TwrCloseResourceDuplicationProfileRewritingTest.java
index 87b5f81..6b83be2 100644
--- a/src/test/java/com/android/tools/r8/profile/art/completeness/TwrCloseResourceDuplicationProfileRewritingTest.java
+++ b/src/test/java/com/android/tools/r8/profile/art/completeness/TwrCloseResourceDuplicationProfileRewritingTest.java
@@ -48,7 +48,7 @@
testBuilder ->
testBuilder.addLibraryFiles(ToolHelper.getAndroidJar(AndroidApiLevel.LATEST)))
.noHorizontalClassMergingOfSynthetics()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspectResidualArtProfile(this::inspectD8)
.run(parameters.getRuntime(), MAIN.typeName(), getZipFile())
@@ -77,7 +77,7 @@
testBuilder ->
testBuilder.addLibraryFiles(ToolHelper.getAndroidJar(AndroidApiLevel.LATEST)))
.noHorizontalClassMergingOfSynthetics()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspectResidualArtProfile(this::inspectR8)
.run(parameters.getRuntime(), MAIN.typeName(), getZipFile())
diff --git a/src/test/java/com/android/tools/r8/profile/art/completeness/VerticalClassMergingBridgeProfileRewritingTest.java b/src/test/java/com/android/tools/r8/profile/art/completeness/VerticalClassMergingBridgeProfileRewritingTest.java
index f7306e7..b04e01b 100644
--- a/src/test/java/com/android/tools/r8/profile/art/completeness/VerticalClassMergingBridgeProfileRewritingTest.java
+++ b/src/test/java/com/android/tools/r8/profile/art/completeness/VerticalClassMergingBridgeProfileRewritingTest.java
@@ -46,7 +46,7 @@
options -> options.callSiteOptimizationOptions().disableOptimization())
.addVerticallyMergedClassesInspector(
inspector -> inspector.assertMergedIntoSubtype(A.class))
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspectResidualArtProfile(this::inspect)
.run(parameters.getRuntime(), Main.class)
diff --git a/src/test/java/com/android/tools/r8/proguard/configuration/ProguardRuleWithEllipsisForReturnTypeTest.java b/src/test/java/com/android/tools/r8/proguard/configuration/ProguardRuleWithEllipsisForReturnTypeTest.java
index d2275df..c7091c2 100644
--- a/src/test/java/com/android/tools/r8/proguard/configuration/ProguardRuleWithEllipsisForReturnTypeTest.java
+++ b/src/test/java/com/android/tools/r8/proguard/configuration/ProguardRuleWithEllipsisForReturnTypeTest.java
@@ -42,7 +42,7 @@
" private static ... unused;",
" public static ... main(...);",
"}")
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), clazz)
.assertSuccessWithOutput(expectedOutput)
.inspect(this::inspect);
diff --git a/src/test/java/com/android/tools/r8/proguard/rules/InnerClassNameSeparatorTest.java b/src/test/java/com/android/tools/r8/proguard/rules/InnerClassNameSeparatorTest.java
index bb37f6f..6f2755e 100644
--- a/src/test/java/com/android/tools/r8/proguard/rules/InnerClassNameSeparatorTest.java
+++ b/src/test/java/com/android/tools/r8/proguard/rules/InnerClassNameSeparatorTest.java
@@ -52,7 +52,7 @@
+ " {",
" <init>(...);",
"}")
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), InnerClassNameSeparatorTestClass.class);
if (separator.equals("$")) {
@@ -80,7 +80,7 @@
+ " {",
" <init>(...);",
"}")
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), InnerClassNameSeparatorTestClass.class);
}
diff --git a/src/test/java/com/android/tools/r8/reachabilitysensitive/ReachabilitySensitiveTest.java b/src/test/java/com/android/tools/r8/reachabilitysensitive/ReachabilitySensitiveTest.java
index c435b84..bdc1188 100644
--- a/src/test/java/com/android/tools/r8/reachabilitysensitive/ReachabilitySensitiveTest.java
+++ b/src/test/java/com/android/tools/r8/reachabilitysensitive/ReachabilitySensitiveTest.java
@@ -165,7 +165,7 @@
throws CompilationFailedException, IOException, ExecutionException {
return testForD8()
.addProgramClasses(classes)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.setMode(CompilationMode.RELEASE)
.compile()
.inspector();
@@ -180,7 +180,7 @@
.addProgramClasses(classes)
// TODO(ager): This will be in android.jar over time. For now, make it part of the app.
.addProgramClasses(ReachabilitySensitive.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.setMode(CompilationMode.RELEASE)
// Keep the input class and its methods.
.addKeepRules(keepRules)
diff --git a/src/test/java/com/android/tools/r8/regress/Regress160394262Test.java b/src/test/java/com/android/tools/r8/regress/Regress160394262Test.java
index 3e295a8..d56e49c 100644
--- a/src/test/java/com/android/tools/r8/regress/Regress160394262Test.java
+++ b/src/test/java/com/android/tools/r8/regress/Regress160394262Test.java
@@ -50,7 +50,7 @@
.allowAccessModification()
.addKeepMainRule(TestClass.class)
.addInnerClasses(Regress160394262Test.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutput(EXPECTED)
.inspect(this::checkJoinerIsClassInlined);
diff --git a/src/test/java/com/android/tools/r8/regress/Regress160831625Test.java b/src/test/java/com/android/tools/r8/regress/Regress160831625Test.java
index 15c0c75..f2b9b91 100644
--- a/src/test/java/com/android/tools/r8/regress/Regress160831625Test.java
+++ b/src/test/java/com/android/tools/r8/regress/Regress160831625Test.java
@@ -39,7 +39,7 @@
@Test
public void testR8() throws Exception {
testForR8(parameters.getBackend())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addInnerClasses(getClass())
.enableMemberValuePropagationAnnotations()
.addKeepMainRule(TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/regress/Regress181837660.java b/src/test/java/com/android/tools/r8/regress/Regress181837660.java
index 0ce8797..7e56d31 100644
--- a/src/test/java/com/android/tools/r8/regress/Regress181837660.java
+++ b/src/test/java/com/android/tools/r8/regress/Regress181837660.java
@@ -99,7 +99,7 @@
// Link against android.jar that contains ReflectiveOperationException.
.addLibraryFiles(parameters.getDefaultAndroidJarAbove(AndroidApiLevel.K))
.addDontObfuscate()
- .setMinApi(parameters.getApiLevel());
+ .setMinApi(parameters);
}
public static class BaseClass {
diff --git a/src/test/java/com/android/tools/r8/regress/Regress214340258.java b/src/test/java/com/android/tools/r8/regress/Regress214340258.java
index bce5a5b..aaea906 100644
--- a/src/test/java/com/android/tools/r8/regress/Regress214340258.java
+++ b/src/test/java/com/android/tools/r8/regress/Regress214340258.java
@@ -49,7 +49,7 @@
.addDontOptimize()
.addKeepAllClassesRule()
.addProgramFiles(compiledJumbo)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), "TestClass0");
r8TestRunResult.assertSuccessWithOutputLines("foobar");
assertTrue(hasJumboString(r8TestRunResult));
diff --git a/src/test/java/com/android/tools/r8/regress/Regress241478253.java b/src/test/java/com/android/tools/r8/regress/Regress241478253.java
index 8a11afd..7bd4611 100644
--- a/src/test/java/com/android/tools/r8/regress/Regress241478253.java
+++ b/src/test/java/com/android/tools/r8/regress/Regress241478253.java
@@ -31,14 +31,14 @@
testForR8(parameters.getBackend())
.addProgramClasses(Foo.class, Bar.class)
.addKeepMainRule(Foo.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Foo.class)
.assertSuccessWithOutputLines(EXPECTED);
testForR8(parameters.getBackend())
.debug()
.addProgramClasses(Foo.class, Bar.class)
.addKeepMainRule(Foo.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Foo.class)
.assertSuccessWithOutputLines(EXPECTED);
}
diff --git a/src/test/java/com/android/tools/r8/regress/UndefinedLambdaInterfaceRegress232379893.java b/src/test/java/com/android/tools/r8/regress/UndefinedLambdaInterfaceRegress232379893.java
index 56fb81a..bf90e3a 100644
--- a/src/test/java/com/android/tools/r8/regress/UndefinedLambdaInterfaceRegress232379893.java
+++ b/src/test/java/com/android/tools/r8/regress/UndefinedLambdaInterfaceRegress232379893.java
@@ -42,7 +42,7 @@
.addDontWarn(UndefinedInterface.class)
.addDontShrink()
.allowDiagnosticWarningMessages(parameters.isDexRuntime())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compileWithExpectedDiagnostics(
diagnostics -> {
if (parameters.isDexRuntime()) {
diff --git a/src/test/java/com/android/tools/r8/regress/b142682636/Regress142682636Runner.java b/src/test/java/com/android/tools/r8/regress/b142682636/Regress142682636Runner.java
index aba69ff..5e52f1d 100644
--- a/src/test/java/com/android/tools/r8/regress/b142682636/Regress142682636Runner.java
+++ b/src/test/java/com/android/tools/r8/regress/b142682636/Regress142682636Runner.java
@@ -37,12 +37,13 @@
@Test
public void test() throws Exception {
- CodeInspector inspector = testForD8()
- .addProgramClasses(testClass)
- .setMinApi(parameters.getApiLevel())
- .release()
- .compile()
- .inspector();
+ CodeInspector inspector =
+ testForD8()
+ .addProgramClasses(testClass)
+ .setMinApi(parameters)
+ .release()
+ .compile()
+ .inspector();
ClassSubject clazz = inspector.clazz(testClass);
assertThat(clazz, isPresent());
MethodSubject foo = clazz.uniqueMethodWithOriginalName("foo");
diff --git a/src/test/java/com/android/tools/r8/regress/b147865212/Regress147865212.java b/src/test/java/com/android/tools/r8/regress/b147865212/Regress147865212.java
index 6db35da..3682370 100644
--- a/src/test/java/com/android/tools/r8/regress/b147865212/Regress147865212.java
+++ b/src/test/java/com/android/tools/r8/regress/b147865212/Regress147865212.java
@@ -44,7 +44,7 @@
CodeInspector inspector =
testForD8()
.addProgramClassFileData(classFile)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.debug()
.compile()
.inspector();
diff --git a/src/test/java/com/android/tools/r8/regress/b149890887/MissingLibraryTargetTest.java b/src/test/java/com/android/tools/r8/regress/b149890887/MissingLibraryTargetTest.java
index 1dab89f..7648d6d53 100644
--- a/src/test/java/com/android/tools/r8/regress/b149890887/MissingLibraryTargetTest.java
+++ b/src/test/java/com/android/tools/r8/regress/b149890887/MissingLibraryTargetTest.java
@@ -60,7 +60,7 @@
.addProgramClasses(PROGRAM)
.addKeepMainRule(MAIN)
.addClasspathClasses(LIBRARY)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepRules("-dontwarn")
.compile()
.addRunClasspathFiles(runtimeClasspath())
diff --git a/src/test/java/com/android/tools/r8/regress/b150274427/JsrRetRegressionTest.java b/src/test/java/com/android/tools/r8/regress/b150274427/JsrRetRegressionTest.java
index 3c41a63..9a6c40e 100644
--- a/src/test/java/com/android/tools/r8/regress/b150274427/JsrRetRegressionTest.java
+++ b/src/test/java/com/android/tools/r8/regress/b150274427/JsrRetRegressionTest.java
@@ -51,7 +51,7 @@
try {
testForD8()
.addProgramClassFileData(getTransformClass(true))
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compileWithExpectedDiagnostics(
diagnostics -> {
diagnostics.assertErrorMessageThatMatches(containsString("RET"));
diff --git a/src/test/java/com/android/tools/r8/regress/b150400371/DebuginfoForInlineFrameRegressionTest.java b/src/test/java/com/android/tools/r8/regress/b150400371/DebuginfoForInlineFrameRegressionTest.java
index 00d373c..b0fdc84 100644
--- a/src/test/java/com/android/tools/r8/regress/b150400371/DebuginfoForInlineFrameRegressionTest.java
+++ b/src/test/java/com/android/tools/r8/regress/b150400371/DebuginfoForInlineFrameRegressionTest.java
@@ -38,7 +38,7 @@
.addInnerClasses(DebuginfoForInlineFrameRegressionTest.class)
.addKeepMainRule(InlineInto.class)
.addKeepRules("-keepparameternames")
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), InlineInto.class)
.assertSuccessWithOutputLines("42foo")
.inspect(
diff --git a/src/test/java/com/android/tools/r8/regress/b150688800/IdempotentCountErrorTest.java b/src/test/java/com/android/tools/r8/regress/b150688800/IdempotentCountErrorTest.java
index 52222e0..6742fda 100644
--- a/src/test/java/com/android/tools/r8/regress/b150688800/IdempotentCountErrorTest.java
+++ b/src/test/java/com/android/tools/r8/regress/b150688800/IdempotentCountErrorTest.java
@@ -36,7 +36,7 @@
.enableMemberValuePropagationAnnotations()
.addInnerClasses(IdempotentCountErrorTest.class)
.addKeepMainRule(TestClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutput(EXPECTED);
}
diff --git a/src/test/java/com/android/tools/r8/regress/b151964517/ConstStringWithMonitorTest.java b/src/test/java/com/android/tools/r8/regress/b151964517/ConstStringWithMonitorTest.java
index 31fcbef..53824fb 100644
--- a/src/test/java/com/android/tools/r8/regress/b151964517/ConstStringWithMonitorTest.java
+++ b/src/test/java/com/android/tools/r8/regress/b151964517/ConstStringWithMonitorTest.java
@@ -28,7 +28,7 @@
testForR8(parameters.getBackend())
.addInnerClasses(ConstStringWithMonitorTest.class)
.addDontObfuscate()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.allowAccessModification()
.addKeepMainRule(TestClass.class)
.compile()
diff --git a/src/test/java/com/android/tools/r8/regress/b152800551/StaticizerGetterRewritingRegressionTest.java b/src/test/java/com/android/tools/r8/regress/b152800551/StaticizerGetterRewritingRegressionTest.java
index 5162092..48ab187 100644
--- a/src/test/java/com/android/tools/r8/regress/b152800551/StaticizerGetterRewritingRegressionTest.java
+++ b/src/test/java/com/android/tools/r8/regress/b152800551/StaticizerGetterRewritingRegressionTest.java
@@ -42,7 +42,7 @@
@Test
public void testR8() throws Exception {
testForR8(parameters.getBackend())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addInnerClasses(getClass())
.addKeepMainRule(TestClass.class)
.enableInliningAnnotations()
diff --git a/src/test/java/com/android/tools/r8/regress/b158429654/InliningNonAccessible.java b/src/test/java/com/android/tools/r8/regress/b158429654/InliningNonAccessible.java
index 9cebb80..88602c8 100644
--- a/src/test/java/com/android/tools/r8/regress/b158429654/InliningNonAccessible.java
+++ b/src/test/java/com/android/tools/r8/regress/b158429654/InliningNonAccessible.java
@@ -28,7 +28,7 @@
@Test
public void testCompileToInvalidFileD8() throws Exception {
testForR8(parameters.getBackend())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addProgramClasses(OuterAbstract.class, OuterImpl.class, InnerClass.class)
.addProgramClasses(Main.class)
.addKeepMainRule(Main.class)
diff --git a/src/test/java/com/android/tools/r8/regress/b158432019/StaticizerSyntheticUseTest.java b/src/test/java/com/android/tools/r8/regress/b158432019/StaticizerSyntheticUseTest.java
index 8fde692..5deaf98 100644
--- a/src/test/java/com/android/tools/r8/regress/b158432019/StaticizerSyntheticUseTest.java
+++ b/src/test/java/com/android/tools/r8/regress/b158432019/StaticizerSyntheticUseTest.java
@@ -41,7 +41,7 @@
testForR8(parameters.getBackend())
.addProgramClasses(Singleton.class, Main.class, Sam.class, A.class)
.addKeepClassAndMembersRules(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addDontObfuscate()
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
diff --git a/src/test/java/com/android/tools/r8/regress/b165825758/Regress165825758Test.java b/src/test/java/com/android/tools/r8/regress/b165825758/Regress165825758Test.java
index 47c33fb..8f93035 100644
--- a/src/test/java/com/android/tools/r8/regress/b165825758/Regress165825758Test.java
+++ b/src/test/java/com/android/tools/r8/regress/b165825758/Regress165825758Test.java
@@ -59,7 +59,7 @@
.addKeepMainRule(TestClass.class)
.addKeepClassRules(A.class)
.enableNeverReprocessMethodAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutput(EXPECTED)
.inspect(this::checkDeadCodeThrowInTryRange);
diff --git a/src/test/java/com/android/tools/r8/regress/b191296688/Regress191296688.java b/src/test/java/com/android/tools/r8/regress/b191296688/Regress191296688.java
index 0fc1c4e..e722b01 100644
--- a/src/test/java/com/android/tools/r8/regress/b191296688/Regress191296688.java
+++ b/src/test/java/com/android/tools/r8/regress/b191296688/Regress191296688.java
@@ -57,12 +57,12 @@
.addLibraryFiles(kotlinc.getKotlinStdlibJar(), kotlinc.getKotlinAnnotationJar())
.addProgramFiles(ktClasses)
.addProgramClasses(A.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.writeToZip();
testForD8()
.addProgramFiles(desugaredJar)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.disableDesugaring()
.run(parameters.getRuntime(), PKG + ".BKt")
.assertSuccessWithOutputLines("hep");
diff --git a/src/test/java/com/android/tools/r8/regress/b63935662/Regress63935662.java b/src/test/java/com/android/tools/r8/regress/b63935662/Regress63935662.java
index a3ce92b..59d6623 100644
--- a/src/test/java/com/android/tools/r8/regress/b63935662/Regress63935662.java
+++ b/src/test/java/com/android/tools/r8/regress/b63935662/Regress63935662.java
@@ -37,7 +37,7 @@
.addKeepRuleFiles()
.allowAccessModification()
.addDontObfuscate()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), mainClass)
.assertSuccessWithOutput(runOnJava(mainClass));
diff --git a/src/test/java/com/android/tools/r8/regress/b69825683/Regress69825683Test.java b/src/test/java/com/android/tools/r8/regress/b69825683/Regress69825683Test.java
index 57761fe..385f0e1 100644
--- a/src/test/java/com/android/tools/r8/regress/b69825683/Regress69825683Test.java
+++ b/src/test/java/com/android/tools/r8/regress/b69825683/Regress69825683Test.java
@@ -57,7 +57,7 @@
"}")
.addOptionsModification(options -> options.enableClassInlining = false)
.addDontObfuscate()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), outer)
// Run code to check that the constructor with synthetic class as argument is present.
.assertSuccessWithOutputThatMatches(startsWith(innerName))
@@ -85,7 +85,7 @@
"}")
.addDontObfuscate()
.addOptionsModification(o -> o.enableClassInlining = false)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
// Run code to check that the constructor with synthetic class as argument is present.
.run(parameters.getRuntime(), clazz)
.assertSuccessWithOutputThatMatches(
diff --git a/src/test/java/com/android/tools/r8/regress/b72485384/Regress72485384Test.java b/src/test/java/com/android/tools/r8/regress/b72485384/Regress72485384Test.java
index a3d670e..983b94d 100644
--- a/src/test/java/com/android/tools/r8/regress/b72485384/Regress72485384Test.java
+++ b/src/test/java/com/android/tools/r8/regress/b72485384/Regress72485384Test.java
@@ -58,7 +58,7 @@
testForR8(parameters.getBackend())
.addProgramClasses(GenericOuter.class, GenericInner.class, Main.class)
.addKeepRules(proguardConfig)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("Hello World!", "Hello World!");
diff --git a/src/test/java/com/android/tools/r8/regress/b76025099/B76025099.java b/src/test/java/com/android/tools/r8/regress/b76025099/B76025099.java
index 79eadb7..b80b9ce 100644
--- a/src/test/java/com/android/tools/r8/regress/b76025099/B76025099.java
+++ b/src/test/java/com/android/tools/r8/regress/b76025099/B76025099.java
@@ -68,7 +68,7 @@
if (parameters.isDexRuntime()) {
testForD8()
.addProgramFiles(proguardCompileResult.outputJar())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::verifyFieldAccess)
.run(parameters.getRuntime(), Main.class)
@@ -87,7 +87,7 @@
.addKeepMainRule(Main.class)
.enableNoVerticalClassMergingAnnotations()
.addDontObfuscate()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::verifyFieldAccess)
.run(parameters.getRuntime(), Main.class)
diff --git a/src/test/java/com/android/tools/r8/regress/b78493232/Regress78493232_WithPhi.java b/src/test/java/com/android/tools/r8/regress/b78493232/Regress78493232_WithPhi.java
index b2b9dad..7d5e8c8 100644
--- a/src/test/java/com/android/tools/r8/regress/b78493232/Regress78493232_WithPhi.java
+++ b/src/test/java/com/android/tools/r8/regress/b78493232/Regress78493232_WithPhi.java
@@ -66,7 +66,7 @@
testForD8()
.addProgramClasses(CLASSES)
.addProgramClassFileData(CLASS_BYTES)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addOptionsModification(options -> options.testing.readInputStackMaps = false)
.run(parameters.getRuntime(), MAIN);
checkResult(result);
@@ -91,7 +91,7 @@
.allowDiagnosticWarningMessages()
.treeShaking(treeShake)
.addDontObfuscate()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addOptionsModification(options -> options.testing.readInputStackMaps = false)
.addKeepMainRule(MAIN)
.compileWithExpectedDiagnostics(
diff --git a/src/test/java/com/android/tools/r8/repackage/CrossPackageInvokeSuperToPackagePrivateMethodTest.java b/src/test/java/com/android/tools/r8/repackage/CrossPackageInvokeSuperToPackagePrivateMethodTest.java
index 4e4001a..66ba3ad 100644
--- a/src/test/java/com/android/tools/r8/repackage/CrossPackageInvokeSuperToPackagePrivateMethodTest.java
+++ b/src/test/java/com/android/tools/r8/repackage/CrossPackageInvokeSuperToPackagePrivateMethodTest.java
@@ -55,7 +55,7 @@
.enableInliningAnnotations()
.enableNoVerticalClassMergingAnnotations()
.enableNeverClassInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), TestClass.class)
.apply(this::inspectRunResult);
diff --git a/src/test/java/com/android/tools/r8/repackage/EnumAndIdentifierBasedStringInAnnotationTest.java b/src/test/java/com/android/tools/r8/repackage/EnumAndIdentifierBasedStringInAnnotationTest.java
index f542e6e..9564480 100644
--- a/src/test/java/com/android/tools/r8/repackage/EnumAndIdentifierBasedStringInAnnotationTest.java
+++ b/src/test/java/com/android/tools/r8/repackage/EnumAndIdentifierBasedStringInAnnotationTest.java
@@ -40,7 +40,7 @@
.addKeepClassAndMembersRules(MyAnnotation.class)
.addKeepClassAndMembersRulesWithAllowObfuscation(Enum.class)
.addKeepRules("-keepclassmembers,allowshrinking class ** { *; }")
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepRuntimeVisibleAnnotations()
.apply(this::configureRepackaging)
.compile()
diff --git a/src/test/java/com/android/tools/r8/repackage/RepackageAfterCollisionWithPackagePrivateSignatureTest.java b/src/test/java/com/android/tools/r8/repackage/RepackageAfterCollisionWithPackagePrivateSignatureTest.java
index c7060f0..84b7819 100644
--- a/src/test/java/com/android/tools/r8/repackage/RepackageAfterCollisionWithPackagePrivateSignatureTest.java
+++ b/src/test/java/com/android/tools/r8/repackage/RepackageAfterCollisionWithPackagePrivateSignatureTest.java
@@ -29,7 +29,7 @@
.addClassObfuscationDictionary("a")
.apply(this::configureRepackaging)
.enableInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/repackage/RepackageAllowRepackagingTest.java b/src/test/java/com/android/tools/r8/repackage/RepackageAllowRepackagingTest.java
index 686be1d..f1965fe 100644
--- a/src/test/java/com/android/tools/r8/repackage/RepackageAllowRepackagingTest.java
+++ b/src/test/java/com/android/tools/r8/repackage/RepackageAllowRepackagingTest.java
@@ -23,7 +23,7 @@
public void testR8() throws Exception {
testForR8(parameters.getBackend())
.addInnerClasses(getClass())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(Main.class)
.apply(this::configureRepackaging)
.addKeepRules(
diff --git a/src/test/java/com/android/tools/r8/repackage/RepackageAnnotationTest.java b/src/test/java/com/android/tools/r8/repackage/RepackageAnnotationTest.java
index fe19c51..bc05c7d 100644
--- a/src/test/java/com/android/tools/r8/repackage/RepackageAnnotationTest.java
+++ b/src/test/java/com/android/tools/r8/repackage/RepackageAnnotationTest.java
@@ -78,7 +78,7 @@
builder.addKeepRules(
"-keep,allowshrinking,allowobfuscation class " + A.class.getTypeName());
})
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(Main.class)
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
diff --git a/src/test/java/com/android/tools/r8/repackage/RepackageClassWithDontObfuscateKeepPackageNameOnTargetTest.java b/src/test/java/com/android/tools/r8/repackage/RepackageClassWithDontObfuscateKeepPackageNameOnTargetTest.java
index 6fa0787..3b50204 100644
--- a/src/test/java/com/android/tools/r8/repackage/RepackageClassWithDontObfuscateKeepPackageNameOnTargetTest.java
+++ b/src/test/java/com/android/tools/r8/repackage/RepackageClassWithDontObfuscateKeepPackageNameOnTargetTest.java
@@ -38,7 +38,7 @@
String originalPackage = DescriptorUtils.getPackageNameFromBinaryName(binaryName(Foo.class));
testForR8(parameters.getBackend())
.addInnerClasses(getClass())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(Main.class)
.enableInliningAnnotations()
.apply(this::configureRepackaging)
diff --git a/src/test/java/com/android/tools/r8/repackage/RepackageClassesWithDontObfuscateTest.java b/src/test/java/com/android/tools/r8/repackage/RepackageClassesWithDontObfuscateTest.java
index 3a36aea..e2cd494 100644
--- a/src/test/java/com/android/tools/r8/repackage/RepackageClassesWithDontObfuscateTest.java
+++ b/src/test/java/com/android/tools/r8/repackage/RepackageClassesWithDontObfuscateTest.java
@@ -36,7 +36,7 @@
public void testR8() throws Exception {
testForR8(parameters.getBackend())
.addInnerClasses(getClass())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(Main.class)
.enableInliningAnnotations()
.apply(this::configureRepackaging)
diff --git a/src/test/java/com/android/tools/r8/repackage/RepackageCloneTest.java b/src/test/java/com/android/tools/r8/repackage/RepackageCloneTest.java
index 722a9cc..ad41331 100644
--- a/src/test/java/com/android/tools/r8/repackage/RepackageCloneTest.java
+++ b/src/test/java/com/android/tools/r8/repackage/RepackageCloneTest.java
@@ -31,7 +31,7 @@
// Ensure we keep values() which has a call to clone.
.addKeepRules("-keepclassmembers class " + typeName(A.class) + " { *; }")
.apply(this::configureRepackaging)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addHorizontallyMergedClassesInspector(
HorizontallyMergedClassesInspector::assertNoClassesMerged)
.enableInliningAnnotations()
diff --git a/src/test/java/com/android/tools/r8/repackage/RepackageCustomMethodHandleTest.java b/src/test/java/com/android/tools/r8/repackage/RepackageCustomMethodHandleTest.java
index f20603d..73bfe1a 100644
--- a/src/test/java/com/android/tools/r8/repackage/RepackageCustomMethodHandleTest.java
+++ b/src/test/java/com/android/tools/r8/repackage/RepackageCustomMethodHandleTest.java
@@ -73,7 +73,7 @@
.apply(this::configureRepackaging)
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(inspector -> assertThat(InvokeCustom.class, isRepackaged(inspector)))
.run(parameters.getRuntime(), Main.class)
diff --git a/src/test/java/com/android/tools/r8/repackage/RepackageDebugMinificationTest.java b/src/test/java/com/android/tools/r8/repackage/RepackageDebugMinificationTest.java
index 38b94ee..e3c041e 100644
--- a/src/test/java/com/android/tools/r8/repackage/RepackageDebugMinificationTest.java
+++ b/src/test/java/com/android/tools/r8/repackage/RepackageDebugMinificationTest.java
@@ -44,7 +44,7 @@
testForR8(parameters.getBackend())
.addProgramClasses(A.class, Main.class)
.setMode(CompilationMode.DEBUG)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.apply(this::configureRepackaging)
.addKeepMainRule(Main.class)
.run(parameters.getRuntime(), Main.class)
@@ -57,7 +57,7 @@
testForR8(parameters.getBackend())
.addProgramClasses(A.class, Main.class)
.setMode(CompilationMode.DEBUG)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(Main.class)
.apply(this::configureRepackaging)
.run(parameters.getRuntime(), Main.class)
diff --git a/src/test/java/com/android/tools/r8/repackage/RepackageDontObfuscateTest.java b/src/test/java/com/android/tools/r8/repackage/RepackageDontObfuscateTest.java
index 658822d..677fe21 100644
--- a/src/test/java/com/android/tools/r8/repackage/RepackageDontObfuscateTest.java
+++ b/src/test/java/com/android/tools/r8/repackage/RepackageDontObfuscateTest.java
@@ -102,7 +102,7 @@
private R8TestCompileResult setup(R8TestBuilder<?> r8TestBuilder) throws Exception {
return r8TestBuilder
.addInnerClasses(getClass())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(Main.class)
.enableInliningAnnotations()
.apply(this::configureRepackaging)
diff --git a/src/test/java/com/android/tools/r8/repackage/RepackageFeatureWithSyntheticsTest.java b/src/test/java/com/android/tools/r8/repackage/RepackageFeatureWithSyntheticsTest.java
index 5e62057..ee5e6d7 100644
--- a/src/test/java/com/android/tools/r8/repackage/RepackageFeatureWithSyntheticsTest.java
+++ b/src/test/java/com/android/tools/r8/repackage/RepackageFeatureWithSyntheticsTest.java
@@ -94,7 +94,7 @@
.addKeepAttributeInnerClassesAndEnclosingMethod()
.apply(this::configureRepackaging)
.enableNeverClassInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile();
// Each Foo class will give rise to a single lambda.
diff --git a/src/test/java/com/android/tools/r8/repackage/RepackageInnerAndOuterClassTest.java b/src/test/java/com/android/tools/r8/repackage/RepackageInnerAndOuterClassTest.java
index 6a8a384..a026793 100644
--- a/src/test/java/com/android/tools/r8/repackage/RepackageInnerAndOuterClassTest.java
+++ b/src/test/java/com/android/tools/r8/repackage/RepackageInnerAndOuterClassTest.java
@@ -48,7 +48,7 @@
.enableInliningAnnotations()
.enableNoHorizontalClassMergingAnnotations()
.enableNoHorizontalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(inspector -> inspect(inspector, eligibleForRepackaging))
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/repackage/RepackageKeepClassMembersTest.java b/src/test/java/com/android/tools/r8/repackage/RepackageKeepClassMembersTest.java
index 57f650e..6506c54 100644
--- a/src/test/java/com/android/tools/r8/repackage/RepackageKeepClassMembersTest.java
+++ b/src/test/java/com/android/tools/r8/repackage/RepackageKeepClassMembersTest.java
@@ -34,7 +34,7 @@
assumeTrue(parameters.isOrSimulateNoneRuntime());
testForProguard(ProguardVersion.V7_0_0)
.addProgramClasses(RepackageForKeepClassMembers.class, Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.apply(this::configureRepackaging)
.addKeepRules(
"-keepclassmembers class " + typeName(RepackageForKeepClassMembers.class) + " { *; }")
@@ -49,7 +49,7 @@
public void testR8() throws Exception {
testForR8(parameters.getBackend())
.addProgramClasses(RepackageForKeepClassMembers.class, Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.apply(this::configureRepackaging)
.addKeepRules(
"-keepclassmembers class " + typeName(RepackageForKeepClassMembers.class) + " { *; }")
diff --git a/src/test/java/com/android/tools/r8/repackage/RepackageKeepPackageNameTest.java b/src/test/java/com/android/tools/r8/repackage/RepackageKeepPackageNameTest.java
index bcffb5f..fabe959 100644
--- a/src/test/java/com/android/tools/r8/repackage/RepackageKeepPackageNameTest.java
+++ b/src/test/java/com/android/tools/r8/repackage/RepackageKeepPackageNameTest.java
@@ -25,7 +25,7 @@
R8TestCompileResult compileLib =
testForR8(parameters.getBackend())
.addInnerClasses(getClass())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepClassAndMembersRulesWithAllowObfuscation(
ShouldStayInPackage.class, ShouldBeRepackaged.class)
.addKeepPackageNamesRule(typeName(ShouldStayInPackage.class))
@@ -42,7 +42,7 @@
.addClasspathClasses(ShouldStayInPackage.class, ShouldBeRepackaged.class)
.addApplyMapping(compileLib.getProguardMap())
.addKeepMainRule(Runner.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.addRunClasspathFiles(compileLib.writeToZip())
.run(parameters.getRuntime(), Runner.class)
diff --git a/src/test/java/com/android/tools/r8/repackage/RepackageLambdaMissingInterfaceTest.java b/src/test/java/com/android/tools/r8/repackage/RepackageLambdaMissingInterfaceTest.java
index 16a1089..9c94c0d 100644
--- a/src/test/java/com/android/tools/r8/repackage/RepackageLambdaMissingInterfaceTest.java
+++ b/src/test/java/com/android/tools/r8/repackage/RepackageLambdaMissingInterfaceTest.java
@@ -49,7 +49,7 @@
.addKeepMainRule(Main.class)
.addKeepAttributeInnerClassesAndEnclosingMethod()
.applyIf(repackage, this::configureRepackaging)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addDontWarn(MissingInterface.class)
.allowDiagnosticWarningMessages(parameters.isDexRuntime())
.noClassInlining()
diff --git a/src/test/java/com/android/tools/r8/repackage/RepackageMissingMemberReferenceTest.java b/src/test/java/com/android/tools/r8/repackage/RepackageMissingMemberReferenceTest.java
index 8a40226..ce49c41 100644
--- a/src/test/java/com/android/tools/r8/repackage/RepackageMissingMemberReferenceTest.java
+++ b/src/test/java/com/android/tools/r8/repackage/RepackageMissingMemberReferenceTest.java
@@ -38,7 +38,7 @@
.addProgramClasses(ClassWithMissingReferenceInCode.class, Main.class)
.addKeepMainRule(Main.class)
.applyIf(repackage, this::configureRepackaging)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addDontWarn(MissingReference.class)
.enableInliningAnnotations()
.compile()
diff --git a/src/test/java/com/android/tools/r8/repackage/RepackageMissingSuperInterfaceTestTest.java b/src/test/java/com/android/tools/r8/repackage/RepackageMissingSuperInterfaceTestTest.java
index e5ffadc..185f05c 100644
--- a/src/test/java/com/android/tools/r8/repackage/RepackageMissingSuperInterfaceTestTest.java
+++ b/src/test/java/com/android/tools/r8/repackage/RepackageMissingSuperInterfaceTestTest.java
@@ -40,7 +40,7 @@
.addProgramClasses(ClassImplementingMissingInterface.class, Main.class)
.addKeepMainRule(Main.class)
.applyIf(repackage, this::configureRepackaging)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addDontWarn(MissingInterface.class)
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
diff --git a/src/test/java/com/android/tools/r8/repackage/RepackageMissingSuperTypeTest.java b/src/test/java/com/android/tools/r8/repackage/RepackageMissingSuperTypeTest.java
index 19138f1..72ad8dd 100644
--- a/src/test/java/com/android/tools/r8/repackage/RepackageMissingSuperTypeTest.java
+++ b/src/test/java/com/android/tools/r8/repackage/RepackageMissingSuperTypeTest.java
@@ -50,7 +50,7 @@
Main.class)
.addKeepMainRule(Main.class)
.applyIf(repackage, this::configureRepackaging)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addDontWarn(MissingSuperType.class)
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
diff --git a/src/test/java/com/android/tools/r8/repackage/RepackageMissingTypeCollisionTest.java b/src/test/java/com/android/tools/r8/repackage/RepackageMissingTypeCollisionTest.java
index 2fc2cb0..e967b74 100644
--- a/src/test/java/com/android/tools/r8/repackage/RepackageMissingTypeCollisionTest.java
+++ b/src/test/java/com/android/tools/r8/repackage/RepackageMissingTypeCollisionTest.java
@@ -109,7 +109,7 @@
.addKeepClassAndMembersRules(Anno.class)
.addKeepRuntimeVisibleAnnotations()
.applyIf(repackage, this::configureRepackaging)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addDontWarn(getNewMissingTypeName())
.addOptionsModification(internalOptions -> internalOptions.enableEnumUnboxing = false)
.addHorizontallyMergedClassesInspector(
diff --git a/src/test/java/com/android/tools/r8/repackage/RepackageObjectOnProgramPathTest.java b/src/test/java/com/android/tools/r8/repackage/RepackageObjectOnProgramPathTest.java
index 4c20192..a4c60cd 100644
--- a/src/test/java/com/android/tools/r8/repackage/RepackageObjectOnProgramPathTest.java
+++ b/src/test/java/com/android/tools/r8/repackage/RepackageObjectOnProgramPathTest.java
@@ -35,7 +35,7 @@
testForR8(parameters.getBackend())
.addProgramClassFileData(dumpObject())
.addProgramClasses(A.class, Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.enableInliningAnnotations()
.addKeepMainRule(Main.class)
.addDontWarn("*")
diff --git a/src/test/java/com/android/tools/r8/repackage/RepackageParameterSyntheticOutlineTest.java b/src/test/java/com/android/tools/r8/repackage/RepackageParameterSyntheticOutlineTest.java
index 9e2f6c2..803e03a 100644
--- a/src/test/java/com/android/tools/r8/repackage/RepackageParameterSyntheticOutlineTest.java
+++ b/src/test/java/com/android/tools/r8/repackage/RepackageParameterSyntheticOutlineTest.java
@@ -55,7 +55,7 @@
rewrittenMainWithMethodReferencesToCodeToBeOutlined())
.addKeepMainRule(Main.class)
.addKeepClassRulesWithAllowObfuscation(Param.class, Return.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.enableInliningAnnotations()
.addOptionsModification(
options -> {
diff --git a/src/test/java/com/android/tools/r8/repackage/RepackageProtectedInSamePackageTest.java b/src/test/java/com/android/tools/r8/repackage/RepackageProtectedInSamePackageTest.java
index 8152688..999b514 100644
--- a/src/test/java/com/android/tools/r8/repackage/RepackageProtectedInSamePackageTest.java
+++ b/src/test/java/com/android/tools/r8/repackage/RepackageProtectedInSamePackageTest.java
@@ -38,7 +38,7 @@
testForProguard(ProguardVersion.V7_0_0)
.addProgramClasses(Main.class)
.addProgramClassFileData(getRepackageForKeepClassMembersWithProtectedAccess())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.apply(this::configureRepackaging)
.addKeepRules(
"-keepclassmembers class " + typeName(RepackageForKeepClassMembers.class) + " { *; }")
@@ -54,7 +54,7 @@
testForR8(parameters.getBackend())
.addProgramClasses(Main.class)
.addProgramClassFileData(getRepackageForKeepClassMembersWithProtectedAccess())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.apply(this::configureRepackaging)
.addKeepRules(
"-keepclassmembers class " + typeName(RepackageForKeepClassMembers.class) + " { *; }")
diff --git a/src/test/java/com/android/tools/r8/repackage/RepackageProtectedInSeparatePackageTest.java b/src/test/java/com/android/tools/r8/repackage/RepackageProtectedInSeparatePackageTest.java
index a5e0ea3..ef00223 100644
--- a/src/test/java/com/android/tools/r8/repackage/RepackageProtectedInSeparatePackageTest.java
+++ b/src/test/java/com/android/tools/r8/repackage/RepackageProtectedInSeparatePackageTest.java
@@ -39,7 +39,7 @@
testForR8(parameters.getBackend())
.addProgramClasses(Base.class, Sub.class, Main.class)
.addKeepMainRule(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepClassAndMembersRules(Base.class)
.apply(this::configureRepackaging)
.enableInliningAnnotations()
diff --git a/src/test/java/com/android/tools/r8/repackage/RepackageTest.java b/src/test/java/com/android/tools/r8/repackage/RepackageTest.java
index 9742b6a..370d413 100644
--- a/src/test/java/com/android/tools/r8/repackage/RepackageTest.java
+++ b/src/test/java/com/android/tools/r8/repackage/RepackageTest.java
@@ -114,7 +114,7 @@
.enableInliningAnnotations()
.enableNoHorizontalClassMergingAnnotations()
.enableNoHorizontalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/repackage/RepackageWithArrayMethodTest.java b/src/test/java/com/android/tools/r8/repackage/RepackageWithArrayMethodTest.java
index 0216990..3d5741a 100644
--- a/src/test/java/com/android/tools/r8/repackage/RepackageWithArrayMethodTest.java
+++ b/src/test/java/com/android/tools/r8/repackage/RepackageWithArrayMethodTest.java
@@ -26,7 +26,7 @@
.addKeepMainRule(TestClass.class)
.apply(this::configureRepackaging)
.enableInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/repackage/RepackageWithBridgeHoistingTest.java b/src/test/java/com/android/tools/r8/repackage/RepackageWithBridgeHoistingTest.java
index 23a5cfd..5b9b0b6 100644
--- a/src/test/java/com/android/tools/r8/repackage/RepackageWithBridgeHoistingTest.java
+++ b/src/test/java/com/android/tools/r8/repackage/RepackageWithBridgeHoistingTest.java
@@ -44,7 +44,7 @@
.enableNeverClassInliningAnnotations()
.enableNoHorizontalClassMergingAnnotations()
.enableNoVerticalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/repackage/RepackageWithCatchHandlerTest.java b/src/test/java/com/android/tools/r8/repackage/RepackageWithCatchHandlerTest.java
index 3afa4c2..b5feaca 100644
--- a/src/test/java/com/android/tools/r8/repackage/RepackageWithCatchHandlerTest.java
+++ b/src/test/java/com/android/tools/r8/repackage/RepackageWithCatchHandlerTest.java
@@ -29,7 +29,7 @@
.addKeepMainRule(TestClass.class)
.apply(this::configureRepackaging)
.enableInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/repackage/RepackageWithCollisionsTest.java b/src/test/java/com/android/tools/r8/repackage/RepackageWithCollisionsTest.java
index 7600af0..2001e8a 100644
--- a/src/test/java/com/android/tools/r8/repackage/RepackageWithCollisionsTest.java
+++ b/src/test/java/com/android/tools/r8/repackage/RepackageWithCollisionsTest.java
@@ -61,7 +61,7 @@
.addKeepAttributeInnerClassesAndEnclosingMethod()
.apply(this::configureRepackaging)
.enableNeverClassInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/repackage/RepackageWithDexItemBasedConstStringTest.java b/src/test/java/com/android/tools/r8/repackage/RepackageWithDexItemBasedConstStringTest.java
index 624bdfe..431236b 100644
--- a/src/test/java/com/android/tools/r8/repackage/RepackageWithDexItemBasedConstStringTest.java
+++ b/src/test/java/com/android/tools/r8/repackage/RepackageWithDexItemBasedConstStringTest.java
@@ -48,7 +48,7 @@
.addKeepMainRule(TestClass.class)
.addMainDexKeepClassRules(TestClass.class)
.apply(this::configureRepackaging)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/repackage/RepackageWithFeatureSplitTest.java b/src/test/java/com/android/tools/r8/repackage/RepackageWithFeatureSplitTest.java
index 2255c28..a15760f 100644
--- a/src/test/java/com/android/tools/r8/repackage/RepackageWithFeatureSplitTest.java
+++ b/src/test/java/com/android/tools/r8/repackage/RepackageWithFeatureSplitTest.java
@@ -52,7 +52,7 @@
// BaseDexClassLoader was introduced at api level 14.
.apply(ApiModelingTestHelper::disableOutliningAndStubbing)
.enableInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspectBase, this::inspectFeature)
.runFeature(parameters.getRuntime(), FeatureMain.class)
diff --git a/src/test/java/com/android/tools/r8/repackage/RepackageWithInitClassTest.java b/src/test/java/com/android/tools/r8/repackage/RepackageWithInitClassTest.java
index 4f6f672..55e260d 100644
--- a/src/test/java/com/android/tools/r8/repackage/RepackageWithInitClassTest.java
+++ b/src/test/java/com/android/tools/r8/repackage/RepackageWithInitClassTest.java
@@ -53,7 +53,7 @@
.apply(this::configureRepackaging)
.enableMemberValuePropagationAnnotations(enableMemberValuePropagationAnnotations)
.addOptionsModification(options -> options.enableRedundantFieldLoadElimination = false)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/repackage/RepackageWithInvokeDynamicTest.java b/src/test/java/com/android/tools/r8/repackage/RepackageWithInvokeDynamicTest.java
index a8581be..5500026 100644
--- a/src/test/java/com/android/tools/r8/repackage/RepackageWithInvokeDynamicTest.java
+++ b/src/test/java/com/android/tools/r8/repackage/RepackageWithInvokeDynamicTest.java
@@ -26,7 +26,7 @@
.addKeepMainRule(TestClass.class)
.apply(this::configureRepackaging)
.enableInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/repackage/RepackageWithKeepPackagePrivateTest.java b/src/test/java/com/android/tools/r8/repackage/RepackageWithKeepPackagePrivateTest.java
index 6f79b12..e9219e9 100644
--- a/src/test/java/com/android/tools/r8/repackage/RepackageWithKeepPackagePrivateTest.java
+++ b/src/test/java/com/android/tools/r8/repackage/RepackageWithKeepPackagePrivateTest.java
@@ -49,7 +49,7 @@
.addKeepPackageNamesRule(getClass().getPackage())
.allowAccessModification(allowAccessModification)
.apply(this::configureRepackaging)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect);
@@ -58,7 +58,7 @@
.addClasspathClasses(A.class, B.class)
.addKeepAllClassesRule()
.addApplyMapping(compileResult.getProguardMap())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.addRunClasspathFiles(compileResult.writeToZip())
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/repackage/RepackageWithMainDexListTest.java b/src/test/java/com/android/tools/r8/repackage/RepackageWithMainDexListTest.java
index 81183f5..170708d 100644
--- a/src/test/java/com/android/tools/r8/repackage/RepackageWithMainDexListTest.java
+++ b/src/test/java/com/android/tools/r8/repackage/RepackageWithMainDexListTest.java
@@ -56,7 +56,7 @@
.apply(this::configureRepackaging)
// Debug mode to enable minimal main dex.
.debug()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.allowDiagnosticMessages()
.compileWithExpectedDiagnostics(
diagnostics ->
diff --git a/src/test/java/com/android/tools/r8/repackage/RepackageWithNonReboundFieldReferenceTest.java b/src/test/java/com/android/tools/r8/repackage/RepackageWithNonReboundFieldReferenceTest.java
index 2372f8a..a9202ab 100644
--- a/src/test/java/com/android/tools/r8/repackage/RepackageWithNonReboundFieldReferenceTest.java
+++ b/src/test/java/com/android/tools/r8/repackage/RepackageWithNonReboundFieldReferenceTest.java
@@ -55,7 +55,7 @@
.apply(this::configureRepackaging)
.enableMemberValuePropagationAnnotations()
.enableNoVerticalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutputLines("Hello world!");
diff --git a/src/test/java/com/android/tools/r8/repackage/RepackageWithNonReboundMethodReferenceTest.java b/src/test/java/com/android/tools/r8/repackage/RepackageWithNonReboundMethodReferenceTest.java
index cbb352a..38fd442 100644
--- a/src/test/java/com/android/tools/r8/repackage/RepackageWithNonReboundMethodReferenceTest.java
+++ b/src/test/java/com/android/tools/r8/repackage/RepackageWithNonReboundMethodReferenceTest.java
@@ -56,7 +56,7 @@
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
.enableNoVerticalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutputLines("Hello world!");
diff --git a/src/test/java/com/android/tools/r8/repackage/RepackageWithOverridesOfPackagePrivateMethodsTest.java b/src/test/java/com/android/tools/r8/repackage/RepackageWithOverridesOfPackagePrivateMethodsTest.java
index 4eff919..56436b4 100644
--- a/src/test/java/com/android/tools/r8/repackage/RepackageWithOverridesOfPackagePrivateMethodsTest.java
+++ b/src/test/java/com/android/tools/r8/repackage/RepackageWithOverridesOfPackagePrivateMethodsTest.java
@@ -34,7 +34,7 @@
.enableNeverClassInliningAnnotations()
.enableNoParameterTypeStrengtheningAnnotations()
.enableNoVerticalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/repackage/RepackageWithOverridesOfProtectedMethodsTest.java b/src/test/java/com/android/tools/r8/repackage/RepackageWithOverridesOfProtectedMethodsTest.java
index 56f6a41..356bf73 100644
--- a/src/test/java/com/android/tools/r8/repackage/RepackageWithOverridesOfProtectedMethodsTest.java
+++ b/src/test/java/com/android/tools/r8/repackage/RepackageWithOverridesOfProtectedMethodsTest.java
@@ -34,7 +34,7 @@
.enableNeverClassInliningAnnotations()
.enableNoParameterTypeStrengtheningAnnotations()
.enableNoVerticalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/repackage/RepackageWithPackagePrivateClassAnnotationTest.java b/src/test/java/com/android/tools/r8/repackage/RepackageWithPackagePrivateClassAnnotationTest.java
index 34cd1af..a82ecf7 100644
--- a/src/test/java/com/android/tools/r8/repackage/RepackageWithPackagePrivateClassAnnotationTest.java
+++ b/src/test/java/com/android/tools/r8/repackage/RepackageWithPackagePrivateClassAnnotationTest.java
@@ -37,7 +37,7 @@
.addKeepRuntimeVisibleAnnotations()
.apply(this::configureRepackaging)
.enableInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/repackage/RepackageWithPackagePrivateFieldAnnotationTest.java b/src/test/java/com/android/tools/r8/repackage/RepackageWithPackagePrivateFieldAnnotationTest.java
index af48e82..aac8019 100644
--- a/src/test/java/com/android/tools/r8/repackage/RepackageWithPackagePrivateFieldAnnotationTest.java
+++ b/src/test/java/com/android/tools/r8/repackage/RepackageWithPackagePrivateFieldAnnotationTest.java
@@ -39,7 +39,7 @@
.apply(this::configureRepackaging)
.enableInliningAnnotations()
.enableMemberValuePropagationAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/repackage/RepackageWithPackagePrivateFieldTypeTest.java b/src/test/java/com/android/tools/r8/repackage/RepackageWithPackagePrivateFieldTypeTest.java
index 6faa4f7..6ec9817 100644
--- a/src/test/java/com/android/tools/r8/repackage/RepackageWithPackagePrivateFieldTypeTest.java
+++ b/src/test/java/com/android/tools/r8/repackage/RepackageWithPackagePrivateFieldTypeTest.java
@@ -34,7 +34,7 @@
.apply(this::configureRepackaging)
.enableInliningAnnotations()
.enableNoFieldTypeStrengtheningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/repackage/RepackageWithPackagePrivateInnerClassTest.java b/src/test/java/com/android/tools/r8/repackage/RepackageWithPackagePrivateInnerClassTest.java
index 3097738..70bd738 100644
--- a/src/test/java/com/android/tools/r8/repackage/RepackageWithPackagePrivateInnerClassTest.java
+++ b/src/test/java/com/android/tools/r8/repackage/RepackageWithPackagePrivateInnerClassTest.java
@@ -46,7 +46,7 @@
.addKeepAttributeInnerClassesAndEnclosingMethod()
.apply(this::configureRepackaging)
.enableInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(inspector -> inspect(inspector, expectRepackaged))
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/repackage/RepackageWithPackagePrivateInterfaceTest.java b/src/test/java/com/android/tools/r8/repackage/RepackageWithPackagePrivateInterfaceTest.java
index 7fa82cd..a27cacc 100644
--- a/src/test/java/com/android/tools/r8/repackage/RepackageWithPackagePrivateInterfaceTest.java
+++ b/src/test/java/com/android/tools/r8/repackage/RepackageWithPackagePrivateInterfaceTest.java
@@ -32,7 +32,7 @@
.addKeepClassRules(NonPublicKeptInterface.class)
.apply(this::configureRepackaging)
.enableInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/repackage/RepackageWithPackagePrivateLibraryMethodTest.java b/src/test/java/com/android/tools/r8/repackage/RepackageWithPackagePrivateLibraryMethodTest.java
index 58155cc..a7e2d9e 100644
--- a/src/test/java/com/android/tools/r8/repackage/RepackageWithPackagePrivateLibraryMethodTest.java
+++ b/src/test/java/com/android/tools/r8/repackage/RepackageWithPackagePrivateLibraryMethodTest.java
@@ -42,7 +42,7 @@
.apply(this::configureRepackaging)
.addKeepMainRule(Main.class)
.enableInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.addRunClasspathFiles(buildOnDexRuntime(parameters, Library.class))
.run(parameters.getRuntime(), Main.class)
diff --git a/src/test/java/com/android/tools/r8/repackage/RepackageWithPackagePrivateLibraryOverrideTest.java b/src/test/java/com/android/tools/r8/repackage/RepackageWithPackagePrivateLibraryOverrideTest.java
index ce1c039..70211e0 100644
--- a/src/test/java/com/android/tools/r8/repackage/RepackageWithPackagePrivateLibraryOverrideTest.java
+++ b/src/test/java/com/android/tools/r8/repackage/RepackageWithPackagePrivateLibraryOverrideTest.java
@@ -41,7 +41,7 @@
.addProgramClasses(Program.class, Main.class)
.apply(this::configureRepackaging)
.addKeepMainRule(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.enableNeverClassInliningAnnotations()
.compile()
.addRunClasspathFiles(buildOnDexRuntime(parameters, Library.class))
diff --git a/src/test/java/com/android/tools/r8/repackage/RepackageWithPackagePrivateLibrarySuperTest.java b/src/test/java/com/android/tools/r8/repackage/RepackageWithPackagePrivateLibrarySuperTest.java
index 405c493..19907e9 100644
--- a/src/test/java/com/android/tools/r8/repackage/RepackageWithPackagePrivateLibrarySuperTest.java
+++ b/src/test/java/com/android/tools/r8/repackage/RepackageWithPackagePrivateLibrarySuperTest.java
@@ -38,7 +38,7 @@
.addProgramClasses(Program.class, Main.class)
.apply(this::configureRepackaging)
.addKeepMainRule(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.enableNeverClassInliningAnnotations()
.compile()
.addRunClasspathFiles(buildOnDexRuntime(parameters, Library.class))
diff --git a/src/test/java/com/android/tools/r8/repackage/RepackageWithPackagePrivateLibraryTypeTest.java b/src/test/java/com/android/tools/r8/repackage/RepackageWithPackagePrivateLibraryTypeTest.java
index 90939fb..2578c4a 100644
--- a/src/test/java/com/android/tools/r8/repackage/RepackageWithPackagePrivateLibraryTypeTest.java
+++ b/src/test/java/com/android/tools/r8/repackage/RepackageWithPackagePrivateLibraryTypeTest.java
@@ -49,7 +49,7 @@
.addKeepMainRule(Main.class)
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addRunClasspathFiles(buildOnDexRuntime(parameters, Library.class, LibraryI.class))
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines(EXPECTED)
diff --git a/src/test/java/com/android/tools/r8/repackage/RepackageWithPackagePrivateMethodAnnotationTest.java b/src/test/java/com/android/tools/r8/repackage/RepackageWithPackagePrivateMethodAnnotationTest.java
index 20f8704..bc24407 100644
--- a/src/test/java/com/android/tools/r8/repackage/RepackageWithPackagePrivateMethodAnnotationTest.java
+++ b/src/test/java/com/android/tools/r8/repackage/RepackageWithPackagePrivateMethodAnnotationTest.java
@@ -37,7 +37,7 @@
.addKeepRuntimeVisibleAnnotations()
.apply(this::configureRepackaging)
.enableInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/repackage/RepackageWithPackagePrivateMethodParameterAnnotationTest.java b/src/test/java/com/android/tools/r8/repackage/RepackageWithPackagePrivateMethodParameterAnnotationTest.java
index 8c754e5..68ef648 100644
--- a/src/test/java/com/android/tools/r8/repackage/RepackageWithPackagePrivateMethodParameterAnnotationTest.java
+++ b/src/test/java/com/android/tools/r8/repackage/RepackageWithPackagePrivateMethodParameterAnnotationTest.java
@@ -39,7 +39,7 @@
.apply(this::configureRepackaging)
.enableConstantArgumentAnnotations()
.enableInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/repackage/RepackageWithPackagePrivateSuperClassTest.java b/src/test/java/com/android/tools/r8/repackage/RepackageWithPackagePrivateSuperClassTest.java
index 6029869..a262577 100644
--- a/src/test/java/com/android/tools/r8/repackage/RepackageWithPackagePrivateSuperClassTest.java
+++ b/src/test/java/com/android/tools/r8/repackage/RepackageWithPackagePrivateSuperClassTest.java
@@ -32,7 +32,7 @@
.addKeepClassRules(NonPublicKeptClass.class)
.apply(this::configureRepackaging)
.enableInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/repackage/RepackageWithServiceLoaderTest.java b/src/test/java/com/android/tools/r8/repackage/RepackageWithServiceLoaderTest.java
index 13ebc95..9c08021 100644
--- a/src/test/java/com/android/tools/r8/repackage/RepackageWithServiceLoaderTest.java
+++ b/src/test/java/com/android/tools/r8/repackage/RepackageWithServiceLoaderTest.java
@@ -53,7 +53,7 @@
options.dataResourceConsumer = dataResourceConsumer.get();
})
.apply(this::configureRepackaging)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/repackage/RepackageWithStringIdentifier.java b/src/test/java/com/android/tools/r8/repackage/RepackageWithStringIdentifier.java
index e589ab1..3f8e0bb 100644
--- a/src/test/java/com/android/tools/r8/repackage/RepackageWithStringIdentifier.java
+++ b/src/test/java/com/android/tools/r8/repackage/RepackageWithStringIdentifier.java
@@ -47,7 +47,7 @@
.addKeepMainRule(Main.class)
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(inspector -> assertThat(A.class, isRepackaged(inspector)))
.run(parameters.getRuntime(), Main.class)
diff --git a/src/test/java/com/android/tools/r8/repackage/RepackageWithSyntheticItemTest.java b/src/test/java/com/android/tools/r8/repackage/RepackageWithSyntheticItemTest.java
index 7611b1c..c33e05e 100644
--- a/src/test/java/com/android/tools/r8/repackage/RepackageWithSyntheticItemTest.java
+++ b/src/test/java/com/android/tools/r8/repackage/RepackageWithSyntheticItemTest.java
@@ -50,7 +50,7 @@
.addInnerClasses(RepackageWithSyntheticItemTest.class)
.addKeepMainRule(Main.class)
.addKeepClassRules(I.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.apply(this::configureRepackaging)
.noClassInlining()
.addInliningAnnotations()
diff --git a/src/test/java/com/android/tools/r8/resolution/DefaultMethodShadowedByStaticTest.java b/src/test/java/com/android/tools/r8/resolution/DefaultMethodShadowedByStaticTest.java
index b974111..5cf8ec7 100644
--- a/src/test/java/com/android/tools/r8/resolution/DefaultMethodShadowedByStaticTest.java
+++ b/src/test/java/com/android/tools/r8/resolution/DefaultMethodShadowedByStaticTest.java
@@ -54,7 +54,7 @@
testForR8(parameters.getBackend())
.addProgramClassFileData(CLASSES)
.addKeepMainRule("Main")
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), "Main")
.assertFailureWithErrorThatThrows(IncompatibleClassChangeError.class);
}
diff --git a/src/test/java/com/android/tools/r8/resolution/InvokeDefaultMethodViaStaticTest.java b/src/test/java/com/android/tools/r8/resolution/InvokeDefaultMethodViaStaticTest.java
index c621b4b..4493f4a 100644
--- a/src/test/java/com/android/tools/r8/resolution/InvokeDefaultMethodViaStaticTest.java
+++ b/src/test/java/com/android/tools/r8/resolution/InvokeDefaultMethodViaStaticTest.java
@@ -53,7 +53,7 @@
testForR8(parameters.getBackend())
.addProgramClassFileData(CLASSES)
.addKeepMainRule("Main")
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addOptionsModification(o -> o.testing.allowInvokeErrors = true)
.run(parameters.getRuntime(), "Main")
.assertFailureWithErrorThatThrows(getExpectedError());
diff --git a/src/test/java/com/android/tools/r8/resolution/InvokeInterfaceOnClassTest.java b/src/test/java/com/android/tools/r8/resolution/InvokeInterfaceOnClassTest.java
index 84a91ca..2a33e51 100644
--- a/src/test/java/com/android/tools/r8/resolution/InvokeInterfaceOnClassTest.java
+++ b/src/test/java/com/android/tools/r8/resolution/InvokeInterfaceOnClassTest.java
@@ -47,7 +47,7 @@
.addProgramClasses(I.class, C1.class, C2.class)
.addProgramClassFileData(transformMain())
.addKeepMainRule(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addOptionsModification(options -> options.testing.allowInvokeErrors = true)
.run(parameters.getRuntime(), Main.class)
.assertFailureWithErrorThatMatches(getExpectedFailureMatcher(true));
diff --git a/src/test/java/com/android/tools/r8/resolution/InvokeSuperCallInStaticTest.java b/src/test/java/com/android/tools/r8/resolution/InvokeSuperCallInStaticTest.java
index 099be70..1b62946 100644
--- a/src/test/java/com/android/tools/r8/resolution/InvokeSuperCallInStaticTest.java
+++ b/src/test/java/com/android/tools/r8/resolution/InvokeSuperCallInStaticTest.java
@@ -85,7 +85,7 @@
.addProgramClassFileData(getAWithRewrittenInvokeSpecialToBase())
.addKeepMainRule(Main.class)
.allowAccessModification()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines(EXPECTED)
.inspect(
diff --git a/src/test/java/com/android/tools/r8/resolution/InvokeVirtualOnInterfaceTest.java b/src/test/java/com/android/tools/r8/resolution/InvokeVirtualOnInterfaceTest.java
index 3f2fc61..ca2dd66 100644
--- a/src/test/java/com/android/tools/r8/resolution/InvokeVirtualOnInterfaceTest.java
+++ b/src/test/java/com/android/tools/r8/resolution/InvokeVirtualOnInterfaceTest.java
@@ -48,7 +48,7 @@
.addProgramClasses(I.class, C1.class, C2.class)
.addProgramClassFileData(transformMain())
.addKeepMainRule(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addOptionsModification(options -> options.testing.allowInvokeErrors = true)
.run(parameters.getRuntime(), Main.class)
.assertFailureWithErrorThatMatches(getExpectedFailureMatcher(true));
diff --git a/src/test/java/com/android/tools/r8/resolution/LibraryExtendsProgramRefinedReceiverIsLibraryClass.java b/src/test/java/com/android/tools/r8/resolution/LibraryExtendsProgramRefinedReceiverIsLibraryClass.java
index 2bd5e75..da5d78a 100644
--- a/src/test/java/com/android/tools/r8/resolution/LibraryExtendsProgramRefinedReceiverIsLibraryClass.java
+++ b/src/test/java/com/android/tools/r8/resolution/LibraryExtendsProgramRefinedReceiverIsLibraryClass.java
@@ -50,7 +50,7 @@
.addKeepClassRules(ProgramClass.class)
.addKeepMainRule(ProgramTestRunnerWithoutPhi.class)
.allowDiagnosticWarningMessages()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.debug()
.compile()
.assertAllWarningMessagesMatch(containsString("extends program class"))
@@ -69,7 +69,7 @@
.addKeepClassRules(ProgramClass.class)
.addKeepMainRule(ProgramTestRunnerWithPhi.class)
.allowDiagnosticWarningMessages()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.assertAllWarningMessagesMatch(containsString("extends program class"))
.addRunClasspathClasses(LibraryClass.class)
diff --git a/src/test/java/com/android/tools/r8/resolution/PrivateInvokeVirtualTest.java b/src/test/java/com/android/tools/r8/resolution/PrivateInvokeVirtualTest.java
index c0f46b5..08ed7a2 100644
--- a/src/test/java/com/android/tools/r8/resolution/PrivateInvokeVirtualTest.java
+++ b/src/test/java/com/android/tools/r8/resolution/PrivateInvokeVirtualTest.java
@@ -73,7 +73,7 @@
.addProgramClasses(Main.class)
.addProgramClassFileData(getUIntWithTransformedInvoke())
.addKeepMainRule(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("1");
}
diff --git a/src/test/java/com/android/tools/r8/resolution/PublicFieldInnerClassTest.java b/src/test/java/com/android/tools/r8/resolution/PublicFieldInnerClassTest.java
index 11f560d..1209624 100644
--- a/src/test/java/com/android/tools/r8/resolution/PublicFieldInnerClassTest.java
+++ b/src/test/java/com/android/tools/r8/resolution/PublicFieldInnerClassTest.java
@@ -87,7 +87,7 @@
.setMode(CompilationMode.DEBUG)
.addProgramClassesAndInnerClasses(CLASS)
.addKeepMainRule(CLASS)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), CLASS)
.assertSuccessWithOutput(EXPECTED_OUTPUT);
}
diff --git a/src/test/java/com/android/tools/r8/resolution/SingleResolutionWithFailingDispatchTest.java b/src/test/java/com/android/tools/r8/resolution/SingleResolutionWithFailingDispatchTest.java
index df001ed..7227684 100644
--- a/src/test/java/com/android/tools/r8/resolution/SingleResolutionWithFailingDispatchTest.java
+++ b/src/test/java/com/android/tools/r8/resolution/SingleResolutionWithFailingDispatchTest.java
@@ -42,7 +42,7 @@
.addProgramClasses(Main.class, I.class, J.class)
.addProgramClassFileData(getProgramClassFileData())
.addKeepMainRule(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), Main.class)
.apply(this::inspectRunResult);
diff --git a/src/test/java/com/android/tools/r8/resolution/SingleTargetExecutionTest.java b/src/test/java/com/android/tools/r8/resolution/SingleTargetExecutionTest.java
index 12b9676..feb28f0 100644
--- a/src/test/java/com/android/tools/r8/resolution/SingleTargetExecutionTest.java
+++ b/src/test/java/com/android/tools/r8/resolution/SingleTargetExecutionTest.java
@@ -78,7 +78,7 @@
R8TestBuilder::enableInliningAnnotations,
TestShrinkerBuilder::addInliningAnnotations)
.enableNoHorizontalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutput(getExpectedOutput());
}
diff --git a/src/test/java/com/android/tools/r8/resolution/VirtualOverrideOfPrivateStaticMethodTest.java b/src/test/java/com/android/tools/r8/resolution/VirtualOverrideOfPrivateStaticMethodTest.java
index 1be10cd..f2c6cac 100644
--- a/src/test/java/com/android/tools/r8/resolution/VirtualOverrideOfPrivateStaticMethodTest.java
+++ b/src/test/java/com/android/tools/r8/resolution/VirtualOverrideOfPrivateStaticMethodTest.java
@@ -109,7 +109,7 @@
public void testD8() throws ExecutionException, CompilationFailedException, IOException {
testForD8(parameters.getBackend())
.addProgramClasses(CLASSES)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
// TODO(b/182335909): Ideally, this should IllegalAccessError.
.applyIf(
@@ -125,7 +125,7 @@
testForR8(parameters.getBackend())
.addProgramClasses(CLASSES)
.addKeepMainRule(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertFailureWithErrorThatThrows(expectedRuntimeError());
}
diff --git a/src/test/java/com/android/tools/r8/resolution/VirtualOverrideOfPrivateStaticMethodWithVirtualParentTest.java b/src/test/java/com/android/tools/r8/resolution/VirtualOverrideOfPrivateStaticMethodWithVirtualParentTest.java
index 77f847c..eae67e7 100644
--- a/src/test/java/com/android/tools/r8/resolution/VirtualOverrideOfPrivateStaticMethodWithVirtualParentTest.java
+++ b/src/test/java/com/android/tools/r8/resolution/VirtualOverrideOfPrivateStaticMethodWithVirtualParentTest.java
@@ -126,7 +126,7 @@
testForD8()
.addProgramClasses(CLASSES)
.addProgramClassFileData(getDumps())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class);
}
checkResult(runResult, false);
@@ -139,7 +139,7 @@
.addProgramClasses(CLASSES)
.addProgramClassFileData(getDumps())
.addKeepMainRule(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class);
checkResult(runResult, true);
}
diff --git a/src/test/java/com/android/tools/r8/resolution/VirtualOverrideOfStaticMethodWithVirtualParentInterfaceTest.java b/src/test/java/com/android/tools/r8/resolution/VirtualOverrideOfStaticMethodWithVirtualParentInterfaceTest.java
index 8118ef2..244e9ea 100644
--- a/src/test/java/com/android/tools/r8/resolution/VirtualOverrideOfStaticMethodWithVirtualParentInterfaceTest.java
+++ b/src/test/java/com/android/tools/r8/resolution/VirtualOverrideOfStaticMethodWithVirtualParentInterfaceTest.java
@@ -170,7 +170,7 @@
.addProgramClasses(CLASSES)
.addProgramClassFileData(DUMP)
.addKeepMainRule(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addOptionsModification(o -> o.enableVerticalClassMerging = enableVerticalClassMerging)
.run(parameters.getRuntime(), Main.class)
.assertFailureWithErrorThatThrows(IncompatibleClassChangeError.class);
diff --git a/src/test/java/com/android/tools/r8/resolution/VirtualOverrideOfStaticMethodWithVirtualParentTest.java b/src/test/java/com/android/tools/r8/resolution/VirtualOverrideOfStaticMethodWithVirtualParentTest.java
index 47c0857..ce3ab7f 100644
--- a/src/test/java/com/android/tools/r8/resolution/VirtualOverrideOfStaticMethodWithVirtualParentTest.java
+++ b/src/test/java/com/android/tools/r8/resolution/VirtualOverrideOfStaticMethodWithVirtualParentTest.java
@@ -208,7 +208,7 @@
testForD8()
.addProgramClasses(CLASSES)
.addProgramClassFileData(DUMPS)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class);
}
checkResult(runResult, false);
@@ -221,7 +221,7 @@
.addProgramClasses(CLASSES)
.addProgramClassFileData(DUMPS)
.addKeepMainRule(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class);
checkResult(runResult, true);
}
diff --git a/src/test/java/com/android/tools/r8/resolution/access/NestInvokeSpecialInterfaceMethodAccessTest.java b/src/test/java/com/android/tools/r8/resolution/access/NestInvokeSpecialInterfaceMethodAccessTest.java
index 5390779..8548410 100644
--- a/src/test/java/com/android/tools/r8/resolution/access/NestInvokeSpecialInterfaceMethodAccessTest.java
+++ b/src/test/java/com/android/tools/r8/resolution/access/NestInvokeSpecialInterfaceMethodAccessTest.java
@@ -188,7 +188,7 @@
testForR8(parameters.getBackend())
.addProgramClasses(getClasses())
.addProgramClassFileData(getTransformedClasses())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(Main.class)
.run(parameters.getRuntime(), Main.class)
.apply(this::checkExpectedResult);
diff --git a/src/test/java/com/android/tools/r8/resolution/access/NestInvokeSpecialInterfaceMethodAccessWithIntermediateTest.java b/src/test/java/com/android/tools/r8/resolution/access/NestInvokeSpecialInterfaceMethodAccessWithIntermediateTest.java
index 79c89e8..4776da3 100644
--- a/src/test/java/com/android/tools/r8/resolution/access/NestInvokeSpecialInterfaceMethodAccessWithIntermediateTest.java
+++ b/src/test/java/com/android/tools/r8/resolution/access/NestInvokeSpecialInterfaceMethodAccessWithIntermediateTest.java
@@ -165,12 +165,13 @@
.addProgramClassFileData(getTransformedClasses())
.addLibraryFiles(parameters.getDefaultRuntimeLibrary())
.addKeepMainRule(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.buildWithLiveness();
}
@Test
public void test() throws Exception {
+ parameters.assumeRuntimeTestParameters();
testForRuntime(parameters)
.addProgramClasses(getClasses())
.addProgramClassFileData(getTransformedClasses())
@@ -180,10 +181,11 @@
@Test
public void testR8() throws Exception {
+ parameters.assumeR8TestParameters();
testForR8(parameters.getBackend())
.addProgramClasses(getClasses())
.addProgramClassFileData(getTransformedClasses())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(Main.class)
.run(parameters.getRuntime(), Main.class)
.apply(result -> checkExpectedResult(result, true));
diff --git a/src/test/java/com/android/tools/r8/resolution/access/NestInvokeSpecialMethodAccessTest.java b/src/test/java/com/android/tools/r8/resolution/access/NestInvokeSpecialMethodAccessTest.java
index dd66e5d5..61712f9 100644
--- a/src/test/java/com/android/tools/r8/resolution/access/NestInvokeSpecialMethodAccessTest.java
+++ b/src/test/java/com/android/tools/r8/resolution/access/NestInvokeSpecialMethodAccessTest.java
@@ -161,7 +161,7 @@
testForR8(parameters.getBackend())
.addProgramClasses(getClasses())
.addProgramClassFileData(getTransformedClasses())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(Main.class)
.run(parameters.getRuntime(), Main.class)
.apply(this::checkExpectedResult);
diff --git a/src/test/java/com/android/tools/r8/resolution/access/NestInvokeSpecialMethodAccessWithIntermediateTest.java b/src/test/java/com/android/tools/r8/resolution/access/NestInvokeSpecialMethodAccessWithIntermediateTest.java
index efbbd16..465b11e 100644
--- a/src/test/java/com/android/tools/r8/resolution/access/NestInvokeSpecialMethodAccessWithIntermediateTest.java
+++ b/src/test/java/com/android/tools/r8/resolution/access/NestInvokeSpecialMethodAccessWithIntermediateTest.java
@@ -201,7 +201,7 @@
testForR8(parameters.getBackend())
.addProgramClasses(getClasses())
.addProgramClassFileData(getTransformedClasses())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(Main.class)
.run(parameters.getRuntime(), Main.class)
.apply(runResult -> checkExpectedResult(runResult, true));
diff --git a/src/test/java/com/android/tools/r8/resolution/access/NestInvokeSpecialMethodPublicAccessWithIntermediateTest.java b/src/test/java/com/android/tools/r8/resolution/access/NestInvokeSpecialMethodPublicAccessWithIntermediateTest.java
index e1d4d99..0a20eab 100644
--- a/src/test/java/com/android/tools/r8/resolution/access/NestInvokeSpecialMethodPublicAccessWithIntermediateTest.java
+++ b/src/test/java/com/android/tools/r8/resolution/access/NestInvokeSpecialMethodPublicAccessWithIntermediateTest.java
@@ -160,7 +160,7 @@
testForR8(parameters.getBackend())
.addProgramClasses(getClasses())
.addProgramClassFileData(getTransformedClasses())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(Main.class)
.run(parameters.getRuntime(), Main.class)
.apply(this::checkExpectedResult);
diff --git a/src/test/java/com/android/tools/r8/resolution/access/NestStaticMethodAccessTest.java b/src/test/java/com/android/tools/r8/resolution/access/NestStaticMethodAccessTest.java
index 63cd43e..9216e56 100644
--- a/src/test/java/com/android/tools/r8/resolution/access/NestStaticMethodAccessTest.java
+++ b/src/test/java/com/android/tools/r8/resolution/access/NestStaticMethodAccessTest.java
@@ -93,7 +93,7 @@
.addProgramClasses(getClasses())
.addProgramClassFileData(getTransformedClasses())
.enableNoHorizontalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(Main.class)
.run(parameters.getRuntime(), Main.class)
.apply(this::checkExpectedResult);
diff --git a/src/test/java/com/android/tools/r8/resolution/access/NestStaticMethodAccessWithIntermediateClassTest.java b/src/test/java/com/android/tools/r8/resolution/access/NestStaticMethodAccessWithIntermediateClassTest.java
index f7bfe55..235b3d1 100644
--- a/src/test/java/com/android/tools/r8/resolution/access/NestStaticMethodAccessWithIntermediateClassTest.java
+++ b/src/test/java/com/android/tools/r8/resolution/access/NestStaticMethodAccessWithIntermediateClassTest.java
@@ -97,7 +97,7 @@
testForR8(parameters.getBackend())
.addProgramClasses(getClasses())
.addProgramClassFileData(getTransformedClasses())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(Main.class)
.run(parameters.getRuntime(), Main.class)
.apply(runResult -> checkExpectedResult(runResult, true));
diff --git a/src/test/java/com/android/tools/r8/resolution/access/NestVirtualMethodAccessTest.java b/src/test/java/com/android/tools/r8/resolution/access/NestVirtualMethodAccessTest.java
index 7d9eb16..d86d67d 100644
--- a/src/test/java/com/android/tools/r8/resolution/access/NestVirtualMethodAccessTest.java
+++ b/src/test/java/com/android/tools/r8/resolution/access/NestVirtualMethodAccessTest.java
@@ -94,7 +94,7 @@
testForR8(parameters.getBackend())
.addProgramClasses(getClasses())
.addProgramClassFileData(getTransformedClasses())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(Main.class)
.enableNoHorizontalClassMergingAnnotations()
.run(parameters.getRuntime(), Main.class)
diff --git a/src/test/java/com/android/tools/r8/resolution/access/NestVirtualMethodAccessWithIntermediateClassTest.java b/src/test/java/com/android/tools/r8/resolution/access/NestVirtualMethodAccessWithIntermediateClassTest.java
index 4a9c475..6c3e040 100644
--- a/src/test/java/com/android/tools/r8/resolution/access/NestVirtualMethodAccessWithIntermediateClassTest.java
+++ b/src/test/java/com/android/tools/r8/resolution/access/NestVirtualMethodAccessWithIntermediateClassTest.java
@@ -96,7 +96,7 @@
testForR8(parameters.getBackend())
.addProgramClasses(getClasses())
.addProgramClassFileData(getTransformedClasses())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(Main.class)
.run(parameters.getRuntime(), Main.class)
.apply(runResult -> checkExpectedResult(runResult, true));
diff --git a/src/test/java/com/android/tools/r8/resolution/access/SelfVirtualMethodAccessTest.java b/src/test/java/com/android/tools/r8/resolution/access/SelfVirtualMethodAccessTest.java
index 754b19d..aff8d60 100644
--- a/src/test/java/com/android/tools/r8/resolution/access/SelfVirtualMethodAccessTest.java
+++ b/src/test/java/com/android/tools/r8/resolution/access/SelfVirtualMethodAccessTest.java
@@ -77,7 +77,7 @@
testForR8(parameters.getBackend())
.addProgramClasses(getClasses())
.addProgramClassFileData(getTransformedClasses())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(Main.class)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutput(EXPECTED);
diff --git a/src/test/java/com/android/tools/r8/resolution/access/indirectfield/IndirectFieldAccessTest.java b/src/test/java/com/android/tools/r8/resolution/access/indirectfield/IndirectFieldAccessTest.java
index fc7a254..99b02c3 100644
--- a/src/test/java/com/android/tools/r8/resolution/access/indirectfield/IndirectFieldAccessTest.java
+++ b/src/test/java/com/android/tools/r8/resolution/access/indirectfield/IndirectFieldAccessTest.java
@@ -82,7 +82,7 @@
public void testR8() throws Exception {
testForR8(parameters.getBackend())
.addProgramClasses(getClasses())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(Main.class)
.run(parameters.getRuntime(), Main.class)
.apply(this::checkExpectedResult);
diff --git a/src/test/java/com/android/tools/r8/resolution/access/indirectmethod/IndirectMethodAccessTest.java b/src/test/java/com/android/tools/r8/resolution/access/indirectmethod/IndirectMethodAccessTest.java
index c5363de..528b8aa 100644
--- a/src/test/java/com/android/tools/r8/resolution/access/indirectmethod/IndirectMethodAccessTest.java
+++ b/src/test/java/com/android/tools/r8/resolution/access/indirectmethod/IndirectMethodAccessTest.java
@@ -84,7 +84,7 @@
testForR8(parameters.getBackend())
.addProgramClasses(getClasses())
.addProgramClassFileData(getTransforms())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(Main.class)
.run(parameters.getRuntime(), Main.class)
.apply(this::checkExpectedResult);
diff --git a/src/test/java/com/android/tools/r8/resolution/b123730538/B123730538.java b/src/test/java/com/android/tools/r8/resolution/b123730538/B123730538.java
index e2f71f5..78e5623 100644
--- a/src/test/java/com/android/tools/r8/resolution/b123730538/B123730538.java
+++ b/src/test/java/com/android/tools/r8/resolution/b123730538/B123730538.java
@@ -74,7 +74,7 @@
.addProgramFiles(CLASSES)
.addKeepMainRule(MAIN)
.addKeepRules("-dontoptimize")
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), MAIN)
.assertSuccessWithOutput(EXPECTED_OUTPUT)
.inspect(this::inspect);
diff --git a/src/test/java/com/android/tools/r8/resolution/duplicatedefinitions/MaximallySpecificAbstractOnIncompletePathTest.java b/src/test/java/com/android/tools/r8/resolution/duplicatedefinitions/MaximallySpecificAbstractOnIncompletePathTest.java
index cf882a8..69f0801 100644
--- a/src/test/java/com/android/tools/r8/resolution/duplicatedefinitions/MaximallySpecificAbstractOnIncompletePathTest.java
+++ b/src/test/java/com/android/tools/r8/resolution/duplicatedefinitions/MaximallySpecificAbstractOnIncompletePathTest.java
@@ -121,7 +121,7 @@
.addProgramClassFileData(getMainWithoutFoo(), getIOnProgram())
.addDefaultRuntimeLibrary(parameters)
.addLibraryFiles(libraryClasses)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addOptionsModification(options -> options.loadAllClassDefinitions = true);
}
diff --git a/src/test/java/com/android/tools/r8/resolution/duplicatedefinitions/MaximallySpecificDifferentParentHierarchyTest.java b/src/test/java/com/android/tools/r8/resolution/duplicatedefinitions/MaximallySpecificDifferentParentHierarchyTest.java
index 6440e17..a87967c 100644
--- a/src/test/java/com/android/tools/r8/resolution/duplicatedefinitions/MaximallySpecificDifferentParentHierarchyTest.java
+++ b/src/test/java/com/android/tools/r8/resolution/duplicatedefinitions/MaximallySpecificDifferentParentHierarchyTest.java
@@ -153,7 +153,7 @@
.addProgramClassFileData(getJProgram())
.addDefaultRuntimeLibrary(parameters)
.addLibraryFiles(libraryClasses)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addOptionsModification(options -> options.loadAllClassDefinitions = true);
}
diff --git a/src/test/java/com/android/tools/r8/resolution/duplicatedefinitions/MaximallySpecificMultipleOnCompleteTest.java b/src/test/java/com/android/tools/r8/resolution/duplicatedefinitions/MaximallySpecificMultipleOnCompleteTest.java
index e220b6e..75cc0cd 100644
--- a/src/test/java/com/android/tools/r8/resolution/duplicatedefinitions/MaximallySpecificMultipleOnCompleteTest.java
+++ b/src/test/java/com/android/tools/r8/resolution/duplicatedefinitions/MaximallySpecificMultipleOnCompleteTest.java
@@ -112,7 +112,7 @@
.addProgramClassFileData(getJOnProgram(), getMainWithAllImplements())
.addDefaultRuntimeLibrary(parameters)
.addLibraryFiles(libraryClasses)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addOptionsModification(options -> options.loadAllClassDefinitions = true)
.compile()
.addBootClasspathFiles(buildOnDexRuntime(parameters, libraryClasses))
diff --git a/src/test/java/com/android/tools/r8/resolution/duplicatedefinitions/MaximallySpecificMultiplePathsICCETest.java b/src/test/java/com/android/tools/r8/resolution/duplicatedefinitions/MaximallySpecificMultiplePathsICCETest.java
index a3a2dbc..910bc1d 100644
--- a/src/test/java/com/android/tools/r8/resolution/duplicatedefinitions/MaximallySpecificMultiplePathsICCETest.java
+++ b/src/test/java/com/android/tools/r8/resolution/duplicatedefinitions/MaximallySpecificMultiplePathsICCETest.java
@@ -141,7 +141,7 @@
.addProgramClassFileData(getMainWithInterfacesIAndJ())
.addDefaultRuntimeLibrary(parameters)
.addLibraryFiles(libraryClasses)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addOptionsModification(options -> options.loadAllClassDefinitions = true)
.compile()
.addBootClasspathFiles(buildOnDexRuntime(parameters, libraryClasses))
diff --git a/src/test/java/com/android/tools/r8/resolution/duplicatedefinitions/MaximallySpecificMultiplePathsSuccessTest.java b/src/test/java/com/android/tools/r8/resolution/duplicatedefinitions/MaximallySpecificMultiplePathsSuccessTest.java
index 7466ae4..394540c 100644
--- a/src/test/java/com/android/tools/r8/resolution/duplicatedefinitions/MaximallySpecificMultiplePathsSuccessTest.java
+++ b/src/test/java/com/android/tools/r8/resolution/duplicatedefinitions/MaximallySpecificMultiplePathsSuccessTest.java
@@ -153,7 +153,7 @@
.addProgramClassFileData(getIProgram(), getJProgram())
.addDefaultRuntimeLibrary(parameters)
.addLibraryFiles(libraryClasses)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addOptionsModification(options -> options.loadAllClassDefinitions = true)
.compile()
.addBootClasspathFiles(buildOnDexRuntime(parameters, libraryClasses))
diff --git a/src/test/java/com/android/tools/r8/resolution/duplicatedefinitions/MaximallySpecificMultiplePathsThroughClassTest.java b/src/test/java/com/android/tools/r8/resolution/duplicatedefinitions/MaximallySpecificMultiplePathsThroughClassTest.java
index e97e1c7..af98951 100644
--- a/src/test/java/com/android/tools/r8/resolution/duplicatedefinitions/MaximallySpecificMultiplePathsThroughClassTest.java
+++ b/src/test/java/com/android/tools/r8/resolution/duplicatedefinitions/MaximallySpecificMultiplePathsThroughClassTest.java
@@ -131,7 +131,7 @@
.addProgramClassFileData(getAWithImplementsI(), getIProgram())
.addDefaultRuntimeLibrary(parameters)
.addLibraryFiles(libraryClasses)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addOptionsModification(options -> options.loadAllClassDefinitions = true)
.compile()
.addBootClasspathFiles(buildOnDexRuntime(parameters, libraryClasses))
diff --git a/src/test/java/com/android/tools/r8/resolution/duplicatedefinitions/MaximallySpecificSingleDominatingAfterJoinTest.java b/src/test/java/com/android/tools/r8/resolution/duplicatedefinitions/MaximallySpecificSingleDominatingAfterJoinTest.java
index cc39cfa..f34097c 100644
--- a/src/test/java/com/android/tools/r8/resolution/duplicatedefinitions/MaximallySpecificSingleDominatingAfterJoinTest.java
+++ b/src/test/java/com/android/tools/r8/resolution/duplicatedefinitions/MaximallySpecificSingleDominatingAfterJoinTest.java
@@ -130,7 +130,7 @@
.addProgramClasses(K.class, Main.class)
.addDefaultRuntimeLibrary(parameters)
.addLibraryFiles(libraryClasses)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addOptionsModification(options -> options.loadAllClassDefinitions = true)
.compile()
.addBootClasspathFiles(buildOnDexRuntime(parameters, libraryClasses))
diff --git a/src/test/java/com/android/tools/r8/resolution/duplicatedefinitions/MaximallySpecificSingleDominatingSubTest.java b/src/test/java/com/android/tools/r8/resolution/duplicatedefinitions/MaximallySpecificSingleDominatingSubTest.java
index da2e10d..c7ce7db 100644
--- a/src/test/java/com/android/tools/r8/resolution/duplicatedefinitions/MaximallySpecificSingleDominatingSubTest.java
+++ b/src/test/java/com/android/tools/r8/resolution/duplicatedefinitions/MaximallySpecificSingleDominatingSubTest.java
@@ -125,7 +125,7 @@
.addProgramClassFileData(getJOnProgram())
.addDefaultRuntimeLibrary(parameters)
.addLibraryFiles(libraryClasses)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addOptionsModification(options -> options.loadAllClassDefinitions = true)
.compile()
.addBootClasspathFiles(buildOnDexRuntime(parameters, libraryClasses))
diff --git a/src/test/java/com/android/tools/r8/resolution/duplicatedefinitions/MaximallySpecificSingleLibraryPartialTest.java b/src/test/java/com/android/tools/r8/resolution/duplicatedefinitions/MaximallySpecificSingleLibraryPartialTest.java
index 779bf76..32e82f1 100644
--- a/src/test/java/com/android/tools/r8/resolution/duplicatedefinitions/MaximallySpecificSingleLibraryPartialTest.java
+++ b/src/test/java/com/android/tools/r8/resolution/duplicatedefinitions/MaximallySpecificSingleLibraryPartialTest.java
@@ -148,7 +148,7 @@
.addProgramClassFileData(getIProgram())
.addDefaultRuntimeLibrary(parameters)
.addLibraryFiles(libraryClasses)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addOptionsModification(options -> options.loadAllClassDefinitions = true)
.compile()
.addBootClasspathFiles(buildOnDexRuntime(parameters, libraryClasses))
diff --git a/src/test/java/com/android/tools/r8/resolution/duplicatedefinitions/MaximallySpecificSingleProgramPartialTest.java b/src/test/java/com/android/tools/r8/resolution/duplicatedefinitions/MaximallySpecificSingleProgramPartialTest.java
index 4648726..a9c3e11 100644
--- a/src/test/java/com/android/tools/r8/resolution/duplicatedefinitions/MaximallySpecificSingleProgramPartialTest.java
+++ b/src/test/java/com/android/tools/r8/resolution/duplicatedefinitions/MaximallySpecificSingleProgramPartialTest.java
@@ -144,7 +144,7 @@
.addProgramClassFileData(getMainImplementingI(), getIProgram())
.addDefaultRuntimeLibrary(parameters)
.addLibraryFiles(libraryClasses)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addOptionsModification(options -> options.loadAllClassDefinitions = true)
.compile()
.addBootClasspathFiles(buildOnDexRuntime(parameters, libraryClasses))
diff --git a/src/test/java/com/android/tools/r8/resolution/interfacediamonds/AbstractAllTest.java b/src/test/java/com/android/tools/r8/resolution/interfacediamonds/AbstractAllTest.java
index a2ddf8c..0b920a5 100644
--- a/src/test/java/com/android/tools/r8/resolution/interfacediamonds/AbstractAllTest.java
+++ b/src/test/java/com/android/tools/r8/resolution/interfacediamonds/AbstractAllTest.java
@@ -65,7 +65,7 @@
testForR8(parameters.getBackend())
.addInnerClasses(AbstractAllTest.class)
.addKeepMainRule(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("C::f");
}
diff --git a/src/test/java/com/android/tools/r8/resolution/interfacediamonds/DefaultLeftAbstractRightTest.java b/src/test/java/com/android/tools/r8/resolution/interfacediamonds/DefaultLeftAbstractRightTest.java
index 273569d..e64d747 100644
--- a/src/test/java/com/android/tools/r8/resolution/interfacediamonds/DefaultLeftAbstractRightTest.java
+++ b/src/test/java/com/android/tools/r8/resolution/interfacediamonds/DefaultLeftAbstractRightTest.java
@@ -71,7 +71,7 @@
.addProgramClasses(CLASSES)
.addProgramClassFileData(transformB())
.addKeepMainRule(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("L::f");
}
diff --git a/src/test/java/com/android/tools/r8/resolution/interfacediamonds/DefaultRightAbstractLeftTest.java b/src/test/java/com/android/tools/r8/resolution/interfacediamonds/DefaultRightAbstractLeftTest.java
index 9d2f8a3..19bbe39 100644
--- a/src/test/java/com/android/tools/r8/resolution/interfacediamonds/DefaultRightAbstractLeftTest.java
+++ b/src/test/java/com/android/tools/r8/resolution/interfacediamonds/DefaultRightAbstractLeftTest.java
@@ -71,7 +71,7 @@
.addProgramClasses(CLASSES)
.addProgramClassFileData(transformB())
.addKeepMainRule(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("R::f");
}
diff --git a/src/test/java/com/android/tools/r8/resolution/interfacediamonds/DefaultTopAbstractLeftTest.java b/src/test/java/com/android/tools/r8/resolution/interfacediamonds/DefaultTopAbstractLeftTest.java
index 8a89743..2917464 100644
--- a/src/test/java/com/android/tools/r8/resolution/interfacediamonds/DefaultTopAbstractLeftTest.java
+++ b/src/test/java/com/android/tools/r8/resolution/interfacediamonds/DefaultTopAbstractLeftTest.java
@@ -73,7 +73,7 @@
.addProgramClasses(CLASSES)
.addProgramClassFileData(transformB())
.addKeepMainRule(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addOptionsModification(
options -> options.testing.allowNonAbstractClassesWithAbstractMethods = true)
.run(parameters.getRuntime(), Main.class)
diff --git a/src/test/java/com/android/tools/r8/resolution/interfacediamonds/DefaultTopAbstractRightTest.java b/src/test/java/com/android/tools/r8/resolution/interfacediamonds/DefaultTopAbstractRightTest.java
index 32b069e..6c16dfd 100644
--- a/src/test/java/com/android/tools/r8/resolution/interfacediamonds/DefaultTopAbstractRightTest.java
+++ b/src/test/java/com/android/tools/r8/resolution/interfacediamonds/DefaultTopAbstractRightTest.java
@@ -73,7 +73,7 @@
.addProgramClasses(CLASSES)
.addProgramClassFileData(transformB())
.addKeepMainRule(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addOptionsModification(
options -> options.testing.allowNonAbstractClassesWithAbstractMethods = true)
.run(parameters.getRuntime(), Main.class)
diff --git a/src/test/java/com/android/tools/r8/resolution/interfacediamonds/DefaultTopAndBothTest.java b/src/test/java/com/android/tools/r8/resolution/interfacediamonds/DefaultTopAndBothTest.java
index c654f1e..92ab6be 100644
--- a/src/test/java/com/android/tools/r8/resolution/interfacediamonds/DefaultTopAndBothTest.java
+++ b/src/test/java/com/android/tools/r8/resolution/interfacediamonds/DefaultTopAndBothTest.java
@@ -80,7 +80,7 @@
.addProgramClasses(CLASSES)
.addProgramClassFileData(transformB())
.addKeepMainRule(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertFailureWithErrorThatMatches(containsString("IncompatibleClassChangeError"));
}
diff --git a/src/test/java/com/android/tools/r8/resolution/interfacediamonds/DefaultTopAndLeftTest.java b/src/test/java/com/android/tools/r8/resolution/interfacediamonds/DefaultTopAndLeftTest.java
index 2896987..3547f61 100644
--- a/src/test/java/com/android/tools/r8/resolution/interfacediamonds/DefaultTopAndLeftTest.java
+++ b/src/test/java/com/android/tools/r8/resolution/interfacediamonds/DefaultTopAndLeftTest.java
@@ -68,7 +68,7 @@
testForR8(parameters.getBackend())
.addProgramClasses(CLASSES)
.addKeepMainRule(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("L::f");
}
diff --git a/src/test/java/com/android/tools/r8/resolution/interfacediamonds/DefaultTopAndRightTest.java b/src/test/java/com/android/tools/r8/resolution/interfacediamonds/DefaultTopAndRightTest.java
index f8087c1..1c7913d 100644
--- a/src/test/java/com/android/tools/r8/resolution/interfacediamonds/DefaultTopAndRightTest.java
+++ b/src/test/java/com/android/tools/r8/resolution/interfacediamonds/DefaultTopAndRightTest.java
@@ -68,7 +68,7 @@
testForR8(parameters.getBackend())
.addProgramClasses(CLASSES)
.addKeepMainRule(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("R::f");
}
diff --git a/src/test/java/com/android/tools/r8/resolution/interfacediamonds/TwoDefaultMethodsWithoutTopTest.java b/src/test/java/com/android/tools/r8/resolution/interfacediamonds/TwoDefaultMethodsWithoutTopTest.java
index 810d984..4f1a7fa 100644
--- a/src/test/java/com/android/tools/r8/resolution/interfacediamonds/TwoDefaultMethodsWithoutTopTest.java
+++ b/src/test/java/com/android/tools/r8/resolution/interfacediamonds/TwoDefaultMethodsWithoutTopTest.java
@@ -106,7 +106,7 @@
.addProgramClasses(CLASSES)
.addProgramClassFileData(transformB())
.addKeepMainRule(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertFailureWithErrorThatMatches(containsString("IncompatibleClassChangeError"));
}
diff --git a/src/test/java/com/android/tools/r8/resolution/interfacetargets/DefaultMethodAsOverrideWithLambdaTest.java b/src/test/java/com/android/tools/r8/resolution/interfacetargets/DefaultMethodAsOverrideWithLambdaTest.java
index 8558740..200a3ad 100644
--- a/src/test/java/com/android/tools/r8/resolution/interfacetargets/DefaultMethodAsOverrideWithLambdaTest.java
+++ b/src/test/java/com/android/tools/r8/resolution/interfacetargets/DefaultMethodAsOverrideWithLambdaTest.java
@@ -95,7 +95,7 @@
.enableNoVerticalClassMergingAnnotations()
.enableNeverClassInliningAnnotations()
.addKeepMainRule(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines(EXPECTED);
}
diff --git a/src/test/java/com/android/tools/r8/resolution/interfacetargets/DefaultMethodLambdaTest.java b/src/test/java/com/android/tools/r8/resolution/interfacetargets/DefaultMethodLambdaTest.java
index 0466c4f..3f9476e 100644
--- a/src/test/java/com/android/tools/r8/resolution/interfacetargets/DefaultMethodLambdaTest.java
+++ b/src/test/java/com/android/tools/r8/resolution/interfacetargets/DefaultMethodLambdaTest.java
@@ -92,7 +92,7 @@
.enableNoVerticalClassMergingAnnotations()
.enableNeverClassInliningAnnotations()
.addKeepMainRule(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines(EXPECTED);
}
diff --git a/src/test/java/com/android/tools/r8/resolution/interfacetargets/DefaultWithoutTopTest.java b/src/test/java/com/android/tools/r8/resolution/interfacetargets/DefaultWithoutTopTest.java
index 9ee3d01..1579e3f 100644
--- a/src/test/java/com/android/tools/r8/resolution/interfacetargets/DefaultWithoutTopTest.java
+++ b/src/test/java/com/android/tools/r8/resolution/interfacetargets/DefaultWithoutTopTest.java
@@ -93,7 +93,7 @@
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
.enableNoVerticalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines(EXPECTED);
}
@@ -144,7 +144,7 @@
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
.enableNoVerticalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines(EXPECTED);
}
diff --git a/src/test/java/com/android/tools/r8/resolution/interfacetargets/DuplicateImportsTest.java b/src/test/java/com/android/tools/r8/resolution/interfacetargets/DuplicateImportsTest.java
index d5fe077..56e1a51 100644
--- a/src/test/java/com/android/tools/r8/resolution/interfacetargets/DuplicateImportsTest.java
+++ b/src/test/java/com/android/tools/r8/resolution/interfacetargets/DuplicateImportsTest.java
@@ -91,7 +91,7 @@
.enableNoVerticalClassMergingAnnotations()
.enableNeverClassInliningAnnotations()
.addKeepMainRule(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines(EXPECTED);
}
diff --git a/src/test/java/com/android/tools/r8/resolution/interfacetargets/InvokeInterfaceWithStaticTargetTest.java b/src/test/java/com/android/tools/r8/resolution/interfacetargets/InvokeInterfaceWithStaticTargetTest.java
index 2370c83..667b6c7 100644
--- a/src/test/java/com/android/tools/r8/resolution/interfacetargets/InvokeInterfaceWithStaticTargetTest.java
+++ b/src/test/java/com/android/tools/r8/resolution/interfacetargets/InvokeInterfaceWithStaticTargetTest.java
@@ -76,7 +76,7 @@
.addProgramClasses(A.class, I.class)
.addProgramClassFileData(transformMain())
.addKeepMainRule(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertFailureWithErrorThatThrows(IncompatibleClassChangeError.class);
}
diff --git a/src/test/java/com/android/tools/r8/resolution/interfacetargets/LambdaMultipleInterfacesTest.java b/src/test/java/com/android/tools/r8/resolution/interfacetargets/LambdaMultipleInterfacesTest.java
index 6cbdb90..c01dc38 100644
--- a/src/test/java/com/android/tools/r8/resolution/interfacetargets/LambdaMultipleInterfacesTest.java
+++ b/src/test/java/com/android/tools/r8/resolution/interfacetargets/LambdaMultipleInterfacesTest.java
@@ -92,7 +92,7 @@
.enableNoVerticalClassMergingAnnotations()
.enableNeverClassInliningAnnotations()
.addKeepMainRule(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines(EXPECTED);
}
diff --git a/src/test/java/com/android/tools/r8/resolution/interfacetargets/MissingInterfaceVirtualTargetsTest.java b/src/test/java/com/android/tools/r8/resolution/interfacetargets/MissingInterfaceVirtualTargetsTest.java
index afb96e2..37fa843 100644
--- a/src/test/java/com/android/tools/r8/resolution/interfacetargets/MissingInterfaceVirtualTargetsTest.java
+++ b/src/test/java/com/android/tools/r8/resolution/interfacetargets/MissingInterfaceVirtualTargetsTest.java
@@ -38,13 +38,13 @@
Path out =
testForD8(parameters.getBackend())
.addProgramClasses(TestClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.assertNoMessages()
.writeToZip();
testForD8(parameters.getBackend())
.addProgramClasses(I.class, A.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addRunClasspathFiles(out)
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutput(EXPECTED);
diff --git a/src/test/java/com/android/tools/r8/resolution/interfacetargets/MultipleImplementsTest.java b/src/test/java/com/android/tools/r8/resolution/interfacetargets/MultipleImplementsTest.java
index f493261..5dad4b6 100644
--- a/src/test/java/com/android/tools/r8/resolution/interfacetargets/MultipleImplementsTest.java
+++ b/src/test/java/com/android/tools/r8/resolution/interfacetargets/MultipleImplementsTest.java
@@ -90,7 +90,7 @@
.enableNoVerticalClassMergingAnnotations()
.enableNeverClassInliningAnnotations()
.addKeepMainRule(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines(EXPECTED);
}
diff --git a/src/test/java/com/android/tools/r8/resolution/interfacetargets/ProgramAndLibraryDefinitionTest.java b/src/test/java/com/android/tools/r8/resolution/interfacetargets/ProgramAndLibraryDefinitionTest.java
index e76a5b6..195f74c 100644
--- a/src/test/java/com/android/tools/r8/resolution/interfacetargets/ProgramAndLibraryDefinitionTest.java
+++ b/src/test/java/com/android/tools/r8/resolution/interfacetargets/ProgramAndLibraryDefinitionTest.java
@@ -68,7 +68,7 @@
testForR8(parameters.getBackend())
.addDefaultRuntimeLibrary(parameters)
.addProgramClasses(Main.class, Implementer.class, I.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addDontWarn(A.class, B.class)
.addKeepMainRule(Main.class)
.addOptionsModification(options -> options.loadAllClassDefinitions = true)
diff --git a/src/test/java/com/android/tools/r8/resolution/interfacetargets/SimpleInterfaceInvokeTest.java b/src/test/java/com/android/tools/r8/resolution/interfacetargets/SimpleInterfaceInvokeTest.java
index e89ba72..fab0e87 100644
--- a/src/test/java/com/android/tools/r8/resolution/interfacetargets/SimpleInterfaceInvokeTest.java
+++ b/src/test/java/com/android/tools/r8/resolution/interfacetargets/SimpleInterfaceInvokeTest.java
@@ -96,7 +96,7 @@
.enableNoVerticalClassMergingAnnotations()
.enableNeverClassInliningAnnotations()
.addKeepMainRule(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines(EXPECTED);
}
diff --git a/src/test/java/com/android/tools/r8/resolution/interfacetargets/SubInterfaceOverridesTest.java b/src/test/java/com/android/tools/r8/resolution/interfacetargets/SubInterfaceOverridesTest.java
index 5f758fb..4fb6ea3 100644
--- a/src/test/java/com/android/tools/r8/resolution/interfacetargets/SubInterfaceOverridesTest.java
+++ b/src/test/java/com/android/tools/r8/resolution/interfacetargets/SubInterfaceOverridesTest.java
@@ -97,7 +97,7 @@
.enableNoVerticalClassMergingAnnotations()
.enableNeverClassInliningAnnotations()
.addKeepMainRule(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines(EXPECTED);
diff --git a/src/test/java/com/android/tools/r8/resolution/interfacetargets/SubTypeMissingOverridesTest.java b/src/test/java/com/android/tools/r8/resolution/interfacetargets/SubTypeMissingOverridesTest.java
index d5a7c33..5563d1c 100644
--- a/src/test/java/com/android/tools/r8/resolution/interfacetargets/SubTypeMissingOverridesTest.java
+++ b/src/test/java/com/android/tools/r8/resolution/interfacetargets/SubTypeMissingOverridesTest.java
@@ -90,7 +90,7 @@
.enableNoVerticalClassMergingAnnotations()
.enableNeverClassInliningAnnotations()
.addKeepMainRule(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines(EXPECTED);
diff --git a/src/test/java/com/android/tools/r8/resolution/interfacetargets/SubTypeOverridesTest.java b/src/test/java/com/android/tools/r8/resolution/interfacetargets/SubTypeOverridesTest.java
index 49d6e69..edc31a9 100644
--- a/src/test/java/com/android/tools/r8/resolution/interfacetargets/SubTypeOverridesTest.java
+++ b/src/test/java/com/android/tools/r8/resolution/interfacetargets/SubTypeOverridesTest.java
@@ -94,7 +94,7 @@
.enableNoVerticalClassMergingAnnotations()
.enableNeverClassInliningAnnotations()
.addKeepMainRule(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines(EXPECTED);
diff --git a/src/test/java/com/android/tools/r8/resolution/packageprivate/PackagePrivateClasspathWidenTest.java b/src/test/java/com/android/tools/r8/resolution/packageprivate/PackagePrivateClasspathWidenTest.java
index ea9e6bb..8a36359 100644
--- a/src/test/java/com/android/tools/r8/resolution/packageprivate/PackagePrivateClasspathWidenTest.java
+++ b/src/test/java/com/android/tools/r8/resolution/packageprivate/PackagePrivateClasspathWidenTest.java
@@ -100,7 +100,7 @@
testForR8(parameters.getBackend())
.addProgramClasses(C.class, Main.class)
.addClasspathClasses(CLASSPATH_CLASSES)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(Main.class)
.addRunClasspathFiles(buildOnDexRuntime(parameters, classPathJar))
.run(parameters.getRuntime(), Main.class)
diff --git a/src/test/java/com/android/tools/r8/resolution/packageprivate/PackagePrivateInitialResolutionHolderTest.java b/src/test/java/com/android/tools/r8/resolution/packageprivate/PackagePrivateInitialResolutionHolderTest.java
index 4d37079..ae99bf7 100644
--- a/src/test/java/com/android/tools/r8/resolution/packageprivate/PackagePrivateInitialResolutionHolderTest.java
+++ b/src/test/java/com/android/tools/r8/resolution/packageprivate/PackagePrivateInitialResolutionHolderTest.java
@@ -94,7 +94,7 @@
testForR8(parameters.getBackend())
.addProgramClassFileData(getRewrittenResources())
.addKeepMainRule(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), Main.class)
// TODO(b/264522833): Should be IllegalAccessError.
diff --git a/src/test/java/com/android/tools/r8/resolution/packageprivate/PackagePrivateReentryTest.java b/src/test/java/com/android/tools/r8/resolution/packageprivate/PackagePrivateReentryTest.java
index 5afee32..d6c548d 100644
--- a/src/test/java/com/android/tools/r8/resolution/packageprivate/PackagePrivateReentryTest.java
+++ b/src/test/java/com/android/tools/r8/resolution/packageprivate/PackagePrivateReentryTest.java
@@ -84,7 +84,7 @@
public void testR8() throws ExecutionException, CompilationFailedException, IOException {
testForR8(parameters.getBackend())
.addProgramClasses(A.class, B.class, C.class, D.class, Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(Main.class)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines(EXPECTED);
diff --git a/src/test/java/com/android/tools/r8/resolution/packageprivate/PackagePrivateReentryWithNarrowingTest.java b/src/test/java/com/android/tools/r8/resolution/packageprivate/PackagePrivateReentryWithNarrowingTest.java
index 0608cdd..7cbbb62 100644
--- a/src/test/java/com/android/tools/r8/resolution/packageprivate/PackagePrivateReentryWithNarrowingTest.java
+++ b/src/test/java/com/android/tools/r8/resolution/packageprivate/PackagePrivateReentryWithNarrowingTest.java
@@ -100,7 +100,7 @@
testForR8(parameters.getBackend())
.addProgramClasses(A.class, B.class, C.class, Main.class)
.addProgramClassFileData(getDWithPackagePrivateFoo())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(Main.class)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines(EXPECTED);
diff --git a/src/test/java/com/android/tools/r8/resolution/packageprivate/PackagePrivateWithDefaultMethod2Test.java b/src/test/java/com/android/tools/r8/resolution/packageprivate/PackagePrivateWithDefaultMethod2Test.java
index 182a774..4bf6dc7 100644
--- a/src/test/java/com/android/tools/r8/resolution/packageprivate/PackagePrivateWithDefaultMethod2Test.java
+++ b/src/test/java/com/android/tools/r8/resolution/packageprivate/PackagePrivateWithDefaultMethod2Test.java
@@ -121,7 +121,7 @@
J.class,
Main.class)
.addProgramClassFileData(getNonAbstractWithoutDeclaredMethods())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(Main.class)
.run(parameters.getRuntime(), Main.class);
if (parameters.isDexRuntime()
diff --git a/src/test/java/com/android/tools/r8/resolution/packageprivate/PackagePrivateWithDefaultMethodTest.java b/src/test/java/com/android/tools/r8/resolution/packageprivate/PackagePrivateWithDefaultMethodTest.java
index 95a30a7..9984687 100644
--- a/src/test/java/com/android/tools/r8/resolution/packageprivate/PackagePrivateWithDefaultMethodTest.java
+++ b/src/test/java/com/android/tools/r8/resolution/packageprivate/PackagePrivateWithDefaultMethodTest.java
@@ -98,7 +98,7 @@
.addProgramClasses(
Abstract.class, I.class, A.class, NonAbstractExtendingA.class, J.class, Main.class)
.addProgramClassFileData(getNonAbstractWithoutDeclaredMethods())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(Main.class)
.run(parameters.getRuntime(), Main.class);
if (parameters.isDexRuntime()
diff --git a/src/test/java/com/android/tools/r8/resolution/packageprivate/WidenAccessOutsidePackageTest.java b/src/test/java/com/android/tools/r8/resolution/packageprivate/WidenAccessOutsidePackageTest.java
index 87d2449..8745ee1 100644
--- a/src/test/java/com/android/tools/r8/resolution/packageprivate/WidenAccessOutsidePackageTest.java
+++ b/src/test/java/com/android/tools/r8/resolution/packageprivate/WidenAccessOutsidePackageTest.java
@@ -95,7 +95,7 @@
public void testR8() throws ExecutionException, CompilationFailedException, IOException {
testForR8(parameters.getBackend())
.addProgramClasses(A.class, B.class, C.class, Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(Main.class)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines(EXPECTED);
diff --git a/src/test/java/com/android/tools/r8/resolution/virtualtargets/AbstractInMiddleTest.java b/src/test/java/com/android/tools/r8/resolution/virtualtargets/AbstractInMiddleTest.java
index f531b63..ac915f2 100644
--- a/src/test/java/com/android/tools/r8/resolution/virtualtargets/AbstractInMiddleTest.java
+++ b/src/test/java/com/android/tools/r8/resolution/virtualtargets/AbstractInMiddleTest.java
@@ -90,7 +90,7 @@
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
.addKeepMainRule(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines(EXPECTED);
}
diff --git a/src/test/java/com/android/tools/r8/resolution/virtualtargets/DefaultInterfaceMethodInSubInterfaceSubTypeTest.java b/src/test/java/com/android/tools/r8/resolution/virtualtargets/DefaultInterfaceMethodInSubInterfaceSubTypeTest.java
index fdfa6f4..efed293 100644
--- a/src/test/java/com/android/tools/r8/resolution/virtualtargets/DefaultInterfaceMethodInSubInterfaceSubTypeTest.java
+++ b/src/test/java/com/android/tools/r8/resolution/virtualtargets/DefaultInterfaceMethodInSubInterfaceSubTypeTest.java
@@ -90,7 +90,7 @@
.enableNeverClassInliningAnnotations()
.enableInliningAnnotations()
.enableNoVerticalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines(EXPECTED);
}
diff --git a/src/test/java/com/android/tools/r8/resolution/virtualtargets/DefaultInterfaceMethodInSubInterfaceTest.java b/src/test/java/com/android/tools/r8/resolution/virtualtargets/DefaultInterfaceMethodInSubInterfaceTest.java
index aabe5d6..bfe1d1b 100644
--- a/src/test/java/com/android/tools/r8/resolution/virtualtargets/DefaultInterfaceMethodInSubInterfaceTest.java
+++ b/src/test/java/com/android/tools/r8/resolution/virtualtargets/DefaultInterfaceMethodInSubInterfaceTest.java
@@ -90,7 +90,7 @@
.enableNeverClassInliningAnnotations()
.enableInliningAnnotations()
.enableNoVerticalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines(EXPECTED);
}
diff --git a/src/test/java/com/android/tools/r8/resolution/virtualtargets/DefaultWithoutTopTest.java b/src/test/java/com/android/tools/r8/resolution/virtualtargets/DefaultWithoutTopTest.java
index b541993..57b31a1 100644
--- a/src/test/java/com/android/tools/r8/resolution/virtualtargets/DefaultWithoutTopTest.java
+++ b/src/test/java/com/android/tools/r8/resolution/virtualtargets/DefaultWithoutTopTest.java
@@ -93,7 +93,7 @@
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
.enableNoVerticalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines(EXPECTED);
}
diff --git a/src/test/java/com/android/tools/r8/resolution/virtualtargets/InvalidResolutionToThisTarget.java b/src/test/java/com/android/tools/r8/resolution/virtualtargets/InvalidResolutionToThisTarget.java
index 6135ae8..e06d4be 100644
--- a/src/test/java/com/android/tools/r8/resolution/virtualtargets/InvalidResolutionToThisTarget.java
+++ b/src/test/java/com/android/tools/r8/resolution/virtualtargets/InvalidResolutionToThisTarget.java
@@ -88,7 +88,7 @@
testForR8(parameters.getBackend())
.addProgramClasses(A.class)
.addProgramClassFileData(getMainWithModifiedReceiverCall())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(Main.class)
.compileWithExpectedDiagnostics(
diagnosticMessages -> {
diff --git a/src/test/java/com/android/tools/r8/resolution/virtualtargets/InvokeVirtualToInterfaceDefinitionTest.java b/src/test/java/com/android/tools/r8/resolution/virtualtargets/InvokeVirtualToInterfaceDefinitionTest.java
index f8381cd..64e046a 100644
--- a/src/test/java/com/android/tools/r8/resolution/virtualtargets/InvokeVirtualToInterfaceDefinitionTest.java
+++ b/src/test/java/com/android/tools/r8/resolution/virtualtargets/InvokeVirtualToInterfaceDefinitionTest.java
@@ -90,7 +90,7 @@
.enableNeverClassInliningAnnotations()
.enableInliningAnnotations()
.enableNoVerticalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines(EXPECTED);
}
diff --git a/src/test/java/com/android/tools/r8/resolution/virtualtargets/PackagePrivateChainTest.java b/src/test/java/com/android/tools/r8/resolution/virtualtargets/PackagePrivateChainTest.java
index 6d22d8d..e1dad43 100644
--- a/src/test/java/com/android/tools/r8/resolution/virtualtargets/PackagePrivateChainTest.java
+++ b/src/test/java/com/android/tools/r8/resolution/virtualtargets/PackagePrivateChainTest.java
@@ -93,7 +93,7 @@
testForR8(parameters.getBackend())
.addProgramClasses(Top.class, Middle.class, Bottom.class, TopRunner.class, Main.class)
.addKeepMainRule(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines(EXPECTED);
}
diff --git a/src/test/java/com/android/tools/r8/resolution/virtualtargets/PackagePrivateFinalOverrideInterfaceTest.java b/src/test/java/com/android/tools/r8/resolution/virtualtargets/PackagePrivateFinalOverrideInterfaceTest.java
index 4e8bdd8..7c531aa 100644
--- a/src/test/java/com/android/tools/r8/resolution/virtualtargets/PackagePrivateFinalOverrideInterfaceTest.java
+++ b/src/test/java/com/android/tools/r8/resolution/virtualtargets/PackagePrivateFinalOverrideInterfaceTest.java
@@ -48,7 +48,7 @@
.addProgramClasses(ViewModel.class, I.class, Zoolander.class, Main.class)
.addKeepClassAndMembersRules(ViewModel.class)
.addKeepClassAndMembersRules(I.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(Main.class)
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
diff --git a/src/test/java/com/android/tools/r8/resolution/virtualtargets/PackagePrivateFinalOverrideTest.java b/src/test/java/com/android/tools/r8/resolution/virtualtargets/PackagePrivateFinalOverrideTest.java
index 0e3d84c..ad30339 100644
--- a/src/test/java/com/android/tools/r8/resolution/virtualtargets/PackagePrivateFinalOverrideTest.java
+++ b/src/test/java/com/android/tools/r8/resolution/virtualtargets/PackagePrivateFinalOverrideTest.java
@@ -102,7 +102,7 @@
.addProgramClasses(MyViewModel.class, Main.class, ViewModel.class, ViewModelRunner.class)
.addKeepMainRule(Main.class)
.enableInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines(EXPECTED);
}
@@ -150,7 +150,7 @@
.addProgramClassFileData(getModifiedMainWithIllegalInvokeToViewModelClear())
.addKeepMainRule(Main.class)
.enableInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertFailureWithErrorThatThrows(IllegalAccessError.class);
}
@@ -208,7 +208,7 @@
.addProgramClassFileData(getModifiedViewModelRunnerWithDirectMyViewModelTarget())
.addKeepMainRule(Main.class)
.enableInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines(AMBIGUOUS_EXPECTED_OUTPUT);
}
diff --git a/src/test/java/com/android/tools/r8/resolution/virtualtargets/PrivateOverrideOfVirtualTargetTest.java b/src/test/java/com/android/tools/r8/resolution/virtualtargets/PrivateOverrideOfVirtualTargetTest.java
index af24b1f..536e845 100644
--- a/src/test/java/com/android/tools/r8/resolution/virtualtargets/PrivateOverrideOfVirtualTargetTest.java
+++ b/src/test/java/com/android/tools/r8/resolution/virtualtargets/PrivateOverrideOfVirtualTargetTest.java
@@ -89,7 +89,7 @@
testForR8(parameters.getBackend())
.addProgramClasses(A.class, Main.class)
.addProgramClassFileData(getBWithModifiedInvokes())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(Main.class)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines(EXPECTED);
diff --git a/src/test/java/com/android/tools/r8/resolution/virtualtargets/ProtectedDifferentPackageLookupTest.java b/src/test/java/com/android/tools/r8/resolution/virtualtargets/ProtectedDifferentPackageLookupTest.java
index 3260662..f7bff16 100644
--- a/src/test/java/com/android/tools/r8/resolution/virtualtargets/ProtectedDifferentPackageLookupTest.java
+++ b/src/test/java/com/android/tools/r8/resolution/virtualtargets/ProtectedDifferentPackageLookupTest.java
@@ -83,7 +83,7 @@
.addProgramClasses(A.class)
.addProgramClassFileData(getBInAnotherPackage(), getMainWithCallToRelocatedB())
.addKeepMainRule(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
// TODO(b/173363527): Should be an error on CF.
.assertSuccessWithOutputLines(EXPECTED);
diff --git a/src/test/java/com/android/tools/r8/resolution/virtualtargets/ProtectedSamePackageLookupTest.java b/src/test/java/com/android/tools/r8/resolution/virtualtargets/ProtectedSamePackageLookupTest.java
index e69241a..fcfd723 100644
--- a/src/test/java/com/android/tools/r8/resolution/virtualtargets/ProtectedSamePackageLookupTest.java
+++ b/src/test/java/com/android/tools/r8/resolution/virtualtargets/ProtectedSamePackageLookupTest.java
@@ -71,7 +71,7 @@
testForR8(parameters.getBackend())
.addProgramClasses(A.class, C.class, Main.class)
.addKeepMainRule(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines(EXPECTED);
}
diff --git a/src/test/java/com/android/tools/r8/resolution/virtualtargets/TargetInDefaultMethodTest.java b/src/test/java/com/android/tools/r8/resolution/virtualtargets/TargetInDefaultMethodTest.java
index 5419ff6..56fa675 100644
--- a/src/test/java/com/android/tools/r8/resolution/virtualtargets/TargetInDefaultMethodTest.java
+++ b/src/test/java/com/android/tools/r8/resolution/virtualtargets/TargetInDefaultMethodTest.java
@@ -98,7 +98,7 @@
.enableNoVerticalClassMergingAnnotations()
.enableNeverClassInliningAnnotations()
.addKeepMainRule(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines(EXPECTED);
}
diff --git a/src/test/java/com/android/tools/r8/retrace/InlineFunctionInPrunedClassTest.java b/src/test/java/com/android/tools/r8/retrace/InlineFunctionInPrunedClassTest.java
index 8daa8d7..d594deb 100644
--- a/src/test/java/com/android/tools/r8/retrace/InlineFunctionInPrunedClassTest.java
+++ b/src/test/java/com/android/tools/r8/retrace/InlineFunctionInPrunedClassTest.java
@@ -49,7 +49,7 @@
public void testR8() throws Exception {
testForR8(parameters.getBackend())
.addProgramClassFileData(getAWithCustomSourceFile(), getMainWithStaticPosition())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(Main.class)
.addKeepAttributeSourceFile()
.addKeepAttributeLineNumberTable()
diff --git a/src/test/java/com/android/tools/r8/retrace/InlineWithoutNullCheckTest.java b/src/test/java/com/android/tools/r8/retrace/InlineWithoutNullCheckTest.java
index cb07033..7a5ecfe 100644
--- a/src/test/java/com/android/tools/r8/retrace/InlineWithoutNullCheckTest.java
+++ b/src/test/java/com/android/tools/r8/retrace/InlineWithoutNullCheckTest.java
@@ -116,7 +116,7 @@
.enableInliningAnnotations()
.addKeepAttributeSourceFile()
.addKeepAttributeLineNumberTable()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::checkSomething)
.run(parameters.getRuntime(), TestClassForInlineMethod.class)
@@ -134,7 +134,7 @@
.enableInliningAnnotations()
.addKeepAttributeSourceFile()
.addKeepAttributeLineNumberTable()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::checkSomething)
.run(parameters.getRuntime(), TestClassForInlineField.class)
@@ -153,7 +153,7 @@
.enableInliningAnnotations()
.addKeepAttributeSourceFile()
.addKeepAttributeLineNumberTable()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::checkSomething)
.run(parameters.getRuntime(), TestClassForInlineStaticField.class)
diff --git a/src/test/java/com/android/tools/r8/retrace/KotlinInlineFunctionInSameFileRetraceTests.java b/src/test/java/com/android/tools/r8/retrace/KotlinInlineFunctionInSameFileRetraceTests.java
index 7f2dac3..f0f0519 100644
--- a/src/test/java/com/android/tools/r8/retrace/KotlinInlineFunctionInSameFileRetraceTests.java
+++ b/src/test/java/com/android/tools/r8/retrace/KotlinInlineFunctionInSameFileRetraceTests.java
@@ -100,7 +100,7 @@
.addKeepMainRule(MAIN)
.allowDiagnosticWarningMessages()
.addDontObfuscate()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.assertAllWarningMessagesMatch(equalTo("Resource 'META-INF/MANIFEST.MF' already exists."))
.run(parameters.getRuntime(), MAIN)
diff --git a/src/test/java/com/android/tools/r8/retrace/KotlinInlineFunctionRetraceTest.java b/src/test/java/com/android/tools/r8/retrace/KotlinInlineFunctionRetraceTest.java
index d42b54f..7ddf873 100644
--- a/src/test/java/com/android/tools/r8/retrace/KotlinInlineFunctionRetraceTest.java
+++ b/src/test/java/com/android/tools/r8/retrace/KotlinInlineFunctionRetraceTest.java
@@ -108,7 +108,7 @@
.allowDiagnosticWarningMessages()
.setMode(CompilationMode.RELEASE)
.addKeepMainRule(main)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.assertAllWarningMessagesMatch(equalTo("Resource 'META-INF/MANIFEST.MF' already exists."))
.run(parameters.getRuntime(), main)
@@ -139,7 +139,7 @@
.allowDiagnosticWarningMessages()
.setMode(CompilationMode.RELEASE)
.addKeepMainRule(main)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.assertAllWarningMessagesMatch(equalTo("Resource 'META-INF/MANIFEST.MF' already exists."))
.run(parameters.getRuntime(), main)
@@ -176,7 +176,7 @@
.allowDiagnosticWarningMessages()
.setMode(CompilationMode.RELEASE)
.addKeepMainRule(main)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.assertAllWarningMessagesMatch(equalTo("Resource 'META-INF/MANIFEST.MF' already exists."))
.run(parameters.getRuntime(), main)
@@ -209,7 +209,7 @@
.allowDiagnosticWarningMessages()
.setMode(CompilationMode.RELEASE)
.addKeepMainRule(main)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.assertAllWarningMessagesMatch(equalTo("Resource 'META-INF/MANIFEST.MF' already exists."))
.run(parameters.getRuntime(), main)
diff --git a/src/test/java/com/android/tools/r8/retrace/OverloadsWithoutLineNumberTest.java b/src/test/java/com/android/tools/r8/retrace/OverloadsWithoutLineNumberTest.java
index 2ba06ba..cbe2680 100644
--- a/src/test/java/com/android/tools/r8/retrace/OverloadsWithoutLineNumberTest.java
+++ b/src/test/java/com/android/tools/r8/retrace/OverloadsWithoutLineNumberTest.java
@@ -41,7 +41,7 @@
.removeLineNumberTable(MethodPredicate.all())
.transform())
.addKeepAttributeLineNumberTable()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepRules(
"-keepclassmembers class " + typeName(ClassWithOverload.class) + " { *; }")
.addKeepClassAndMembersRules(Main.class)
diff --git a/src/test/java/com/android/tools/r8/retrace/RetraceCompanionWithPreambleTest.java b/src/test/java/com/android/tools/r8/retrace/RetraceCompanionWithPreambleTest.java
index 12eff52..50d4ce0 100644
--- a/src/test/java/com/android/tools/r8/retrace/RetraceCompanionWithPreambleTest.java
+++ b/src/test/java/com/android/tools/r8/retrace/RetraceCompanionWithPreambleTest.java
@@ -68,7 +68,7 @@
.internalEnableMappingOutput()
.addProgramClasses(Main.class, A.class)
.addProgramClassFileData(getI())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.apply(this::checkRunResult)
.inspectStackTrace(RetraceCompanionWithPreambleTest::checkExpectedStackTrace);
@@ -82,7 +82,7 @@
.addKeepMainRule(Main.class)
.addKeepAttributeSourceFile()
.addKeepAttributeLineNumberTable()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.apply(this::checkRunResult)
.inspectStackTrace(RetraceCompanionWithPreambleTest::checkExpectedStackTrace);
diff --git a/src/test/java/com/android/tools/r8/retrace/RetraceLambdaTest.java b/src/test/java/com/android/tools/r8/retrace/RetraceLambdaTest.java
index 98d324c..11e53ef 100644
--- a/src/test/java/com/android/tools/r8/retrace/RetraceLambdaTest.java
+++ b/src/test/java/com/android/tools/r8/retrace/RetraceLambdaTest.java
@@ -61,7 +61,7 @@
testForD8(parameters.getBackend())
.internalEnableMappingOutput()
.addInnerClasses(getClass())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.apply(this::checkRunResult)
.apply(this::checkOneOutputSynthetic)
@@ -76,7 +76,7 @@
.addKeepMainRule(Main.class)
.addKeepAttributeSourceFile()
.addKeepAttributeLineNumberTable()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.apply(this::checkRunResult)
.inspectFailure(
@@ -104,7 +104,7 @@
.addDontOptimize()
.addKeepAttributeSourceFile()
.addKeepAttributeLineNumberTable()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.apply(this::checkRunResult)
.applyIf(
diff --git a/src/test/java/com/android/tools/r8/retrace/RetraceMappingWithOverloadsTest.java b/src/test/java/com/android/tools/r8/retrace/RetraceMappingWithOverloadsTest.java
index 2b0831c..efd547d 100644
--- a/src/test/java/com/android/tools/r8/retrace/RetraceMappingWithOverloadsTest.java
+++ b/src/test/java/com/android/tools/r8/retrace/RetraceMappingWithOverloadsTest.java
@@ -28,8 +28,8 @@
return getTestParameters().withNoneRuntime().build();
}
- public RetraceMappingWithOverloadsTest(TestParameters testParameters) {
- testParameters.assertNoneRuntime();
+ public RetraceMappingWithOverloadsTest(TestParameters parameters) {
+ parameters.assertNoneRuntime();
}
private final ClassReference someClassOriginal = Reference.classFromTypeName("some.Class");
diff --git a/src/test/java/com/android/tools/r8/retrace/RetraceTests.java b/src/test/java/com/android/tools/r8/retrace/RetraceTests.java
index 6ebcaf7..0c031df 100644
--- a/src/test/java/com/android/tools/r8/retrace/RetraceTests.java
+++ b/src/test/java/com/android/tools/r8/retrace/RetraceTests.java
@@ -108,14 +108,14 @@
BooleanUtils.values());
}
- private final TestParameters testParameters;
+ private final TestParameters parameters;
private final boolean external;
private final boolean verbose;
private final boolean stream;
public RetraceTests(
TestParameters parameters, boolean external, boolean verbose, boolean stream) {
- this.testParameters = parameters;
+ this.parameters = parameters;
this.external = external;
this.verbose = verbose;
this.stream = stream;
@@ -483,7 +483,7 @@
? stackTraceForTest.retraceVerboseStackTrace()
: stackTraceForTest.retracedStackTrace());
if (external) {
- assumeTrue(testParameters.isCfRuntime());
+ assumeTrue(parameters.isCfRuntime());
// The external dependency is built on top of R8Lib. If test.py is run with
// no r8lib, do not try and run the external R8 Retrace since it has not been built.
assumeTrue(ToolHelper.isTestingR8Lib());
@@ -498,7 +498,7 @@
.getBytes(StandardCharsets.UTF_8));
List<String> command = new ArrayList<>();
- command.add(testParameters.getRuntime().asCf().getJavaExecutable().toString());
+ command.add(parameters.getRuntime().asCf().getJavaExecutable().toString());
command.add("-ea");
command.add("-cp");
command.add(ToolHelper.R8_RETRACE_JAR.toString());
diff --git a/src/test/java/com/android/tools/r8/retrace/SourceFileTest.java b/src/test/java/com/android/tools/r8/retrace/SourceFileTest.java
index 6f533c2..d7a71f9 100644
--- a/src/test/java/com/android/tools/r8/retrace/SourceFileTest.java
+++ b/src/test/java/com/android/tools/r8/retrace/SourceFileTest.java
@@ -93,7 +93,7 @@
.addKeepClassRules(ClassWithoutCustomFileName.class)
.enableInliningAnnotations()
.addKeepMainRule(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepAttributeSourceFile()
.compile();
R8TestRunResult runResult =
diff --git a/src/test/java/com/android/tools/r8/retrace/StackTraceWithPcAndJumboStringTestRunner.java b/src/test/java/com/android/tools/r8/retrace/StackTraceWithPcAndJumboStringTestRunner.java
index a6940a8..25e7cc8 100644
--- a/src/test/java/com/android/tools/r8/retrace/StackTraceWithPcAndJumboStringTestRunner.java
+++ b/src/test/java/com/android/tools/r8/retrace/StackTraceWithPcAndJumboStringTestRunner.java
@@ -49,7 +49,7 @@
.noTreeShaking()
.addKeepAttributeLineNumberTable()
.addKeepMainRule(getTestClass())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addOptionsModification(
o -> {
o.testing.forceJumboStringProcessing = true;
diff --git a/src/test/java/com/android/tools/r8/retrace/StackTraceWithPcAndNoLineTableTestRunner.java b/src/test/java/com/android/tools/r8/retrace/StackTraceWithPcAndNoLineTableTestRunner.java
index 47c1d91..a89c8a4 100644
--- a/src/test/java/com/android/tools/r8/retrace/StackTraceWithPcAndNoLineTableTestRunner.java
+++ b/src/test/java/com/android/tools/r8/retrace/StackTraceWithPcAndNoLineTableTestRunner.java
@@ -52,7 +52,7 @@
.addProgramClasses(getTestClass())
.addKeepMainRule(getTestClass())
.addKeepRules("-keep,allowshrinking,allowobfuscation class * { *; }")
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), getTestClass())
.assertFailureWithErrorThatThrows(RuntimeException.class)
.inspectStackTrace(
diff --git a/src/test/java/com/android/tools/r8/rewrite/JavaScriptScriptEngineTest.java b/src/test/java/com/android/tools/r8/rewrite/JavaScriptScriptEngineTest.java
index 7d4a46b..2450204 100644
--- a/src/test/java/com/android/tools/r8/rewrite/JavaScriptScriptEngineTest.java
+++ b/src/test/java/com/android/tools/r8/rewrite/JavaScriptScriptEngineTest.java
@@ -46,7 +46,7 @@
assumeTrue("Only run D8 for dex backend", parameters.isDexRuntime());
testForD8()
.addInnerClasses(JavaScriptScriptEngineTest.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.apply(this::addRhinoForAndroid)
.compile()
.run(parameters.getRuntime(), TestClassWithExplicitRhinoScriptEngineRegistration.class)
@@ -58,7 +58,7 @@
testForR8(parameters.getBackend())
.addInnerClasses(JavaScriptScriptEngineTest.class)
.addKeepMainRule(TestClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.applyIf(
parameters.isDexRuntime(),
testBuilder -> {
diff --git a/src/test/java/com/android/tools/r8/rewrite/ScriptEngineTest.java b/src/test/java/com/android/tools/r8/rewrite/ScriptEngineTest.java
index 8a6035c..f1a8c42 100644
--- a/src/test/java/com/android/tools/r8/rewrite/ScriptEngineTest.java
+++ b/src/test/java/com/android/tools/r8/rewrite/ScriptEngineTest.java
@@ -65,7 +65,7 @@
options
.getOpenClosedInterfacesOptions()
.suppressAllOpenInterfacesDueToMissingClasses()))
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addDataEntryResources(
DataEntryResource.fromBytes(
StringUtils.lines(MyScriptEngine1FactoryImpl.class.getTypeName()).getBytes(),
diff --git a/src/test/java/com/android/tools/r8/rewrite/ServiceLoaderClassLoaderRewritingTest.java b/src/test/java/com/android/tools/r8/rewrite/ServiceLoaderClassLoaderRewritingTest.java
index fbaef02..7f9e0cd 100644
--- a/src/test/java/com/android/tools/r8/rewrite/ServiceLoaderClassLoaderRewritingTest.java
+++ b/src/test/java/com/android/tools/r8/rewrite/ServiceLoaderClassLoaderRewritingTest.java
@@ -83,7 +83,7 @@
testForR8(parameters.getBackend())
.addInnerClasses(ServiceLoaderClassLoaderRewritingTest.class)
.addKeepMainRule(MainRunner.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.enableInliningAnnotations()
.addDataEntryResources(
DataEntryResource.fromBytes(
diff --git a/src/test/java/com/android/tools/r8/rewrite/ServiceLoaderMultipleCallsSameMethodTest.java b/src/test/java/com/android/tools/r8/rewrite/ServiceLoaderMultipleCallsSameMethodTest.java
index 49589c6..f24ea60 100644
--- a/src/test/java/com/android/tools/r8/rewrite/ServiceLoaderMultipleCallsSameMethodTest.java
+++ b/src/test/java/com/android/tools/r8/rewrite/ServiceLoaderMultipleCallsSameMethodTest.java
@@ -93,7 +93,7 @@
testForR8(parameters.getBackend())
.addInnerClasses(ServiceLoaderMultipleCallsSameMethodTest.class)
.addKeepMainRule(MainRunner.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.enableInliningAnnotations()
.addDataEntryResources(
DataEntryResource.fromBytes(
diff --git a/src/test/java/com/android/tools/r8/rewrite/ServiceLoaderMultipleCallsTest.java b/src/test/java/com/android/tools/r8/rewrite/ServiceLoaderMultipleCallsTest.java
index fd1a05a..28ccb42 100644
--- a/src/test/java/com/android/tools/r8/rewrite/ServiceLoaderMultipleCallsTest.java
+++ b/src/test/java/com/android/tools/r8/rewrite/ServiceLoaderMultipleCallsTest.java
@@ -94,7 +94,7 @@
testForR8(parameters.getBackend())
.addInnerClasses(ServiceLoaderMultipleCallsTest.class)
.addKeepMainRule(MainRunner.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.enableInliningAnnotations()
.addDataEntryResources(
DataEntryResource.fromBytes(
diff --git a/src/test/java/com/android/tools/r8/rewrite/ServiceLoaderRewritingLineSeparatorTest.java b/src/test/java/com/android/tools/r8/rewrite/ServiceLoaderRewritingLineSeparatorTest.java
index 9b828fc..322224e 100644
--- a/src/test/java/com/android/tools/r8/rewrite/ServiceLoaderRewritingLineSeparatorTest.java
+++ b/src/test/java/com/android/tools/r8/rewrite/ServiceLoaderRewritingLineSeparatorTest.java
@@ -75,7 +75,7 @@
testForR8(parameters.getBackend())
.addInnerClasses(ServiceLoaderRewritingTest.class)
.addKeepMainRule(MainRunner.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addDataEntryResources(
DataEntryResource.fromBytes(
StringUtils.join(
diff --git a/src/test/java/com/android/tools/r8/rewrite/ServiceLoaderRewritingTest.java b/src/test/java/com/android/tools/r8/rewrite/ServiceLoaderRewritingTest.java
index 76fe6b6..a14aafd 100644
--- a/src/test/java/com/android/tools/r8/rewrite/ServiceLoaderRewritingTest.java
+++ b/src/test/java/com/android/tools/r8/rewrite/ServiceLoaderRewritingTest.java
@@ -164,7 +164,7 @@
testForR8(parameters.getBackend())
.addInnerClasses(ServiceLoaderRewritingTest.class)
.addKeepMainRule(MainRunner.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addDataEntryResources(
DataEntryResource.fromBytes(
StringUtils.lines(ServiceImpl.class.getTypeName()).getBytes(),
@@ -192,7 +192,7 @@
testForR8(parameters.getBackend())
.addInnerClasses(ServiceLoaderRewritingTest.class)
.addKeepMainRule(MainRunner.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addDataEntryResources(
DataEntryResource.fromBytes(
StringUtils.lines(ServiceImpl.class.getTypeName(), ServiceImpl2.class.getTypeName())
@@ -221,7 +221,7 @@
testForR8(parameters.getBackend())
.addInnerClasses(ServiceLoaderRewritingTest.class)
.addKeepMainRule(MainWithTryCatchRunner.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addDataEntryResources(
DataEntryResource.fromBytes(
StringUtils.lines(ServiceImpl.class.getTypeName(), ServiceImpl2.class.getTypeName())
@@ -250,7 +250,7 @@
testForR8(parameters.getBackend())
.addInnerClasses(ServiceLoaderRewritingTest.class)
.addKeepMainRule(OtherRunner.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addDataEntryResources(
DataEntryResource.fromBytes(
StringUtils.lines(ServiceImpl.class.getTypeName()).getBytes(),
@@ -281,7 +281,7 @@
.addInnerClasses(ServiceLoaderRewritingTest.class)
.addKeepMainRule(EscapingRunner.class)
.enableInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addDontObfuscate()
.addDataEntryResources(
DataEntryResource.fromBytes(
@@ -313,7 +313,7 @@
.addInnerClasses(ServiceLoaderRewritingTest.class)
.addKeepMainRule(LoadWhereClassLoaderIsPhi.class)
.enableInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addDataEntryResources(
DataEntryResource.fromBytes(
StringUtils.lines(ServiceImpl.class.getTypeName()).getBytes(),
@@ -349,7 +349,7 @@
.addInnerClasses(ServiceLoaderRewritingTest.class)
.addKeepMainRule(MainRunner.class)
.addKeepClassRules(Service.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addDataEntryResources(
DataEntryResource.fromBytes(
StringUtils.lines(ServiceImpl.class.getTypeName()).getBytes(),
diff --git a/src/test/java/com/android/tools/r8/rewrite/arrays/ArrayLengthRewriteTest.java b/src/test/java/com/android/tools/r8/rewrite/arrays/ArrayLengthRewriteTest.java
index c85fbbe..b6cc9de 100644
--- a/src/test/java/com/android/tools/r8/rewrite/arrays/ArrayLengthRewriteTest.java
+++ b/src/test/java/com/android/tools/r8/rewrite/arrays/ArrayLengthRewriteTest.java
@@ -63,7 +63,7 @@
assumeTrue(parameters.isDexRuntime());
testForD8()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.setMode(debugMode ? CompilationMode.DEBUG : CompilationMode.RELEASE)
.addProgramClasses(Main.class)
.run(parameters.getRuntime(), Main.class)
@@ -73,7 +73,7 @@
@Test public void r8() throws Exception {
testForR8(parameters.getBackend())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.setMode(debugMode ? CompilationMode.DEBUG : CompilationMode.RELEASE)
.addProgramClasses(Main.class)
.addKeepMainRule(Main.class)
diff --git a/src/test/java/com/android/tools/r8/rewrite/arrays/ArrayWithDataLengthRewriteTest.java b/src/test/java/com/android/tools/r8/rewrite/arrays/ArrayWithDataLengthRewriteTest.java
index 513dc73..394e050 100644
--- a/src/test/java/com/android/tools/r8/rewrite/arrays/ArrayWithDataLengthRewriteTest.java
+++ b/src/test/java/com/android/tools/r8/rewrite/arrays/ArrayWithDataLengthRewriteTest.java
@@ -40,7 +40,7 @@
@Test
public void d8() throws Exception {
testForD8()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.setMode(CompilationMode.RELEASE)
.addProgramClasses(Main.class)
.addOptionsModification(opt -> opt.testing.irModifier = this::transformArray)
diff --git a/src/test/java/com/android/tools/r8/rewrite/arrays/FilledArrayDataWithCatchHandlerTest.java b/src/test/java/com/android/tools/r8/rewrite/arrays/FilledArrayDataWithCatchHandlerTest.java
index 3e04138..e28a4fc 100644
--- a/src/test/java/com/android/tools/r8/rewrite/arrays/FilledArrayDataWithCatchHandlerTest.java
+++ b/src/test/java/com/android/tools/r8/rewrite/arrays/FilledArrayDataWithCatchHandlerTest.java
@@ -52,7 +52,7 @@
assumeTrue(parameters.isDexRuntime());
testForD8(parameters.getBackend())
.release()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addInnerClasses(FilledArrayDataWithCatchHandlerTest.class)
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutput(EXPECTED)
diff --git a/src/test/java/com/android/tools/r8/rewrite/arrays/NewArrayInCatchRangeTest.java b/src/test/java/com/android/tools/r8/rewrite/arrays/NewArrayInCatchRangeTest.java
index 0003703..f9e3ffe 100644
--- a/src/test/java/com/android/tools/r8/rewrite/arrays/NewArrayInCatchRangeTest.java
+++ b/src/test/java/com/android/tools/r8/rewrite/arrays/NewArrayInCatchRangeTest.java
@@ -51,7 +51,7 @@
assumeTrue(parameters.isDexRuntime());
testForD8(parameters.getBackend())
.release()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addInnerClasses(NewArrayInCatchRangeTest.class)
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutput(EXPECTED)
diff --git a/src/test/java/com/android/tools/r8/rewrite/arrays/NewArrayInSameCatchRangeTest.java b/src/test/java/com/android/tools/r8/rewrite/arrays/NewArrayInSameCatchRangeTest.java
index 5ad8f6b..7583503 100644
--- a/src/test/java/com/android/tools/r8/rewrite/arrays/NewArrayInSameCatchRangeTest.java
+++ b/src/test/java/com/android/tools/r8/rewrite/arrays/NewArrayInSameCatchRangeTest.java
@@ -46,7 +46,7 @@
assumeTrue(parameters.isDexRuntime());
testForD8(parameters.getBackend())
.release()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addInnerClasses(NewArrayInSameCatchRangeTest.class)
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutput(EXPECTED)
diff --git a/src/test/java/com/android/tools/r8/rewrite/arrays/NewArrayInTwoCatchRangesTest.java b/src/test/java/com/android/tools/r8/rewrite/arrays/NewArrayInTwoCatchRangesTest.java
index 3996647..3ecd9de 100644
--- a/src/test/java/com/android/tools/r8/rewrite/arrays/NewArrayInTwoCatchRangesTest.java
+++ b/src/test/java/com/android/tools/r8/rewrite/arrays/NewArrayInTwoCatchRangesTest.java
@@ -46,7 +46,7 @@
assumeTrue(parameters.isDexRuntime());
testForD8(parameters.getBackend())
.release()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addInnerClasses(NewArrayInTwoCatchRangesTest.class)
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutput(EXPECTED)
diff --git a/src/test/java/com/android/tools/r8/rewrite/arrays/NewArrayMonitorTest.java b/src/test/java/com/android/tools/r8/rewrite/arrays/NewArrayMonitorTest.java
index 40d1557..c7e3b2a 100644
--- a/src/test/java/com/android/tools/r8/rewrite/arrays/NewArrayMonitorTest.java
+++ b/src/test/java/com/android/tools/r8/rewrite/arrays/NewArrayMonitorTest.java
@@ -51,7 +51,7 @@
assumeTrue(parameters.isDexRuntime());
testForD8(parameters.getBackend())
.release()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addInnerClasses(NewArrayMonitorTest.class)
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutput(EXPECTED)
diff --git a/src/test/java/com/android/tools/r8/rewrite/arrays/NewArrayPutInCatchRangeTest.java b/src/test/java/com/android/tools/r8/rewrite/arrays/NewArrayPutInCatchRangeTest.java
index d7dc866..a3fd2da 100644
--- a/src/test/java/com/android/tools/r8/rewrite/arrays/NewArrayPutInCatchRangeTest.java
+++ b/src/test/java/com/android/tools/r8/rewrite/arrays/NewArrayPutInCatchRangeTest.java
@@ -50,7 +50,7 @@
assumeTrue(parameters.isDexRuntime());
testForD8(parameters.getBackend())
.release()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addInnerClasses(NewArrayPutInCatchRangeTest.class)
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutput(EXPECTED)
diff --git a/src/test/java/com/android/tools/r8/rewrite/arrays/NewArraySynchronizedBlockTest.java b/src/test/java/com/android/tools/r8/rewrite/arrays/NewArraySynchronizedBlockTest.java
index 3319ccc..c552566 100644
--- a/src/test/java/com/android/tools/r8/rewrite/arrays/NewArraySynchronizedBlockTest.java
+++ b/src/test/java/com/android/tools/r8/rewrite/arrays/NewArraySynchronizedBlockTest.java
@@ -49,7 +49,7 @@
assumeTrue(parameters.isDexRuntime());
testForD8(parameters.getBackend())
.release()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addInnerClasses(NewArraySynchronizedBlockTest.class)
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutput(EXPECTED)
diff --git a/src/test/java/com/android/tools/r8/rewrite/arrays/SimplifyArrayConstructionTest.java b/src/test/java/com/android/tools/r8/rewrite/arrays/SimplifyArrayConstructionTest.java
index 611ed3f..6a03cd1 100644
--- a/src/test/java/com/android/tools/r8/rewrite/arrays/SimplifyArrayConstructionTest.java
+++ b/src/test/java/com/android/tools/r8/rewrite/arrays/SimplifyArrayConstructionTest.java
@@ -107,8 +107,7 @@
assumeFalse(compilationMode == CompilationMode.DEBUG);
testForRuntime(
parameters.getRuntime(),
- d8TestBuilder ->
- d8TestBuilder.setMinApi(parameters.getApiLevel()).setMode(compilationMode))
+ d8TestBuilder -> d8TestBuilder.setMinApi(parameters).setMode(compilationMode))
.addProgramClassFileData(TRANSFORMED_MAIN)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines(EXPECTED_OUTPUT)
@@ -118,7 +117,7 @@
@Test
public void testR8() throws Exception {
testForR8(parameters.getBackend())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addOptionsModification(
options ->
options
diff --git a/src/test/java/com/android/tools/r8/rewrite/assertionerror/AssertionErrorRewriteTest.java b/src/test/java/com/android/tools/r8/rewrite/assertionerror/AssertionErrorRewriteTest.java
index 2fa9d11..6316441 100644
--- a/src/test/java/com/android/tools/r8/rewrite/assertionerror/AssertionErrorRewriteTest.java
+++ b/src/test/java/com/android/tools/r8/rewrite/assertionerror/AssertionErrorRewriteTest.java
@@ -41,7 +41,7 @@
assumeTrue(parameters.isDexRuntime());
testForD8()
.addProgramClasses(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
// None of the VMs we have for testing is missing the two args constructor.
.assertSuccessWithOutputLines("message", "java.lang.RuntimeException: cause message");
@@ -52,7 +52,7 @@
assumeTrue(parameters.isDexRuntime());
testForD8()
.addProgramClasses(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.disableDesugaring()
.compile()
// TODO(b/247596495): There should be no synthetics.
@@ -75,7 +75,7 @@
.addProgramClasses(Main.class)
.addKeepMainRule(Main.class)
.enableInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class, String.valueOf(expectCause))
// None of the VMs we have for testing is missing the two args constructor.
.assertSuccessWithOutputLines("message", "java.lang.RuntimeException: cause message");
diff --git a/src/test/java/com/android/tools/r8/rewrite/assertions/AssertionConfigurationAssertionHandlerKotlinTestBase.java b/src/test/java/com/android/tools/r8/rewrite/assertions/AssertionConfigurationAssertionHandlerKotlinTestBase.java
index b70b311..f6b6a9d 100644
--- a/src/test/java/com/android/tools/r8/rewrite/assertions/AssertionConfigurationAssertionHandlerKotlinTestBase.java
+++ b/src/test/java/com/android/tools/r8/rewrite/assertions/AssertionConfigurationAssertionHandlerKotlinTestBase.java
@@ -95,7 +95,7 @@
Path kotlinStdlibDex = temp.newFolder().toPath().resolve("kotlin-stdlib-dex.jar");
testForD8()
.addProgramFiles(kotlinStdlibCf)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.writeToZip(kotlinStdlibDex);
return kotlinStdlibDex;
@@ -134,7 +134,7 @@
assumeTrue(parameters.isDexRuntime());
testForD8()
.apply(this::configureKotlinStdlib)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addProgramClasses(AssertionHandlers.class)
.apply(this::addKotlinClasses)
.addAssertionsConfiguration(
@@ -151,7 +151,7 @@
public void testR8() throws Exception {
testForR8(parameters.getBackend())
.apply(this::configureKotlinStdlib)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addProgramClasses(AssertionHandlers.class)
.apply(this::addKotlinClasses)
.addAssertionsConfiguration(
diff --git a/src/test/java/com/android/tools/r8/rewrite/assertions/AssertionConfigurationAssertionHandlerMissingClassTest.java b/src/test/java/com/android/tools/r8/rewrite/assertions/AssertionConfigurationAssertionHandlerMissingClassTest.java
index a5d165c..32fd0dd 100644
--- a/src/test/java/com/android/tools/r8/rewrite/assertions/AssertionConfigurationAssertionHandlerMissingClassTest.java
+++ b/src/test/java/com/android/tools/r8/rewrite/assertions/AssertionConfigurationAssertionHandlerMissingClassTest.java
@@ -56,7 +56,7 @@
if (parameters.isDexRuntime()) {
testForD8()
.addProgramClasses(AssertionHandlers.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.writeToZip(jar);
return jar;
@@ -77,7 +77,7 @@
.addKeepMainRule(MAIN_CLASS)
.addKeepAnnotation()
.addKeepRules("-keepclassmembers class * { @com.android.tools.r8.Keep *; }")
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addIgnoreWarnings()
.addAssertionsConfiguration(
builder -> builder.setAssertionHandler(getAssertionHandler()).setScopeAll().build())
diff --git a/src/test/java/com/android/tools/r8/rewrite/assertions/AssertionConfigurationAssertionHandlerTestBase.java b/src/test/java/com/android/tools/r8/rewrite/assertions/AssertionConfigurationAssertionHandlerTestBase.java
index 715fb7f..773d065 100644
--- a/src/test/java/com/android/tools/r8/rewrite/assertions/AssertionConfigurationAssertionHandlerTestBase.java
+++ b/src/test/java/com/android/tools/r8/rewrite/assertions/AssertionConfigurationAssertionHandlerTestBase.java
@@ -59,7 +59,7 @@
testForD8(parameters.getBackend())
.addProgramClasses(getAssertionHandlerClasses())
.addProgramClasses(getTestClasses())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addOptionsModification(o -> o.testing.forceIRForCfToCfDesugar = true)
.addAssertionsConfiguration(
builder ->
@@ -80,7 +80,7 @@
.addKeepMainRule(getTestClasses().get(0))
.addKeepAnnotation()
.addKeepRules("-keepclassmembers class * { @com.android.tools.r8.Keep *; }")
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addAssertionsConfiguration(
builder ->
builder
diff --git a/src/test/java/com/android/tools/r8/rewrite/assertions/AssertionConfigurationKotlinTest.java b/src/test/java/com/android/tools/r8/rewrite/assertions/AssertionConfigurationKotlinTest.java
index efab8b4..ba3ed7a 100644
--- a/src/test/java/com/android/tools/r8/rewrite/assertions/AssertionConfigurationKotlinTest.java
+++ b/src/test/java/com/android/tools/r8/rewrite/assertions/AssertionConfigurationKotlinTest.java
@@ -100,7 +100,7 @@
Path kotlinStdlibDex = temp.newFolder().toPath().resolve("kotlin-stdlib-dex.jar");
testForD8()
.addProgramFiles(kotlinStdlibCf)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.writeToZip(kotlinStdlibDex);
return kotlinStdlibDex;
@@ -115,7 +115,7 @@
testForD8()
.addClasspathFiles(kotlinc.getKotlinStdlibJar())
.addProgramFiles(compiledForAssertions.getForConfiguration(kotlinc, targetVersion))
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.apply(builderConsumer)
.addRunClasspathFiles(kotlinStdlibLibraryForRuntime())
.run(
@@ -127,7 +127,7 @@
testForD8()
.addProgramFiles(kotlinc.getKotlinStdlibJar())
.addProgramFiles(compiledForAssertions.getForConfiguration(kotlinc, targetVersion))
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.apply(builderConsumer)
.run(
parameters.getRuntime(),
@@ -164,7 +164,7 @@
.addProgramFiles(compiledForAssertions.getForConfiguration(kotlinc, targetVersion))
.addKeepMainRule(testClassKt)
.addKeepClassAndMembersRules(class1, class2)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.apply(builderConsumer)
.allowDiagnosticWarningMessages(!kotlinStdlibAsLibrary)
.addRunClasspathFiles(kotlinStdlibLibraryForRuntime())
@@ -535,7 +535,7 @@
testForD8()
.addProgramClassFileData(dumpModifiedKotlinAssertions())
.addProgramFiles(compiledForAssertions.getForConfiguration(kotlinc, targetVersion))
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addAssertionsConfiguration(AssertionsConfiguration.Builder::passthroughAllAssertions)
.run(
parameters.getRuntime(),
@@ -544,7 +544,7 @@
testForD8()
.addProgramClassFileData(dumpModifiedKotlinAssertions())
.addProgramFiles(compiledForAssertions.getForConfiguration(kotlinc, targetVersion))
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addAssertionsConfiguration(AssertionsConfiguration.Builder::compileTimeEnableAllAssertions)
.run(
parameters.getRuntime(),
@@ -553,7 +553,7 @@
testForD8()
.addProgramClassFileData(dumpModifiedKotlinAssertions())
.addProgramFiles(compiledForAssertions.getForConfiguration(kotlinc, targetVersion))
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addAssertionsConfiguration(
AssertionsConfiguration.Builder::compileTimeDisableAllAssertions)
.run(
diff --git a/src/test/java/com/android/tools/r8/rewrite/assertions/AssertionsConfigurationJacocoTest.java b/src/test/java/com/android/tools/r8/rewrite/assertions/AssertionsConfigurationJacocoTest.java
index 28b41bd..fbd50f4 100644
--- a/src/test/java/com/android/tools/r8/rewrite/assertions/AssertionsConfigurationJacocoTest.java
+++ b/src/test/java/com/android/tools/r8/rewrite/assertions/AssertionsConfigurationJacocoTest.java
@@ -51,7 +51,7 @@
testForD8()
.addProgramClasses(TestClass.class, MockJacocoInit.class)
.addProgramClassFileData(transformClassWithJacocoInstrumentation(A.class))
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addAssertionsConfiguration(AssertionsConfiguration.Builder::compileTimeEnableAllAssertions)
.run(parameters.getRuntime(), TestClass.class)
.inspect(this::checkAssertionCodeEnabled)
@@ -65,7 +65,7 @@
.addProgramClassFileData(transformClassWithJacocoInstrumentation(A.class))
.addKeepMainRule(TestClass.class)
.addKeepClassAndMembersRules(A.class, MockJacocoInit.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addAssertionsConfiguration(AssertionsConfiguration.Builder::compileTimeEnableAllAssertions)
.run(parameters.getRuntime(), TestClass.class)
.inspect(this::checkAssertionCodeEnabled)
diff --git a/src/test/java/com/android/tools/r8/rewrite/assertions/AssertionsConfigurationTest.java b/src/test/java/com/android/tools/r8/rewrite/assertions/AssertionsConfigurationTest.java
index 2141fea..05c3861 100644
--- a/src/test/java/com/android/tools/r8/rewrite/assertions/AssertionsConfigurationTest.java
+++ b/src/test/java/com/android/tools/r8/rewrite/assertions/AssertionsConfigurationTest.java
@@ -73,7 +73,7 @@
throws Exception {
testForD8()
.addProgramClasses(testClasses)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.apply(builderConsumer)
.compile()
.inspect(inspector)
@@ -100,7 +100,7 @@
.addProgramClasses(testClasses)
.addKeepMainRule(TestClass.class)
.addKeepClassAndMembersRules(class1, class2, subpackageClass1, subpackageClass2)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.apply(builderConsumer)
.compile()
.inspect(inspector)
@@ -413,7 +413,7 @@
testClassForUnknownPackage(),
classInUnnamedPackage("Class1"),
classInUnnamedPackage("Class2"))
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addAssertionsConfiguration(
builder -> builder.setCompileTimeEnable().setScopePackage("").build())
.compile()
@@ -460,7 +460,7 @@
Assume.assumeTrue(parameters.isDexRuntime());
testForD8()
.addProgramClasses(TestClassForInnerClass.class, TestClassForInnerClass.InnerClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addAssertionsConfiguration(
builder ->
builder
diff --git a/src/test/java/com/android/tools/r8/rewrite/enums/EnumInvalidValuesLengthTest.java b/src/test/java/com/android/tools/r8/rewrite/enums/EnumInvalidValuesLengthTest.java
index 2636944..0bfd096 100644
--- a/src/test/java/com/android/tools/r8/rewrite/enums/EnumInvalidValuesLengthTest.java
+++ b/src/test/java/com/android/tools/r8/rewrite/enums/EnumInvalidValuesLengthTest.java
@@ -37,7 +37,7 @@
.addProgramClasses(EnumInvalidValuesLengthTest.Main.class)
.addProgramClassFileData(transformValues(MyEnum.class))
.enableNeverClassInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), EnumInvalidValuesLengthTest.Main.class)
.assertSuccessWithOutputLines("5");
diff --git a/src/test/java/com/android/tools/r8/rewrite/enums/EnumOptimizationTest.java b/src/test/java/com/android/tools/r8/rewrite/enums/EnumOptimizationTest.java
index 7cd0420..35991a7 100644
--- a/src/test/java/com/android/tools/r8/rewrite/enums/EnumOptimizationTest.java
+++ b/src/test/java/com/android/tools/r8/rewrite/enums/EnumOptimizationTest.java
@@ -63,7 +63,7 @@
.enableMemberValuePropagationAnnotations()
.enableSideEffectAnnotations()
.addOptionsModification(this::configure)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspectOrdinals)
.run(parameters.getRuntime(), Ordinals.class)
@@ -111,7 +111,7 @@
.enableMemberValuePropagationAnnotations()
.enableSideEffectAnnotations()
.addOptionsModification(this::configure)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspectNames)
.run(parameters.getRuntime(), Names.class)
@@ -159,7 +159,7 @@
.enableMemberValuePropagationAnnotations()
.enableSideEffectAnnotations()
.addOptionsModification(this::configure)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspectToStrings)
.run(parameters.getRuntime(), ToStrings.class)
diff --git a/src/test/java/com/android/tools/r8/rewrite/enums/EnumSideEffect.java b/src/test/java/com/android/tools/r8/rewrite/enums/EnumSideEffect.java
index 2d1b018..9b30628 100644
--- a/src/test/java/com/android/tools/r8/rewrite/enums/EnumSideEffect.java
+++ b/src/test/java/com/android/tools/r8/rewrite/enums/EnumSideEffect.java
@@ -40,7 +40,7 @@
.enableInliningAnnotations()
.addInnerClasses(EnumSideEffect.class)
.enableNeverClassInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("clinit", "a", "b", "init", "init", "a", "b");
diff --git a/src/test/java/com/android/tools/r8/rewrite/enums/EnumValueOfOptimizationTest.java b/src/test/java/com/android/tools/r8/rewrite/enums/EnumValueOfOptimizationTest.java
index 6f061f3..9b344c5 100644
--- a/src/test/java/com/android/tools/r8/rewrite/enums/EnumValueOfOptimizationTest.java
+++ b/src/test/java/com/android/tools/r8/rewrite/enums/EnumValueOfOptimizationTest.java
@@ -30,7 +30,7 @@
testForR8(parameters.getBackend())
.addKeepMainRule(Main.class)
.addInnerClasses(EnumValueOfOptimizationTest.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("npe OK", "iae1 OK", "iae2 OK", "iae3 OK", "iae4 OK");
diff --git a/src/test/java/com/android/tools/r8/rewrite/serviceloaders/MissingServiceClassTest.java b/src/test/java/com/android/tools/r8/rewrite/serviceloaders/MissingServiceClassTest.java
index 5bcfdb8..5df5fe4 100644
--- a/src/test/java/com/android/tools/r8/rewrite/serviceloaders/MissingServiceClassTest.java
+++ b/src/test/java/com/android/tools/r8/rewrite/serviceloaders/MissingServiceClassTest.java
@@ -56,7 +56,7 @@
.addOptionsModification(o -> o.dataResourceConsumer = dataResourceConsumer)
.addDontWarn(ServiceImpl.class)
.allowDiagnosticWarningMessages()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspectDiagnosticMessages(this::inspectDiagnosticMessagesWithDontWarn)
.addRunClasspathClasses(Service.class, ServiceImpl.class)
diff --git a/src/test/java/com/android/tools/r8/rewrite/serviceloaders/MissingServiceClassWithFeatureTest.java b/src/test/java/com/android/tools/r8/rewrite/serviceloaders/MissingServiceClassWithFeatureTest.java
index be5dfb6..ffd8600 100644
--- a/src/test/java/com/android/tools/r8/rewrite/serviceloaders/MissingServiceClassWithFeatureTest.java
+++ b/src/test/java/com/android/tools/r8/rewrite/serviceloaders/MissingServiceClassWithFeatureTest.java
@@ -45,7 +45,7 @@
AppServices.SERVICE_DIRECTORY_NAME + Service.class.getTypeName(),
Origin.unknown()))
.addFeatureSplit(FeatureClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile();
}
diff --git a/src/test/java/com/android/tools/r8/rewrite/serviceloaders/MissingServiceImplementationClassTest.java b/src/test/java/com/android/tools/r8/rewrite/serviceloaders/MissingServiceImplementationClassTest.java
index ca17780..f22742c 100644
--- a/src/test/java/com/android/tools/r8/rewrite/serviceloaders/MissingServiceImplementationClassTest.java
+++ b/src/test/java/com/android/tools/r8/rewrite/serviceloaders/MissingServiceImplementationClassTest.java
@@ -70,7 +70,7 @@
new DataResourceConsumerForTesting(options.dataResourceConsumer));
options.dataResourceConsumer = dataResourceConsumer.get();
})
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile();
CodeInspector inspector = compileResult.inspector();
@@ -93,7 +93,7 @@
.addClasspathClasses(Service.class)
.addKeepAllClassesRule()
.addApplyMapping(compileResult.getProguardMap())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.addRunClasspathFiles(
transformServiceDeclarationInProgram(
diff --git a/src/test/java/com/android/tools/r8/rewrite/serviceloaders/MissingServiceImplementationClassWithFeatureTest.java b/src/test/java/com/android/tools/r8/rewrite/serviceloaders/MissingServiceImplementationClassWithFeatureTest.java
index a3aea84..899886e 100644
--- a/src/test/java/com/android/tools/r8/rewrite/serviceloaders/MissingServiceImplementationClassWithFeatureTest.java
+++ b/src/test/java/com/android/tools/r8/rewrite/serviceloaders/MissingServiceImplementationClassWithFeatureTest.java
@@ -47,7 +47,7 @@
AppServices.SERVICE_DIRECTORY_NAME + Service.class.getTypeName(),
Origin.unknown()))
.addFeatureSplit(FeatureClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile();
}
diff --git a/src/test/java/com/android/tools/r8/rewrite/serviceloaders/ServiceWithoutResourceFileAtCompileTimeTest.java b/src/test/java/com/android/tools/r8/rewrite/serviceloaders/ServiceWithoutResourceFileAtCompileTimeTest.java
index 9f5eada..e72624d 100644
--- a/src/test/java/com/android/tools/r8/rewrite/serviceloaders/ServiceWithoutResourceFileAtCompileTimeTest.java
+++ b/src/test/java/com/android/tools/r8/rewrite/serviceloaders/ServiceWithoutResourceFileAtCompileTimeTest.java
@@ -52,7 +52,7 @@
.addProgramClasses(TestClass.class, Service.class)
.addKeepMainRule(TestClass.class)
.addKeepClassAndMembersRulesWithAllowObfuscation(Service.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile();
CodeInspector inspector = compileResult.inspector();
@@ -70,7 +70,7 @@
.addKeepAllClassesRule()
.addApplyMapping(compileResult.getProguardMap())
.enableInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.addRunClasspathFiles(
injectServiceDeclarationInProgram(
diff --git a/src/test/java/com/android/tools/r8/rewrite/switches/MaxIntSwitchTest.java b/src/test/java/com/android/tools/r8/rewrite/switches/MaxIntSwitchTest.java
index ddbefce..edb7678 100644
--- a/src/test/java/com/android/tools/r8/rewrite/switches/MaxIntSwitchTest.java
+++ b/src/test/java/com/android/tools/r8/rewrite/switches/MaxIntSwitchTest.java
@@ -93,7 +93,7 @@
public void testD8() throws Exception {
testForD8(parameters.getBackend())
.addInnerClasses(this.getClass())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.setMode(mode)
.run(parameters.getRuntime(), TestClass.class)
.inspect(this::checkSwitchKeys)
@@ -108,7 +108,7 @@
.enableConstantArgumentAnnotations()
.enableInliningAnnotations()
.enableMemberValuePropagationAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.setMode(mode)
.run(parameters.getRuntime(), TestClass.class)
.inspect(this::checkSwitchKeys)
diff --git a/src/test/java/com/android/tools/r8/shaking/AbstractMethodOnNonAbstractClassTest.java b/src/test/java/com/android/tools/r8/shaking/AbstractMethodOnNonAbstractClassTest.java
index 201971d..9658449 100644
--- a/src/test/java/com/android/tools/r8/shaking/AbstractMethodOnNonAbstractClassTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/AbstractMethodOnNonAbstractClassTest.java
@@ -46,7 +46,7 @@
.addInnerClasses(AbstractMethodOnNonAbstractClassTest.class)
.addKeepMainRule(TestClass.class)
.enableNoHorizontalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile();
// A is not made abstract in compat mode.
@@ -77,7 +77,7 @@
.addInnerClasses(AbstractMethodOnNonAbstractClassTest.class)
.addKeepMainRule(TestClass.class)
.enableNoHorizontalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile();
// A is made abstract in full mode.
diff --git a/src/test/java/com/android/tools/r8/shaking/B149831282.java b/src/test/java/com/android/tools/r8/shaking/B149831282.java
index 67b9bca..f9cb447 100644
--- a/src/test/java/com/android/tools/r8/shaking/B149831282.java
+++ b/src/test/java/com/android/tools/r8/shaking/B149831282.java
@@ -48,7 +48,7 @@
.enableInliningAnnotations()
.enableNoVerticalClassMergingAnnotations()
.enableNeverClassInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutputLines("In A.m()");
diff --git a/src/test/java/com/android/tools/r8/shaking/ClasspathAndProgramSharedSuperTypeTest.java b/src/test/java/com/android/tools/r8/shaking/ClasspathAndProgramSharedSuperTypeTest.java
index 4363f33..08e88c8 100644
--- a/src/test/java/com/android/tools/r8/shaking/ClasspathAndProgramSharedSuperTypeTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/ClasspathAndProgramSharedSuperTypeTest.java
@@ -36,7 +36,7 @@
testForR8(parameters.getBackend())
.addProgramClasses(SharedSuperType.class, ProgramClass.class, Main.class)
.addClasspathClasses(SharedSuperType.class, ClasspathClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(Main.class)
.compileWithExpectedDiagnostics(
diagnostics ->
diff --git a/src/test/java/com/android/tools/r8/shaking/EventuallyNonTargetedMethodTest.java b/src/test/java/com/android/tools/r8/shaking/EventuallyNonTargetedMethodTest.java
index ca0f8d5..e31d8de 100644
--- a/src/test/java/com/android/tools/r8/shaking/EventuallyNonTargetedMethodTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/EventuallyNonTargetedMethodTest.java
@@ -45,7 +45,7 @@
.enableNeverClassInliningAnnotations()
.addInnerClasses(EventuallyNonTargetedMethodTest.class)
.addKeepMainRule(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutput(EXPECTED)
.inspect(this::checkIsFooPresent);
diff --git a/src/test/java/com/android/tools/r8/shaking/FieldReadsJasminTest.java b/src/test/java/com/android/tools/r8/shaking/FieldReadsJasminTest.java
index 7ccba55..238234a 100644
--- a/src/test/java/com/android/tools/r8/shaking/FieldReadsJasminTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/FieldReadsJasminTest.java
@@ -101,7 +101,7 @@
if (parameters.isDexRuntime()) {
testForD8()
.addProgramClassFileData(classes)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(inspector -> ensureNoFieldsRead(inspector, clazz.name, false));
}
@@ -109,7 +109,7 @@
testForR8(parameters.getBackend())
.addProgramClassFileData(classes)
.addKeepRules("-keep class * { <methods>; }")
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(inspector -> ensureNoFieldsRead(inspector, clazz.name, true));
}
@@ -157,7 +157,7 @@
testForR8(parameters.getBackend())
.addProgramClassFileData(builder.buildClasses())
.addKeepRules("-keep class * { <methods>; }")
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector ->
@@ -314,7 +314,7 @@
if (parameters.isDexRuntime()) {
testForD8()
.addProgramClassFileData(classes)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(d8Inspector);
}
@@ -322,7 +322,7 @@
testForR8(parameters.getBackend())
.addProgramClassFileData(classes)
.addKeepRules("-keep class * { <methods>; }")
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(r8Inspector);
}
diff --git a/src/test/java/com/android/tools/r8/shaking/ForwardingConstructorShakingOnDexTest.java b/src/test/java/com/android/tools/r8/shaking/ForwardingConstructorShakingOnDexTest.java
index 85f698d..34fe591 100644
--- a/src/test/java/com/android/tools/r8/shaking/ForwardingConstructorShakingOnDexTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/ForwardingConstructorShakingOnDexTest.java
@@ -42,7 +42,7 @@
.enableConstantArgumentAnnotations()
.enableNeverClassInliningAnnotations()
.enableNoVerticalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect)
.run(parameters.getRuntime(), Main.class)
diff --git a/src/test/java/com/android/tools/r8/shaking/ForwardingConstructorShakingOnDexWithClassMergingTest.java b/src/test/java/com/android/tools/r8/shaking/ForwardingConstructorShakingOnDexWithClassMergingTest.java
index 582adfc..587abff 100644
--- a/src/test/java/com/android/tools/r8/shaking/ForwardingConstructorShakingOnDexWithClassMergingTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/ForwardingConstructorShakingOnDexWithClassMergingTest.java
@@ -50,7 +50,7 @@
inspector -> inspector.assertMergedInto(A.class, B.class).assertNoOtherClassesMerged())
.enableInliningAnnotations()
.enableNoVerticalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect)
.run(parameters.getRuntime(), Main.class)
diff --git a/src/test/java/com/android/tools/r8/shaking/InstantiatedLambdaReceiverTest.java b/src/test/java/com/android/tools/r8/shaking/InstantiatedLambdaReceiverTest.java
index 0a1f760..7d02ea9 100644
--- a/src/test/java/com/android/tools/r8/shaking/InstantiatedLambdaReceiverTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/InstantiatedLambdaReceiverTest.java
@@ -43,7 +43,7 @@
testForR8(parameters.getBackend())
.addInnerClasses(InstantiatedLambdaReceiverTest.class)
.addKeepMainRule(TestClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutput(expectedOutput);
}
diff --git a/src/test/java/com/android/tools/r8/shaking/InstantiatedLambdasTestRunner.java b/src/test/java/com/android/tools/r8/shaking/InstantiatedLambdasTestRunner.java
index 1533aca..ed80366 100644
--- a/src/test/java/com/android/tools/r8/shaking/InstantiatedLambdasTestRunner.java
+++ b/src/test/java/com/android/tools/r8/shaking/InstantiatedLambdasTestRunner.java
@@ -69,7 +69,7 @@
.addProgramFiles(inputJar)
.addKeepMainRule(CLASS)
.debug()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.apply(
compileResult ->
diff --git a/src/test/java/com/android/tools/r8/shaking/InvalidTypesTest.java b/src/test/java/com/android/tools/r8/shaking/InvalidTypesTest.java
index acc8765..e5ce137 100644
--- a/src/test/java/com/android/tools/r8/shaking/InvalidTypesTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/InvalidTypesTest.java
@@ -281,14 +281,14 @@
DXTestRunResult dxResult =
testForDX()
.addProgramFiles(inputJar)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), mainClass.name);
checkTestRunResult(dxResult, Compiler.DX);
D8TestRunResult d8Result =
testForD8()
.addProgramFiles(inputJar)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), mainClass.name);
checkTestRunResult(d8Result, Compiler.D8);
}
@@ -313,7 +313,7 @@
}
})
.allowDiagnosticWarningMessages(allowDiagnosticWarningMessages)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compileWithExpectedDiagnostics(
diagnostics -> {
if (allowDiagnosticWarningMessages) {
diff --git a/src/test/java/com/android/tools/r8/shaking/KeepClassMembersFieldTest.java b/src/test/java/com/android/tools/r8/shaking/KeepClassMembersFieldTest.java
index 87ef2b8..31d557e 100644
--- a/src/test/java/com/android/tools/r8/shaking/KeepClassMembersFieldTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/KeepClassMembersFieldTest.java
@@ -42,7 +42,7 @@
.addInnerClasses(getClass())
.addKeepMainRule(Foo.class)
.addKeepRules(KEEP_RULE)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector ->
diff --git a/src/test/java/com/android/tools/r8/shaking/LambdaCaptureShrinkingTest.java b/src/test/java/com/android/tools/r8/shaking/LambdaCaptureShrinkingTest.java
index 4efaeb4..b3b8693 100644
--- a/src/test/java/com/android/tools/r8/shaking/LambdaCaptureShrinkingTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/LambdaCaptureShrinkingTest.java
@@ -41,7 +41,7 @@
.addInnerClasses(getClass())
.addKeepMainRule(Main.class)
.enableNoVerticalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.applyIf(
parameters.isCfRuntime(),
diff --git a/src/test/java/com/android/tools/r8/shaking/LibraryClassExtendingProgramClassSuperTest.java b/src/test/java/com/android/tools/r8/shaking/LibraryClassExtendingProgramClassSuperTest.java
index c2c9f80..e856027 100644
--- a/src/test/java/com/android/tools/r8/shaking/LibraryClassExtendingProgramClassSuperTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/LibraryClassExtendingProgramClassSuperTest.java
@@ -71,7 +71,7 @@
.addProgramClasses(ProgramDirectSuper.class, ProgramIndirectSuper.class, Main.class)
.addKeepMainRule(Main.class)
.applyIf(dontWarn, b -> b.addDontWarn(LibraryClass.class))
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addRunClasspathFiles(
compileToZip(
parameters,
diff --git a/src/test/java/com/android/tools/r8/shaking/LibraryMethodOverrideCovariantTest.java b/src/test/java/com/android/tools/r8/shaking/LibraryMethodOverrideCovariantTest.java
index 59fcf6d..a37017a 100644
--- a/src/test/java/com/android/tools/r8/shaking/LibraryMethodOverrideCovariantTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/LibraryMethodOverrideCovariantTest.java
@@ -55,7 +55,7 @@
.addDefaultRuntimeLibrary(parameters)
.addLibraryClasses(LibraryUser.class)
.addKeepMainRule(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.enableInliningAnnotations()
.compile()
.addRunClasspathFiles(buildOnDexRuntime(parameters, LibraryUser.class))
diff --git a/src/test/java/com/android/tools/r8/shaking/LibraryMethodOverrideInInterfaceMarkingTest.java b/src/test/java/com/android/tools/r8/shaking/LibraryMethodOverrideInInterfaceMarkingTest.java
index 42268b2..9b497de 100644
--- a/src/test/java/com/android/tools/r8/shaking/LibraryMethodOverrideInInterfaceMarkingTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/LibraryMethodOverrideInInterfaceMarkingTest.java
@@ -41,7 +41,7 @@
.addOptionsModification(
options -> options.testing.enqueuerInspector = this::verifyLibraryOverrideInformation)
.enableNoVerticalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutputLines("true", "true");
}
diff --git a/src/test/java/com/android/tools/r8/shaking/LibraryMethodOverrideInLambdaMarkingTest.java b/src/test/java/com/android/tools/r8/shaking/LibraryMethodOverrideInLambdaMarkingTest.java
index 563a312..1ae00db 100644
--- a/src/test/java/com/android/tools/r8/shaking/LibraryMethodOverrideInLambdaMarkingTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/LibraryMethodOverrideInLambdaMarkingTest.java
@@ -44,7 +44,7 @@
.addOptionsModification(
options -> options.testing.enqueuerInspector = this::verifyLibraryOverrideInformation)
.enableNoVerticalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutputLines("null", "null");
}
diff --git a/src/test/java/com/android/tools/r8/shaking/LibraryMethodOverrideMarkingTest.java b/src/test/java/com/android/tools/r8/shaking/LibraryMethodOverrideMarkingTest.java
index a7908c2..252777e 100644
--- a/src/test/java/com/android/tools/r8/shaking/LibraryMethodOverrideMarkingTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/LibraryMethodOverrideMarkingTest.java
@@ -42,7 +42,7 @@
.addOptionsModification(
options -> options.testing.enqueuerInspector = this::verifyLibraryOverrideInformation)
.enableNoVerticalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile();
}
diff --git a/src/test/java/com/android/tools/r8/shaking/LibraryProvidedProguardRulesTest.java b/src/test/java/com/android/tools/r8/shaking/LibraryProvidedProguardRulesTest.java
index 6472a03..d1a4966 100644
--- a/src/test/java/com/android/tools/r8/shaking/LibraryProvidedProguardRulesTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/LibraryProvidedProguardRulesTest.java
@@ -111,7 +111,7 @@
return testForR8(parameters.getBackend())
.applyIf(providerType == ProviderType.API, b -> b.addProgramFiles(library))
.applyIf(providerType == ProviderType.INJARS, b -> b.addKeepRules("-injars " + library))
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspector();
}
@@ -161,7 +161,7 @@
() ->
testForR8(parameters.getBackend())
.addProgramFiles(buildLibrary(ImmutableList.of("error")))
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compileWithExpectedDiagnostics(
diagnostics ->
diagnostics.assertErrorThatMatches(
@@ -180,7 +180,7 @@
() ->
testForR8(parameters.getBackend())
.addProgramFiles(buildLibrary(ImmutableList.of("-include other.rules")))
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compileWithExpectedDiagnostics(
diagnostics ->
diagnostics.assertErrorThatMatches(
@@ -223,7 +223,7 @@
() ->
testForR8(parameters.getBackend())
.addProgramResourceProviders(new TestProvider())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compileWithExpectedDiagnostics(
diagnostics ->
diagnostics.assertErrorThatMatches(
diff --git a/src/test/java/com/android/tools/r8/shaking/MissingInterfaceTest.java b/src/test/java/com/android/tools/r8/shaking/MissingInterfaceTest.java
index 82d690c..654ad50 100644
--- a/src/test/java/com/android/tools/r8/shaking/MissingInterfaceTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/MissingInterfaceTest.java
@@ -40,7 +40,7 @@
testForR8(parameters.getBackend())
.addProgramClasses(TestClassForB112849320.class)
.addDontWarn(GoingToBeMissed.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(TestClassForB112849320.class)
.addOptionsModification(options -> options.inlinerOptions().enableInlining = false)
.addKeepPackageNamesRule(GoingToBeMissed.class.getPackage())
@@ -77,7 +77,7 @@
.addProgramClasses(TestClassForB112849320.class)
.addLibraryFiles(lib)
.addDefaultRuntimeLibrary(parameters)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(TestClassForB112849320.class)
.addOptionsModification(options -> options.inlinerOptions().enableInlining = false)
.addRunClasspathFiles(buildOnDexRuntime(parameters, lib))
diff --git a/src/test/java/com/android/tools/r8/shaking/NonTargetedMethodTest.java b/src/test/java/com/android/tools/r8/shaking/NonTargetedMethodTest.java
index a5704cb..9290c0f 100644
--- a/src/test/java/com/android/tools/r8/shaking/NonTargetedMethodTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/NonTargetedMethodTest.java
@@ -46,7 +46,7 @@
.enableNeverClassInliningAnnotations()
.addInnerClasses(NonTargetedMethodTest.class)
.addKeepMainRule(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutput(EXPECTED)
.inspect(this::checkIsFooPresent);
diff --git a/src/test/java/com/android/tools/r8/shaking/ParameterTypeTest.java b/src/test/java/com/android/tools/r8/shaking/ParameterTypeTest.java
index 0a61b39..d4bcbbd 100644
--- a/src/test/java/com/android/tools/r8/shaking/ParameterTypeTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/ParameterTypeTest.java
@@ -134,7 +134,7 @@
options.enableVerticalClassMerging = enableVerticalClassMerging;
})
.enableNoHorizontalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), B112452064TestMain.class)
.assertSuccessWithOutput(javaResult.stdout)
@@ -315,7 +315,7 @@
options.callSiteOptimizationOptions().setEnabled(enableArgumentPropagation);
})
.addDontObfuscate()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector -> {
diff --git a/src/test/java/com/android/tools/r8/shaking/PreserveDesugaredLambdaTest.java b/src/test/java/com/android/tools/r8/shaking/PreserveDesugaredLambdaTest.java
index a5c58ae..a3c3b31 100644
--- a/src/test/java/com/android/tools/r8/shaking/PreserveDesugaredLambdaTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/PreserveDesugaredLambdaTest.java
@@ -58,7 +58,7 @@
testForR8(parameters.getBackend())
.addProgramClasses(Interface.class, A.class)
.addKeepAllClassesRule()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile();
// A is not passed in to ensure the Enqueuer is not tracing through classpath to see the use of
// computeFoo().
@@ -68,7 +68,7 @@
.addLibraryFiles(TestBase.runtimeJar(parameters.getBackend()))
.addKeepAllClassesRule()
.addDontWarn(A.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.addRunClasspathFiles(libraryCompileResult.writeToZip())
.inspect(
diff --git a/src/test/java/com/android/tools/r8/shaking/PrintUsageTest.java b/src/test/java/com/android/tools/r8/shaking/PrintUsageTest.java
index e32e47c..fdb513c 100644
--- a/src/test/java/com/android/tools/r8/shaking/PrintUsageTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/PrintUsageTest.java
@@ -74,7 +74,7 @@
// Disable inlining to make this test not depend on inlining decisions.
.addOptionsModification(o -> o.inlinerOptions().enableInlining = false)
.enableProguardTestOptions()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile();
}
diff --git a/src/test/java/com/android/tools/r8/shaking/ProguardDirectoryInputsTest.java b/src/test/java/com/android/tools/r8/shaking/ProguardDirectoryInputsTest.java
index 352d268..d74b5ae 100644
--- a/src/test/java/com/android/tools/r8/shaking/ProguardDirectoryInputsTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/ProguardDirectoryInputsTest.java
@@ -87,17 +87,19 @@
Collections.singletonList(prefix + directory.toAbsolutePath()), origin);
})
.addKeepMainRule(TestClass.class)
- .setMinApi(parameters.getApiLevel())
- .compileWithExpectedDiagnostics(diagnostics -> {
- diagnostics.assertOnlyErrors();
- diagnostics.assertErrorsCount(1);
- Diagnostic diagnostic = diagnostics.getErrors().get(0);
- assertThat(diagnostic.getDiagnosticMessage(), containsString("Unexpected input type"));
- assertEquals(origin, diagnostic.getOrigin());
- TextPosition position = (TextPosition) diagnostic.getPosition();
- assertEquals(1, position.getLine());
- assertEquals(prefix.length() + 1, position.getColumn());
- });
+ .setMinApi(parameters)
+ .compileWithExpectedDiagnostics(
+ diagnostics -> {
+ diagnostics.assertOnlyErrors();
+ diagnostics.assertErrorsCount(1);
+ Diagnostic diagnostic = diagnostics.getErrors().get(0);
+ assertThat(
+ diagnostic.getDiagnosticMessage(), containsString("Unexpected input type"));
+ assertEquals(origin, diagnostic.getOrigin());
+ TextPosition position = (TextPosition) diagnostic.getPosition();
+ assertEquals(1, position.getLine());
+ assertEquals(prefix.length() + 1, position.getColumn());
+ });
}
static class TestClass {
diff --git a/src/test/java/com/android/tools/r8/shaking/RemoveCallToStaticInitTest.java b/src/test/java/com/android/tools/r8/shaking/RemoveCallToStaticInitTest.java
index 7149490..9a39af3 100644
--- a/src/test/java/com/android/tools/r8/shaking/RemoveCallToStaticInitTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/RemoveCallToStaticInitTest.java
@@ -46,7 +46,7 @@
testForR8(parameters.getBackend())
.addProgramClasses(A.class, Main.class)
.addProgramClassFileData(getBWithBridge())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(Main.class)
.enableInliningAnnotations()
.run(parameters.getRuntime(), Main.class)
diff --git a/src/test/java/com/android/tools/r8/shaking/RetainIndirectlyReferencedConstructorShakingOnDexTest.java b/src/test/java/com/android/tools/r8/shaking/RetainIndirectlyReferencedConstructorShakingOnDexTest.java
index 5863d41..a19fd93 100644
--- a/src/test/java/com/android/tools/r8/shaking/RetainIndirectlyReferencedConstructorShakingOnDexTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/RetainIndirectlyReferencedConstructorShakingOnDexTest.java
@@ -51,7 +51,7 @@
options.testing.enableRetargetingConstructorBridgeCalls =
enableRetargetingConstructorBridgeCalls)
.enableNoVerticalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect)
.run(parameters.getRuntime(), Main.class)
diff --git a/src/test/java/com/android/tools/r8/shaking/ReturnTypeTest.java b/src/test/java/com/android/tools/r8/shaking/ReturnTypeTest.java
index 3cd79f3..0b40a04 100644
--- a/src/test/java/com/android/tools/r8/shaking/ReturnTypeTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/ReturnTypeTest.java
@@ -80,7 +80,7 @@
B112517039ReturnType.class, B112517039I.class, B112517039Caller.class, MAIN)
.addKeepMainRule(MAIN)
.enableConstantArgumentAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addOptionsModification(o -> o.inlinerOptions().enableInlining = false)
.run(parameters.getRuntime(), MAIN)
.assertSuccessWithOutput(JAVA_OUTPUT)
diff --git a/src/test/java/com/android/tools/r8/shaking/ServiceLoaderTest.java b/src/test/java/com/android/tools/r8/shaking/ServiceLoaderTest.java
index dda29d7..be04fba 100644
--- a/src/test/java/com/android/tools/r8/shaking/ServiceLoaderTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/ServiceLoaderTest.java
@@ -94,7 +94,7 @@
.enableGraphInspector()
.enableMemberValuePropagationAnnotations()
.enableNoMethodStaticizingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutput(expectedOutput);
@@ -192,7 +192,7 @@
options.dataResourceConsumer = dataResourceConsumer;
})
.enableNoMethodStaticizingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), OtherTestClass.class)
.assertSuccessWithOutput(expectedOutput)
.inspector();
diff --git a/src/test/java/com/android/tools/r8/shaking/SoftPinDefaultInitializerWithConstClassInCompatModeTest.java b/src/test/java/com/android/tools/r8/shaking/SoftPinDefaultInitializerWithConstClassInCompatModeTest.java
index d553900..0771e06 100644
--- a/src/test/java/com/android/tools/r8/shaking/SoftPinDefaultInitializerWithConstClassInCompatModeTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/SoftPinDefaultInitializerWithConstClassInCompatModeTest.java
@@ -29,7 +29,7 @@
testForR8Compat(parameters.getBackend())
.addInnerClasses(getClass())
.addKeepMainRule(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("A");
diff --git a/src/test/java/com/android/tools/r8/shaking/TreeShakingTest.java b/src/test/java/com/android/tools/r8/shaking/TreeShakingTest.java
index 1d5d9c8..bbc5b5b 100644
--- a/src/test/java/com/android/tools/r8/shaking/TreeShakingTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/TreeShakingTest.java
@@ -186,7 +186,7 @@
.addProgramFiles(Paths.get(programFile)))
.enableProguardTestOptions()
.minification(minify.isMinify())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepRuleFiles(ListUtils.map(keepRulesFiles, Paths::get))
.addLibraryFiles(Paths.get(ToolHelper.EXAMPLES_BUILD_DIR + "shakinglib.jar"))
.addDefaultRuntimeLibrary(parameters)
diff --git a/src/test/java/com/android/tools/r8/shaking/UsageInformationConsumerTest.java b/src/test/java/com/android/tools/r8/shaking/UsageInformationConsumerTest.java
index 3355fab..a2510d0 100644
--- a/src/test/java/com/android/tools/r8/shaking/UsageInformationConsumerTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/UsageInformationConsumerTest.java
@@ -40,7 +40,7 @@
.addKeepClassAndMembersRules(TestClass.class)
.apply(
b -> b.getBuilder().setProguardUsageConsumer(ToolHelper.consumeString(usageData::set)))
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutput(EXPECTED);
assertEquals(StringUtils.lines(UnusedClass.class.getTypeName()), usageData.get());
@@ -53,7 +53,7 @@
.addProgramClasses(TestClass.class, UnusedClass.class)
.addKeepClassAndMembersRules(TestClass.class)
.addKeepRules("-printusage")
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.assertStdoutThatMatches(equalTo(StringUtils.lines(UnusedClass.class.getTypeName())))
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/shaking/VerticalClassMergerInvokeSpecialInConstructorTest.java b/src/test/java/com/android/tools/r8/shaking/VerticalClassMergerInvokeSpecialInConstructorTest.java
index 4f2943f..520f0cc 100644
--- a/src/test/java/com/android/tools/r8/shaking/VerticalClassMergerInvokeSpecialInConstructorTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/VerticalClassMergerInvokeSpecialInConstructorTest.java
@@ -49,7 +49,7 @@
.addKeepMainRule(Main.class)
.addKeepClassRules(A.class)
.enableNeverClassInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines(EXPECTED);
}
diff --git a/src/test/java/com/android/tools/r8/shaking/addconfigurationdebugging/B133167042.java b/src/test/java/com/android/tools/r8/shaking/addconfigurationdebugging/B133167042.java
index 3971997..5b318bf 100644
--- a/src/test/java/com/android/tools/r8/shaking/addconfigurationdebugging/B133167042.java
+++ b/src/test/java/com/android/tools/r8/shaking/addconfigurationdebugging/B133167042.java
@@ -46,7 +46,7 @@
.addProgramClasses(TestClass.class)
.addKeepMainRule(TestClass.class)
.addKeepRules("-addconfigurationdebugging")
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutput(StringUtils.lines("false"));
}
diff --git a/src/test/java/com/android/tools/r8/shaking/addconfigurationdebugging/ConfigurationDebuggingTest.java b/src/test/java/com/android/tools/r8/shaking/addconfigurationdebugging/ConfigurationDebuggingTest.java
index 2fc2284..5d90382 100644
--- a/src/test/java/com/android/tools/r8/shaking/addconfigurationdebugging/ConfigurationDebuggingTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/addconfigurationdebugging/ConfigurationDebuggingTest.java
@@ -110,7 +110,7 @@
.addKeepRules("-addconfigurationdebugging")
.addKeepRules("-keep class **.TestClass { <init>(); }")
.addDontObfuscate()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect)
.writeToZip();
@@ -121,7 +121,7 @@
.addDefaultRuntimeLibrary(parameters)
.addProgramClasses(Caller.class)
.addKeepMainRule(Caller.class)
- .setMinApi(parameters.getApiLevel());
+ .setMinApi(parameters);
R8TestRunResult result =
builder
.compile()
diff --git a/src/test/java/com/android/tools/r8/shaking/allowshrinking/ConditionalKeepClassMethodsAllowShrinkingCompatibilityTest.java b/src/test/java/com/android/tools/r8/shaking/allowshrinking/ConditionalKeepClassMethodsAllowShrinkingCompatibilityTest.java
index 2217ace..80497ad 100644
--- a/src/test/java/com/android/tools/r8/shaking/allowshrinking/ConditionalKeepClassMethodsAllowShrinkingCompatibilityTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/allowshrinking/ConditionalKeepClassMethodsAllowShrinkingCompatibilityTest.java
@@ -81,7 +81,7 @@
.addInnerClasses(ConditionalKeepClassMethodsAllowShrinkingCompatibilityTest.class)
.addKeepClassAndMembersRules(TestClass.class)
.addKeepRules(keepRule)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), TestClass.class, A.class.getTypeName())
.assertSuccessWithOutput(getExpected())
.inspect(
diff --git a/src/test/java/com/android/tools/r8/shaking/allowshrinking/KeepAllowShrinkingCompatibilityTest.java b/src/test/java/com/android/tools/r8/shaking/allowshrinking/KeepAllowShrinkingCompatibilityTest.java
index 4bd9bfd..b821492 100644
--- a/src/test/java/com/android/tools/r8/shaking/allowshrinking/KeepAllowShrinkingCompatibilityTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/allowshrinking/KeepAllowShrinkingCompatibilityTest.java
@@ -83,7 +83,7 @@
.addInnerClasses(KeepAllowShrinkingCompatibilityTest.class)
.addKeepClassAndMembersRules(TestClass.class)
.addKeepRules(keepRule)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), TestClass.class, A.class.getTypeName())
.assertSuccessWithOutput(getExpected())
.inspect(
diff --git a/src/test/java/com/android/tools/r8/shaking/allowshrinking/KeepClassFieldsAllowShrinkingCompatibilityTest.java b/src/test/java/com/android/tools/r8/shaking/allowshrinking/KeepClassFieldsAllowShrinkingCompatibilityTest.java
index 0d73c09..1c8c9b5 100644
--- a/src/test/java/com/android/tools/r8/shaking/allowshrinking/KeepClassFieldsAllowShrinkingCompatibilityTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/allowshrinking/KeepClassFieldsAllowShrinkingCompatibilityTest.java
@@ -79,7 +79,7 @@
.addInnerClasses(KeepClassFieldsAllowShrinkingCompatibilityTest.class)
.addKeepClassAndMembersRules(TestClass.class)
.addKeepRules(keepRule)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), TestClass.class, A.class.getTypeName())
.assertSuccessWithOutput(getExpected())
.inspect(
diff --git a/src/test/java/com/android/tools/r8/shaking/allowshrinking/KeepClassMethodsAllowShrinkingCompatibilityTest.java b/src/test/java/com/android/tools/r8/shaking/allowshrinking/KeepClassMethodsAllowShrinkingCompatibilityTest.java
index ff2da06..a7d590f 100644
--- a/src/test/java/com/android/tools/r8/shaking/allowshrinking/KeepClassMethodsAllowShrinkingCompatibilityTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/allowshrinking/KeepClassMethodsAllowShrinkingCompatibilityTest.java
@@ -83,7 +83,7 @@
.addInnerClasses(KeepClassMethodsAllowShrinkingCompatibilityTest.class)
.addKeepClassAndMembersRules(TestClass.class)
.addKeepRules(keepRule)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), TestClass.class, A.class.getTypeName())
.assertSuccessWithOutput(getExpected())
.inspect(
diff --git a/src/test/java/com/android/tools/r8/shaking/allowshrinking/KeepMethodNameCompatibilityTest.java b/src/test/java/com/android/tools/r8/shaking/allowshrinking/KeepMethodNameCompatibilityTest.java
index 4d62baf..5341635 100644
--- a/src/test/java/com/android/tools/r8/shaking/allowshrinking/KeepMethodNameCompatibilityTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/allowshrinking/KeepMethodNameCompatibilityTest.java
@@ -49,7 +49,7 @@
.addKeepMainRule(TestClass.class)
.addKeepRules(
"-keepclassmembernames class " + TestClass.class.getTypeName() + " { void test(); }")
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector ->
diff --git a/src/test/java/com/android/tools/r8/shaking/annotations/AlwaysRetainNonDefaultRetentionAnnotationTest.java b/src/test/java/com/android/tools/r8/shaking/annotations/AlwaysRetainNonDefaultRetentionAnnotationTest.java
index cfeb5c1..9e53326 100644
--- a/src/test/java/com/android/tools/r8/shaking/annotations/AlwaysRetainNonDefaultRetentionAnnotationTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/annotations/AlwaysRetainNonDefaultRetentionAnnotationTest.java
@@ -69,7 +69,7 @@
"-keep,allowshrinking,allowobfuscation class "
+ MyRuntimeAnnotation.class.getTypeName());
})
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector -> {
diff --git a/src/test/java/com/android/tools/r8/shaking/annotations/AnnotationShakingBehaviorTest.java b/src/test/java/com/android/tools/r8/shaking/annotations/AnnotationShakingBehaviorTest.java
index e98541c..13654a8 100644
--- a/src/test/java/com/android/tools/r8/shaking/annotations/AnnotationShakingBehaviorTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/annotations/AnnotationShakingBehaviorTest.java
@@ -46,7 +46,7 @@
.addKeepMainRule(Main.class)
.addKeepClassAndMembersRules(Factory.class)
.addKeepAttributes("*Annotation*")
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("Hello World!")
.inspect(inspector -> assertThat(inspector.clazz(C.class), isPresent()));
@@ -65,7 +65,7 @@
+ "{void test();}")
.addKeepAttributes("*Annotation*")
.enableInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), MainWithMethodAnnotation.class)
.assertSuccessWithOutputLines("Hello World!")
.inspect(inspector -> assertThat(inspector.clazz(C.class), isPresent()));
@@ -78,7 +78,7 @@
.addProgramClasses(MainWithGenericC.class, C.class)
.addKeepMainRule(MainWithGenericC.class)
.addKeepAttributes("Signature", "InnerClasses", "EnclosingMethod")
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), MainWithGenericC.class)
.assertSuccessWithOutputLines("Hello World!")
.inspect(
@@ -97,7 +97,7 @@
.addKeepAttributes("*Annotation*")
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), MainWithNewB.class)
.assertSuccessWithOutputLines("Hello World!")
.inspect(
diff --git a/src/test/java/com/android/tools/r8/shaking/annotations/AnnotationsOnTargetedMethodTest.java b/src/test/java/com/android/tools/r8/shaking/annotations/AnnotationsOnTargetedMethodTest.java
index 35dace2..0524037 100644
--- a/src/test/java/com/android/tools/r8/shaking/annotations/AnnotationsOnTargetedMethodTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/annotations/AnnotationsOnTargetedMethodTest.java
@@ -91,7 +91,7 @@
.enableNoHorizontalClassMergingAnnotations()
.enableNoVerticalClassMergingAnnotations()
.addDontObfuscate()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutput(
!enableProguardCompatibilityMode && !keepAllowShrinking
diff --git a/src/test/java/com/android/tools/r8/shaking/annotations/B149729626.java b/src/test/java/com/android/tools/r8/shaking/annotations/B149729626.java
index 5b8f418..1ffb1bb 100644
--- a/src/test/java/com/android/tools/r8/shaking/annotations/B149729626.java
+++ b/src/test/java/com/android/tools/r8/shaking/annotations/B149729626.java
@@ -44,7 +44,7 @@
"-keepclassmembers @" + Marker.class.getTypeName() + " class * {",
" <init>(...);",
"}")
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect)
.run(parameters.getRuntime(), TestClass.class)
@@ -61,7 +61,7 @@
"-keep class <1> {",
" <init>(...);",
"}")
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect)
.run(parameters.getRuntime(), TestClass.class)
@@ -73,7 +73,7 @@
testForR8Compat(parameters.getBackend())
.addInnerClasses(B149729626.class)
.addKeepMainRule(TestClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/shaking/annotations/KeepAllowAnnotationRemovalTest.java b/src/test/java/com/android/tools/r8/shaking/annotations/KeepAllowAnnotationRemovalTest.java
index a47afde..5d102de 100644
--- a/src/test/java/com/android/tools/r8/shaking/annotations/KeepAllowAnnotationRemovalTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/annotations/KeepAllowAnnotationRemovalTest.java
@@ -45,7 +45,7 @@
"}")
.addKeepRuntimeInvisibleAnnotations()
.enableProguardTestOptions()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector -> {
diff --git a/src/test/java/com/android/tools/r8/shaking/annotations/KeepDisallowAnnotationRemovalAllowOptimizationTest.java b/src/test/java/com/android/tools/r8/shaking/annotations/KeepDisallowAnnotationRemovalAllowOptimizationTest.java
index d07689d..34f4195 100644
--- a/src/test/java/com/android/tools/r8/shaking/annotations/KeepDisallowAnnotationRemovalAllowOptimizationTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/annotations/KeepDisallowAnnotationRemovalAllowOptimizationTest.java
@@ -55,7 +55,7 @@
.allowUnusedProguardConfigurationRules(enableCompatibilityMode)
.enableInliningAnnotations()
.enableKeepUnusedReturnValueAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector -> {
diff --git a/src/test/java/com/android/tools/r8/shaking/annotations/KeepWithMultipleClassAnnotationsTest.java b/src/test/java/com/android/tools/r8/shaking/annotations/KeepWithMultipleClassAnnotationsTest.java
index 80dab7c..83e53bf 100644
--- a/src/test/java/com/android/tools/r8/shaking/annotations/KeepWithMultipleClassAnnotationsTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/annotations/KeepWithMultipleClassAnnotationsTest.java
@@ -39,7 +39,7 @@
"-keep @" + A.class.getTypeName() + " class * {",
" public static void main(java.lang.String[]);",
"}")
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutputLines("Hello world!");
@@ -53,7 +53,7 @@
"-keep @" + A.class.getTypeName() + " @" + B.class.getTypeName() + " class * {",
" public static void main(java.lang.String[]);",
"}")
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutputLines("Hello world!");
@@ -74,7 +74,7 @@
" public static void main(java.lang.String[]);",
"}")
.allowUnusedProguardConfigurationRules()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(inspector -> assertTrue(inspector.allClasses().isEmpty()));
}
diff --git a/src/test/java/com/android/tools/r8/shaking/annotations/KeepWithMultipleInheritanceAnnotationsTest.java b/src/test/java/com/android/tools/r8/shaking/annotations/KeepWithMultipleInheritanceAnnotationsTest.java
index 25e610b..53b6a8f 100644
--- a/src/test/java/com/android/tools/r8/shaking/annotations/KeepWithMultipleInheritanceAnnotationsTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/annotations/KeepWithMultipleInheritanceAnnotationsTest.java
@@ -39,7 +39,7 @@
"-keep class * extends @" + A.class.getTypeName() + " * {",
" public static void main(java.lang.String[]);",
"}")
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutputLines("Hello world!");
@@ -57,7 +57,7 @@
+ " * {",
" public static void main(java.lang.String[]);",
"}")
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutputLines("Hello world!");
@@ -78,7 +78,7 @@
" public static void main(java.lang.String[]);",
"}")
.allowUnusedProguardConfigurationRules()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(inspector -> assertTrue(inspector.allClasses().isEmpty()));
}
diff --git a/src/test/java/com/android/tools/r8/shaking/annotations/KeepWithMultipleMemberAnnotationsTest.java b/src/test/java/com/android/tools/r8/shaking/annotations/KeepWithMultipleMemberAnnotationsTest.java
index cafe2a4..32825a2 100644
--- a/src/test/java/com/android/tools/r8/shaking/annotations/KeepWithMultipleMemberAnnotationsTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/annotations/KeepWithMultipleMemberAnnotationsTest.java
@@ -39,7 +39,7 @@
"-keepclasseswithmembers class * {",
" @" + A.class.getTypeName() + " public static void main(java.lang.String[]);",
"}")
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutputLines("Hello world!");
@@ -57,7 +57,7 @@
+ B.class.getTypeName()
+ " public static void main(java.lang.String[]);",
"}")
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutputLines("Hello world!");
@@ -78,7 +78,7 @@
+ " public static void main(java.lang.String[]);",
"}")
.allowUnusedProguardConfigurationRules()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(inspector -> assertTrue(inspector.allClasses().isEmpty()));
}
diff --git a/src/test/java/com/android/tools/r8/shaking/annotations/KeepWithMultipleParameterAnnotationsTest.java b/src/test/java/com/android/tools/r8/shaking/annotations/KeepWithMultipleParameterAnnotationsTest.java
index 795574a..70672c5 100644
--- a/src/test/java/com/android/tools/r8/shaking/annotations/KeepWithMultipleParameterAnnotationsTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/annotations/KeepWithMultipleParameterAnnotationsTest.java
@@ -39,7 +39,7 @@
"-keepclasseswithmembers class * {",
" @" + A.class.getTypeName() + " public static void main(java.lang.String[]);",
"}")
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutputLines("Hello world!");
@@ -57,7 +57,7 @@
+ B.class.getTypeName()
+ " public static void main(java.lang.String[]);",
"}")
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutputLines("Hello world!");
@@ -78,7 +78,7 @@
+ " public static void main(java.lang.String[]);",
"}")
.allowUnusedProguardConfigurationRules()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(inspector -> assertTrue(inspector.allClasses().isEmpty()));
}
diff --git a/src/test/java/com/android/tools/r8/shaking/annotations/LibraryAndMissingAnnotationsTest.java b/src/test/java/com/android/tools/r8/shaking/annotations/LibraryAndMissingAnnotationsTest.java
index 135287e..c10b798 100644
--- a/src/test/java/com/android/tools/r8/shaking/annotations/LibraryAndMissingAnnotationsTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/annotations/LibraryAndMissingAnnotationsTest.java
@@ -51,7 +51,7 @@
return testForR8(getStaticTemp(), parameters.getBackend())
.addProgramClasses(LibraryAnnotation.class)
.addKeepClassAndMembersRulesWithAllowObfuscation(LibraryAnnotation.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.writeToZip();
}
@@ -111,7 +111,7 @@
builder.isProguardTestBuilder(),
ignore -> builder.addDontWarn(LibraryAndMissingAnnotationsTest.class))
.addKeepMainRule(mainClass)
- .setMinApi(parameters.getApiLevel());
+ .setMinApi(parameters);
if (includeOnLibraryPath) {
t.addLibraryClasses(LibraryAnnotation.class);
} else {
diff --git a/src/test/java/com/android/tools/r8/shaking/annotations/ProgramAnnotationRemovalTest.java b/src/test/java/com/android/tools/r8/shaking/annotations/ProgramAnnotationRemovalTest.java
index 6aeec9f..f95baff 100644
--- a/src/test/java/com/android/tools/r8/shaking/annotations/ProgramAnnotationRemovalTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/annotations/ProgramAnnotationRemovalTest.java
@@ -61,7 +61,7 @@
.addKeepMainRule(TestClass.class)
.addKeepRuntimeVisibleAnnotations()
.enableInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), TestClass.class);
diff --git a/src/test/java/com/android/tools/r8/shaking/annotations/PrunedOrMergedAnnotationTest.java b/src/test/java/com/android/tools/r8/shaking/annotations/PrunedOrMergedAnnotationTest.java
index 187d79c..bcbf5b9 100644
--- a/src/test/java/com/android/tools/r8/shaking/annotations/PrunedOrMergedAnnotationTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/annotations/PrunedOrMergedAnnotationTest.java
@@ -82,7 +82,7 @@
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
.enableNoHorizontalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("Hello", "World!")
.inspect(
diff --git a/src/test/java/com/android/tools/r8/shaking/annotations/ReflectiveAnnotationUseTest.java b/src/test/java/com/android/tools/r8/shaking/annotations/ReflectiveAnnotationUseTest.java
index d0c5bdc..4bbf672 100644
--- a/src/test/java/com/android/tools/r8/shaking/annotations/ReflectiveAnnotationUseTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/annotations/ReflectiveAnnotationUseTest.java
@@ -104,7 +104,7 @@
.addKeepRules("-keep @interface " + ANNOTATION_NAME + " {", " *;", "}")
.allowDiagnosticWarningMessages()
.minification(minify)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.assertAllWarningMessagesMatch(
equalTo("Resource 'META-INF/MANIFEST.MF' already exists."))
@@ -145,7 +145,7 @@
"}")
.allowDiagnosticWarningMessages()
.minification(minify)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.assertAllWarningMessagesMatch(
equalTo("Resource 'META-INF/MANIFEST.MF' already exists."))
@@ -183,7 +183,7 @@
.addKeepRules(KEEP_ANNOTATIONS)
.allowDiagnosticWarningMessages()
.minification(minify)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.assertAllWarningMessagesMatch(
equalTo("Resource 'META-INF/MANIFEST.MF' already exists."))
@@ -220,7 +220,7 @@
.addKeepMainRule(MAIN_CLASS_NAME)
.allowDiagnosticWarningMessages()
.minification(minify)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.assertAllWarningMessagesMatch(
equalTo("Resource 'META-INF/MANIFEST.MF' already exists."))
diff --git a/src/test/java/com/android/tools/r8/shaking/annotations/SerializedNameAlternateTest.java b/src/test/java/com/android/tools/r8/shaking/annotations/SerializedNameAlternateTest.java
index 683a18c..c8754ae 100644
--- a/src/test/java/com/android/tools/r8/shaking/annotations/SerializedNameAlternateTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/annotations/SerializedNameAlternateTest.java
@@ -90,7 +90,7 @@
+ " {",
" @" + SerializedName.class.getTypeName() + " <fields>;",
"}")
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addDontObfuscate()
.run(parameters.getRuntime(), Main.class);
checkRunResult(result);
diff --git a/src/test/java/com/android/tools/r8/shaking/annotations/annotationdefault/DefaultValueForAnnotationWithExplicitValueShrinkingTest.java b/src/test/java/com/android/tools/r8/shaking/annotations/annotationdefault/DefaultValueForAnnotationWithExplicitValueShrinkingTest.java
index fecefb9..76c6a30 100644
--- a/src/test/java/com/android/tools/r8/shaking/annotations/annotationdefault/DefaultValueForAnnotationWithExplicitValueShrinkingTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/annotations/annotationdefault/DefaultValueForAnnotationWithExplicitValueShrinkingTest.java
@@ -44,7 +44,7 @@
.addKeepMainRule(Main.class)
.addKeepAttributeAnnotationDefault()
.addKeepRuntimeVisibleAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.apply(
compileResult -> {
diff --git a/src/test/java/com/android/tools/r8/shaking/annotations/annotationdefault/DefaultValueForLiveButNotKeptAnnotationShrinkingTest.java b/src/test/java/com/android/tools/r8/shaking/annotations/annotationdefault/DefaultValueForLiveButNotKeptAnnotationShrinkingTest.java
index 5f3bf9b..a1e72e9 100644
--- a/src/test/java/com/android/tools/r8/shaking/annotations/annotationdefault/DefaultValueForLiveButNotKeptAnnotationShrinkingTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/annotations/annotationdefault/DefaultValueForLiveButNotKeptAnnotationShrinkingTest.java
@@ -45,7 +45,7 @@
.addKeepClassAndMembersRules(MyAnnotation.class)
.addKeepAttributeAnnotationDefault()
.addKeepRuntimeVisibleAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.apply(
compileResult -> {
diff --git a/src/test/java/com/android/tools/r8/shaking/annotations/annotationdefault/DefaultValueForUnusedAnnotationShrinkingTest.java b/src/test/java/com/android/tools/r8/shaking/annotations/annotationdefault/DefaultValueForUnusedAnnotationShrinkingTest.java
index 9adafb6..a01b251 100644
--- a/src/test/java/com/android/tools/r8/shaking/annotations/annotationdefault/DefaultValueForUnusedAnnotationShrinkingTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/annotations/annotationdefault/DefaultValueForUnusedAnnotationShrinkingTest.java
@@ -44,7 +44,7 @@
.addKeepMainRule(Main.class)
.addKeepAttributeAnnotationDefault()
.addKeepRuntimeVisibleAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.apply(
compileResult -> {
diff --git a/src/test/java/com/android/tools/r8/shaking/annotations/b137392797/B137392797.java b/src/test/java/com/android/tools/r8/shaking/annotations/b137392797/B137392797.java
index 161d685..d935a00 100644
--- a/src/test/java/com/android/tools/r8/shaking/annotations/b137392797/B137392797.java
+++ b/src/test/java/com/android/tools/r8/shaking/annotations/b137392797/B137392797.java
@@ -80,7 +80,7 @@
"-keepclassmembers,allowshrinking class com.squareup.wire.WireField$Label {",
" static com.squareup.wire.WireField$Label OPTIONAL;",
"}"))
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::checkEnumUses)
.run(parameters.getRuntime(), TestClass.class, "com.squareup.demo.myapplication.Test")
diff --git a/src/test/java/com/android/tools/r8/shaking/array/DeadArrayLengthTest.java b/src/test/java/com/android/tools/r8/shaking/array/DeadArrayLengthTest.java
index ff7cb9e..71f9761 100644
--- a/src/test/java/com/android/tools/r8/shaking/array/DeadArrayLengthTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/array/DeadArrayLengthTest.java
@@ -65,7 +65,7 @@
testForD8()
.release()
.addProgramClasses(MAIN)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), MAIN)
.assertSuccessWithOutput(EXPECTED_OUTPUT)
.inspect(codeInspector -> inspect(codeInspector, false));
@@ -79,7 +79,7 @@
.enableInliningAnnotations()
.enableMemberValuePropagationAnnotations()
.addDontObfuscate()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), MAIN)
.assertSuccessWithOutput(EXPECTED_OUTPUT)
.inspect(codeInspector -> inspect(codeInspector, true));
diff --git a/src/test/java/com/android/tools/r8/shaking/assumenosideeffects/AssumeNoSideEffectsForJavaLangClassTest.java b/src/test/java/com/android/tools/r8/shaking/assumenosideeffects/AssumeNoSideEffectsForJavaLangClassTest.java
index 6419f78..9b61b25 100644
--- a/src/test/java/com/android/tools/r8/shaking/assumenosideeffects/AssumeNoSideEffectsForJavaLangClassTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/assumenosideeffects/AssumeNoSideEffectsForJavaLangClassTest.java
@@ -44,7 +44,7 @@
.addKeepMainRule(TestClass.class)
.enableInliningAnnotations()
.enableSideEffectAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/shaking/assumenosideeffects/AssumeNoSideEffectsForLibraryMethodTest.java b/src/test/java/com/android/tools/r8/shaking/assumenosideeffects/AssumeNoSideEffectsForLibraryMethodTest.java
index 9d74c64..eba862f 100644
--- a/src/test/java/com/android/tools/r8/shaking/assumenosideeffects/AssumeNoSideEffectsForLibraryMethodTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/assumenosideeffects/AssumeNoSideEffectsForLibraryMethodTest.java
@@ -39,7 +39,7 @@
.addKeepMainRule(TestClass.class)
.addKeepRules(
"-assumenosideeffects class java.util.ArrayList { int hashCode() return 42; }")
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector -> {
diff --git a/src/test/java/com/android/tools/r8/shaking/assumenosideeffects/AssumeNoSideEffectsRuleOnThrowingMethodTest.java b/src/test/java/com/android/tools/r8/shaking/assumenosideeffects/AssumeNoSideEffectsRuleOnThrowingMethodTest.java
index ba02019..4339e37 100644
--- a/src/test/java/com/android/tools/r8/shaking/assumenosideeffects/AssumeNoSideEffectsRuleOnThrowingMethodTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/assumenosideeffects/AssumeNoSideEffectsRuleOnThrowingMethodTest.java
@@ -32,7 +32,7 @@
.addProgramClasses(Main.class)
.addKeepMainRule(Main.class)
.addKeepRules("-assumenosideeffects class " + Main.class.getTypeName() + " { ouch(); }")
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("Hello world!");
diff --git a/src/test/java/com/android/tools/r8/shaking/assumenosideeffects/AssumenosideeffectsPropagationTest.java b/src/test/java/com/android/tools/r8/shaking/assumenosideeffects/AssumenosideeffectsPropagationTest.java
index 5d95ca0..9f5eed2 100644
--- a/src/test/java/com/android/tools/r8/shaking/assumenosideeffects/AssumenosideeffectsPropagationTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/assumenosideeffects/AssumenosideeffectsPropagationTest.java
@@ -154,7 +154,7 @@
options.horizontalClassMergerOptions().enableIf(enableHorizontalClassMerging))
.enableInliningAnnotations()
.addDontObfuscate()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), MAIN)
.assertSuccessWithOutput(config.expectedOutput(enableHorizontalClassMerging));
}
diff --git a/src/test/java/com/android/tools/r8/shaking/assumenosideeffects/AssumenosideeffectsPropagationWithSuperCallTest.java b/src/test/java/com/android/tools/r8/shaking/assumenosideeffects/AssumenosideeffectsPropagationWithSuperCallTest.java
index a97890a..7dec9de 100644
--- a/src/test/java/com/android/tools/r8/shaking/assumenosideeffects/AssumenosideeffectsPropagationWithSuperCallTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/assumenosideeffects/AssumenosideeffectsPropagationWithSuperCallTest.java
@@ -77,7 +77,7 @@
.addKeepMainRule(MAIN)
.addKeepRules(config.getKeepRules())
.addDontObfuscate()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), MAIN)
.assertSuccessWithOutput(config.expectedOutput(parameters));
}
diff --git a/src/test/java/com/android/tools/r8/shaking/assumenosideeffects/AssumenosideeffectsVisibleMethodsTest.java b/src/test/java/com/android/tools/r8/shaking/assumenosideeffects/AssumenosideeffectsVisibleMethodsTest.java
index 003000c..05fa461 100644
--- a/src/test/java/com/android/tools/r8/shaking/assumenosideeffects/AssumenosideeffectsVisibleMethodsTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/assumenosideeffects/AssumenosideeffectsVisibleMethodsTest.java
@@ -161,7 +161,7 @@
.enableNoVerticalClassMergingAnnotations()
.enableNeverClassInliningAnnotations()
.enableInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.addRunClasspathFiles(parameters.isDexRuntime() ? libDexPath : libJarPath)
.run(parameters.getRuntime(), MAIN)
diff --git a/src/test/java/com/android/tools/r8/shaking/assumenosideeffects/B152492625.java b/src/test/java/com/android/tools/r8/shaking/assumenosideeffects/B152492625.java
index 1baeed5..da1e4f1 100644
--- a/src/test/java/com/android/tools/r8/shaking/assumenosideeffects/B152492625.java
+++ b/src/test/java/com/android/tools/r8/shaking/assumenosideeffects/B152492625.java
@@ -112,7 +112,7 @@
.addKeepMainRule(TestClass.class)
.applyIf(dontWarnObject, tb -> tb.addDontWarn(Object.class))
.addKeepRules("-assumenosideeffects class " + B.class.getTypeName() + " { *; }")
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.allowDiagnosticWarningMessages(!dontWarnObject)
.compileWithExpectedDiagnostics(
diagnostics -> assertErrorsOrWarnings(diagnostics, matchers))
@@ -167,7 +167,7 @@
b ->
b.getBuilder()
.addProguardConfiguration(ImmutableList.of(methodsRule), methodsRuleOrigin))
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.allowDiagnosticWarningMessages(!dontWarnObject)
.compileWithExpectedDiagnostics(
diagnostics -> assertErrorsOrWarnings(diagnostics, matchers))
@@ -183,7 +183,7 @@
.addKeepMainRule(TestClass.class)
.applyIf(dontWarnObject, tb -> tb.addDontWarn(Object.class))
.addKeepRules("-assumenosideeffects class " + B.class.getTypeName() + " { hash*(); }")
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutputLines("Hello, world");
@@ -200,7 +200,7 @@
.addKeepMainRule(TestClass.class)
.applyIf(dontWarnObject, tb -> tb.addDontWarn(Object.class))
.addKeepRules("-assumenosideeffects class " + B.class.getTypeName() + " { <methods>; }")
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.allowDiagnosticWarningMessages(!dontWarnObject)
.compileWithExpectedDiagnostics(
diagnostics -> assertErrorsOrWarnings(diagnostics, matchers))
@@ -219,7 +219,7 @@
.addKeepMainRule(TestClass.class)
.applyIf(dontWarnObject, tb -> tb.addDontWarn(Object.class))
.addKeepRules("-assumenosideeffects class " + B.class.getTypeName() + " { *** w*(...); }")
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.allowDiagnosticWarningMessages(!dontWarnObject)
.compileWithExpectedDiagnostics(
diagnostics -> assertErrorsOrWarnings(diagnostics, matchers))
@@ -238,7 +238,7 @@
.addProgramClasses(TestClass.class, B.class)
.addKeepMainRule(TestClass.class)
.addKeepRules("-assumenosideeffects class java.lang.Object { void wait(); }")
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.allowDiagnosticWarningMessages()
.compileWithExpectedDiagnostics(
diagnostics -> assertErrorsOrWarnings(diagnostics, matchers))
@@ -256,7 +256,7 @@
.addKeepRules(
"-if class " + TestClass.class.getTypeName(),
" -assumenosideeffects class " + B.class.getTypeName() + " { *; }")
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compileWithExpectedDiagnostics(
diagnostics -> {
diagnostics.assertOnlyErrors();
@@ -280,7 +280,7 @@
.addKeepMainRule(TestClass.class)
.addKeepRules("-assumenosideeffects class " + B.class.getTypeName() + " { *; }")
.addDontWarn(B152492625.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutputLines("Hello, world");
@@ -296,7 +296,7 @@
.addKeepMainRule(TestClass.class)
.addKeepRules("-assumenosideeffects class java.lang.Object { void wait(); }")
.addDontWarn(B152492625.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(inspector -> checkIfWaitIsInvokedFromMain(inspector, false))
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/shaking/assumenosideeffects/B157688676.java b/src/test/java/com/android/tools/r8/shaking/assumenosideeffects/B157688676.java
index 85be324..06c262f 100644
--- a/src/test/java/com/android/tools/r8/shaking/assumenosideeffects/B157688676.java
+++ b/src/test/java/com/android/tools/r8/shaking/assumenosideeffects/B157688676.java
@@ -33,7 +33,7 @@
.addProgramClasses(TestClass.class)
.addKeepMainRule(TestClass.class)
.enableAssumeNoSideEffectsAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithEmptyOutput();
diff --git a/src/test/java/com/android/tools/r8/shaking/assumenosideeffects/NullableReturnAfterNonNullableReturnTest.java b/src/test/java/com/android/tools/r8/shaking/assumenosideeffects/NullableReturnAfterNonNullableReturnTest.java
index e9b4f9f..3cb1957 100644
--- a/src/test/java/com/android/tools/r8/shaking/assumenosideeffects/NullableReturnAfterNonNullableReturnTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/assumenosideeffects/NullableReturnAfterNonNullableReturnTest.java
@@ -36,7 +36,7 @@
.enableAssumeNoSideEffectsAnnotations()
.enableInliningAnnotations()
.enableReprocessMethodAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile();
}
diff --git a/src/test/java/com/android/tools/r8/shaking/assumenosideeffects/StringBuildersAfterAssumenosideeffectsTest.java b/src/test/java/com/android/tools/r8/shaking/assumenosideeffects/StringBuildersAfterAssumenosideeffectsTest.java
index ca28f14..505d2f2 100644
--- a/src/test/java/com/android/tools/r8/shaking/assumenosideeffects/StringBuildersAfterAssumenosideeffectsTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/assumenosideeffects/StringBuildersAfterAssumenosideeffectsTest.java
@@ -51,7 +51,7 @@
" void info(...);",
"}")
.addDontObfuscate()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), MAIN)
.assertSuccessWithOutput(EXPECTED)
.inspect(this::inspect);
diff --git a/src/test/java/com/android/tools/r8/shaking/assumevalues/AssumeReturnsFieldWithSubtypingTest.java b/src/test/java/com/android/tools/r8/shaking/assumevalues/AssumeReturnsFieldWithSubtypingTest.java
index 63ea0c7..1912956 100644
--- a/src/test/java/com/android/tools/r8/shaking/assumevalues/AssumeReturnsFieldWithSubtypingTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/assumevalues/AssumeReturnsFieldWithSubtypingTest.java
@@ -37,7 +37,7 @@
"-keepclassmembers,allowobfuscation class " + Main.class.getTypeName() + "{",
" java.lang.String greeting;",
"}")
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("Hello world!");
diff --git a/src/test/java/com/android/tools/r8/shaking/assumevalues/AssumeValuesForConstantValuedFieldTest.java b/src/test/java/com/android/tools/r8/shaking/assumevalues/AssumeValuesForConstantValuedFieldTest.java
index 0c6c8b8..18287f0 100644
--- a/src/test/java/com/android/tools/r8/shaking/assumevalues/AssumeValuesForConstantValuedFieldTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/assumevalues/AssumeValuesForConstantValuedFieldTest.java
@@ -32,7 +32,7 @@
.addInnerClasses(AssumeValuesForConstantValuedFieldTest.class)
.addKeepMainRule(TestClass.class)
.addKeepRules("-assumevalues class * { static boolean field return false; }")
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutputLines(
diff --git a/src/test/java/com/android/tools/r8/shaking/assumevalues/AssumeValuesForLibraryMethodTest.java b/src/test/java/com/android/tools/r8/shaking/assumevalues/AssumeValuesForLibraryMethodTest.java
index 852409f..0f9c204 100644
--- a/src/test/java/com/android/tools/r8/shaking/assumevalues/AssumeValuesForLibraryMethodTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/assumevalues/AssumeValuesForLibraryMethodTest.java
@@ -38,7 +38,7 @@
.addProgramClasses(TestClass.class)
.addKeepMainRule(TestClass.class)
.addKeepRules("-assumevalues class java.util.ArrayList { int hashCode() return 42; }")
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector -> {
diff --git a/src/test/java/com/android/tools/r8/shaking/assumevalues/AssumeValuesMaterializeFieldReadTest.java b/src/test/java/com/android/tools/r8/shaking/assumevalues/AssumeValuesMaterializeFieldReadTest.java
index 31930b0..da3c5de 100644
--- a/src/test/java/com/android/tools/r8/shaking/assumevalues/AssumeValuesMaterializeFieldReadTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/assumevalues/AssumeValuesMaterializeFieldReadTest.java
@@ -42,7 +42,7 @@
" static java.lang.Object get() return " + Main.class.getTypeName() + ".field;",
"}")
.enableInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector -> {
diff --git a/src/test/java/com/android/tools/r8/shaking/attributes/KeepAttributesTest.java b/src/test/java/com/android/tools/r8/shaking/attributes/KeepAttributesTest.java
index 82bcb21..8c65d0e 100644
--- a/src/test/java/com/android/tools/r8/shaking/attributes/KeepAttributesTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/attributes/KeepAttributesTest.java
@@ -118,7 +118,7 @@
.addKeepAllClassesRule()
.addKeepRules(keepRules)
.enableSideEffectAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), CLASS)
.inspector()
.clazz(CLASS)
diff --git a/src/test/java/com/android/tools/r8/shaking/attributes/KeepEnclosingMethodForKeptMethodTest.java b/src/test/java/com/android/tools/r8/shaking/attributes/KeepEnclosingMethodForKeptMethodTest.java
index d2e5d79..9a66258 100644
--- a/src/test/java/com/android/tools/r8/shaking/attributes/KeepEnclosingMethodForKeptMethodTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/attributes/KeepEnclosingMethodForKeptMethodTest.java
@@ -71,7 +71,7 @@
.addKeepAttributeInnerClassesAndEnclosingMethod()
.addKeepMainRule(KeptClass.class)
.addKeepClassAndMembersRules(KeptClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), KeptClass.class);
}
diff --git a/src/test/java/com/android/tools/r8/shaking/attributes/KeepInnerClassesEnclosingMethodAnnotationsTest.java b/src/test/java/com/android/tools/r8/shaking/attributes/KeepInnerClassesEnclosingMethodAnnotationsTest.java
index 6c7c774..b25babb 100644
--- a/src/test/java/com/android/tools/r8/shaking/attributes/KeepInnerClassesEnclosingMethodAnnotationsTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/attributes/KeepInnerClassesEnclosingMethodAnnotationsTest.java
@@ -67,7 +67,7 @@
(isCompat ? testForR8Compat(parameters.getBackend()) : testForR8(parameters.getBackend()))
.addProgramClassesAndInnerClasses(Outer.class)
.addProgramClasses(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepRules(proguardConfiguration)
.run(parameters.getRuntime(), Main.class));
}
diff --git a/src/test/java/com/android/tools/r8/shaking/attributes/KeepSignatureTest.java b/src/test/java/com/android/tools/r8/shaking/attributes/KeepSignatureTest.java
index 2d2160b..d79c473 100644
--- a/src/test/java/com/android/tools/r8/shaking/attributes/KeepSignatureTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/attributes/KeepSignatureTest.java
@@ -81,7 +81,7 @@
ProguardKeepAttributes.SIGNATURE,
ProguardKeepAttributes.INNER_CLASSES,
ProguardKeepAttributes.ENCLOSING_METHOD)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.enableConstantArgumentAnnotations()
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
diff --git a/src/test/java/com/android/tools/r8/shaking/b113138046/NativeMethodTest.java b/src/test/java/com/android/tools/r8/shaking/b113138046/NativeMethodTest.java
index 9d35176..41ea956 100644
--- a/src/test/java/com/android/tools/r8/shaking/b113138046/NativeMethodTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/b113138046/NativeMethodTest.java
@@ -45,7 +45,7 @@
private void test(List<String> config, boolean expectedFooPresence) throws Exception {
R8TestCompileResult compileResult =
(compatMode ? testForR8Compat(parameters.getBackend()) : testForR8(parameters.getBackend()))
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addProgramClassesAndInnerClasses(Keep.class, Data.class, Handler.class, Outer.class)
.addKeepRules(config)
.addOptionsModification(options -> options.inlinerOptions().enableInlining = false)
diff --git a/src/test/java/com/android/tools/r8/shaking/b134858535/EventPublisherTest.java b/src/test/java/com/android/tools/r8/shaking/b134858535/EventPublisherTest.java
index 422ec12..8650770 100644
--- a/src/test/java/com/android/tools/r8/shaking/b134858535/EventPublisherTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/b134858535/EventPublisherTest.java
@@ -51,7 +51,7 @@
.addProgramFiles(kotlinTestParameters.getCompiler().getKotlinStdlibJar())
.addKeepClassRules(Interface.class)
.addKeepMainRule(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addHorizontallyMergedClassesInspector(
inspector -> inspector.assertClassesNotMerged(EventPublisher$b.class))
.compile();
diff --git a/src/test/java/com/android/tools/r8/shaking/b136195382/AbstractBridgeInheritTest.java b/src/test/java/com/android/tools/r8/shaking/b136195382/AbstractBridgeInheritTest.java
index 58faf90..2df32bc 100644
--- a/src/test/java/com/android/tools/r8/shaking/b136195382/AbstractBridgeInheritTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/b136195382/AbstractBridgeInheritTest.java
@@ -38,7 +38,7 @@
Service.class, Factory.class, SubService.class, SubFactory.class, Main.class)
.addKeepMainRule(Main.class)
.enableInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("Hello World!");
}
diff --git a/src/test/java/com/android/tools/r8/shaking/b136698023/LibraryBridgeTest.java b/src/test/java/com/android/tools/r8/shaking/b136698023/LibraryBridgeTest.java
index 45286b6..a53b095 100644
--- a/src/test/java/com/android/tools/r8/shaking/b136698023/LibraryBridgeTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/b136698023/LibraryBridgeTest.java
@@ -102,7 +102,7 @@
.addKeepClassAndMembersRules(ICloneable.class)
.addKeepMainRule(MainWithOrdinaryClone.class)
.addDontObfuscate()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), MainWithOrdinaryClone.class)
.assertSuccessWithOutputThatMatches(containsString(BaseOrdinaryClone.class.getTypeName()));
}
@@ -115,7 +115,7 @@
.addKeepClassAndMembersRules(XCloneable.class, Base.class)
.addKeepMainRule(Main.class)
.addDontObfuscate()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputThatMatches(containsString(Model.class.getTypeName()));
}
@@ -128,7 +128,7 @@
.addKeepClassAndMembersRules(XCloneable.class, Base.class)
.addKeepMainRule(MainImpl.class)
.addDontObfuscate()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), MainImpl.class)
.assertSuccessWithOutputThatMatches(containsString(Model.class.getTypeName()));
}
@@ -140,7 +140,7 @@
testForR8(parameters.getBackend())
.addProgramClasses(Base.class)
.addKeepAllClassesRule()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile();
testForR8(parameters.getBackend())
.addProgramClasses(XCloneable.class, Model.class, Main.class)
@@ -148,7 +148,7 @@
.addDefaultRuntimeLibrary(parameters)
.addKeepClassAndMembersRules(XCloneable.class)
.addKeepMainRule(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addDontObfuscate()
.compile()
.addRunClasspathFiles(library.writeToZip())
diff --git a/src/test/java/com/android/tools/r8/shaking/b169045091/B169045091.java b/src/test/java/com/android/tools/r8/shaking/b169045091/B169045091.java
index fdec859..4ae9413 100644
--- a/src/test/java/com/android/tools/r8/shaking/b169045091/B169045091.java
+++ b/src/test/java/com/android/tools/r8/shaking/b169045091/B169045091.java
@@ -58,7 +58,7 @@
.enableNeverClassInliningAnnotations()
.enableInliningAnnotations()
.enableNoVerticalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addDontObfuscate()
.compile()
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/shaking/clinit/ClassInitInlineForGetterTest.java b/src/test/java/com/android/tools/r8/shaking/clinit/ClassInitInlineForGetterTest.java
index be07a10..0e3f560 100644
--- a/src/test/java/com/android/tools/r8/shaking/clinit/ClassInitInlineForGetterTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/clinit/ClassInitInlineForGetterTest.java
@@ -39,7 +39,7 @@
public void testR8() throws Exception {
testForR8(parameters.getBackend())
.addInnerClasses(getClass())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(Main.class)
.addKeepRules("-keep class " + typeName(B.class) + " { <fields>; }")
.enableInliningAnnotations()
diff --git a/src/test/java/com/android/tools/r8/shaking/clinit/ClassInitInlineForStaticGetterInSuperTypeTest.java b/src/test/java/com/android/tools/r8/shaking/clinit/ClassInitInlineForStaticGetterInSuperTypeTest.java
index ae433d9..8542b75 100644
--- a/src/test/java/com/android/tools/r8/shaking/clinit/ClassInitInlineForStaticGetterInSuperTypeTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/clinit/ClassInitInlineForStaticGetterInSuperTypeTest.java
@@ -38,7 +38,7 @@
public void testR8() throws Exception {
testForR8(parameters.getBackend())
.addInnerClasses(getClass())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(Main.class)
.addKeepRules("-keep class " + typeName(B.class) + " { <fields>; }")
.enableInliningAnnotations()
diff --git a/src/test/java/com/android/tools/r8/shaking/clinit/ClassInitializationTriggersIndirectInterfaceInitializationTest.java b/src/test/java/com/android/tools/r8/shaking/clinit/ClassInitializationTriggersIndirectInterfaceInitializationTest.java
index 1c7492d..6581f18 100644
--- a/src/test/java/com/android/tools/r8/shaking/clinit/ClassInitializationTriggersIndirectInterfaceInitializationTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/clinit/ClassInitializationTriggersIndirectInterfaceInitializationTest.java
@@ -45,7 +45,7 @@
.enableNoHorizontalClassMergingAnnotations()
.enableNoUnusedInterfaceRemovalAnnotations()
.enableNoVerticalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector -> {
diff --git a/src/test/java/com/android/tools/r8/shaking/clinit/ClassInitializedByClassForNameTest.java b/src/test/java/com/android/tools/r8/shaking/clinit/ClassInitializedByClassForNameTest.java
index 169bfa5..02228f8 100644
--- a/src/test/java/com/android/tools/r8/shaking/clinit/ClassInitializedByClassForNameTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/clinit/ClassInitializedByClassForNameTest.java
@@ -36,7 +36,7 @@
testForR8(parameters.getBackend())
.addInnerClasses(ClassInitializedByClassForNameTest.class)
.addKeepMainRule(TestClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/shaking/clinit/ClassInitializedByInvokeStaticTest.java b/src/test/java/com/android/tools/r8/shaking/clinit/ClassInitializedByInvokeStaticTest.java
index 8036f2f..be1d320 100644
--- a/src/test/java/com/android/tools/r8/shaking/clinit/ClassInitializedByInvokeStaticTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/clinit/ClassInitializedByInvokeStaticTest.java
@@ -36,7 +36,7 @@
testForR8(parameters.getBackend())
.addInnerClasses(ClassInitializedByInvokeStaticTest.class)
.addKeepMainRule(TestClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/shaking/clinit/ClassInitializedByKeepRuleTest.java b/src/test/java/com/android/tools/r8/shaking/clinit/ClassInitializedByKeepRuleTest.java
index 2e31c07..37abbb1 100644
--- a/src/test/java/com/android/tools/r8/shaking/clinit/ClassInitializedByKeepRuleTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/clinit/ClassInitializedByKeepRuleTest.java
@@ -36,7 +36,7 @@
testForR8(parameters.getBackend())
.addInnerClasses(ClassInitializedByKeepRuleTest.class)
.addKeepClassRules(TestClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect);
}
diff --git a/src/test/java/com/android/tools/r8/shaking/clinit/ClassInitializedByNewInstanceTest.java b/src/test/java/com/android/tools/r8/shaking/clinit/ClassInitializedByNewInstanceTest.java
index 2349839..ccc3c06 100644
--- a/src/test/java/com/android/tools/r8/shaking/clinit/ClassInitializedByNewInstanceTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/clinit/ClassInitializedByNewInstanceTest.java
@@ -36,7 +36,7 @@
testForR8(parameters.getBackend())
.addInnerClasses(ClassInitializedByNewInstanceTest.class)
.addKeepMainRule(TestClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/shaking/clinit/ClassInitializedByStaticGetTest.java b/src/test/java/com/android/tools/r8/shaking/clinit/ClassInitializedByStaticGetTest.java
index 9501a21..5fd51d5 100644
--- a/src/test/java/com/android/tools/r8/shaking/clinit/ClassInitializedByStaticGetTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/clinit/ClassInitializedByStaticGetTest.java
@@ -36,7 +36,7 @@
testForR8(parameters.getBackend())
.addInnerClasses(ClassInitializedByStaticGetTest.class)
.addKeepMainRule(TestClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/shaking/clinit/ClassNotInitializedByCheckCastTest.java b/src/test/java/com/android/tools/r8/shaking/clinit/ClassNotInitializedByCheckCastTest.java
index 484526f..e07d83f 100644
--- a/src/test/java/com/android/tools/r8/shaking/clinit/ClassNotInitializedByCheckCastTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/clinit/ClassNotInitializedByCheckCastTest.java
@@ -35,7 +35,7 @@
testForR8(parameters.getBackend())
.addInnerClasses(ClassNotInitializedByCheckCastTest.class)
.addKeepMainRule(TestClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/shaking/clinit/ClassNotInitializedByConstClassTest.java b/src/test/java/com/android/tools/r8/shaking/clinit/ClassNotInitializedByConstClassTest.java
index f40cc94..0c5686d 100644
--- a/src/test/java/com/android/tools/r8/shaking/clinit/ClassNotInitializedByConstClassTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/clinit/ClassNotInitializedByConstClassTest.java
@@ -39,7 +39,7 @@
testForR8(parameters.getBackend())
.addInnerClasses(ClassNotInitializedByConstClassTest.class)
.addKeepMainRule(TestClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), TestClass.class);
// Check that A.<clinit>() is removed.
diff --git a/src/test/java/com/android/tools/r8/shaking/clinit/ClassNotInitializedByInstanceOfTest.java b/src/test/java/com/android/tools/r8/shaking/clinit/ClassNotInitializedByInstanceOfTest.java
index cc64abf..061ea28 100644
--- a/src/test/java/com/android/tools/r8/shaking/clinit/ClassNotInitializedByInstanceOfTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/clinit/ClassNotInitializedByInstanceOfTest.java
@@ -39,7 +39,7 @@
.addKeepMainRule(TestClass.class)
.addOptionsModification(
options -> options.testing.enableCheckCastAndInstanceOfRemoval = false)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/shaking/clinit/InterfaceInitializedByImplementationTest.java b/src/test/java/com/android/tools/r8/shaking/clinit/InterfaceInitializedByImplementationTest.java
index eecee11..0040528 100644
--- a/src/test/java/com/android/tools/r8/shaking/clinit/InterfaceInitializedByImplementationTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/clinit/InterfaceInitializedByImplementationTest.java
@@ -45,7 +45,7 @@
.addKeepMainRule(TestClass.class)
.enableInliningAnnotations()
.enableNoMethodStaticizingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addDontObfuscate()
.compile()
.inspect(this::inspect)
diff --git a/src/test/java/com/android/tools/r8/shaking/clinit/InterfaceInitializedByInvokeStaticOnSubInterfaceTest.java b/src/test/java/com/android/tools/r8/shaking/clinit/InterfaceInitializedByInvokeStaticOnSubInterfaceTest.java
index fca1942..1177193 100644
--- a/src/test/java/com/android/tools/r8/shaking/clinit/InterfaceInitializedByInvokeStaticOnSubInterfaceTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/clinit/InterfaceInitializedByInvokeStaticOnSubInterfaceTest.java
@@ -45,7 +45,7 @@
.addInnerClasses(getClass())
.addKeepMainRule(TestClass.class)
.allowStdoutMessages()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutputLines("J");
diff --git a/src/test/java/com/android/tools/r8/shaking/clinit/InterfaceInitializedByInvokeStaticTest.java b/src/test/java/com/android/tools/r8/shaking/clinit/InterfaceInitializedByInvokeStaticTest.java
index 08df00b..3613950 100644
--- a/src/test/java/com/android/tools/r8/shaking/clinit/InterfaceInitializedByInvokeStaticTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/clinit/InterfaceInitializedByInvokeStaticTest.java
@@ -45,7 +45,7 @@
.addInnerClasses(getClass())
.addKeepMainRule(TestClass.class)
.allowStdoutMessages()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutputLines("I", "J");
diff --git a/src/test/java/com/android/tools/r8/shaking/clinit/InterfaceInitializedByStaticGetOnSubClassTest.java b/src/test/java/com/android/tools/r8/shaking/clinit/InterfaceInitializedByStaticGetOnSubClassTest.java
index ec1018f..12dc078 100644
--- a/src/test/java/com/android/tools/r8/shaking/clinit/InterfaceInitializedByStaticGetOnSubClassTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/clinit/InterfaceInitializedByStaticGetOnSubClassTest.java
@@ -35,7 +35,7 @@
assumeTrue(parameters.isDexRuntime());
testForD8()
.addInnerClasses(getClass())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutputLines("A");
@@ -47,7 +47,7 @@
.addInnerClasses(getClass())
.addKeepMainRule(TestClass.class)
.allowStdoutMessages()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutputLines("A");
diff --git a/src/test/java/com/android/tools/r8/shaking/clinit/InterfaceInitializedByStaticGetOnSubInterfaceTest.java b/src/test/java/com/android/tools/r8/shaking/clinit/InterfaceInitializedByStaticGetOnSubInterfaceTest.java
index 15b7662..b123d58 100644
--- a/src/test/java/com/android/tools/r8/shaking/clinit/InterfaceInitializedByStaticGetOnSubInterfaceTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/clinit/InterfaceInitializedByStaticGetOnSubInterfaceTest.java
@@ -35,7 +35,7 @@
assumeTrue(parameters.isDexRuntime());
testForD8()
.addInnerClasses(getClass())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutputLines("J");
@@ -47,7 +47,7 @@
.addInnerClasses(getClass())
.addKeepMainRule(TestClass.class)
.allowStdoutMessages()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutputLines("J");
diff --git a/src/test/java/com/android/tools/r8/shaking/clinit/InterfaceInitializedByStaticGetTest.java b/src/test/java/com/android/tools/r8/shaking/clinit/InterfaceInitializedByStaticGetTest.java
index 65b4bcb..f43cbc0 100644
--- a/src/test/java/com/android/tools/r8/shaking/clinit/InterfaceInitializedByStaticGetTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/clinit/InterfaceInitializedByStaticGetTest.java
@@ -35,7 +35,7 @@
assumeTrue(parameters.isDexRuntime());
testForD8()
.addInnerClasses(getClass())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutputLines("I");
@@ -47,7 +47,7 @@
.addInnerClasses(getClass())
.addKeepMainRule(TestClass.class)
.allowStdoutMessages()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutputLines("I");
diff --git a/src/test/java/com/android/tools/r8/shaking/clinit/InterfaceNotInitializedByInvokeStaticOnSubClassTest.java b/src/test/java/com/android/tools/r8/shaking/clinit/InterfaceNotInitializedByInvokeStaticOnSubClassTest.java
index d73e875..e3dcdff 100644
--- a/src/test/java/com/android/tools/r8/shaking/clinit/InterfaceNotInitializedByInvokeStaticOnSubClassTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/clinit/InterfaceNotInitializedByInvokeStaticOnSubClassTest.java
@@ -36,7 +36,7 @@
assumeTrue(parameters.isDexRuntime());
testForD8()
.addInnerClasses(getClass())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithEmptyOutput();
@@ -48,7 +48,7 @@
.addInnerClasses(getClass())
.addKeepMainRule(TestClass.class)
.allowStdoutMessages()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(inspector -> assertEquals(1, inspector.allClasses().size()))
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/shaking/clinit/InterfaceWithDefaultMethodInitializedByInvokeStaticOnSubClassTest.java b/src/test/java/com/android/tools/r8/shaking/clinit/InterfaceWithDefaultMethodInitializedByInvokeStaticOnSubClassTest.java
index 18ce5f2..d4c1c3b 100644
--- a/src/test/java/com/android/tools/r8/shaking/clinit/InterfaceWithDefaultMethodInitializedByInvokeStaticOnSubClassTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/clinit/InterfaceWithDefaultMethodInitializedByInvokeStaticOnSubClassTest.java
@@ -36,7 +36,7 @@
assumeTrue(parameters.isDexRuntime());
testForD8()
.addInnerClasses(getClass())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), TestClass.class)
.apply(
@@ -60,7 +60,7 @@
.addInnerClasses(getClass())
.addKeepMainRule(TestClass.class)
.allowStdoutMessages()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), TestClass.class)
// TODO(b/144266257): This should succeed with "I" when default interface methods are
diff --git a/src/test/java/com/android/tools/r8/shaking/clinit/InterfaceWithDefaultMethodInitializedByInvokeStaticOnSubInterfaceTest.java b/src/test/java/com/android/tools/r8/shaking/clinit/InterfaceWithDefaultMethodInitializedByInvokeStaticOnSubInterfaceTest.java
index edcfaf0..7ae4305 100644
--- a/src/test/java/com/android/tools/r8/shaking/clinit/InterfaceWithDefaultMethodInitializedByInvokeStaticOnSubInterfaceTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/clinit/InterfaceWithDefaultMethodInitializedByInvokeStaticOnSubInterfaceTest.java
@@ -36,7 +36,7 @@
assumeTrue(parameters.isDexRuntime());
testForD8()
.addInnerClasses(getClass())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithEmptyOutput();
@@ -48,7 +48,7 @@
.addInnerClasses(getClass())
.addKeepMainRule(TestClass.class)
.allowStdoutMessages()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithEmptyOutput();
diff --git a/src/test/java/com/android/tools/r8/shaking/clinit/InterfaceWithDefaultMethodInitializedByStaticGetOnSubClassTest.java b/src/test/java/com/android/tools/r8/shaking/clinit/InterfaceWithDefaultMethodInitializedByStaticGetOnSubClassTest.java
index 96f64f8..9f6e0c8 100644
--- a/src/test/java/com/android/tools/r8/shaking/clinit/InterfaceWithDefaultMethodInitializedByStaticGetOnSubClassTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/clinit/InterfaceWithDefaultMethodInitializedByStaticGetOnSubClassTest.java
@@ -35,7 +35,7 @@
assumeTrue(parameters.isDexRuntime());
testForD8()
.addInnerClasses(getClass())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), TestClass.class)
.apply(
@@ -59,7 +59,7 @@
.addInnerClasses(getClass())
.addKeepMainRule(TestClass.class)
.allowStdoutMessages()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), TestClass.class)
// TODO(b/144266257): This should succeed with "I\nA" when default interface methods are
diff --git a/src/test/java/com/android/tools/r8/shaking/clinit/InterfaceWithDefaultMethodInitializedByStaticGetOnSubInterfaceTest.java b/src/test/java/com/android/tools/r8/shaking/clinit/InterfaceWithDefaultMethodInitializedByStaticGetOnSubInterfaceTest.java
index a751dc3..6413582 100644
--- a/src/test/java/com/android/tools/r8/shaking/clinit/InterfaceWithDefaultMethodInitializedByStaticGetOnSubInterfaceTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/clinit/InterfaceWithDefaultMethodInitializedByStaticGetOnSubInterfaceTest.java
@@ -36,7 +36,7 @@
assumeTrue(parameters.isDexRuntime());
testForD8()
.addInnerClasses(getClass())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutputLines("J");
@@ -48,7 +48,7 @@
.addInnerClasses(getClass())
.addKeepMainRule(TestClass.class)
.allowStdoutMessages()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutputLines("J");
diff --git a/src/test/java/com/android/tools/r8/shaking/clinit/InterfaceWithDefaultMethodNotInitializedByInvokeStaticOnSubInterfaceTest.java b/src/test/java/com/android/tools/r8/shaking/clinit/InterfaceWithDefaultMethodNotInitializedByInvokeStaticOnSubInterfaceTest.java
index 4bb1e9c..c5dfe9e 100644
--- a/src/test/java/com/android/tools/r8/shaking/clinit/InterfaceWithDefaultMethodNotInitializedByInvokeStaticOnSubInterfaceTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/clinit/InterfaceWithDefaultMethodNotInitializedByInvokeStaticOnSubInterfaceTest.java
@@ -37,7 +37,7 @@
assumeTrue(parameters.isDexRuntime());
testForD8()
.addInnerClasses(getClass())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithEmptyOutput();
@@ -49,7 +49,7 @@
.addInnerClasses(getClass())
.addKeepMainRule(TestClass.class)
.allowStdoutMessages()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(inspector -> assertEquals(1, inspector.allClasses().size()))
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/shaking/convertchecknotnull/ConvertCheckNotNullTest.java b/src/test/java/com/android/tools/r8/shaking/convertchecknotnull/ConvertCheckNotNullTest.java
index 5b2bd38..b1ad9de 100644
--- a/src/test/java/com/android/tools/r8/shaking/convertchecknotnull/ConvertCheckNotNullTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/convertchecknotnull/ConvertCheckNotNullTest.java
@@ -55,7 +55,7 @@
" ** requireNonNull(**, ...);",
"}")
.enableExperimentalConvertCheckNotNull()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector -> {
diff --git a/src/test/java/com/android/tools/r8/shaking/defaultmethods/DefaultMethodsTest.java b/src/test/java/com/android/tools/r8/shaking/defaultmethods/DefaultMethodsTest.java
index ae783ee..edc8bce 100644
--- a/src/test/java/com/android/tools/r8/shaking/defaultmethods/DefaultMethodsTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/defaultmethods/DefaultMethodsTest.java
@@ -48,7 +48,7 @@
ClassImplementingInterface.class,
OtherClassImplementingInterface.class,
TestClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(TestClass.class)
.addKeepRules(additionalKeepRules)
.addDontObfuscate()
diff --git a/src/test/java/com/android/tools/r8/shaking/definitelynull/DefinitelyNullTest.java b/src/test/java/com/android/tools/r8/shaking/definitelynull/DefinitelyNullTest.java
index 8431fcb..e762fb8 100644
--- a/src/test/java/com/android/tools/r8/shaking/definitelynull/DefinitelyNullTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/definitelynull/DefinitelyNullTest.java
@@ -41,18 +41,14 @@
if (parameters.isCfRuntime()) {
writeClassesToJar(classpath, Collections.singletonList(A.class));
} else {
- testForD8()
- .setMinApi(parameters.getApiLevel())
- .addProgramClasses(A.class)
- .compile()
- .writeToZip(classpath);
+ testForD8().setMinApi(parameters).addProgramClasses(A.class).compile().writeToZip(classpath);
}
testForR8(parameters.getBackend())
// Disable minification so that A still refers to A given on the classpath below.
.addDontObfuscate()
.addProgramClasses(TestClass.class, A.class)
.addKeepMainRule(TestClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
// Prepend the full definition of class A since the compiler will have mostly eliminated it.
.addRunClasspathFiles(classpath)
diff --git a/src/test/java/com/android/tools/r8/shaking/desugar/KeepRuleWarningTest.java b/src/test/java/com/android/tools/r8/shaking/desugar/KeepRuleWarningTest.java
index 02dfda4..269e3f4 100644
--- a/src/test/java/com/android/tools/r8/shaking/desugar/KeepRuleWarningTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/desugar/KeepRuleWarningTest.java
@@ -58,7 +58,7 @@
public void test_allMethods() throws Exception {
testForR8(parameters.getBackend())
.addProgramClasses(I.class, C.class, MAIN)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.enableNoVerticalClassMergingAnnotations()
.addKeepMainRule(MAIN)
.addKeepRules("-keep interface **.I { <methods>; }")
@@ -72,7 +72,7 @@
public void test_asterisk() throws Exception {
testForR8(parameters.getBackend())
.addProgramClasses(I.class, C.class, MAIN)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.enableNoVerticalClassMergingAnnotations()
.addKeepMainRule(MAIN)
.addKeepRules("-keep interface **.I { *(); }")
@@ -86,7 +86,7 @@
public void test_stillNotSpecific() throws Exception {
testForR8(parameters.getBackend())
.addProgramClasses(I.class, C.class, MAIN)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.enableNoVerticalClassMergingAnnotations()
.addKeepMainRule(MAIN)
.addKeepRules("-keep interface **.I { *** f*(); }")
@@ -100,7 +100,7 @@
public void test_specific() throws Exception {
testForR8(parameters.getBackend())
.addProgramClasses(I.class, C.class, MAIN)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.enableNoVerticalClassMergingAnnotations()
.addKeepMainRule(MAIN)
.addKeepRules("-keep interface **.I { static void foo(); }")
diff --git a/src/test/java/com/android/tools/r8/shaking/desugar/interfacemethods/BridgeInliningTest.java b/src/test/java/com/android/tools/r8/shaking/desugar/interfacemethods/BridgeInliningTest.java
index e1fab88..a32cc56 100644
--- a/src/test/java/com/android/tools/r8/shaking/desugar/interfacemethods/BridgeInliningTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/desugar/interfacemethods/BridgeInliningTest.java
@@ -43,7 +43,7 @@
.addKeepMainRule(Main.class)
.addKeepRules("-keep interface " + I.class.getTypeName() + " { m(); }")
.enableNoVerticalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("I::m")
.inspect(this::inspect);
diff --git a/src/test/java/com/android/tools/r8/shaking/enums/EnumArrayInAnnotationTest.java b/src/test/java/com/android/tools/r8/shaking/enums/EnumArrayInAnnotationTest.java
index 8e63f60..1f750c0 100644
--- a/src/test/java/com/android/tools/r8/shaking/enums/EnumArrayInAnnotationTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/enums/EnumArrayInAnnotationTest.java
@@ -108,7 +108,7 @@
// Do nothing for DEX.
assertTrue(useGenericEnumsRule); // Check not running twice.
})
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepRuntimeVisibleAnnotations()
.run(parameters.getRuntime(), Main.class)
.inspect(
@@ -133,7 +133,7 @@
.addProgramFiles(r8cf)
.addKeepMainRule(Main.class)
.addKeepEnumsRule()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepRuntimeVisibleAnnotations()
.run(parameters.getRuntime(), Main.class)
.inspect(
diff --git a/src/test/java/com/android/tools/r8/shaking/enums/EnumInAnnotationTest.java b/src/test/java/com/android/tools/r8/shaking/enums/EnumInAnnotationTest.java
index 92e2c31..62426f7 100644
--- a/src/test/java/com/android/tools/r8/shaking/enums/EnumInAnnotationTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/enums/EnumInAnnotationTest.java
@@ -105,7 +105,7 @@
// Do nothing for DEX.
assertTrue(useGenericEnumsRule); // Check not running twice.
})
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepRuntimeVisibleAnnotations()
.run(parameters.getRuntime(), Main.class)
.inspect(
@@ -127,7 +127,7 @@
.addProgramFiles(r8cf)
.addKeepMainRule(Main.class)
.addKeepEnumsRule()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepRuntimeVisibleAnnotations()
.run(parameters.getRuntime(), Main.class)
.inspect(
diff --git a/src/test/java/com/android/tools/r8/shaking/enums/EnumInAnnotationWhereAnnotationIsDeadTest.java b/src/test/java/com/android/tools/r8/shaking/enums/EnumInAnnotationWhereAnnotationIsDeadTest.java
index f769adb..815484d 100644
--- a/src/test/java/com/android/tools/r8/shaking/enums/EnumInAnnotationWhereAnnotationIsDeadTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/enums/EnumInAnnotationWhereAnnotationIsDeadTest.java
@@ -41,7 +41,7 @@
.addInnerClasses(getClass())
.addKeepMainRule(Main.class)
.addKeepEnumsRule()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepRuntimeVisibleAnnotations()
.run(parameters.getRuntime(), Main.class)
.inspect(
diff --git a/src/test/java/com/android/tools/r8/shaking/enums/EnumSafeGuardPruneTestRunner.java b/src/test/java/com/android/tools/r8/shaking/enums/EnumSafeGuardPruneTestRunner.java
index b40ce28..84bec77 100644
--- a/src/test/java/com/android/tools/r8/shaking/enums/EnumSafeGuardPruneTestRunner.java
+++ b/src/test/java/com/android/tools/r8/shaking/enums/EnumSafeGuardPruneTestRunner.java
@@ -49,7 +49,7 @@
testForR8(parameters.getBackend())
.addInnerClasses(EnumSafeGuardPruneTestRunner.class)
.addKeepMainRule(Main.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines(EXPECTED)
.inspect(this::inspect);
diff --git a/src/test/java/com/android/tools/r8/shaking/forceproguardcompatibility/ForceProguardCompatibilityTest.java b/src/test/java/com/android/tools/r8/shaking/forceproguardcompatibility/ForceProguardCompatibilityTest.java
index 48f0372..bb40a40 100644
--- a/src/test/java/com/android/tools/r8/shaking/forceproguardcompatibility/ForceProguardCompatibilityTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/forceproguardcompatibility/ForceProguardCompatibilityTest.java
@@ -87,7 +87,7 @@
.addProgramClasses(mainClass, mentionedClass)
.addKeepMainRule(mainClass)
.apply(configuration)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspector();
assertThat(inspector.clazz(mainClass), isPresent());
@@ -126,7 +126,7 @@
.allowAccessModification()
.addKeepClassAndMembersRules(annotationClass)
.map(b -> keepAnnotations ? b.addKeepAttributes("*Annotation*") : b)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspector();
@@ -165,7 +165,7 @@
.addProgramClasses(testClass)
.addKeepRules(proguardConfig)
.enableGraphInspector()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.graphInspector();
@@ -208,7 +208,7 @@
testForR8Compat(parameters.getBackend(), forceProguardCompatibility)
.addProgramClasses(mainClass, instantiatedClass)
.addKeepRules(proguardConfig)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspector();
@@ -261,7 +261,7 @@
testForR8Compat(parameters.getBackend(), forceProguardCompatibility)
.addProgramClasses(mainClass, forNameClass1, forNameClass2)
.addKeepRules(proguardConfig)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspector();
@@ -316,7 +316,7 @@
testForR8Compat(parameters.getBackend(), forceProguardCompatibility)
.addProgramClasses(mainClass, withMemberClass)
.addKeepRules(proguardConfig)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspector();
@@ -381,7 +381,7 @@
testForR8Compat(parameters.getBackend(), forceProguardCompatibility)
.addProgramClasses(mainClass, withVolatileFields)
.addKeepRules(proguardConfig)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspector();
@@ -459,7 +459,7 @@
keepRules)
.addOptionsModification(options -> options.enableClassInlining = false)
.enableSideEffectAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), TestKeepAttributes.class)
.applyIf(
forceProguardCompatibility && (innerClasses || enclosingMethod),
@@ -511,7 +511,7 @@
"-dontobfuscate")
.addKeepRules(additionalKeepRules)
.enableGraphInspector()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addOptionsModification(
o -> {
o.enableClassInlining = false;
diff --git a/src/test/java/com/android/tools/r8/shaking/ifrule/ConditionalKeepIfKeptTest.java b/src/test/java/com/android/tools/r8/shaking/ifrule/ConditionalKeepIfKeptTest.java
index 34c9293..902d86a 100644
--- a/src/test/java/com/android/tools/r8/shaking/ifrule/ConditionalKeepIfKeptTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/ifrule/ConditionalKeepIfKeptTest.java
@@ -55,7 +55,7 @@
.addInnerClasses(ConditionalKeepIfKeptTest.class)
.addKeepRules(getConditionalRulePrefix())
.addKeepMainRule(TestClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutput(EXPECTED)
.inspect(
@@ -76,7 +76,7 @@
.addInnerClasses(ConditionalKeepIfKeptTest.class)
.addKeepRules(getConditionalRulePrefix() + " { *; }")
.addKeepMainRule(TestClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutput(EXPECTED)
.inspect(
@@ -95,7 +95,7 @@
.addInnerClasses(ConditionalKeepIfKeptTest.class)
.addKeepRules(getConditionalRulePrefix() + " { static *; }")
.addKeepMainRule(TestClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutput(EXPECTED)
.inspect(
@@ -114,7 +114,7 @@
.addInnerClasses(ConditionalKeepIfKeptTest.class)
.addKeepRules(getConditionalRulePrefix() + " { !static *; }")
.addKeepMainRule(TestClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutput(EXPECTED)
.inspect(
@@ -133,7 +133,7 @@
.addInnerClasses(ConditionalKeepIfKeptTest.class)
.addKeepRules(getConditionalRulePrefix() + " { <fields>; }")
.addKeepMainRule(TestClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutput(EXPECTED)
.inspect(
@@ -152,7 +152,7 @@
.addInnerClasses(ConditionalKeepIfKeptTest.class)
.addKeepRules(getConditionalRulePrefix() + " { <methods>; }")
.addKeepMainRule(TestClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutput(EXPECTED)
.inspect(
diff --git a/src/test/java/com/android/tools/r8/shaking/ifrule/ConsequentRootSetWithSatisfiedDependentItemsTest.java b/src/test/java/com/android/tools/r8/shaking/ifrule/ConsequentRootSetWithSatisfiedDependentItemsTest.java
index 040b2d4..c7a58dd 100644
--- a/src/test/java/com/android/tools/r8/shaking/ifrule/ConsequentRootSetWithSatisfiedDependentItemsTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/ifrule/ConsequentRootSetWithSatisfiedDependentItemsTest.java
@@ -40,7 +40,7 @@
"-keepclassmembers class " + A.class.getTypeName() + "{",
" <init>();",
"}")
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/shaking/ifrule/IfOnAccessModifierTest.java b/src/test/java/com/android/tools/r8/shaking/ifrule/IfOnAccessModifierTest.java
index 5559309..9aec797 100644
--- a/src/test/java/com/android/tools/r8/shaking/ifrule/IfOnAccessModifierTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/ifrule/IfOnAccessModifierTest.java
@@ -82,7 +82,7 @@
"-keep,allowobfuscation class **.ClassForSubsequent {",
" public <methods>;",
"}")
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector -> {
@@ -117,7 +117,7 @@
"-keep,allowobfuscation class **.ClassForSubsequent {",
" public <methods>;",
"}")
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector -> {
@@ -157,7 +157,7 @@
"-keep,allowobfuscation class **.ClassForSubsequent {",
" !public <methods>;",
"}")
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector -> {
@@ -198,7 +198,7 @@
"-keep,allowobfuscation class **.ClassForSubsequent {",
" public <methods>;",
"}")
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector -> {
@@ -237,7 +237,7 @@
"-keep,allowobfuscation class **.ClassForSubsequent {",
" !public <methods>;",
"}")
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector -> {
diff --git a/src/test/java/com/android/tools/r8/shaking/ifrule/IfOnAnnotationWithWildcardTest.java b/src/test/java/com/android/tools/r8/shaking/ifrule/IfOnAnnotationWithWildcardTest.java
index 3bb240a..74d2126 100644
--- a/src/test/java/com/android/tools/r8/shaking/ifrule/IfOnAnnotationWithWildcardTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/ifrule/IfOnAnnotationWithWildcardTest.java
@@ -56,7 +56,7 @@
private void runTest(String ifRule) throws Exception {
testForR8Compat(parameters.getBackend())
.addProgramClasses(MyClass.class, MyAnnotation.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepClassAndMembersRules(MyAnnotation.class)
.addKeepRules("-keep class * { @" + MyAnnotation.class.getTypeName() + " <fields>; }")
.addKeepRules(ifRule)
diff --git a/src/test/java/com/android/tools/r8/shaking/ifrule/IfOnStaticFinalFieldTest.java b/src/test/java/com/android/tools/r8/shaking/ifrule/IfOnStaticFinalFieldTest.java
index e368a4f..a34ef14 100644
--- a/src/test/java/com/android/tools/r8/shaking/ifrule/IfOnStaticFinalFieldTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/ifrule/IfOnStaticFinalFieldTest.java
@@ -51,7 +51,7 @@
.addKeepRules(
"-if class " + StaticNonFinalField.class.getTypeName() + " { int f; }",
"-keep class " + B.class.getTypeName())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.allowDiagnosticMessages()
.compileWithExpectedDiagnostics(
diagnostics ->
@@ -71,7 +71,7 @@
.addInnerClasses(getClass())
.addKeepMainRule(TestClass.class)
.addKeepRules("-if class * { int f; } -keep class " + B.class.getTypeName())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.allowDiagnosticMessages()
.compileWithExpectedDiagnostics(
diagnostics ->
diff --git a/src/test/java/com/android/tools/r8/shaking/ifrule/IfOnTargetedMethodTest.java b/src/test/java/com/android/tools/r8/shaking/ifrule/IfOnTargetedMethodTest.java
index 02947f7..efba0d2 100644
--- a/src/test/java/com/android/tools/r8/shaking/ifrule/IfOnTargetedMethodTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/ifrule/IfOnTargetedMethodTest.java
@@ -39,7 +39,7 @@
CodeInspector inspector =
testForR8(parameters.getBackend())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addInnerClasses(IfOnTargetedMethodTest.class)
.addKeepMainRule(TestClass.class)
.addKeepRules(
diff --git a/src/test/java/com/android/tools/r8/shaking/ifrule/IfRuleWithFieldAnnotation.java b/src/test/java/com/android/tools/r8/shaking/ifrule/IfRuleWithFieldAnnotation.java
index 8105b81..18d41dd 100644
--- a/src/test/java/com/android/tools/r8/shaking/ifrule/IfRuleWithFieldAnnotation.java
+++ b/src/test/java/com/android/tools/r8/shaking/ifrule/IfRuleWithFieldAnnotation.java
@@ -49,7 +49,7 @@
.addProgramClasses(Foo.class, Bar.class, SerializedName.class)
.addKeepMainRule(Foo.class)
.addKeepRules(CONDITIONAL_KEEP_RULE)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
codeInspector -> {
@@ -64,7 +64,7 @@
.addKeepMainRule(FooNotCallingBar.class)
.addKeepRules(CONDITIONAL_KEEP_RULE)
.allowUnusedProguardConfigurationRules()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
codeInspector -> {
diff --git a/src/test/java/com/android/tools/r8/shaking/ifrule/IfRuleWithFieldBasedOnClassExtends.java b/src/test/java/com/android/tools/r8/shaking/ifrule/IfRuleWithFieldBasedOnClassExtends.java
index 4ca6833..ecdcca3 100644
--- a/src/test/java/com/android/tools/r8/shaking/ifrule/IfRuleWithFieldBasedOnClassExtends.java
+++ b/src/test/java/com/android/tools/r8/shaking/ifrule/IfRuleWithFieldBasedOnClassExtends.java
@@ -53,7 +53,7 @@
.addKeepMainRule(TestClass.class)
.addKeepClassAndMembersRules(Extending.class)
.addKeepRules(CONDITIONAL_KEEP_RULE)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), TestClass.class)
.inspect(
@@ -77,7 +77,7 @@
.addInnerClasses(getClass())
.addKeepMainRule(TestClass.class)
.addKeepClassAndMembersRules(Extending.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), TestClass.class)
.assertFailureWithErrorThatThrows(NoSuchFieldException.class);
@@ -92,7 +92,7 @@
.addDontWarn(getClass())
.addKeepClassAndMembersRules(Extending.class)
.addKeepRules(CONDITIONAL_KEEP_RULE)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutputLines(EXPECTED);
@@ -108,7 +108,7 @@
.addKeepClassAndMembersRules(Extending.class)
.addKeepRules(CONDITIONAL_KEEP_RULE_FOR_SAME_CLASS)
.allowUnusedProguardConfigurationRules()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), TestClass.class)
.assertFailureWithErrorThatThrows(NoSuchFieldException.class);
diff --git a/src/test/java/com/android/tools/r8/shaking/ifrule/IfRuleWithKeepAllTest.java b/src/test/java/com/android/tools/r8/shaking/ifrule/IfRuleWithKeepAllTest.java
index c4dd92f..d8716ee 100644
--- a/src/test/java/com/android/tools/r8/shaking/ifrule/IfRuleWithKeepAllTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/ifrule/IfRuleWithKeepAllTest.java
@@ -49,7 +49,7 @@
.addProgramClasses(DirectlyKept.class, KeptByIf.class)
.addKeepClassAndMembersRules(DirectlyKept.class)
.addKeepRules(precondition + "\n-keep class " + KeptByIf.class.getTypeName() + " { *; }")
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
codeInspector -> {
diff --git a/src/test/java/com/android/tools/r8/shaking/ifrule/KeepClassesWithAnnotatedFieldsReferencedFromGetterTest.java b/src/test/java/com/android/tools/r8/shaking/ifrule/KeepClassesWithAnnotatedFieldsReferencedFromGetterTest.java
index 6811351..5c764c1 100644
--- a/src/test/java/com/android/tools/r8/shaking/ifrule/KeepClassesWithAnnotatedFieldsReferencedFromGetterTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/ifrule/KeepClassesWithAnnotatedFieldsReferencedFromGetterTest.java
@@ -49,7 +49,7 @@
"}")
.enableInliningAnnotations()
.enableMemberValuePropagationAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector -> {
diff --git a/src/test/java/com/android/tools/r8/shaking/ifrule/KeepClassesWithAnnotatedFieldsTest.java b/src/test/java/com/android/tools/r8/shaking/ifrule/KeepClassesWithAnnotatedFieldsTest.java
index 76244dd..1babdfa 100644
--- a/src/test/java/com/android/tools/r8/shaking/ifrule/KeepClassesWithAnnotatedFieldsTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/ifrule/KeepClassesWithAnnotatedFieldsTest.java
@@ -9,14 +9,13 @@
import com.android.tools.r8.TestBase;
import com.android.tools.r8.TestParameters;
import com.android.tools.r8.TestParametersCollection;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
@RunWith(Parameterized.class)
public class KeepClassesWithAnnotatedFieldsTest extends TestBase {
@@ -45,7 +44,7 @@
"}")
.enableInliningAnnotations()
.enableMemberValuePropagationAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutputLines("Hello world!");
diff --git a/src/test/java/com/android/tools/r8/shaking/ifrule/NoLongerSatisfiedIfRuleTest.java b/src/test/java/com/android/tools/r8/shaking/ifrule/NoLongerSatisfiedIfRuleTest.java
index 28b399c..3e8ff75 100644
--- a/src/test/java/com/android/tools/r8/shaking/ifrule/NoLongerSatisfiedIfRuleTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/ifrule/NoLongerSatisfiedIfRuleTest.java
@@ -40,7 +40,7 @@
.addKeepRules(
"-if class " + A.class.getTypeName(),
"-keep class " + B.class.getTypeName() + " { void m(); }")
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/shaking/ifrule/NoLongerSyntheticConstructorTest.java b/src/test/java/com/android/tools/r8/shaking/ifrule/NoLongerSyntheticConstructorTest.java
index ff4f02d..b6666da 100644
--- a/src/test/java/com/android/tools/r8/shaking/ifrule/NoLongerSyntheticConstructorTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/ifrule/NoLongerSyntheticConstructorTest.java
@@ -43,7 +43,7 @@
" synthetic <init>();",
"}",
"-keep class " + B.class.getTypeName())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect);
}
diff --git a/src/test/java/com/android/tools/r8/shaking/ifrule/accessrelaxation/IfRuleWithAccessRelaxationTest.java b/src/test/java/com/android/tools/r8/shaking/ifrule/accessrelaxation/IfRuleWithAccessRelaxationTest.java
index 1defdee..ba76b23 100644
--- a/src/test/java/com/android/tools/r8/shaking/ifrule/accessrelaxation/IfRuleWithAccessRelaxationTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/ifrule/accessrelaxation/IfRuleWithAccessRelaxationTest.java
@@ -57,7 +57,7 @@
.allowAccessModification()
.enableInliningAnnotations()
.enableNoMethodStaticizingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspector();
diff --git a/src/test/java/com/android/tools/r8/shaking/ifrule/classstaticizer/IfRuleWithClassStaticizerTest.java b/src/test/java/com/android/tools/r8/shaking/ifrule/classstaticizer/IfRuleWithClassStaticizerTest.java
index 8c67d3e..ee59f24 100644
--- a/src/test/java/com/android/tools/r8/shaking/ifrule/classstaticizer/IfRuleWithClassStaticizerTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/ifrule/classstaticizer/IfRuleWithClassStaticizerTest.java
@@ -60,7 +60,7 @@
"-keep class " + Unused.class.getTypeName())
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutput(expectedOutput)
.inspector();
diff --git a/src/test/java/com/android/tools/r8/shaking/ifrule/interfacemethoddesugaring/IfRuleWithInterfaceMethodDesugaringTest.java b/src/test/java/com/android/tools/r8/shaking/ifrule/interfacemethoddesugaring/IfRuleWithInterfaceMethodDesugaringTest.java
index 0b486ff..075e0f6 100644
--- a/src/test/java/com/android/tools/r8/shaking/ifrule/interfacemethoddesugaring/IfRuleWithInterfaceMethodDesugaringTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/ifrule/interfacemethoddesugaring/IfRuleWithInterfaceMethodDesugaringTest.java
@@ -80,7 +80,7 @@
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
.enableNoVerticalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutput(EXPECTED_OUTPUT)
.inspector();
diff --git a/src/test/java/com/android/tools/r8/shaking/ifrule/membervaluepropagation/IfWithFieldValuePropagationTest.java b/src/test/java/com/android/tools/r8/shaking/ifrule/membervaluepropagation/IfWithFieldValuePropagationTest.java
index cc1a987..e4321c8 100644
--- a/src/test/java/com/android/tools/r8/shaking/ifrule/membervaluepropagation/IfWithFieldValuePropagationTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/ifrule/membervaluepropagation/IfWithFieldValuePropagationTest.java
@@ -50,7 +50,7 @@
.addProgramClasses(Library.class)
.addClasspathClasses(Layout.class)
.addKeepAllClassesRule()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.writeToZip())
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/shaking/ifrule/membervaluepropagation/IfWithMethodValuePropagationTest.java b/src/test/java/com/android/tools/r8/shaking/ifrule/membervaluepropagation/IfWithMethodValuePropagationTest.java
index 93f8a34..270a837 100644
--- a/src/test/java/com/android/tools/r8/shaking/ifrule/membervaluepropagation/IfWithMethodValuePropagationTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/ifrule/membervaluepropagation/IfWithMethodValuePropagationTest.java
@@ -42,7 +42,7 @@
"-keep class " + Layout.class.getTypeName())
.addLibraryClasses(Library.class)
.addDefaultRuntimeLibrary(parameters)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::verifyOutput)
.addRunClasspathFiles(
@@ -50,7 +50,7 @@
.addProgramClasses(Library.class)
.addClasspathClasses(Layout.class)
.addKeepAllClassesRule()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.writeToZip())
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/shaking/ifrule/verticalclassmerging/CheckDiscardedFailuresWithIfRulesAndVerticalClassMergingTest.java b/src/test/java/com/android/tools/r8/shaking/ifrule/verticalclassmerging/CheckDiscardedFailuresWithIfRulesAndVerticalClassMergingTest.java
index 2541213..d422118 100644
--- a/src/test/java/com/android/tools/r8/shaking/ifrule/verticalclassmerging/CheckDiscardedFailuresWithIfRulesAndVerticalClassMergingTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/ifrule/verticalclassmerging/CheckDiscardedFailuresWithIfRulesAndVerticalClassMergingTest.java
@@ -72,7 +72,7 @@
.applyIf(
!enableVerticalClassMerging,
R8TestBuilder::enableNoVerticalClassMergingAnnotations)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compileWithExpectedDiagnostics(
diagnostics -> {
if (enableCheckDiscard) {
diff --git a/src/test/java/com/android/tools/r8/shaking/ifrule/verticalclassmerging/KeepIfPresentRuleWithVerticalClassMergingTest.java b/src/test/java/com/android/tools/r8/shaking/ifrule/verticalclassmerging/KeepIfPresentRuleWithVerticalClassMergingTest.java
index 45698a5..c330985 100644
--- a/src/test/java/com/android/tools/r8/shaking/ifrule/verticalclassmerging/KeepIfPresentRuleWithVerticalClassMergingTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/ifrule/verticalclassmerging/KeepIfPresentRuleWithVerticalClassMergingTest.java
@@ -41,7 +41,7 @@
.addKeepRules(
"-if class * extends " + A.class.getTypeName(), "-keep class <1> { <init>(...); }")
.enableInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector -> {
diff --git a/src/test/java/com/android/tools/r8/shaking/ifrule/verticalclassmerging/MergedTypeBaseTest.java b/src/test/java/com/android/tools/r8/shaking/ifrule/verticalclassmerging/MergedTypeBaseTest.java
index 385f32f..f6e1ea7 100644
--- a/src/test/java/com/android/tools/r8/shaking/ifrule/verticalclassmerging/MergedTypeBaseTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/ifrule/verticalclassmerging/MergedTypeBaseTest.java
@@ -105,7 +105,7 @@
"-keep class " + Unused.class.getTypeName(),
getAdditionalKeepRules())
.addDontObfuscate()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.apply(this::configure)
.run(parameters.getRuntime(), getTestClass())
.assertSuccessWithOutput(expected)
diff --git a/src/test/java/com/android/tools/r8/shaking/includedescriptorclasses/IncludeDescriptorClassesTest.java b/src/test/java/com/android/tools/r8/shaking/includedescriptorclasses/IncludeDescriptorClassesTest.java
index e2b6d2e..3cb49ea 100644
--- a/src/test/java/com/android/tools/r8/shaking/includedescriptorclasses/IncludeDescriptorClassesTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/includedescriptorclasses/IncludeDescriptorClassesTest.java
@@ -22,10 +22,10 @@
@RunWith(Parameterized.class)
public class IncludeDescriptorClassesTest extends TestBase {
- private final TestParameters testParameters;
+ private final TestParameters parameters;
public IncludeDescriptorClassesTest(TestParameters parameters) {
- this.testParameters = parameters;
+ this.parameters = parameters;
}
@Parameterized.Parameters(name = "{0}")
@@ -87,8 +87,8 @@
ThrowableConsumer<R8FullTestBuilder> configureR8)
throws Exception {
CodeInspector inspector =
- testForR8(testParameters.getBackend())
- .setMinApi(testParameters.getApiLevel())
+ testForR8(parameters.getBackend())
+ .setMinApi(parameters)
.addProgramClasses(applicationClasses)
.apply(configure::accept)
.apply(configureR8)
@@ -100,7 +100,7 @@
if (isRunProguard()) {
proguardedInspector =
testForProguard()
- .setMinApi(testParameters.getApiLevel())
+ .setMinApi(parameters)
.addProgramClasses(applicationClasses)
.apply(configure::accept)
.compile()
diff --git a/src/test/java/com/android/tools/r8/shaking/interfaces/RedundantImplementsClauseTest.java b/src/test/java/com/android/tools/r8/shaking/interfaces/RedundantImplementsClauseTest.java
index fae800c..97f8d03 100644
--- a/src/test/java/com/android/tools/r8/shaking/interfaces/RedundantImplementsClauseTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/interfaces/RedundantImplementsClauseTest.java
@@ -44,7 +44,7 @@
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
.enableNoVerticalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/shaking/keep/IndirectKeepStaticMethodTest.java b/src/test/java/com/android/tools/r8/shaking/keep/IndirectKeepStaticMethodTest.java
index 3e20dcd..0eca2ef 100644
--- a/src/test/java/com/android/tools/r8/shaking/keep/IndirectKeepStaticMethodTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/keep/IndirectKeepStaticMethodTest.java
@@ -33,7 +33,7 @@
.addProgramClasses(A.class, B.class)
.addKeepRules("-keep class " + B.class.getTypeName() + " {", " static void m();", "}")
.enableNoVerticalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.addRunClasspathFiles(buildOnDexRuntime(parameters, Main.class))
.run(parameters.getRuntime(), Main.class)
diff --git a/src/test/java/com/android/tools/r8/shaking/keepclassmembers/KeepInterfaceMethodTest.java b/src/test/java/com/android/tools/r8/shaking/keepclassmembers/KeepInterfaceMethodTest.java
index 1a13a8d..a725efc 100644
--- a/src/test/java/com/android/tools/r8/shaking/keepclassmembers/KeepInterfaceMethodTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/keepclassmembers/KeepInterfaceMethodTest.java
@@ -58,7 +58,7 @@
.addProgramClasses(I.class)
.addKeepRules("-keepclassmembers class " + I.class.getTypeName() + " { void foo(); }")
.addKeepRules("-keep class " + I.class.getTypeName() + " { }")
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspectIClassAndMethodIsPresent);
}
@@ -84,7 +84,7 @@
.addKeepRules("-keepclassmembers class " + I.class.getTypeName() + " { void foo(); }")
.addKeepMainRule(Main.class)
.enableNoHorizontalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("A.foo")
.inspect(this::inspectIClassAndMethodIsPresent);
diff --git a/src/test/java/com/android/tools/r8/shaking/keepclassmembers/UnsatisfiedDependentNoObfuscationTest.java b/src/test/java/com/android/tools/r8/shaking/keepclassmembers/UnsatisfiedDependentNoObfuscationTest.java
index efdfb71..e915b47 100644
--- a/src/test/java/com/android/tools/r8/shaking/keepclassmembers/UnsatisfiedDependentNoObfuscationTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/keepclassmembers/UnsatisfiedDependentNoObfuscationTest.java
@@ -42,7 +42,7 @@
" <methods>;",
"}")
.enableInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(inspector -> assertThat(inspector.clazz(Greeter.class), isPresentAndRenamed()))
.run(parameters.getRuntime(), Main.class)
diff --git a/src/test/java/com/android/tools/r8/shaking/keptgraph/KeptByConditionalOnMethodTest.java b/src/test/java/com/android/tools/r8/shaking/keptgraph/KeptByConditionalOnMethodTest.java
index 9d35603..6a9341c 100644
--- a/src/test/java/com/android/tools/r8/shaking/keptgraph/KeptByConditionalOnMethodTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/keptgraph/KeptByConditionalOnMethodTest.java
@@ -77,7 +77,7 @@
.addProgramClasses(Main.class, IfClass.class, ThenClass.class)
.addKeepMainRule(Main.class)
.addKeepRules(ifRuleContent)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class, ThenClass.class.getTypeName())
.assertSuccessWithOutput(EXPECTED)
.graphInspector();
diff --git a/src/test/java/com/android/tools/r8/shaking/keptgraph/KeptByConditionalRuleTestRunner.java b/src/test/java/com/android/tools/r8/shaking/keptgraph/KeptByConditionalRuleTestRunner.java
index 32c8662..4964ba5 100644
--- a/src/test/java/com/android/tools/r8/shaking/keptgraph/KeptByConditionalRuleTestRunner.java
+++ b/src/test/java/com/android/tools/r8/shaking/keptgraph/KeptByConditionalRuleTestRunner.java
@@ -89,7 +89,7 @@
.addProgramClasses(CLASS)
.addKeepMainRule(CLASS)
.addKeepRules(CONDITIONAL_KEEP_RULE)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), CLASS)
.assertSuccessWithOutput(EXPECTED)
.graphInspector();
diff --git a/src/test/java/com/android/tools/r8/shaking/keptgraph/KeptByKeepClassMembersNonStaticTestRunner.java b/src/test/java/com/android/tools/r8/shaking/keptgraph/KeptByKeepClassMembersNonStaticTestRunner.java
index cd8f5ba..dc87e2d 100644
--- a/src/test/java/com/android/tools/r8/shaking/keptgraph/KeptByKeepClassMembersNonStaticTestRunner.java
+++ b/src/test/java/com/android/tools/r8/shaking/keptgraph/KeptByKeepClassMembersNonStaticTestRunner.java
@@ -94,7 +94,7 @@
.addProgramClasses(CLASS)
.addKeepMainRule(CLASS)
.addKeepRules(KEEP_CLASS_MEMBERS_RULE)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), CLASS)
.assertSuccessWithOutput(EXPECTED)
.graphInspector();
diff --git a/src/test/java/com/android/tools/r8/shaking/keptgraph/KeptByKeepClassMembersTestRunner.java b/src/test/java/com/android/tools/r8/shaking/keptgraph/KeptByKeepClassMembersTestRunner.java
index d07d918..68f3a5d 100644
--- a/src/test/java/com/android/tools/r8/shaking/keptgraph/KeptByKeepClassMembersTestRunner.java
+++ b/src/test/java/com/android/tools/r8/shaking/keptgraph/KeptByKeepClassMembersTestRunner.java
@@ -76,7 +76,7 @@
.addProgramClasses(CLASS)
.addKeepMainRule(KeptByKeepClassMembersTest.class)
.addKeepRules(keepClassMembersRuleContent)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), CLASS)
.assertSuccessWithOutput(EXPECTED)
.graphInspector();
diff --git a/src/test/java/com/android/tools/r8/shaking/keptgraph/KeptByReferenceInAnnotationTest.java b/src/test/java/com/android/tools/r8/shaking/keptgraph/KeptByReferenceInAnnotationTest.java
index 137706a..eab2e7b 100644
--- a/src/test/java/com/android/tools/r8/shaking/keptgraph/KeptByReferenceInAnnotationTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/keptgraph/KeptByReferenceInAnnotationTest.java
@@ -34,7 +34,7 @@
.addKeepMainRule(Main.class)
.addKeepRuntimeVisibleAnnotations()
.enableGraphInspector()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspectGraph(
inspector -> {
diff --git a/src/test/java/com/android/tools/r8/shaking/keptgraph/RemovedClassTestRunner.java b/src/test/java/com/android/tools/r8/shaking/keptgraph/RemovedClassTestRunner.java
index 9edc64d..49877df 100644
--- a/src/test/java/com/android/tools/r8/shaking/keptgraph/RemovedClassTestRunner.java
+++ b/src/test/java/com/android/tools/r8/shaking/keptgraph/RemovedClassTestRunner.java
@@ -57,7 +57,7 @@
.addProgramClasses(CLASSES)
.addKeepMethodRules(mainMethod)
.addKeepRules("-whyareyoukeeping class " + REMOVED_CLASS.getTypeName())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.collectStdout()
.compile()
.assertStdoutThatMatches(
diff --git a/src/test/java/com/android/tools/r8/shaking/librarymethodoverride/LibraryMethodOverrideDefaultMethodTest.java b/src/test/java/com/android/tools/r8/shaking/librarymethodoverride/LibraryMethodOverrideDefaultMethodTest.java
index 939b14a..1b727a0 100644
--- a/src/test/java/com/android/tools/r8/shaking/librarymethodoverride/LibraryMethodOverrideDefaultMethodTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/librarymethodoverride/LibraryMethodOverrideDefaultMethodTest.java
@@ -48,7 +48,7 @@
.addOptionsModification(
options -> options.testing.enqueuerInspector = this::verifyLibraryOverrideInformation)
.addLibraryClasses(LibraryI.class, LibraryClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(Main.class)
.compile()
.addBootClasspathClasses(LibraryI.class, LibraryClass.class)
diff --git a/src/test/java/com/android/tools/r8/shaking/librarymethodoverride/LibraryMethodOverrideOfClassMethodWithInterfaceTest.java b/src/test/java/com/android/tools/r8/shaking/librarymethodoverride/LibraryMethodOverrideOfClassMethodWithInterfaceTest.java
index 247b780..cd79bde 100644
--- a/src/test/java/com/android/tools/r8/shaking/librarymethodoverride/LibraryMethodOverrideOfClassMethodWithInterfaceTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/librarymethodoverride/LibraryMethodOverrideOfClassMethodWithInterfaceTest.java
@@ -50,7 +50,7 @@
.addLibraryClasses(LibraryClass.class)
.addOptionsModification(
options -> options.testing.enqueuerInspector = this::verifyLibraryOverrideInformation)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(Main.class)
.compile()
.addBootClasspathClasses(LibraryClass.class)
diff --git a/src/test/java/com/android/tools/r8/shaking/librarymethodoverride/LibraryMethodOverrideTest.java b/src/test/java/com/android/tools/r8/shaking/librarymethodoverride/LibraryMethodOverrideTest.java
index 2699e27..5eeb4b1 100644
--- a/src/test/java/com/android/tools/r8/shaking/librarymethodoverride/LibraryMethodOverrideTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/librarymethodoverride/LibraryMethodOverrideTest.java
@@ -45,7 +45,7 @@
.enableNeverClassInliningAnnotations()
.enableNoVerticalClassMergingAnnotations()
.enableNoHorizontalClassMergingAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::verifyOutput)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/shaking/methods/MethodsTestBase.java b/src/test/java/com/android/tools/r8/shaking/methods/MethodsTestBase.java
index 1cff714..117caa4 100644
--- a/src/test/java/com/android/tools/r8/shaking/methods/MethodsTestBase.java
+++ b/src/test/java/com/android/tools/r8/shaking/methods/MethodsTestBase.java
@@ -53,7 +53,7 @@
List<String> keepRules, BiConsumer<CodeInspector, Shrinker> inspector, String expected)
throws Throwable {
testForR8(parameters.getBackend())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.enableNoVerticalClassMergingAnnotations()
.addProgramClasses(getClasses())
.addKeepRules(keepRules)
diff --git a/src/test/java/com/android/tools/r8/shaking/methods/interfaces/AbstractInterfaceMethodsTest.java b/src/test/java/com/android/tools/r8/shaking/methods/interfaces/AbstractInterfaceMethodsTest.java
index 2cd5ff7..b80e6ec 100644
--- a/src/test/java/com/android/tools/r8/shaking/methods/interfaces/AbstractInterfaceMethodsTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/methods/interfaces/AbstractInterfaceMethodsTest.java
@@ -46,7 +46,7 @@
assumeTrue(parameters.isCfRuntime());
testForProguard()
.addProgramClasses(I.class, J.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMethodRules(J.class, "void foo()")
.addKeepRules("-dontwarn")
.compile()
@@ -65,7 +65,7 @@
R8TestCompileResult compileResult =
testForR8(parameters.getBackend())
.addProgramClasses(I.class, J.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMethodRules(J.class, "void foo()")
.compile();
testForRuntime(parameters)
diff --git a/src/test/java/com/android/tools/r8/shaking/methods/interfaces/DefaultInterfaceMethodsTest.java b/src/test/java/com/android/tools/r8/shaking/methods/interfaces/DefaultInterfaceMethodsTest.java
index cbb3fc9..d65c86f 100644
--- a/src/test/java/com/android/tools/r8/shaking/methods/interfaces/DefaultInterfaceMethodsTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/methods/interfaces/DefaultInterfaceMethodsTest.java
@@ -48,7 +48,7 @@
assumeTrue(parameters.isCfRuntime());
testForProguard()
.addProgramClasses(I.class, J.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMethodRules(J.class, "void foo()")
.addKeepRules("-dontwarn")
.compile()
@@ -68,7 +68,7 @@
R8TestCompileResult compileResult =
testForR8(parameters.getBackend())
.addProgramClasses(I.class, J.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMethodRules(J.class, "void foo()")
.addOptionsModification(
internalOptions -> internalOptions.enableVerticalClassMerging = false)
@@ -78,7 +78,7 @@
testForR8(parameters.getBackend())
.addProgramClasses(ImplJ.class, Main.class)
.addClasspathClasses(I.class, J.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(Main.class)
.addKeepClassRules(ImplJ.class)
.addRunClasspathFiles(compileResult.writeToZip())
@@ -97,7 +97,7 @@
R8TestCompileResult compileResult =
testForR8(parameters.getBackend())
.addProgramClasses(I.class, J.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMethodRules(J.class, "void foo()")
.compile();
testForRuntime(parameters)
@@ -113,7 +113,7 @@
R8TestCompileResult compileResult =
testForR8(parameters.getBackend())
.addProgramClasses(I.class, J.class, ImplJ.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepClassAndMembersRules(ImplJ.class)
.addKeepMethodRules(J.class, "void foo()")
.compile();
@@ -130,7 +130,7 @@
R8TestCompileResult compileResult =
testForR8(parameters.getBackend())
.addProgramClasses(I.class, J.class, ImplJ.class, SubImplJ.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMethodRules(SubImplJ.class, "void <init>()", "void foo()")
.compile();
testForRuntime(parameters)
diff --git a/src/test/java/com/android/tools/r8/shaking/methods/interfaces/ImplementingMethodInSubclassTest.java b/src/test/java/com/android/tools/r8/shaking/methods/interfaces/ImplementingMethodInSubclassTest.java
index 5171c66..9357d07 100644
--- a/src/test/java/com/android/tools/r8/shaking/methods/interfaces/ImplementingMethodInSubclassTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/methods/interfaces/ImplementingMethodInSubclassTest.java
@@ -36,7 +36,7 @@
R8TestCompileResult libraryResult =
testForR8(parameters.getBackend())
.addProgramClasses(I.class, A.class, B.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMethodRules(A.class, "void foo()")
.addKeepClassRules(B.class)
.compile();
diff --git a/src/test/java/com/android/tools/r8/shaking/methods/interfaces/InterfaceAbstractTriangleTest.java b/src/test/java/com/android/tools/r8/shaking/methods/interfaces/InterfaceAbstractTriangleTest.java
index cf15643..1ca1855 100644
--- a/src/test/java/com/android/tools/r8/shaking/methods/interfaces/InterfaceAbstractTriangleTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/methods/interfaces/InterfaceAbstractTriangleTest.java
@@ -35,7 +35,7 @@
R8TestCompileResult libraryResult =
testForR8(parameters.getBackend())
.addProgramClasses(I.class, J.class, A.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMethodRules(A.class, "void foo()", "void <init>()")
.compile();
testForRuntime(parameters)
diff --git a/src/test/java/com/android/tools/r8/shaking/methods/interfaces/InterfaceDefaultMethodKeptTest.java b/src/test/java/com/android/tools/r8/shaking/methods/interfaces/InterfaceDefaultMethodKeptTest.java
index 4331c76..5f6222d 100644
--- a/src/test/java/com/android/tools/r8/shaking/methods/interfaces/InterfaceDefaultMethodKeptTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/methods/interfaces/InterfaceDefaultMethodKeptTest.java
@@ -45,7 +45,7 @@
R8TestCompileResult compileResult =
testForR8(parameters.getBackend())
.addProgramClasses(I.class, A.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepClassAndMembersRules(I.class)
.addKeepMethodRules(A.class, "void <init>()", "void foo()")
.compile()
@@ -69,7 +69,7 @@
R8TestCompileResult compileResult =
testForR8(parameters.getBackend())
.addProgramClasses(I.class, A.class, B.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepClassAndMembersRules(I.class)
.addKeepMethodRules(B.class, "void <init>()", "void foo()")
.compile()
@@ -94,7 +94,7 @@
R8TestCompileResult compileResult =
testForR8(parameters.getBackend())
.addProgramClasses(I.class, A.class, B.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMethodRules(A.class, "void <init>()", "void foo()")
.addKeepMethodRules(B.class, "void <init>()", "void foo()")
.addDontObfuscate()
diff --git a/src/test/java/com/android/tools/r8/shaking/methods/interfaces/InterfaceMethodDefinedInLibraryTest.java b/src/test/java/com/android/tools/r8/shaking/methods/interfaces/InterfaceMethodDefinedInLibraryTest.java
index 1254706..fa8ed16 100644
--- a/src/test/java/com/android/tools/r8/shaking/methods/interfaces/InterfaceMethodDefinedInLibraryTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/methods/interfaces/InterfaceMethodDefinedInLibraryTest.java
@@ -39,7 +39,7 @@
.addProgramClasses(A.class)
.addClasspathClasses(I.class)
.addKeepMethodRules(A.class, "void foo()", "void <init>()")
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile();
testForRuntime(parameters)
.addProgramClasses(Main.class)
@@ -48,7 +48,7 @@
parameters.isDexRuntime()
? testForD8()
.addProgramClasses(I.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.writeToZip()
: ToolHelper.getClassPathForTests())
diff --git a/src/test/java/com/android/tools/r8/shaking/methods/interfaces/InterfaceMethodKeepResolutionTest.java b/src/test/java/com/android/tools/r8/shaking/methods/interfaces/InterfaceMethodKeepResolutionTest.java
index cc6ec52..a2fe6b9 100644
--- a/src/test/java/com/android/tools/r8/shaking/methods/interfaces/InterfaceMethodKeepResolutionTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/methods/interfaces/InterfaceMethodKeepResolutionTest.java
@@ -71,7 +71,7 @@
R8FullTestBuilder libraryBuilder =
testForR8(parameters.getBackend())
.addProgramClasses(classPathClasses)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMethodRules(libraryClassWithMethod, "void foo()");
if (!libraryClassWithMethod.isInterface()) {
libraryBuilder.addKeepClassRules(libraryClassWithMethod);
diff --git a/src/test/java/com/android/tools/r8/shaking/methods/interfaces/LibraryInterfaceMethodsTest.java b/src/test/java/com/android/tools/r8/shaking/methods/interfaces/LibraryInterfaceMethodsTest.java
index 73bc53c..1d8c888 100644
--- a/src/test/java/com/android/tools/r8/shaking/methods/interfaces/LibraryInterfaceMethodsTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/methods/interfaces/LibraryInterfaceMethodsTest.java
@@ -38,7 +38,7 @@
.addProgramClasses(BaseInterface.class, SubInterface.class)
.addLibraryFiles(runtimeJar(parameters))
.addKeepMethodRules(SubInterface.class, "int hashCode()")
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile();
testForRuntime(parameters)
.addProgramClasses(A.class, Main.class)
diff --git a/src/test/java/com/android/tools/r8/shaking/methods/interfaces/MultipleRulesRegression228791247Test.java b/src/test/java/com/android/tools/r8/shaking/methods/interfaces/MultipleRulesRegression228791247Test.java
index c61fa16..3c319fa 100644
--- a/src/test/java/com/android/tools/r8/shaking/methods/interfaces/MultipleRulesRegression228791247Test.java
+++ b/src/test/java/com/android/tools/r8/shaking/methods/interfaces/MultipleRulesRegression228791247Test.java
@@ -46,7 +46,7 @@
.addProgramClasses(I.class, J.class, A.class, TestClass.class)
.addKeepMainRule(TestClass.class)
.addKeepRules(rule1, rule2)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutput(EXPECTED);
}
diff --git a/src/test/java/com/android/tools/r8/shaking/methods/interfaces/MultipleTargetTest.java b/src/test/java/com/android/tools/r8/shaking/methods/interfaces/MultipleTargetTest.java
index 1fdd5d1..adca94a 100644
--- a/src/test/java/com/android/tools/r8/shaking/methods/interfaces/MultipleTargetTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/methods/interfaces/MultipleTargetTest.java
@@ -52,7 +52,7 @@
R8TestCompileResult compileResult =
testForR8(parameters.getBackend())
.addProgramClasses(Top.class, Left.class, Right.class, Bottom.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMethodRules(Bottom.class, "java.lang.String name()")
.addDontObfuscate()
.compile();
@@ -60,7 +60,7 @@
testForR8(parameters.getBackend())
.addProgramClasses(A.class, Main.class)
.addClasspathClasses(Top.class, Left.class, Right.class, Bottom.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(Main.class)
.addRunClasspathFiles(compileResult.writeToZip())
.run(parameters.getRuntime(), Main.class)
@@ -79,7 +79,7 @@
testForR8(parameters.getBackend())
.addProgramClasses(Top.class, Left.class, Right.class, Bottom.class)
.addKeepMethodRules(Bottom.class, "java.lang.String name()")
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile();
testForRuntime(parameters)
.addProgramClasses(A.class, Main.class)
diff --git a/src/test/java/com/android/tools/r8/shaking/methods/interfaces/SubTypeOverridesInterfaceMethodTest.java b/src/test/java/com/android/tools/r8/shaking/methods/interfaces/SubTypeOverridesInterfaceMethodTest.java
index ae43926..b8095e1 100644
--- a/src/test/java/com/android/tools/r8/shaking/methods/interfaces/SubTypeOverridesInterfaceMethodTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/methods/interfaces/SubTypeOverridesInterfaceMethodTest.java
@@ -42,7 +42,7 @@
throws CompilationFailedException, IOException, ExecutionException {
testForR8(parameters.getBackend())
.addProgramClasses(Main.class, I.class, A.class, B.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(Main.class)
.addKeepMethodRules(A.class, "void <init>()", "void foo()")
.addKeepClassRules(B.class)
diff --git a/src/test/java/com/android/tools/r8/shaking/negatedrules/NegatedMethodArgumentTest.java b/src/test/java/com/android/tools/r8/shaking/negatedrules/NegatedMethodArgumentTest.java
index 2fabb47..b2a2fd5 100644
--- a/src/test/java/com/android/tools/r8/shaking/negatedrules/NegatedMethodArgumentTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/negatedrules/NegatedMethodArgumentTest.java
@@ -44,7 +44,7 @@
testForR8(parameters.getBackend())
.addInnerClasses(getClass())
.addKeepMainRule(TestClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepRules("-keep class * { void setX(!%); }")
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutput(EXPECTED_OUTPUT));
@@ -58,7 +58,7 @@
testForR8(parameters.getBackend())
.addInnerClasses(getClass())
.addKeepMainRule(TestClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepRules("-keep class * { void setX(!**Producer); }")
.compile());
}
diff --git a/src/test/java/com/android/tools/r8/shaking/proxy/MockitoTest.java b/src/test/java/com/android/tools/r8/shaking/proxy/MockitoTest.java
index 3743fb8..1b75532 100644
--- a/src/test/java/com/android/tools/r8/shaking/proxy/MockitoTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/proxy/MockitoTest.java
@@ -53,7 +53,7 @@
.addKeepRuleFiles(flagToKeepTestRunner)
.addDontWarn("org.mockito.**")
.minification(minify)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspector();
ClassSubject itf = inspector.clazz(M_I);
@@ -72,7 +72,7 @@
.addKeepRuleFiles(flagToKeepInterfaceConditionally)
.addDontWarn("org.mockito.**")
.minification(minify)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspector();
ClassSubject itf = inspector.clazz(M_I);
diff --git a/src/test/java/com/android/tools/r8/shaking/proxy/ProxiesTest.java b/src/test/java/com/android/tools/r8/shaking/proxy/ProxiesTest.java
index 75b74e6..ad29af4 100644
--- a/src/test/java/com/android/tools/r8/shaking/proxy/ProxiesTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/proxy/ProxiesTest.java
@@ -68,7 +68,7 @@
})
.enableAlwaysInliningAnnotations()
.addDontObfuscate()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(inspection)
.run(parameters.getRuntime(), Main.class)
diff --git a/src/test/java/com/android/tools/r8/shaking/reflection/FieldAccessTest.java b/src/test/java/com/android/tools/r8/shaking/reflection/FieldAccessTest.java
index 3e3a646..be82988 100644
--- a/src/test/java/com/android/tools/r8/shaking/reflection/FieldAccessTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/reflection/FieldAccessTest.java
@@ -48,7 +48,7 @@
.enableGraphInspector()
.addProgramClasses(testClass)
.addKeepMainRule(testClass)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), testClass)
.inspectGraph(
inspector -> {
diff --git a/src/test/java/com/android/tools/r8/shaking/reflection/GetDeclaredFieldShouldMarkFieldAsWrittenTest.java b/src/test/java/com/android/tools/r8/shaking/reflection/GetDeclaredFieldShouldMarkFieldAsWrittenTest.java
index 0efa7fa..7c546bf 100644
--- a/src/test/java/com/android/tools/r8/shaking/reflection/GetDeclaredFieldShouldMarkFieldAsWrittenTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/reflection/GetDeclaredFieldShouldMarkFieldAsWrittenTest.java
@@ -31,7 +31,7 @@
testForR8(parameters.getBackend())
.addProgramClasses(TestClass.class)
.addKeepMainRule(TestClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutputLines("42");
}
diff --git a/src/test/java/com/android/tools/r8/shaking/reflection/ReflectiveNewInstanceTest.java b/src/test/java/com/android/tools/r8/shaking/reflection/ReflectiveNewInstanceTest.java
index 47a9fc7..65b5ed6 100644
--- a/src/test/java/com/android/tools/r8/shaking/reflection/ReflectiveNewInstanceTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/reflection/ReflectiveNewInstanceTest.java
@@ -57,7 +57,7 @@
.addKeepMainRule(TestClass.class)
.enableGraphInspector()
.enableUnusedArgumentAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutput(expectedOutputAfterR8)
.graphInspector();
diff --git a/src/test/java/com/android/tools/r8/shaking/staticinterfacemethods/defaultmethods/StaticInterfaceMethodsTest.java b/src/test/java/com/android/tools/r8/shaking/staticinterfacemethods/defaultmethods/StaticInterfaceMethodsTest.java
index 58c7558..0d9f97c 100644
--- a/src/test/java/com/android/tools/r8/shaking/staticinterfacemethods/defaultmethods/StaticInterfaceMethodsTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/staticinterfacemethods/defaultmethods/StaticInterfaceMethodsTest.java
@@ -55,7 +55,7 @@
throws Exception {
return testForR8(parameters.getBackend())
.addProgramClasses(InterfaceWithStaticMethods.class, TestClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addKeepMainRule(TestClass.class)
.addKeepRules(additionalKeepRules)
.enableInliningAnnotations()
@@ -78,7 +78,7 @@
.addKeepAllClassesRule()
.addApplyMapping(compileResult.getProguardMap())
.addClasspathClasses(InterfaceWithStaticMethods.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.addRunClasspathFiles(app)
.run(parameters.getRuntime(), InstrumentedTestClass.class);
diff --git a/src/test/java/com/android/tools/r8/smali/JumboStringTest.java b/src/test/java/com/android/tools/r8/smali/JumboStringTest.java
index d3a9e4d..59224ae 100644
--- a/src/test/java/com/android/tools/r8/smali/JumboStringTest.java
+++ b/src/test/java/com/android/tools/r8/smali/JumboStringTest.java
@@ -81,7 +81,7 @@
testForR8(parameters.getBackend())
.addProgramDexFileData(smaliBuilder.compile())
.addKeepMainRule(DEFAULT_CLASS_NAME)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addOptionsModification(
options -> {
options.enableStringConcatenationOptimization = false;
@@ -132,7 +132,7 @@
.addProgramDexFileData(smaliBuilder.compile())
.addKeepMainRule(DEFAULT_CLASS_NAME)
.addKeepRules("-addconfigurationdebugging")
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addOptionsModification(
options -> {
options.enableStringConcatenationOptimization = false;
diff --git a/src/test/java/com/android/tools/r8/softverification/TestRunnerBuilder.java b/src/test/java/com/android/tools/r8/softverification/TestRunnerBuilder.java
index c842e42..d7870f2 100644
--- a/src/test/java/com/android/tools/r8/softverification/TestRunnerBuilder.java
+++ b/src/test/java/com/android/tools/r8/softverification/TestRunnerBuilder.java
@@ -189,7 +189,7 @@
buildJar(benchmarkJar);
D8TestCompileResult compileResult =
testForD8(parameters.getBackend())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addProgramFiles(benchmarkJar)
.compile();
Dex2OatTestRunResult dex2OatTestRunResult = compileResult.runDex2Oat(parameters.getRuntime());
diff --git a/src/test/java/com/android/tools/r8/startup/InliningOutOfStartupPartitionTest.java b/src/test/java/com/android/tools/r8/startup/InliningOutOfStartupPartitionTest.java
index 77909c0..e1a415d 100644
--- a/src/test/java/com/android/tools/r8/startup/InliningOutOfStartupPartitionTest.java
+++ b/src/test/java/com/android/tools/r8/startup/InliningOutOfStartupPartitionTest.java
@@ -52,7 +52,7 @@
.addKeepMainRule(Main.class)
.apply(
testBuilder -> StartupTestingUtils.setStartupConfiguration(testBuilder, startupItems))
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector -> {
diff --git a/src/test/java/com/android/tools/r8/startup/MinimalStartupDexTest.java b/src/test/java/com/android/tools/r8/startup/MinimalStartupDexTest.java
index f8a5438..fa1dd30 100644
--- a/src/test/java/com/android/tools/r8/startup/MinimalStartupDexTest.java
+++ b/src/test/java/com/android/tools/r8/startup/MinimalStartupDexTest.java
@@ -51,7 +51,7 @@
.apply(
StartupTestingUtils.enableStartupInstrumentationForOriginalAppUsingLogcat(parameters))
.release()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.addRunClasspathFiles(StartupTestingUtils.getAndroidUtilLog(temp))
.run(parameters.getRuntime(), Main.class)
@@ -71,7 +71,7 @@
.setEnableStartupCompletenessCheckForTesting())
.enableInliningAnnotations()
.apply(testBuilder -> StartupTestingUtils.setStartupConfiguration(testBuilder, startupList))
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspectMultiDex(
primaryDexInspector -> {
diff --git a/src/test/java/com/android/tools/r8/startup/StartupInstrumentationTest.java b/src/test/java/com/android/tools/r8/startup/StartupInstrumentationTest.java
index 3709e7a..8399d05 100644
--- a/src/test/java/com/android/tools/r8/startup/StartupInstrumentationTest.java
+++ b/src/test/java/com/android/tools/r8/startup/StartupInstrumentationTest.java
@@ -59,7 +59,7 @@
StartupTestingUtils.enableStartupInstrumentationForOriginalAppUsingLogcat(parameters),
StartupTestingUtils.enableStartupInstrumentationForOriginalAppUsingFile(parameters))
.release()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.applyIf(
logcat,
diff --git a/src/test/java/com/android/tools/r8/startup/StartupSyntheticPlacementTest.java b/src/test/java/com/android/tools/r8/startup/StartupSyntheticPlacementTest.java
index 42ff835..742361e 100644
--- a/src/test/java/com/android/tools/r8/startup/StartupSyntheticPlacementTest.java
+++ b/src/test/java/com/android/tools/r8/startup/StartupSyntheticPlacementTest.java
@@ -82,7 +82,7 @@
.addKeepMainRule(Main.class)
.addKeepClassAndMembersRules(A.class, B.class, C.class)
.addDontOptimize()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile();
// Verify that the build works.
@@ -99,7 +99,7 @@
.apply(
StartupTestingUtils.enableStartupInstrumentationForOptimizedAppUsingLogcat(parameters))
.release()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.addRunClasspathFiles(StartupTestingUtils.getAndroidUtilLog(temp))
.run(parameters.getRuntime(), Main.class, Boolean.toString(useLambda))
@@ -119,7 +119,7 @@
testBuilder ->
configureStartupOptions(testBuilder, r8CompileResult.inspector(), startupList))
.release()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspectMultiDex(
r8CompileResult.writeProguardMap(), this::inspectPrimaryDex, this::inspectSecondaryDex)
@@ -138,7 +138,7 @@
StartupTestingUtils.enableStartupInstrumentationForOriginalAppUsingLogcat(
parameters))
.release()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile();
instrumentationCompileResult
@@ -161,7 +161,7 @@
testBuilder ->
configureStartupOptions(
testBuilder, instrumentationCompileResult.inspector(), startupList))
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspectMultiDex(this::inspectPrimaryDex, this::inspectSecondaryDex)
.run(parameters.getRuntime(), Main.class, Boolean.toString(useLambda))
diff --git a/src/test/java/com/android/tools/r8/startup/StartupSyntheticWithoutContextTest.java b/src/test/java/com/android/tools/r8/startup/StartupSyntheticWithoutContextTest.java
index 2b47d1d..815b50d 100644
--- a/src/test/java/com/android/tools/r8/startup/StartupSyntheticWithoutContextTest.java
+++ b/src/test/java/com/android/tools/r8/startup/StartupSyntheticWithoutContextTest.java
@@ -70,7 +70,7 @@
.apply(
StartupTestingUtils.enableStartupInstrumentationForOriginalAppUsingLogcat(parameters))
.release()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.addRunClasspathFiles(StartupTestingUtils.getAndroidUtilLog(temp))
.run(parameters.getRuntime(), Main.class)
@@ -95,7 +95,7 @@
.setMixedSectionLayoutStrategyInspector(getMixedSectionLayoutInspector());
})
.apply(testBuilder -> StartupTestingUtils.setStartupConfiguration(testBuilder, startupList))
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspectMultiDex(this::inspectPrimaryDex, this::inspectSecondaryDex)
.run(parameters.getRuntime(), Main.class)
diff --git a/src/test/java/com/android/tools/r8/synthesis/SyntheticMarkerCfTest.java b/src/test/java/com/android/tools/r8/synthesis/SyntheticMarkerCfTest.java
index 706ace9..697b2b5 100644
--- a/src/test/java/com/android/tools/r8/synthesis/SyntheticMarkerCfTest.java
+++ b/src/test/java/com/android/tools/r8/synthesis/SyntheticMarkerCfTest.java
@@ -188,7 +188,7 @@
Box<SyntheticMarkerV2> currentCompilerMarker = new Box<>();
testForD8(parameters.getBackend())
.addProgramClasses(TestClass.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.setIntermediate(true)
.setProgramConsumer(
new ClassFileConsumer() {
@@ -215,7 +215,7 @@
// tests below.
D8TestBuilder builder =
testForD8(parameters.getBackend())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addProgramClassFileData(
getTestClassWithMarker(
new SyntheticMarkerV2(
@@ -229,7 +229,7 @@
// We do so by injecting an old marker and put in a non-valid ID which would cause the compiler
// to fail if it was read.
testForD8(parameters.getBackend())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addProgramClassFileData(getTestClassWithMarker(new SyntheticMarkerV1(Short.MAX_VALUE)))
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutput(EXPECTED);
@@ -241,7 +241,7 @@
// We do so by injecting an old marker and put in a non-valid ID which would cause the compiler
// to fail if it was read.
testForD8(parameters.getBackend())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addProgramClassFileData(
getTestClassWithMarker(new SyntheticMarkerV2(Short.MAX_VALUE, new byte[0])))
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/synthesis/SyntheticMarkerDexTest.java b/src/test/java/com/android/tools/r8/synthesis/SyntheticMarkerDexTest.java
index fd37907..2420976 100644
--- a/src/test/java/com/android/tools/r8/synthesis/SyntheticMarkerDexTest.java
+++ b/src/test/java/com/android/tools/r8/synthesis/SyntheticMarkerDexTest.java
@@ -39,14 +39,14 @@
public void test() throws Exception {
Path out =
testForD8(parameters.getBackend())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.setIntermediate(true)
.addProgramClasses(TestClass.class)
.compile()
.inspect(this::checkSyntheticClassIsMarked)
.writeToZip();
testForD8(parameters.getBackend())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.addProgramFiles(out)
// Use intermediate again to preserve synthetics.
.setIntermediate(true)
diff --git a/src/test/java/com/android/tools/r8/testing/RuntimeBootstrapFunctionalityTest.java b/src/test/java/com/android/tools/r8/testing/RuntimeBootstrapFunctionalityTest.java
index 2f6843b..010681b 100644
--- a/src/test/java/com/android/tools/r8/testing/RuntimeBootstrapFunctionalityTest.java
+++ b/src/test/java/com/android/tools/r8/testing/RuntimeBootstrapFunctionalityTest.java
@@ -37,7 +37,7 @@
testForR8(parameters.getBackend())
.addProgramClasses(I.class)
.addKeepClassAndMembersRules(I.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile();
testForRuntime(parameters)
.addProgramClasses(A.class, Main.class)
diff --git a/src/test/java/com/android/tools/r8/testing/StackTraceTest.java b/src/test/java/com/android/tools/r8/testing/StackTraceTest.java
index 41b6de3..eddc3cf 100644
--- a/src/test/java/com/android/tools/r8/testing/StackTraceTest.java
+++ b/src/test/java/com/android/tools/r8/testing/StackTraceTest.java
@@ -188,7 +188,7 @@
assumeTrue(parameters.isDexRuntime());
testForD8()
.addInnerClasses(StackTraceTest.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.run(parameters.getRuntime(), Main.class)
.assertFailure()
.inspectStackTrace(this::checkStackTraceFromRunning);
diff --git a/src/test/java/com/android/tools/r8/testingannotations/NeverInlineStaticInterfaceMethodTest.java b/src/test/java/com/android/tools/r8/testingannotations/NeverInlineStaticInterfaceMethodTest.java
index 35d810b..3cf4266 100644
--- a/src/test/java/com/android/tools/r8/testingannotations/NeverInlineStaticInterfaceMethodTest.java
+++ b/src/test/java/com/android/tools/r8/testingannotations/NeverInlineStaticInterfaceMethodTest.java
@@ -43,7 +43,7 @@
.addInnerClasses(getClass())
.addKeepMainRule(Main.class)
.enableInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(
inspector -> {
diff --git a/src/test/java/com/android/tools/r8/workaround/ArrayFieldGetWithMissingBaseTypeTest.java b/src/test/java/com/android/tools/r8/workaround/ArrayFieldGetWithMissingBaseTypeTest.java
index b28721d..cdd2dea 100644
--- a/src/test/java/com/android/tools/r8/workaround/ArrayFieldGetWithMissingBaseTypeTest.java
+++ b/src/test/java/com/android/tools/r8/workaround/ArrayFieldGetWithMissingBaseTypeTest.java
@@ -52,7 +52,7 @@
.assertNoOtherClassesMerged())
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("Hello world!");
diff --git a/src/test/java/com/android/tools/r8/workaround/InputWithAbstractMethodOnNonAbstractClassTest.java b/src/test/java/com/android/tools/r8/workaround/InputWithAbstractMethodOnNonAbstractClassTest.java
index 00a3fba..f091151 100644
--- a/src/test/java/com/android/tools/r8/workaround/InputWithAbstractMethodOnNonAbstractClassTest.java
+++ b/src/test/java/com/android/tools/r8/workaround/InputWithAbstractMethodOnNonAbstractClassTest.java
@@ -40,7 +40,7 @@
testForD8()
.addProgramClasses(TestClass.class)
.addProgramClassFileData(transformer(Greeter.class).unsetAbstract().transform())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect)
.run(parameters.getRuntime(), TestClass.class)
@@ -54,7 +54,7 @@
.addProgramClassFileData(transformer(Greeter.class).unsetAbstract().transform())
.addKeepMainRule(TestClass.class)
.addKeepClassAndMembersRules(Greeter.class)
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.inspect(this::inspect)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/workaround/InvokeVirtualToInterfaceVerifyErrorWorkaroundTest.java b/src/test/java/com/android/tools/r8/workaround/InvokeVirtualToInterfaceVerifyErrorWorkaroundTest.java
index 03d7c66..374b512 100644
--- a/src/test/java/com/android/tools/r8/workaround/InvokeVirtualToInterfaceVerifyErrorWorkaroundTest.java
+++ b/src/test/java/com/android/tools/r8/workaround/InvokeVirtualToInterfaceVerifyErrorWorkaroundTest.java
@@ -55,7 +55,7 @@
&& parameters.getApiLevel().isGreaterThanOrEqualTo(AndroidApiLevel.L),
i -> i.assertIsCompleteMergeGroup(A.class, CameraDeviceUser.class))
.assertNoOtherClassesMerged())
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
// CameraDeviceUser.m() can only be inlined when min API>=L.
.inspect(
diff --git a/src/test/java/com/android/tools/r8/workaround/MethodReturnWithMissingBaseTypeTest.java b/src/test/java/com/android/tools/r8/workaround/MethodReturnWithMissingBaseTypeTest.java
index 87a601b..3e98a00 100644
--- a/src/test/java/com/android/tools/r8/workaround/MethodReturnWithMissingBaseTypeTest.java
+++ b/src/test/java/com/android/tools/r8/workaround/MethodReturnWithMissingBaseTypeTest.java
@@ -46,7 +46,7 @@
.assertNoOtherClassesMerged())
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
- .setMinApi(parameters.getApiLevel())
+ .setMinApi(parameters)
.compile()
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("Hello world!");
