commit 6fcf1eb2fdb66157c86c46df3fd6afcf86e5cabb
author Morten Krogh-Jespersen <mkroghj@google.com> Wed Apr 14 13:52:43 2021 +0200
committer Morten Krogh-Jespersen <mkroghj@google.com> Wed Apr 14 12:15:08 2021 +0000
tree 36a77df0aec85b701283fe3717182e9cea868962
parent 17b6fa085fd2094f9ab0846b6714d729c82a5c11

Add kotlin compiler 1.5.0-M2

Contents of README.google:

Name: Kotlin
URL: https://github.com/JetBrains/kotlin/
Version: 1.5.0-M2
Revision: NA
License: Apache License Version 2.0

Bug: 185317811
Change-Id: I9c8c8cc6c1dbd2ad18779a2c05b8fde31422dee3

.gitignore

diff --git a/.gitignore b/.gitignore
index 28f7415..b929f34 100644
--- a/.gitignore
+++ b/.gitignore
@@ -106,6 +106,8 @@
 third_party/kotlin/kotlin-compiler-1.3.72
 third_party/kotlin/kotlin-compiler-1.4.20.tar.gz
 third_party/kotlin/kotlin-compiler-1.4.20
+third_party/kotlin/kotlin-compiler-1.5.0-M2.tar.gz
+third_party/kotlin/kotlin-compiler-1.5.0-M2
 third_party/kotlinx-coroutines-1.3.6.tar.gz
 third_party/kotlinx-coroutines-1.3.6
 third_party/nest/*

build.gradle

diff --git a/build.gradle b/build.gradle
index 30c839c..a2b474e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -327,6 +327,7 @@
                 "kotlin/kotlin-compiler-1.3.41",
                 "kotlin/kotlin-compiler-1.3.72",
                 "kotlin/kotlin-compiler-1.4.20",
+                "kotlin/kotlin-compiler-1.5.0-M2",
                 "kotlinx-coroutines-1.3.6",
                 "openjdk/openjdk-rt-1.8",
                 "openjdk/desugar_jdk_libs",

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

diff --git a/src/test/java/com/android/tools/r8/KotlinCompilerTool.java b/src/test/java/com/android/tools/r8/KotlinCompilerTool.java
index f19059b..8f71e5b 100644
--- a/src/test/java/com/android/tools/r8/KotlinCompilerTool.java
+++ b/src/test/java/com/android/tools/r8/KotlinCompilerTool.java
@@ -30,7 +30,8 @@
 
   public enum KotlinCompilerVersion {
     KOTLINC_1_3_72("kotlin-compiler-1.3.72"),
-    KOTLINC_1_4_20("kotlin-compiler-1.4.20");
+    KOTLINC_1_4_20("kotlin-compiler-1.4.20"),
+    KOTLINC_1_5_20_M2("kotlin-compiler-1.5.0-M2");
 
     private final String folder;
 

src/test/java/com/android/tools/r8/ToolHelper.java

diff --git a/src/test/java/com/android/tools/r8/ToolHelper.java b/src/test/java/com/android/tools/r8/ToolHelper.java
index e9a47e3..bbe92a3 100644
--- a/src/test/java/com/android/tools/r8/ToolHelper.java
+++ b/src/test/java/com/android/tools/r8/ToolHelper.java
@@ -5,6 +5,7 @@
 
 import static com.android.tools.r8.KotlinCompilerTool.KotlinCompilerVersion.KOTLINC_1_3_72;
 import static com.android.tools.r8.KotlinCompilerTool.KotlinCompilerVersion.KOTLINC_1_4_20;
+import static com.android.tools.r8.KotlinCompilerTool.KotlinCompilerVersion.KOTLINC_1_5_20_M2;
 import static com.android.tools.r8.utils.FileUtils.CLASS_EXTENSION;
 import static com.android.tools.r8.utils.FileUtils.isDexFile;
 import static org.junit.Assert.assertEquals;
@@ -2152,6 +2153,10 @@
     return new KotlinCompiler(KOTLINC_1_4_20);
   }
 
+  public static KotlinCompiler getKotlinC_1_5_0_m2() {
+    return new KotlinCompiler(KOTLINC_1_5_20_M2);
+  }
+
   public static KotlinCompiler[] getKotlinCompilers() {
     return new KotlinCompiler[] {getKotlinC_1_3_72(), getKotlinC_1_4_20()};
   }

third_party/kotlin/kotlin-compiler-1.5.0-M2.tar.gz.sha1

diff --git a/third_party/kotlin/kotlin-compiler-1.5.0-M2.tar.gz.sha1 b/third_party/kotlin/kotlin-compiler-1.5.0-M2.tar.gz.sha1
new file mode 100644
index 0000000..e0b251e
--- /dev/null
+++ b/third_party/kotlin/kotlin-compiler-1.5.0-M2.tar.gz.sha1
@@ -0,0 +1 @@
+7368d9ee73d01fc609d7ded1bf0506f72aa3ac66
\ No newline at end of file