Skip to content

Commit d2e5c16

Browse files
VirtlinkVirtlink
committed
Merge branch 'develop'
2 parents 2634ef8 + cee20fc commit d2e5c16

File tree

17 files changed

+138
-132
lines changed

17 files changed

+138
-132
lines changed

‎build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
plugins {
2-
id("org.metaborg.gradle.config.root-project") version "0.4.8"
3-
id("org.metaborg.gitonium") version "1.2.0"
2+
id("org.metaborg.gradle.config.root-project") version "0.7.3"
3+
id("org.metaborg.gitonium") version "1.2.0"
44
}

‎example/build.gradle.kts

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
plugins {
2-
id("org.metaborg.gradle.config.root-project") version "0.4.8"
3-
id("org.metaborg.gitonium") version "1.2.0"
2+
id("org.metaborg.gradle.config.root-project") version "0.4.8"
3+
id("org.metaborg.gitonium") version "1.2.0"
44

5-
// Set versions for plugins to use, only applying them in subprojects (apply false here).
6-
id("org.metaborg.spoofax.gradle.langspec") apply false // No version: use the plugin from the included composite build
7-
id("org.metaborg.spoofax.gradle.project") apply false
8-
id("org.metaborg.spoofax.gradle.test") apply false
5+
// Set versions for plugins to use, only applying them in subprojects (apply false here).
6+
id("org.metaborg.spoofax.gradle.langspec") apply false // No version: use the plugin from the included composite build
7+
id("org.metaborg.spoofax.gradle.project") apply false
8+
id("org.metaborg.spoofax.gradle.test") apply false
99
}
1010

