From 837d84b39c8c71cb0adb6ceab45b0205491ab9ff Mon Sep 17 00:00:00 2001
From: "Daniel A. A. Pelsmaeker" <developer@pelsmaeker.net>
Date: Tue, 9 Jul 2024 17:11:18 +0200
Subject: [PATCH] Apply foojar plugin in settings convention

---
 convention-plugin/build.gradle.kts                           | 1 +
 convention-plugin/settings.gradle.kts                        | 2 +-
 .../org/metaborg/convention/SettingsConventionPlugin.kt      | 5 ++++-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/convention-plugin/build.gradle.kts b/convention-plugin/build.gradle.kts
index 0207cd3..8b21507 100644
--- a/convention-plugin/build.gradle.kts
+++ b/convention-plugin/build.gradle.kts
@@ -25,6 +25,7 @@ dependencies {
     implementation(gradleApi())
     implementation(gradleKotlinDsl())
     api(libs.gradle.develocityPlugin)
+    api(libs.gradle.foojayPlugin)
 
     testImplementation(libs.kotest)
     testImplementation(libs.kotest.assertions)
diff --git a/convention-plugin/settings.gradle.kts b/convention-plugin/settings.gradle.kts
index 691d902..9b18d47 100644
--- a/convention-plugin/settings.gradle.kts
+++ b/convention-plugin/settings.gradle.kts
@@ -14,7 +14,7 @@ dependencyResolutionManagement {
     }
     versionCatalogs {
         create("libs") {
-            from("org.metaborg.spoofax3:catalog:0.3.6")
+            from("org.metaborg.spoofax3:catalog:0.3.7")
         }
     }
 }
diff --git a/convention-plugin/src/main/kotlin/org/metaborg/convention/SettingsConventionPlugin.kt b/convention-plugin/src/main/kotlin/org/metaborg/convention/SettingsConventionPlugin.kt
index 59bf174..55588b6 100644
--- a/convention-plugin/src/main/kotlin/org/metaborg/convention/SettingsConventionPlugin.kt
+++ b/convention-plugin/src/main/kotlin/org/metaborg/convention/SettingsConventionPlugin.kt
@@ -12,7 +12,7 @@ import org.gradle.kotlin.dsl.maven
 @Suppress("unused")
 class SettingsConventionPlugin: Plugin<Settings> {
 
-    private val catalogVersion = "0.3.6"
+    private val catalogVersion = "0.3.7"
 
     @Suppress("UnstableApiUsage")
     override fun apply(settings: Settings): Unit = with(settings) {
@@ -39,6 +39,9 @@ class SettingsConventionPlugin: Plugin<Settings> {
             }
         }
 
+        // Apply the Foojay plugin
+        plugins.apply("org.gradle.toolchains.foojay-resolver-convention")
+
         // Apply and configure the Develocity plugin
         plugins.apply("com.gradle.develocity")
         extensions.configure(DevelocityConfiguration::class.java) {