Exclude platform, but platform is never applied

metaborg · Jul 24, 2024 · 7b346b7 · 7b346b7
1 parent 4220d84
commit 7b346b7
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git 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
@@ -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
@@ -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()