Add Kotlin 2.2.0
Kotlin 2.2.0 is tested as a dev compiler (on the kotlin-dev bot).
Fixes: b/432173383
Bug: b/416189028
Change-Id: Icfdcc48e583cd60fa9f5c178abbd9d50336785d9
diff --git a/.gitignore b/.gitignore
index a7e0f2a..e310747 100644
--- a/.gitignore
+++ b/.gitignore
@@ -175,8 +175,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-2.2.0
+third_party/kotlin/kotlin-compiler-2.2.0.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 5597398..17f6c74 100644
--- a/d8_r8/commonBuildSrc/src/main/kotlin/DependenciesPlugin.kt
+++ b/d8_r8/commonBuildSrc/src/main/kotlin/DependenciesPlugin.kt
@@ -1109,7 +1109,7 @@
"kotlin-compiler-1.9.21",
"kotlin-compiler-2.0.20",
"kotlin-compiler-2.1.10",
- "kotlin-compiler-2.2.0-Beta2",
+ "kotlin-compiler-2.2.0",
"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 96b801b..be1f81a 100644
--- a/src/test/java/com/android/tools/r8/debug/KotlinInlineTest.java
+++ b/src/test/java/com/android/tools/r8/debug/KotlinInlineTest.java
@@ -269,8 +269,8 @@
@Test
public void testNestedInlining() throws Throwable {
- assumeFalse(
- kotlinParameters.getCompilerVersion().equals(KotlinCompilerVersion.KOTLINC_2_2_0_Beta2));
+ // TODO(b/416189028): Triage this.
+ assumeFalse(kotlinParameters.getCompilerVersion().equals(KotlinCompilerVersion.KOTLINC_2_2_0));
// 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 6a55ea8..6a69246 100644
--- a/src/test/testbase/java/com/android/tools/r8/KotlinCompilerTool.java
+++ b/src/test/testbase/java/com/android/tools/r8/KotlinCompilerTool.java
@@ -21,7 +21,6 @@
import com.android.tools.r8.ToolHelper.CommandResultCache;
import com.android.tools.r8.ToolHelper.ProcessResult;
import com.android.tools.r8.errors.Unimplemented;
-import com.android.tools.r8.utils.ArrayUtils;
import com.android.tools.r8.utils.ConsumerUtils;
import com.android.tools.r8.utils.FileUtils;
import com.android.tools.r8.utils.Pair;
@@ -90,13 +89,13 @@
KOTLINC_1_9_21("kotlin-compiler-1.9.21", CLASS, JAVA_8),
KOTLINC_2_0_20("kotlin-compiler-2.0.20", INVOKE_DYNAMIC, JAVA_8),
KOTLINC_2_1_10("kotlin-compiler-2.1.10", INVOKE_DYNAMIC, JAVA_8),
- KOTLINC_2_2_0_Beta2("kotlin-compiler-2.2.0-Beta2", INVOKE_DYNAMIC, JAVA_8),
+ KOTLINC_2_2_0("kotlin-compiler-2.2.0", INVOKE_DYNAMIC, JAVA_8),
KOTLIN_DEV("kotlin-compiler-dev", INVOKE_DYNAMIC, JAVA_8);
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[] {KOTLINC_2_2_0_Beta2, KOTLIN_DEV};
+ new KotlinCompilerVersion[] {KOTLINC_2_2_0, KOTLIN_DEV};
private final String folder;
private final KotlinLambdaGeneration defaultLambdaGeneration;
diff --git a/src/test/testbase/java/com/android/tools/r8/KotlinTestParameters.java b/src/test/testbase/java/com/android/tools/r8/KotlinTestParameters.java
index 78c69ad..05be21f 100644
--- a/src/test/testbase/java/com/android/tools/r8/KotlinTestParameters.java
+++ b/src/test/testbase/java/com/android/tools/r8/KotlinTestParameters.java
@@ -186,6 +186,10 @@
}
public Builder withLatestCompiler() {
+ if (withDevCompiler) {
+ assert KotlinCompilerVersion.DEV_COMPILERS.length > 0;
+ return withCompiler(KotlinCompilerVersion.DEV_COMPILERS[0]);
+ }
return withCompiler(KotlinCompilerVersion.MAX_SUPPORTED_VERSION);
}
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
deleted file mode 100644
index 2dea284..0000000
--- a/third_party/kotlin/kotlin-compiler-2.2.0-Beta2.tar.gz.sha1
+++ /dev/null
@@ -1 +0,0 @@
-ddc48ab74ebcc86a121c24301aee34541116d196
\ No newline at end of file
diff --git a/third_party/kotlin/kotlin-compiler-2.2.0.tar.gz.sha1 b/third_party/kotlin/kotlin-compiler-2.2.0.tar.gz.sha1
new file mode 100644
index 0000000..f74b5d0
--- /dev/null
+++ b/third_party/kotlin/kotlin-compiler-2.2.0.tar.gz.sha1
@@ -0,0 +1 @@
+bb9ffa1be7344aa7a71a0daac9f7776fb317a336
\ No newline at end of file
