From 34d138e2ce389d48f2d5a83c2ad1a1a168b154cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=B3bert=20Papp=20=28TWiStErRob=29?=
 <papp.robert.s@gmail.com>
Date: Sat, 9 Nov 2024 03:25:49 +0000
Subject: [PATCH] Add toolchain plugin everywhere and unify plugin style

> Configure project :testkit:gradle-testkit-plugin
Using a toolchain installed via auto-provisioning, but having no toolchain repositories configured. This behavior is deprecated. Consider defining toolchain download repositories, otherwise the build might fail in clean environments; see https://docs.gradle.org/8.11-rc-3/userguide/toolchains.html#sub:download_repositoriesed artifacts.
---
 build-logic/settings.gradle.kts | 7 +++++++
 settings.gradle.kts             | 3 ++-
 testkit/settings.gradle.kts     | 2 ++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/build-logic/settings.gradle.kts b/build-logic/settings.gradle.kts
index 8a7ac85c2..e11f87ae8 100644
--- a/build-logic/settings.gradle.kts
+++ b/build-logic/settings.gradle.kts
@@ -7,6 +7,13 @@ pluginManagement {
     gradlePluginPortal()
     mavenCentral()
   }
+  plugins {
+    id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
+  }
+}
+
+plugins {
+  id("org.gradle.toolchains.foojay-resolver-convention")
 }
 
 dependencyResolutionManagement {
diff --git a/settings.gradle.kts b/settings.gradle.kts
index dc967f05f..652295896 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -31,12 +31,13 @@ pluginManagement {
     id("com.gradleup.shadow") version "8.3.0"
     id("com.gradle.develocity") version "3.18.2"
     id("com.gradle.plugin-publish") version "1.1.0"
+    id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
   }
 }
 
 plugins {
   id("com.gradle.develocity")
-  id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
+  id("org.gradle.toolchains.foojay-resolver-convention")
 }
 
 // Yes, this is also in pluginManagement above. This is required for normal dependencies.
diff --git a/testkit/settings.gradle.kts b/testkit/settings.gradle.kts
index 3b3ee9416..0e91054e9 100644
--- a/testkit/settings.gradle.kts
+++ b/testkit/settings.gradle.kts
@@ -28,11 +28,13 @@ pluginManagement {
     id("com.gradle.develocity") version "3.18.2"
     id("com.gradle.plugin-publish") version "1.1.0"
     id("org.jetbrains.dokka") version "1.9.20"
+    id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
   }
 }
 
 plugins {
   id("com.gradle.develocity")
+  id("org.gradle.toolchains.foojay-resolver-convention")
 }
 
 dependencyResolutionManagement {