1111
subprojects {
12-
metaborg {
13-
configureSubProject()
14-
}
12+
metaborg {
13+
configureSubProject()
14+
}
1515
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
plugins {
2-
id("org.metaborg.spoofax.gradle.project")
2+
id("org.metaborg.spoofax.gradle.project")
33
}
44

55
dependencies {
6-
compileLanguage(project(":empty"))
6+
compileLanguage(project(":empty"))
77
}

‎example/empty/empty.example/metaborg.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
---
22
id: org.metaborg:empty.example:0.1.0-SNAPSHOT
33
name: empty
4+
metaborgVersion: 2.6.0-SNAPSHOT
45
dependencies:
56
compile:
67
- org.metaborg:empty:0.1.0-SNAPSHOT

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
plugins {
2-
id("org.metaborg.spoofax.gradle.test")
2+
id("org.metaborg.spoofax.gradle.test")
33
}
44

55
spoofaxTest {
6-
languageUnderTest.set(org.metaborg.core.language.LanguageIdentifier.parse("$group:empty:$version"))
6+
languageUnderTest.set(org.metaborg.core.language.LanguageIdentifier.parse("$group:empty:$version"))
77
}
88

99
dependencies {
10-
compileLanguage(project(":empty"))
10+
compileLanguage(project(":empty"))
1111
}

‎example/empty/empty.test/metaborg.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
---
22
id: org.metaborg:empty.test:0.1.0-SNAPSHOT
33
name: empty
4+
metaborgVersion: 2.6.0-SNAPSHOT
45
dependencies:
56
compile:
67
- org.metaborg:empty:0.1.0-SNAPSHOT

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
plugins {
2-
id("org.metaborg.spoofax.gradle.langspec")
2+
id("org.metaborg.spoofax.gradle.langspec")
33
}

‎example/empty/empty/metaborg.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
---
22
id: org.metaborg:empty:0.1.0-SNAPSHOT
33
name: empty
4+
metaborgVersion: 2.6.0-SNAPSHOT
45
dependencies:
56
compile:
67
- org.metaborg:org.metaborg.meta.lang.esv:${metaborgVersion}
@@ -13,4 +14,4 @@ language:
1314
sdf:
1415
sdf2table: java
1516
stratego:
16-
enabled: false
17+
enabled: false

‎example/language_contribution_addition/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import org.metaborg.core.language.*
22

33
plugins {
4-
id("org.metaborg.spoofax.gradle.langspec")
4+
id("org.metaborg.spoofax.gradle.langspec")
55
}
66

77
spoofaxLanguageSpecification {
8-
languageContributions.add(LanguageContributionIdentifier(LanguageIdentifier(group.toString() + ".test", name + "_test", LanguageVersion.parse(version.toString() + "-test")), "lca"))
8+
languageContributions.add(LanguageContributionIdentifier(LanguageIdentifier(group.toString() + ".test", name + "_test", LanguageVersion.parse(version.toString() + "-test")), "lca"))
99
}

‎example/language_contribution_addition/metaborg.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
---
22
id: org.metaborg:language_contribution_addition:0.1.0-SNAPSHOT
33
name: language_contribution_addition
4+
metaborgVersion: 2.6.0-SNAPSHOT
45
contributions:
56
- name: language_contribution_addition
67
id: org.metaborg:language_contribution_addition:0.1.0-SNAPSHOT

‎example/language_contribution_override/build.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import org.metaborg.core.language.*
22

33
plugins {
4-
id("org.metaborg.spoofax.gradle.langspec")
4+
id("org.metaborg.spoofax.gradle.langspec")
55
}
66

77
spoofaxLanguageSpecification {
8-
addLanguageContributionsFromMetaborgYaml.set(false)
9-
languageContributions.add(LanguageContributionIdentifier(LanguageIdentifier(group.toString(), name, LanguageVersion.parse(version.toString())), "lco"))
8+
addLanguageContributionsFromMetaborgYaml.set(false)
9+
languageContributions.add(LanguageContributionIdentifier(LanguageIdentifier(group.toString(), name, LanguageVersion.parse(version.toString())), "lco"))
1010
}

‎example/language_contribution_override/metaborg.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
---
22
id: org.metaborg:language_contribution_override:0.1.0-SNAPSHOT
33
name: language_contribution_override
4+
metaborgVersion: 2.6.0-SNAPSHOT
45
contributions:
56
- name: language_contribution_override
67
id: org.metaborg:language_contribution_override:0.1.0-SNAPSHOT

‎example/settings.gradle.kts

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
11
rootProject.name = "spoofax.gradle.example"
22

33
pluginManagement {
4-
repositories {
5-
maven("https://artifacts.metaborg.org/content/groups/public/")
6-
}
4+
repositories {
5+
maven("https://artifacts.metaborg.org/content/groups/public/")
6+
}
77
}
88

99
// Only include composite builds when this is the root project (it has no parent), for example when running Gradle tasks
1010
// from the command-line. Otherwise, the parent project will include these composite builds.
11-
if(gradle.parent == null) {
12-
includeBuild("../plugin")
11+
if (gradle.parent == null) {
12+
includeBuild("../plugin")
1313
}
1414

1515
fun String.includeProject(id: String, path: String = "$this/$id") {
16-
include(id)
17-
project(":$id").projectDir = file(path)
16+
include(id)
17+
project(":$id").projectDir = file(path)
1818
}
1919

2020
"empty".run {
21-
includeProject("empty")
22-
includeProject("empty.example")
23-
includeProject("empty.test")
21+
includeProject("empty")
22+
includeProject("empty.example")
23+
includeProject("empty.test")
2424
}
2525

2626
include("stratego_format_override")

‎example/stratego_format_override/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
plugins {
2-
id("org.metaborg.spoofax.gradle.langspec")
2+
id("org.metaborg.spoofax.gradle.langspec")
33
}
44

55
spoofaxLanguageSpecification {
6-
strategoFormat.set(org.metaborg.spoofax.meta.core.config.StrategoFormat.jar)
6+
strategoFormat.set(org.metaborg.spoofax.meta.core.config.StrategoFormat.jar)
77
}

‎example/stratego_format_override/metaborg.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
---
22
id: org.metaborg:stratego_format_override:0.1.0-SNAPSHOT
33
name: stratego_format_override
4+
metaborgVersion: 2.6.0-SNAPSHOT
45
dependencies:
56
compile:
67
- org.metaborg:org.metaborg.meta.lang.esv:${metaborgVersion}

‎gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# These properties are only used when this repository is built stand-alone, outside of devenv.
22
org.gradle.jvmargs=-Xms512M -Xmx2G -Xss8M
3-
systemProp.spoofax2Version=2.5.20
3+
systemProp.spoofax2Version=2.5.21

0 commit comments

Comments
 (0)