From 7b346b7b2bddfc05d0990fe045c24044a37fd212 Mon Sep 17 00:00:00 2001
From: "Daniel A. A. Pelsmaeker" <developer@pelsmaeker.net>
Date: Thu, 25 Jul 2024 01:15:16 +0200
Subject: [PATCH] Exclude platform, but platform is never applied

---
 example/empty/empty/build.gradle.kts                 |  2 +-
 plugin/build.gradle.kts                              |  2 ++
 .../kotlin/mb/spoofax/gradle/util/ConfigOverride.kt  | 12 ++++++------
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/example/empty/empty/build.gradle.kts b/example/empty/empty/build.gradle.kts
index 04abeaf..3ad79e3 100644
--- a/example/empty/empty/build.gradle.kts
+++ b/example/empty/empty/build.gradle.kts
@@ -16,7 +16,7 @@ spoofaxLanguageSpecification {
 }
 
 dependencies {
-    api(platform(libs.metaborg.platform)) { version { require("latest.integration") } }
+    api(platform(libs.metaborg.platform))
 
     compileLanguage(libs.esv.lang)
     compileLanguage(libs.sdf3.lang)
diff --git a/plugin/build.gradle.kts b/plugin/build.gradle.kts
index c776e2e..5c30488 100644
--- a/plugin/build.gradle.kts
+++ b/plugin/build.gradle.kts
@@ -21,6 +21,8 @@ version = gitonium.version
 group = "org.metaborg.devenv"
 
 dependencies {
+    api(platform(libs.metaborg.platform))
+
     api(libs.spoofax.meta.core)
     api(libs.spt.core)
 
diff --git a/plugin/src/main/kotlin/mb/spoofax/gradle/util/ConfigOverride.kt b/plugin/src/main/kotlin/mb/spoofax/gradle/util/ConfigOverride.kt
index a8c587f..db37923 100644
--- a/plugin/src/main/kotlin/mb/spoofax/gradle/util/ConfigOverride.kt
+++ b/plugin/src/main/kotlin/mb/spoofax/gradle/util/ConfigOverride.kt
@@ -107,12 +107,12 @@ internal fun SpoofaxExtensionBase.overrideDependencies(configOverrides: SpoofaxG
       //  dependencies.
       // TODO: I think this should become `project.compileLanguageFiles.incoming.resolutionResult`, but I'm not sure what
       //  to do with project(...) dependencies, as they don't have a group:module:version ID.
-    compileDeps = project.compileLanguageFiles.resolvedConfiguration.firstLevelModuleDependencies.map {
-      it.toSpoofaxDependency()
-    }
-    sourceDeps = project.sourceLanguageFiles.resolvedConfiguration.firstLevelModuleDependencies.map {
-      it.toSpoofaxDependency()
-    }
+    compileDeps = project.compileLanguageFiles.resolvedConfiguration.firstLevelModuleDependencies
+        .filterNot { it.module.id.group == "org.metaborg" && it.module.id.name == "platform" }
+        .map { it.toSpoofaxDependency() }
+    sourceDeps = project.sourceLanguageFiles.resolvedConfiguration.firstLevelModuleDependencies
+        .filterNot { it.module.id.group == "org.metaborg" && it.module.id.name == "platform" }
+        .map { it.toSpoofaxDependency() }
     if(project.plugins.hasPlugin(JavaPlugin::class.java)) {
       project.configurations.getByName(JavaPlugin.COMPILE_CLASSPATH_CONFIGURATION_NAME).resolvedConfiguration.firstLevelModuleDependencies.map {
         it.toSpoofaxDependency()