commit 13bcef10fa92dfd4453867714e910b72e83c84b0
author Søren Gjesse <sgjesse@google.com> Mon May 22 14:19:38 2023 +0200
committer Søren Gjesse <sgjesse@google.com> Mon May 22 14:19:38 2023 +0200
tree 10ffb691198ae34169316a916cf3a74a16558f49
parent 1ce61a3b38dd82d3d110e1f1930f996fa085597e

Version 8.0.50

Migrate tests to the 8.0 branch.

Bug: b/281774632
Change-Id: I294ea696227c71e02472f9f788b95d371ecb82cf

src/main/java/com/android/tools/r8/Version.java

diff --git a/src/main/java/com/android/tools/r8/Version.java b/src/main/java/com/android/tools/r8/Version.java
index 8e885d5..76b7d79 100644
--- a/src/main/java/com/android/tools/r8/Version.java
+++ b/src/main/java/com/android/tools/r8/Version.java
@@ -11,7 +11,7 @@
 
   // This field is accessed from release scripts using simple pattern matching.
   // Therefore, changing this field could break our release scripts.
-  public static final String LABEL = "8.0.49";
+  public static final String LABEL = "8.0.50";
 
   private Version() {
   }

src/test/java/com/android/tools/r8/locale/TurkishLocaleMultiReleaseJarTest.java

diff --git a/src/test/java/com/android/tools/r8/locale/TurkishLocaleMultiReleaseJarTest.java b/src/test/java/com/android/tools/r8/locale/TurkishLocaleMultiReleaseJarTest.java
index d5edd80..15becb6 100644
--- a/src/test/java/com/android/tools/r8/locale/TurkishLocaleMultiReleaseJarTest.java
+++ b/src/test/java/com/android/tools/r8/locale/TurkishLocaleMultiReleaseJarTest.java
@@ -49,7 +49,7 @@
                 "--min-api",
                 Integer.toString(parameters.getApiLevel().getLevel()),
                 "--lib",
-                ToolHelper.getAndroidJar(AndroidApiLevel.U).toAbsolutePath().toString(),
+                ToolHelper.getAndroidJar(AndroidApiLevel.T).toAbsolutePath().toString(),
                 buildMultiReleaseJarWithUpperCaseMetaInf(workingDir).toString()));
     assertEquals(0, result.exitCode);
     runArtOnClassesDotDex(workingDir);
@@ -61,7 +61,7 @@
     ImmutableList.Builder<String> builder = ImmutableList.builder();
     builder.add(
         "--lib",
-        ToolHelper.getAndroidJar(AndroidApiLevel.U).toAbsolutePath().toString(),
+        ToolHelper.getAndroidJar(AndroidApiLevel.T).toAbsolutePath().toString(),
         "--pg-conf",
         FileUtils.writeTextFile(temp.newFile("test.pro").toPath(), "-keep class * { *; }")
             .toString(),

src/test/java/com/android/tools/r8/locale/TurkishLocaleZipFileInputTest.java

diff --git a/src/test/java/com/android/tools/r8/locale/TurkishLocaleZipFileInputTest.java b/src/test/java/com/android/tools/r8/locale/TurkishLocaleZipFileInputTest.java
index c215eba..222f9d3 100644
--- a/src/test/java/com/android/tools/r8/locale/TurkishLocaleZipFileInputTest.java
+++ b/src/test/java/com/android/tools/r8/locale/TurkishLocaleZipFileInputTest.java
@@ -49,7 +49,7 @@
                 "--min-api",
                 Integer.toString(parameters.getApiLevel().getLevel()),
                 "--lib",
-                ToolHelper.getAndroidJar(AndroidApiLevel.U).toAbsolutePath().toString(),
+                ToolHelper.getAndroidJar(AndroidApiLevel.T).toAbsolutePath().toString(),
                 buildZipWithUpperCaseExtension(workingDir).toString()));
     assertEquals(0, result.exitCode);
     runArtOnClassesDotDex(workingDir);
@@ -61,7 +61,7 @@
     ImmutableList.Builder<String> builder = ImmutableList.builder();
     builder.add(
         "--lib",
-        ToolHelper.getAndroidJar(AndroidApiLevel.U).toAbsolutePath().toString(),
+        ToolHelper.getAndroidJar(AndroidApiLevel.T).toAbsolutePath().toString(),
         "--pg-conf",
         FileUtils.writeTextFile(temp.newFile("test.pro").toPath(), "-keep class * { *; }")
             .toString(),