Add explicit language source/compile dependencies

metaborg · Jul 19, 2024 · 87979ba · 87979ba
1 parent ff37be4
commit 87979ba
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 7 deletions.
diff --git a/example/empty/empty.example/build.gradle.kts b/example/empty/empty.example/build.gradle.kts
@@ -17,5 +17,5 @@ spoofaxProject {
 }
 
 dependencies {
-    compileOnly(libs.spoofax2.core)
+    compileOnly(libs.spoofax.core)
 }
diff --git a/example/empty/empty.test/build.gradle.kts b/example/empty/empty.test/build.gradle.kts
@@ -15,5 +15,5 @@ spoofaxTest {
 
 dependencies {
     compileLanguage(project(":empty"))
-    compileOnly(libs.spoofax2.core)
+    compileOnly(libs.spoofax.core)
 }
diff --git a/example/empty/empty/build.gradle.kts b/example/empty/empty/build.gradle.kts
@@ -5,6 +5,9 @@ plugins {
 }
 
 spoofaxLanguageSpecification {
+    addCompileDependenciesFromMetaborgYaml.set(false)
+    addSourceDependenciesFromMetaborgYaml.set(false)
+
     // Fixes: Could not resolve all dependencies for configuration '<project>:compileClasspath'.
     //  The project declares repositories, effectively ignoring the repositories you have declared in the settings.
     addSpoofaxRepository.set(false)
@@ -13,5 +16,10 @@ spoofaxLanguageSpecification {
 }
 
 dependencies {
-    compileOnly(libs.spoofax2.core)
+    compileLanguage(libs.esv.lang)
+    compileLanguage(libs.sdf3.lang)
+
+    sourceLanguage(libs.meta.lib.spoofax)
+
+    compileOnly(libs.spoofax.core)
 }
diff --git a/example/language_contribution_addition/build.gradle.kts b/example/language_contribution_addition/build.gradle.kts
@@ -7,6 +7,9 @@ plugins {
 }
 
 spoofaxLanguageSpecification {
+    addCompileDependenciesFromMetaborgYaml.set(false)
+    addSourceDependenciesFromMetaborgYaml.set(false)
+
     languageContributions.add(LanguageContributionIdentifier(
         LanguageIdentifier("$group.test", "${name}_test", LanguageVersion.parse("$version-test")), "lca"))
 
@@ -18,5 +21,5 @@ spoofaxLanguageSpecification {
 }
 
 dependencies {
-    compileOnly(libs.spoofax2.core)
+    compileOnly(libs.spoofax.core)
 }
diff --git a/example/language_contribution_override/build.gradle.kts b/example/language_contribution_override/build.gradle.kts
@@ -7,7 +7,10 @@ plugins {
 }
 
 spoofaxLanguageSpecification {
+    addCompileDependenciesFromMetaborgYaml.set(false)
+    addSourceDependenciesFromMetaborgYaml.set(false)
     addLanguageContributionsFromMetaborgYaml.set(false)
+
     languageContributions.add(LanguageContributionIdentifier(LanguageIdentifier(
         group.toString(), name, LanguageVersion.parse(version.toString())), "lco"))
 
@@ -19,5 +22,5 @@ spoofaxLanguageSpecification {
 }
 
 dependencies {
-    compileOnly(libs.spoofax2.core)
+    compileOnly(libs.spoofax.core)
 }
diff --git a/example/stratego_format_override/build.gradle.kts b/example/stratego_format_override/build.gradle.kts
@@ -5,6 +5,9 @@ plugins {
 }
 
 spoofaxLanguageSpecification {
+    addCompileDependenciesFromMetaborgYaml.set(false)
+    addSourceDependenciesFromMetaborgYaml.set(false)
+
     strategoFormat.set(org.metaborg.spoofax.meta.core.config.StrategoFormat.jar)
 
     // Fixes: Could not resolve all dependencies for configuration '<project>:compileClasspath'.
@@ -15,5 +18,10 @@ spoofaxLanguageSpecification {
 }
 
 dependencies {
-    compileOnly(libs.spoofax2.core)
+    compileLanguage(libs.esv.lang)
+    compileLanguage(libs.sdf3.lang)
+
+    sourceLanguage(libs.meta.lib.spoofax)
+
+    compileOnly(libs.spoofax.core)
 }
diff --git a/plugin/build.gradle.kts b/plugin/build.gradle.kts
@@ -21,7 +21,7 @@ plugins {
 group = "org.metaborg.devenv"
 
 dependencies {
-    api(libs.spoofax2.meta.core)
+    api(libs.spoofax.meta.core)
     api(libs.spt.core)
 
     /*