Add Kotlin 2.2.0-Beta2
Kotlin 2.2.0-Beta2 is tested as a dev compiler (on the kotlin-dev bot).
Fixes: b/416170041
Bug: b/416189028
Change-Id: I1df58fae86d88b9db2af1700724aa2e1cb94639b
diff --git a/.gitignore b/.gitignore
index af9e4dd..622e420 100644
--- a/.gitignore
+++ b/.gitignore
@@ -173,6 +173,8 @@
third_party/kotlin/kotlin-compiler-2.0.20
third_party/kotlin/kotlin-compiler-2.1.10
third_party/kotlin/kotlin-compiler-2.1.10.tar.gz
+third_party/kotlin/kotlin-compiler-2.2.0-Beta2
+third_party/kotlin/kotlin-compiler-2.2.0-Beta2.tar.gz
third_party/kotlin/kotlin-compiler-dev.tar.gz
third_party/kotlin/kotlin-compiler-dev
third_party/kotlinx-coroutines-1.3.6.tar.gz
diff --git a/d8_r8/commonBuildSrc/src/main/kotlin/DependenciesPlugin.kt b/d8_r8/commonBuildSrc/src/main/kotlin/DependenciesPlugin.kt
index b67322c..f6ade33 100644
--- a/d8_r8/commonBuildSrc/src/main/kotlin/DependenciesPlugin.kt
+++ b/d8_r8/commonBuildSrc/src/main/kotlin/DependenciesPlugin.kt
@@ -1095,6 +1095,7 @@
"kotlin-compiler-1.9.21",
"kotlin-compiler-2.0.20",
"kotlin-compiler-2.1.10",
+ "kotlin-compiler-2.2.0-Beta2",
"kotlin-compiler-dev",
)
.map {
diff --git a/src/test/java/com/android/tools/r8/debug/KotlinInlineTest.java b/src/test/java/com/android/tools/r8/debug/KotlinInlineTest.java
index 660f9af..aae982c 100644
--- a/src/test/java/com/android/tools/r8/debug/KotlinInlineTest.java
+++ b/src/test/java/com/android/tools/r8/debug/KotlinInlineTest.java
@@ -5,6 +5,7 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
+import static org.junit.Assume.assumeFalse;
import com.android.tools.r8.KotlinCompilerTool.KotlinCompilerVersion;
import com.android.tools.r8.KotlinTestParameters;
@@ -268,6 +269,8 @@
@Test
public void testNestedInlining() throws Throwable {
+ assumeFalse(
+ kotlinParameters.getCompilerVersion().equals(KotlinCompilerVersion.KOTLINC_2_2_0_Beta2));
// Count the number of lines in the source file. This is needed to check that inlined code
// refers to non-existing line numbers.
Path sourceFilePath =
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 f1945ef..160dd55 100644
--- a/src/test/testbase/java/com/android/tools/r8/KotlinCompilerTool.java
+++ b/src/test/testbase/java/com/android/tools/r8/KotlinCompilerTool.java
@@ -79,12 +79,13 @@
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_10("kotlin-compiler-2.1.10", KotlinLambdaGeneration.INVOKE_DYNAMIC),
+ KOTLINC_2_2_0_Beta2("kotlin-compiler-2.2.0-Beta2", KotlinLambdaGeneration.INVOKE_DYNAMIC),
KOTLIN_DEV("kotlin-compiler-dev", KotlinLambdaGeneration.INVOKE_DYNAMIC);
public static final KotlinCompilerVersion MIN_SUPPORTED_VERSION = KOTLINC_2_1_10;
public static final KotlinCompilerVersion MAX_SUPPORTED_VERSION = KOTLINC_2_1_10;
public static final KotlinCompilerVersion[] DEV_COMPILERS =
- new KotlinCompilerVersion[] {KotlinCompilerVersion.KOTLIN_DEV};
+ new KotlinCompilerVersion[] {KOTLINC_2_2_0_Beta2, KOTLIN_DEV};
private final String folder;
private final KotlinLambdaGeneration defaultLambdaGeneration;
diff --git a/third_party/kotlin/kotlin-compiler-2.2.0-Beta2.tar.gz.sha1 b/third_party/kotlin/kotlin-compiler-2.2.0-Beta2.tar.gz.sha1
new file mode 100644
index 0000000..2dea284
--- /dev/null
+++ b/third_party/kotlin/kotlin-compiler-2.2.0-Beta2.tar.gz.sha1
@@ -0,0 +1 @@
+ddc48ab74ebcc86a121c24301aee34541116d196
\ No newline at end of file
