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
---
 gradle.properties                      | 6 +++---
 runners/gradle-plugin/build.gradle.kts | 8 ++++++++
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 4f2dbd00..af58f179 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,12 +1,12 @@
 # Project Settings
-dokka_version_base=1.6.0-RC
+dokka_version_base=1.6.0-RC2
 dokka_publication_channels=maven-central-snapshot&space-dokka-dev
 dokka_integration_test_parallelism=2
 # Versions
-kotlin_version=1.6.0-RC
+kotlin_version=1.6.0-RC2
 coroutines_version=1.5.1
 kotlinx_html_version=0.7.3
-kotlin_plugin_version=211-1.6.0-RC-release-681-IJ7442.40
+kotlin_plugin_version=211-1.6.0-RC2-release-766-IJ7442.40
 jsoup_version=1.13.1
 idea_version=211.7442.40
 language_version=1.4
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