commit 44c473b5b70826dd4ea015476bec3783c028fbba
author Clément Béra <clementbera@google.com> Tue Sep 24 08:37:07 2024 +0200
committer Clément Béra <clementbera@google.com> Tue Sep 24 08:54:14 2024 +0000
tree c5cee624cce5a5712368412ded7a4e1cf51eb39d
parent d48b6366738d625b0f5e9678193dceaa803bef9f

Add tests for Kotlin 2.1.0-beta1

Change-Id: I9d320d3984ae22370e1a771da84018d681a27f4a

src/test/java/com/android/tools/r8/kotlin/KotlinClassInlinerTest.java

diff --git a/src/test/java/com/android/tools/r8/kotlin/KotlinClassInlinerTest.java b/src/test/java/com/android/tools/r8/kotlin/KotlinClassInlinerTest.java
index 4014e78..41c2ec4 100644
--- a/src/test/java/com/android/tools/r8/kotlin/KotlinClassInlinerTest.java
+++ b/src/test/java/com/android/tools/r8/kotlin/KotlinClassInlinerTest.java
@@ -9,7 +9,7 @@
 import static com.android.tools.r8.KotlinCompilerTool.KotlinCompilerVersion.KOTLINC_1_6_0;
 import static com.android.tools.r8.KotlinCompilerTool.KotlinCompilerVersion.KOTLINC_1_9_21;
 import static com.android.tools.r8.KotlinCompilerTool.KotlinCompilerVersion.KOTLINC_2_0_20;
-import static com.android.tools.r8.KotlinCompilerTool.KotlinCompilerVersion.KOTLIN_DEV;
+import static com.android.tools.r8.KotlinCompilerTool.KotlinCompilerVersion.KOTLINC_2_1_0_BETA1;
 import static com.android.tools.r8.utils.codeinspector.Matchers.isAbsent;
 import static com.android.tools.r8.utils.codeinspector.Matchers.isAbsentIf;
 import static com.android.tools.r8.utils.codeinspector.Matchers.isPresent;
@@ -223,7 +223,7 @@
                                     kotlinParameters
                                         .getCompiler()
                                         .getCompilerVersion()
-                                        .isEqualTo(KOTLIN_DEV),
+                                        .isGreaterThanOrEqualTo(KOTLINC_2_1_0_BETA1),
                                     i -> {
                                       ClassReference sequencesKt =
                                           Reference.classFromTypeName(

src/test/testbase/java/com/android/tools/r8/KotlinCompilerTool.java

diff --git a/src/test/testbase/java/com/android/tools/r8/KotlinCompilerTool.java b/src/test/testbase/java/com/android/tools/r8/KotlinCompilerTool.java
index eb7eb2d..1c0c6a8 100644
--- a/src/test/testbase/java/com/android/tools/r8/KotlinCompilerTool.java
+++ b/src/test/testbase/java/com/android/tools/r8/KotlinCompilerTool.java
@@ -78,6 +78,7 @@
     KOTLINC_1_8_0("kotlin-compiler-1.8.0", KotlinLambdaGeneration.CLASS),
     KOTLINC_1_9_21("kotlin-compiler-1.9.21", KotlinLambdaGeneration.CLASS),
     KOTLINC_2_0_20("kotlin-compiler-2.0.20", KotlinLambdaGeneration.INVOKE_DYNAMIC),
+    KOTLINC_2_1_0_BETA1("kotlin-compiler-2.1.0-Beta1", KotlinLambdaGeneration.INVOKE_DYNAMIC),
     KOTLIN_DEV("kotlin-compiler-dev", KotlinLambdaGeneration.INVOKE_DYNAMIC);
 
     public static final KotlinCompilerVersion MIN_SUPPORTED_VERSION = KOTLINC_2_0_20;

third_party/kotlin/kotlin-compiler-2.1.0-Beta1.tar.gz.sha1

diff --git a/third_party/kotlin/kotlin-compiler-2.1.0-Beta1.tar.gz.sha1 b/third_party/kotlin/kotlin-compiler-2.1.0-Beta1.tar.gz.sha1
new file mode 100644
index 0000000..3f0f592
--- /dev/null
+++ b/third_party/kotlin/kotlin-compiler-2.1.0-Beta1.tar.gz.sha1
@@ -0,0 +1 @@
+491ee600cbb5b7febfd1ca4bda0d97e5d14aa370
\ No newline at end of file