From 61a5e1e1bac0e6500f98bfad9645c1eb9de2ad7a Mon Sep 17 00:00:00 2001
From: vmishenev <vad-mishenev@yandex.ru>
Date: Fri, 12 Nov 2021 16:05:53 +0300
Subject: Bump Kotlin to 1.6.0-RC2 (#2221)

* Bump Kotlin to 1.6.0-RC2

* Fix Gradle bug in test configuration
---
 runners/gradle-plugin/build.gradle.kts | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'runners/gradle-plugin')

diff --git a/runners/gradle-plugin/build.gradle.kts b/runners/gradle-plugin/build.gradle.kts
index f9b8491b..2541ed99 100644
--- a/runners/gradle-plugin/build.gradle.kts
+++ b/runners/gradle-plugin/build.gradle.kts
@@ -1,3 +1,4 @@
+import org.gradle.configurationcache.extensions.serviceOf
 import org.jetbrains.*
 
 plugins {
@@ -24,6 +25,13 @@ dependencies {
     testImplementation("org.jetbrains.kotlin:kotlin-gradle-plugin")
     testImplementation("com.android.tools.build:gradle:4.0.1")
 
+    // Fix https://github.com/gradle/gradle/issues/16774
+    testImplementation (
+        files(
+            serviceOf<org.gradle.api.internal.classpath.ModuleRegistry>().getModule("gradle-tooling-api-builders")
+                .classpath.asFiles.first()
+        )
+    )
 
     constraints {
         val kotlin_version: String by project
-- 
cgit