diff --git a/CHANGELOG.md b/CHANGELOG.md index 8de5d06..a604f40 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file. ## [Unreleased] +## [0.4.3] - 2024-07-11 +- Add MB Exec and MB Rep dependencies. + + ## [0.4.2] - 2024-07-11 - Add Spoofax 3/PIE dependencies. @@ -118,7 +122,10 @@ All notable changes to this project will be documented in this file. - Initial release. -[Unreleased]: https://github.com/metaborg/spoofax3-depman/compare/release-0.4.0...HEAD +[Unreleased]: https://github.com/metaborg/spoofax3-depman/compare/release-0.4.3...HEAD +[0.4.3]: https://github.com/metaborg/spoofax3-depman/compare/release-0.4.2...release-0.4.3 +[0.4.2]: https://github.com/metaborg/spoofax3-depman/compare/release-0.4.1...release-0.4.2 +[0.4.1]: https://github.com/metaborg/spoofax3-depman/compare/release-0.4.0...release-0.4.1 [0.4.0]: https://github.com/metaborg/spoofax3-depman/compare/release-0.3.11...release-0.4.0 [0.3.11]: https://github.com/metaborg/spoofax3-depman/compare/release-0.3.10...release-0.3.11 [0.3.10]: https://github.com/metaborg/spoofax3-depman/compare/release-0.3.9...release-0.3.10 diff --git a/example/build.gradle.kts b/example/build.gradle.kts index e2d3b4b..ca7f41d 100644 --- a/example/build.gradle.kts +++ b/example/build.gradle.kts @@ -134,14 +134,6 @@ dependencies { api(libs.spoofax2.strategoxt) // Spoofax 2 - api(libs.spoofax2.metaborg.util) - api(libs.spoofax2.util.vfs2) - api(libs.spoofax2.terms) - api(libs.spoofax2.interpreter.core) - api(libs.spoofax2.interpreter.library.xml) - api(libs.spoofax2.interpreter.library.java) - api(libs.spoofax2.interpreter.library.index) - api(libs.spoofax2.interpreter.library.jsglr) api(libs.spoofax2.core) api(libs.spoofax2.meta.core) api(libs.spoofax2.spt.core) @@ -163,6 +155,17 @@ dependencies { api(libs.spoofax2.stratego.build) api(libs.spoofax2.stratego.build.spoofax2) + // MB Exec + api(libs.spoofax2.metaborg.util) + api(libs.spoofax2.interpreter.core) + api(libs.spoofax2.interpreter.library.xml) + api(libs.spoofax2.interpreter.library.java) +// api(libs.spoofax2.util.vfs2) // TODO: Not released yet + + // MB Rep + api(libs.spoofax2.terms) + api(libs.spoofax2.interpreter.library.index) + // Spoofax languages api(libs.spoofax.lang.esv) api(libs.spoofax.lang.sdf3) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 429c6c6..1dac2e4 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -16,8 +16,10 @@ metaborg-common = "0.11.0" # https://github.com metaborg-log = "0.5.5" # https://github.com/metaborg/log/ metaborg-pie = "0.21.0" # https://github.com/metaborg/pie/ strategoxt = "0.1.36" # https://github.com/metaborg/strategoxt/ -spoofax3 = "0.22.1" # https://github.com/metaborg/spoofax-pie +spoofax3 = "0.22.1" # https://github.com/metaborg/spoofax-pie/ spoofax2 = "2.6.0-SNAPSHOT" # https://spoofax.dev/ (https://github.com/metaborg/spoofax-releng) +mb-exec = "0.1.36" # https://github.com/metaborg/mb-exec/ +mb-rep = "0.1.36" # https://github.com/metaborg/mb-rep/ # Kotlin kotlinx-coroutines = "1.8.1" # https://github.com/Kotlin/kotlinx.coroutines @@ -228,13 +230,6 @@ strategoxt-strj = { module = "org.metaborg.devenv:org.strategoxt spoofax2-strategoxt = { module = "org.metaborg:strategoxt-min-jar", version.ref = "spoofax2" } # TODO: Should this be prefixed with strategoxt? Should this be built by the StrategoXT repo Gradle? # Spoofax 2 -spoofax2-metaborg-util = { module = "org.metaborg:org.metaborg.util", version.ref = "spoofax2" } -spoofax2-util-vfs2 = { module = "org.metaborg:util-vfs2", version.ref = "spoofax2" } -spoofax2-terms = { module = "org.metaborg:org.spoofax.terms", version.ref = "spoofax2" } -spoofax2-interpreter-core = { module = "org.metaborg:org.spoofax.interpreter.core", version.ref = "spoofax2" } -spoofax2-interpreter-library-xml = { module = "org.metaborg:org.spoofax.interpreter.library.xml", version.ref = "spoofax2" } -spoofax2-interpreter-library-java = { module = "org.metaborg:org.spoofax.interpreter.library.java", version.ref = "spoofax2" } -spoofax2-interpreter-library-index = { module = "org.metaborg:org.spoofax.interpreter.library.index", version.ref = "spoofax2" } spoofax2-interpreter-library-jsglr = { module = "org.metaborg:org.spoofax.interpreter.library.jsglr", version.ref = "spoofax2" } spoofax2-core = { module = "org.metaborg:org.metaborg.spoofax.core", version.ref = "spoofax2" } spoofax2-meta-core = { module = "org.metaborg:org.metaborg.spoofax.meta.core", version.ref = "spoofax2" } @@ -257,6 +252,17 @@ spoofax2-runtime-task = { module = "org.metaborg:org.metaborg.runtime. spoofax2-stratego-build = { module = "org.metaborg:stratego.build", version.ref = "spoofax2" } spoofax2-stratego-build-spoofax2 = { module = "org.metaborg:stratego.build.spoofax2", version.ref = "spoofax2" } +# MB Exec +spoofax2-metaborg-util = { module = "org.metaborg.devenv:org.metaborg.util", version.ref = "mb-exec" } +spoofax2-interpreter-core = { module = "org.metaborg.devenv:org.spoofax.interpreter.core", version.ref = "mb-exec" } +spoofax2-interpreter-library-xml = { module = "org.metaborg.devenv:org.spoofax.interpreter.library.xml", version.ref = "mb-exec" } +spoofax2-interpreter-library-java = { module = "org.metaborg.devenv:org.spoofax.interpreter.library.java", version.ref = "mb-exec" } +spoofax2-util-vfs2 = { module = "org.metaborg.devenv:util-vfs2", version.ref = "mb-exec" } + +# MB Rep +spoofax2-terms = { module = "org.metaborg.devenv:org.spoofax.terms", version.ref = "mb-rep" } +spoofax2-interpreter-library-index = { module = "org.metaborg.devenv:org.spoofax.interpreter.library.index", version.ref = "mb-rep" } + # Spoofax Languages spoofax-lang-esv = { module = "org.metaborg:org.metaborg.meta.lang.esv", version.ref = "spoofax2" } spoofax-lang-sdf3 = { module = "org.metaborg:org.metaborg.meta.lang.template", version.ref = "spoofax2" } diff --git a/platform/build.gradle.kts b/platform/build.gradle.kts index cbd0f14..4708b2c 100644 --- a/platform/build.gradle.kts +++ b/platform/build.gradle.kts @@ -134,14 +134,6 @@ dependencies { api(libs.spoofax2.strategoxt) // Spoofax 2 - api(libs.spoofax2.metaborg.util) - api(libs.spoofax2.util.vfs2) - api(libs.spoofax2.terms) - api(libs.spoofax2.interpreter.core) - api(libs.spoofax2.interpreter.library.xml) - api(libs.spoofax2.interpreter.library.java) - api(libs.spoofax2.interpreter.library.index) - api(libs.spoofax2.interpreter.library.jsglr) api(libs.spoofax2.core) api(libs.spoofax2.meta.core) api(libs.spoofax2.spt.core) @@ -163,6 +155,17 @@ dependencies { api(libs.spoofax2.stratego.build) api(libs.spoofax2.stratego.build.spoofax2) + // MB Exec + api(libs.spoofax2.metaborg.util) + api(libs.spoofax2.interpreter.core) + api(libs.spoofax2.interpreter.library.xml) + api(libs.spoofax2.interpreter.library.java) + api(libs.spoofax2.util.vfs2) + + // MB Rep + api(libs.spoofax2.terms) + api(libs.spoofax2.interpreter.library.index) + // Spoofax languages api(libs.spoofax.lang.esv) api(libs.spoofax.lang.sdf3)