Merge branch 'develop'

build.gradle.kts

@@ -1,4 +1,4 @@
 plugins {
-  id("org.metaborg.gradle.config.root-project") version "0.4.8"
-  id("org.metaborg.gitonium") version "1.2.0"
+    id("org.metaborg.gradle.config.root-project") version "0.7.3"
+    id("org.metaborg.gitonium") version "1.2.0"
 }

example/build.gradle.kts

@@ -1,15 +1,15 @@
 plugins {
-  id("org.metaborg.gradle.config.root-project") version "0.4.8"
-  id("org.metaborg.gitonium") version "1.2.0"
+    id("org.metaborg.gradle.config.root-project") version "0.4.8"
+    id("org.metaborg.gitonium") version "1.2.0"
 
-  // Set versions for plugins to use, only applying them in subprojects (apply false here).
-  id("org.metaborg.spoofax.gradle.langspec") apply false // No version: use the plugin from the included composite build
-  id("org.metaborg.spoofax.gradle.project") apply false
-  id("org.metaborg.spoofax.gradle.test") apply false
+    // Set versions for plugins to use, only applying them in subprojects (apply false here).
+    id("org.metaborg.spoofax.gradle.langspec") apply false // No version: use the plugin from the included composite build
+    id("org.metaborg.spoofax.gradle.project") apply false
+    id("org.metaborg.spoofax.gradle.test") apply false
 }
 
 subprojects {
-  metaborg {
-    configureSubProject()
-  }
+    metaborg {
+        configureSubProject()
+    }
 }

example/empty/empty.example/build.gradle.kts

@@ -1,7 +1,7 @@
 plugins {
-  id("org.metaborg.spoofax.gradle.project")
+    id("org.metaborg.spoofax.gradle.project")
 }
 
 dependencies {
-  compileLanguage(project(":empty"))
+    compileLanguage(project(":empty"))
 }

example/empty/empty.example/metaborg.yaml

@@ -1,6 +1,7 @@
 ---
 id: org.metaborg:empty.example:0.1.0-SNAPSHOT
 name: empty
+metaborgVersion: 2.6.0-SNAPSHOT
 dependencies:
   compile:
   - org.metaborg:empty:0.1.0-SNAPSHOT

example/empty/empty.test/build.gradle.kts

@@ -1,11 +1,11 @@
 plugins {
-  id("org.metaborg.spoofax.gradle.test")
+    id("org.metaborg.spoofax.gradle.test")
 }
 
 spoofaxTest {
-  languageUnderTest.set(org.metaborg.core.language.LanguageIdentifier.parse("$group:empty:$version"))
+    languageUnderTest.set(org.metaborg.core.language.LanguageIdentifier.parse("$group:empty:$version"))
 }
 
 dependencies {
-  compileLanguage(project(":empty"))
+    compileLanguage(project(":empty"))
 }

example/empty/empty.test/metaborg.yaml

@@ -1,6 +1,7 @@
 ---
 id: org.metaborg:empty.test:0.1.0-SNAPSHOT
 name: empty
+metaborgVersion: 2.6.0-SNAPSHOT
 dependencies:
   compile:
   - org.metaborg:empty:0.1.0-SNAPSHOT

example/empty/empty/build.gradle.kts

@@ -1,3 +1,3 @@
 plugins {
-  id("org.metaborg.spoofax.gradle.langspec")
+    id("org.metaborg.spoofax.gradle.langspec")
 }

example/empty/empty/metaborg.yaml

@@ -1,6 +1,7 @@
 ---
 id: org.metaborg:empty:0.1.0-SNAPSHOT
 name: empty
+metaborgVersion: 2.6.0-SNAPSHOT
 dependencies:
   compile:
     - org.metaborg:org.metaborg.meta.lang.esv:${metaborgVersion}
@@ -13,4 +14,4 @@ language:
   sdf:
     sdf2table: java
   stratego:
-    enabled: false
+    enabled: false

example/language_contribution_addition/build.gradle.kts

