Skip to content

Commit 7b346b7

Browse files
committed
Exclude platform, but platform is never applied
1 parent 4220d84 commit 7b346b7

File tree

3 files changed

+9
-7
lines changed

3 files changed

+9
-7
lines changed

example/empty/empty/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ spoofaxLanguageSpecification {
1616
}
1717

1818
dependencies {
19-
api(platform(libs.metaborg.platform)) { version { require("latest.integration") } }
19+
api(platform(libs.metaborg.platform))
2020

2121
compileLanguage(libs.esv.lang)
2222
compileLanguage(libs.sdf3.lang)

plugin/build.gradle.kts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ version = gitonium.version
2121
group = "org.metaborg.devenv"
2222

2323
dependencies {
24+
api(platform(libs.metaborg.platform))
25+
2426
api(libs.spoofax.meta.core)
2527
api(libs.spt.core)
2628

plugin/src/main/kotlin/mb/spoofax/gradle/util/ConfigOverride.kt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -107,12 +107,12 @@ internal fun SpoofaxExtensionBase.overrideDependencies(configOverrides: SpoofaxG
107107
// dependencies.
108108
// TODO: I think this should become `project.compileLanguageFiles.incoming.resolutionResult`, but I'm not sure what
109109
// to do with project(...) dependencies, as they don't have a group:module:version ID.
110-
compileDeps = project.compileLanguageFiles.resolvedConfiguration.firstLevelModuleDependencies.map {
111-
it.toSpoofaxDependency()
112-
}
113-
sourceDeps = project.sourceLanguageFiles.resolvedConfiguration.firstLevelModuleDependencies.map {
114-
it.toSpoofaxDependency()
115-
}
110+
compileDeps = project.compileLanguageFiles.resolvedConfiguration.firstLevelModuleDependencies
111+
.filterNot { it.module.id.group == "org.metaborg" && it.module.id.name == "platform" }
112+
.map { it.toSpoofaxDependency() }
113+
sourceDeps = project.sourceLanguageFiles.resolvedConfiguration.firstLevelModuleDependencies
114+
.filterNot { it.module.id.group == "org.metaborg" && it.module.id.name == "platform" }
115+
.map { it.toSpoofaxDependency() }
116116
if(project.plugins.hasPlugin(JavaPlugin::class.java)) {
117117
project.configurations.getByName(JavaPlugin.COMPILE_CLASSPATH_CONFIGURATION_NAME).resolvedConfiguration.firstLevelModuleDependencies.map {
118118
it.toSpoofaxDependency()

0 commit comments

Comments
 (0)