From 869b6fce7ebf155331a289b8562286ab894f5795 Mon Sep 17 00:00:00 2001
From: Filipp Zhinkin <filipp.zhinkin@jetbrains.com>
Date: Thu, 23 Nov 2023 16:03:15 +0100
Subject: [PATCH 1/2] Use foojay conversion plugin for toolchain provisioning

---
 settings.gradle.kts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/settings.gradle.kts b/settings.gradle.kts
index c348383ab..fb5843f80 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -13,6 +13,10 @@ pluginManagement {
     }
 }
 
+plugins {
+    id("org.gradle.toolchains.foojay-resolver-convention") version ("0.7.0")
+}
+
 rootProject.name = "kotlinx-io"
 
 include(":kotlinx-io-core")

From 4375f9477a6d8ce9aeb242466f2c2773b25a0280 Mon Sep 17 00:00:00 2001
From: Filipp Zhinkin <filipp.zhinkin@jetbrains.com>
Date: Thu, 23 Nov 2023 16:43:19 +0100
Subject: [PATCH 2/2] Use foojay conversion plugin in buildSrc

---
 build-logic/build.gradle.kts    | 4 ++++
 build-logic/settings.gradle.kts | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/build-logic/build.gradle.kts b/build-logic/build.gradle.kts
index 14c0f8ec1..849bbc54c 100644
--- a/build-logic/build.gradle.kts
+++ b/build-logic/build.gradle.kts
@@ -15,3 +15,7 @@ dependencies {
     implementation(libs.kotlin.gradle.plugin)
     implementation(libs.animalsniffer.gradle.plugin)
 }
+
+kotlin {
+    jvmToolchain(JavaLanguageVersion.of(libs.versions.java.get()).asInt())
+}
diff --git a/build-logic/settings.gradle.kts b/build-logic/settings.gradle.kts
index 785b51e5b..4f3e0c58d 100644
--- a/build-logic/settings.gradle.kts
+++ b/build-logic/settings.gradle.kts
@@ -3,6 +3,10 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE.txt file.
  */
 
+plugins {
+    id("org.gradle.toolchains.foojay-resolver-convention") version ("0.7.0")
+}
+
 dependencyResolutionManagement {
     versionCatalogs {
         create("libs") {