@@ -1,9 +1,9 @@
 import org.metaborg.core.language.*
 
 plugins {
-  id("org.metaborg.spoofax.gradle.langspec")
+    id("org.metaborg.spoofax.gradle.langspec")
 }
 
 spoofaxLanguageSpecification {
-  languageContributions.add(LanguageContributionIdentifier(LanguageIdentifier(group.toString() + ".test", name + "_test", LanguageVersion.parse(version.toString() + "-test")), "lca"))
+    languageContributions.add(LanguageContributionIdentifier(LanguageIdentifier(group.toString() + ".test", name + "_test", LanguageVersion.parse(version.toString() + "-test")), "lca"))
 }

example/language_contribution_addition/metaborg.yaml

@@ -1,6 +1,7 @@
 ---
 id: org.metaborg:language_contribution_addition:0.1.0-SNAPSHOT
 name: language_contribution_addition
+metaborgVersion: 2.6.0-SNAPSHOT
 contributions:
   - name: language_contribution_addition
     id: org.metaborg:language_contribution_addition:0.1.0-SNAPSHOT

example/language_contribution_override/build.gradle.kts

@@ -1,10 +1,10 @@
 import org.metaborg.core.language.*
 
 plugins {
-  id("org.metaborg.spoofax.gradle.langspec")
+    id("org.metaborg.spoofax.gradle.langspec")
 }
 
 spoofaxLanguageSpecification {
-  addLanguageContributionsFromMetaborgYaml.set(false)
-  languageContributions.add(LanguageContributionIdentifier(LanguageIdentifier(group.toString(), name, LanguageVersion.parse(version.toString())), "lco"))
+    addLanguageContributionsFromMetaborgYaml.set(false)
+    languageContributions.add(LanguageContributionIdentifier(LanguageIdentifier(group.toString(), name, LanguageVersion.parse(version.toString())), "lco"))
 }

example/language_contribution_override/metaborg.yaml

@@ -1,6 +1,7 @@
 ---
 id: org.metaborg:language_contribution_override:0.1.0-SNAPSHOT
 name: language_contribution_override
+metaborgVersion: 2.6.0-SNAPSHOT
 contributions:
   - name: language_contribution_override
     id: org.metaborg:language_contribution_override:0.1.0-SNAPSHOT

example/settings.gradle.kts

@@ -1,26 +1,26 @@
 rootProject.name = "spoofax.gradle.example"
 
 pluginManagement {
-  repositories {
-    maven("https://artifacts.metaborg.org/content/groups/public/")
-  }
+    repositories {
+        maven("https://artifacts.metaborg.org/content/groups/public/")
+    }
 }
 
 // Only include composite builds when this is the root project (it has no parent), for example when running Gradle tasks
 // from the command-line. Otherwise, the parent project will include these composite builds.
-if(gradle.parent == null) {
-  includeBuild("../plugin")
+if (gradle.parent == null) {
+    includeBuild("../plugin")
 }
 
 fun String.includeProject(id: String, path: String = "$this/$id") {
-  include(id)
-  project(":$id").projectDir = file(path)
+    include(id)
+    project(":$id").projectDir = file(path)
 }
 
 "empty".run {
-  includeProject("empty")
-  includeProject("empty.example")
-  includeProject("empty.test")
+    includeProject("empty")
+    includeProject("empty.example")
+    includeProject("empty.test")
 }
 
 include("stratego_format_override")

example/stratego_format_override/build.gradle.kts

@@ -1,7 +1,7 @@
 plugins {
-  id("org.metaborg.spoofax.gradle.langspec")
+    id("org.metaborg.spoofax.gradle.langspec")
 }
 
 spoofaxLanguageSpecification {
-  strategoFormat.set(org.metaborg.spoofax.meta.core.config.StrategoFormat.jar)
+    strategoFormat.set(org.metaborg.spoofax.meta.core.config.StrategoFormat.jar)
 }

example/stratego_format_override/metaborg.yaml

@@ -1,6 +1,7 @@
 ---
 id: org.metaborg:stratego_format_override:0.1.0-SNAPSHOT
 name: stratego_format_override
+metaborgVersion: 2.6.0-SNAPSHOT
 dependencies:
   compile:
     - org.metaborg:org.metaborg.meta.lang.esv:${metaborgVersion}

gradle.properties

@@ -1,3 +1,3 @@
 # These properties are only used when this repository is built stand-alone, outside of devenv.
 org.gradle.jvmargs=-Xms512M -Xmx2G -Xss8M
-systemProp.spoofax2Version=2.5.20
+systemProp.spoofax2Version=2.5.21