From e5995f0c12cef2d6472eda8591f950e079161426 Mon Sep 17 00:00:00 2001
From: Ilmir Usmanov <ilmir.usmanov@jetbrains.com>
Date: Wed, 22 Jul 2020 19:15:47 +0200
Subject: [PATCH] Update R8

Because old version throws assertion error if parameter's LVT record
does no span the whole function.
---
 build.gradle.kts                                              | 2 +-
 .../tests/org/jetbrains/kotlin/codegen/D8Checker.java         | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index f864a49e4db..253990eb689 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -178,7 +178,7 @@ extra["versions.jflex"] = "1.7.0"
 extra["versions.markdown"] = "0.1.25"
 extra["versions.trove4j"] = "1.0.20181211"
 extra["versions.completion-ranking-kotlin"] = "0.1.2"
-extra["versions.r8"] = "1.5.70"
+extra["versions.r8"] = "2.0.88"
 val immutablesVersion = "0.3.1"
 extra["versions.kotlinx-collections-immutable"] = immutablesVersion
 extra["versions.kotlinx-collections-immutable-jvm"] = immutablesVersion
diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/D8Checker.java b/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/D8Checker.java
index bdea96035c4..c7856c4bc25 100644
--- a/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/D8Checker.java
+++ b/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/D8Checker.java
@@ -7,11 +7,7 @@ package org.jetbrains.kotlin.codegen;
 
 import com.android.tools.r8.*;
 import com.android.tools.r8.origin.PathOrigin;
-import com.android.tools.r8.utils.AndroidApiLevel;
-import com.intellij.concurrency.IdeaForkJoinWorkerThreadFactory;
 import kotlin.Pair;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 import org.jetbrains.kotlin.backend.common.output.OutputFile;
 import org.junit.Assert;