commit c393db56d07cb942bc3d2c7cc5aadc4cfa2ff6b2
author Søren Gjesse <sgjesse@google.com> Thu Apr 28 09:45:29 2022 +0200
committer Søren Gjesse <sgjesse@google.com> Fri Apr 29 13:21:47 2022 +0000
tree d076f1e7cb4a7667326361e281f1cb348e0da2e0
parent b5b1f4ea8b97742deb400e85f5a6c4f75b697cd3

Remove deprecated assertion configuration APIs

Fixes: b/230695416
Change-Id: Ia499c65eb55b36d1de5ef0a8af4bb6121a1d065e

src/test/apiUsageSample/com/android/tools/apiusagesample/R8ApiUsageSample.java

diff --git a/src/test/apiUsageSample/com/android/tools/apiusagesample/R8ApiUsageSample.java b/src/test/apiUsageSample/com/android/tools/apiusagesample/R8ApiUsageSample.java
index febd5e6..4b86cea 100644
--- a/src/test/apiUsageSample/com/android/tools/apiusagesample/R8ApiUsageSample.java
+++ b/src/test/apiUsageSample/com/android/tools/apiusagesample/R8ApiUsageSample.java
@@ -416,21 +416,27 @@
               .setProgramConsumer(new EnsureOutputConsumer())
               .addLibraryFiles(libraries)
               .addProgramFiles(inputs)
-              .addAssertionsConfiguration(b -> b.setScopeAll().setEnable().build())
-              .addAssertionsConfiguration(b -> b.setScopeAll().setDisable().build())
+              .addAssertionsConfiguration(b -> b.setScopeAll().setCompileTimeEnable().build())
+              .addAssertionsConfiguration(b -> b.setScopeAll().setCompileTimeDisable().build())
               .addAssertionsConfiguration(
-                  b -> b.setScopePackage("com.android.tools.apiusagesample").setEnable().build())
+                  b ->
+                      b.setScopePackage("com.android.tools.apiusagesample")
+                          .setCompileTimeEnable()
+                          .build())
               .addAssertionsConfiguration(
                   b ->
                       b.setScopePackage("com.android.tools.apiusagesample")
                           .setPassthrough()
                           .build())
               .addAssertionsConfiguration(
-                  b -> b.setScopePackage("com.android.tools.apiusagesample").setDisable().build())
+                  b ->
+                      b.setScopePackage("com.android.tools.apiusagesample")
+                          .setCompileTimeDisable()
+                          .build())
               .addAssertionsConfiguration(
                   b ->
                       b.setScopeClass("com.android.tools.apiusagesample.D8ApiUsageSample")
-                          .setEnable()
+                          .setCompileTimeEnable()
                           .build())
               .addAssertionsConfiguration(
                   b ->
@@ -440,11 +446,13 @@
               .addAssertionsConfiguration(
                   b ->
                       b.setScopeClass("com.android.tools.apiusagesample.D8ApiUsageSample")
-                          .setDisable()
+                          .setCompileTimeDisable()
                           .build())
-              .addAssertionsConfiguration(AssertionsConfiguration.Builder::enableAllAssertions)
+              .addAssertionsConfiguration(
+                  AssertionsConfiguration.Builder::compileTimeEnableAllAssertions)
               .addAssertionsConfiguration(AssertionsConfiguration.Builder::passthroughAllAssertions)
-              .addAssertionsConfiguration(AssertionsConfiguration.Builder::disableAllAssertions)
+              .addAssertionsConfiguration(
+                  AssertionsConfiguration.Builder::compileTimeDisableAllAssertions)
               .build());
     } catch (CompilationFailedException e) {
       throw new RuntimeException("Unexpected compilation exceptions", e);