Skip to content

Commit 9104d46

Browse files
jra-sejra-se
authored
Merge pull request #4 from MontiCore/version-update-780
update to MC 7.8.0
2 parents dc1a121 + ac5b6ad commit 9104d46

File tree

13 files changed

+118
-168
lines changed

13 files changed

+118
-168
lines changed

‎build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
plugins {
2-
alias(libs.plugins.monticore) apply false
2+
id "de.monticore.generator" version "$mc_version" apply false
33
}
44

55
allprojects {

‎gradle.properties‎

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,18 @@ repo=https://nexus.se.rwth-aachen.de/content/groups/public
44

55
useLocalRepo=false
66

7-
version=7.7.0-SNAPSHOT
8-
97
org.gradle.caching=true
108
org.gradle.welcome=never
9+
org.gradle.jvmargs=-Xms3072m -Dfile.encoding=UTF-8
10+
11+
version=7.8.0-SNAPSHOT
12+
13+
# dependency versions
14+
mc_version=7.8.0-SNAPSHOT
15+
emf_version=2.15.0
16+
shadow_plugin_version=7.1.2
17+
guava_version=31.1-jre
18+
junit_version=5.10.3
19+
google_java_format_version=0.9
20+
spoon_core_version=10.2.0
21+
commons_lang3_version=3.9

‎gradle/corpus.versions.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@ guava = { module = "com.google.guava:guava", version = "31.1-jre" }
1717

1818
# de.monticore - MontiCore
1919
# https://github.com/MontiCore/monticore - Java 11
20-
monticore-runtime = { module = "de.monticore:monticore-runtime", version = "7.6.0-SNAPSHOT" }
20+
monticore-runtime = { module = "de.monticore:monticore-runtime", version = "7.8.0-SNAPSHOT" }

‎gradle/libs.versions.toml‎

Lines changed: 0 additions & 36 deletions
This file was deleted.

‎javaDSL-emf/build.gradle‎

Lines changed: 13 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,6 @@ def srcTestDir = "$buildDir/copied-sources/test"
66
def grammarsDir = "${project(":javaDSL").projectDir}/src/main/grammars"
77

88
sourceSets {
9-
main.java.srcDirs("$srcMainDir/java", "$buildDir/generated-sources/monticore/sourcecode")
10-
test.java.srcDirs("$srcTestDir/java")
11-
129
grammars {
1310
resources {
1411
srcDir(grammarsDir)
@@ -23,62 +20,38 @@ java {
2320
}
2421
}
2522

26-
task copyMainSources(type: Copy) {
23+
tasks.register('copyMainSources', Copy) {
2724
destinationDir = file srcMainDir
2825
from "${project(':javaDSL').projectDir}/src/main"
2926
}
3027

31-
task copyTestSources(type: Copy) {
28+
tasks.register('copyTestSources', Copy) {
3229
destinationDir = file srcTestDir
3330
from "${project(':javaDSL').projectDir}/src/main"
3431
}
3532

36-
tasks.register("generateTextBlock", MCTask) {
33+
generateMCGrammars {
3734
dependsOn(copyMainSources, copyTestSources)
38-
39-
grammar = file "$grammarsDir/de/monticore/java/TextBlock.mc4"
40-
outputDir = file "$buildDir/generated-sources/monticore/sourcecode"
41-
handcodedPath "$srcMainDir/java"
42-
4335
script = "de/monticore/monticore_emf.groovy"
44-
45-
def upToDate = incCheck("de/monticore/java/TextBlock.mc4")
46-
outputs.upToDateWhen { upToDate }
47-
}
48-
49-
tasks.register("generate", MCTask) {
50-
dependsOn(tasks.generateTextBlock)
51-
dependsOn(copyMainSources, copyTestSources)
52-
53-
grammar = file "$grammarsDir/de/monticore/java/JavaDSL.mc4"
54-
outputDir = file "$buildDir/generated-sources/monticore/sourcecode"
55-
modelPath "$grammarsDir"
56-
handcodedPath "$srcMainDir/java"
57-
58-
script = "de/monticore/monticore_emf.groovy"
59-
60-
def upToDate = incCheck("de/monticore/java/JavaDSL.mc4")
61-
outputs.upToDateWhen { upToDate }
6236
}
6337

6438
dependencies {
65-
implementation(platform(libs.junit.bom))
66-
implementation "de.monticore.lang:cd4analysis:7.7.0-SNAPSHOT"
39+
implementation "de.monticore.lang:cd4analysis:$mc_version"
6740

68-
api(libs.monticore.grammar.emf)
69-
api(libs.monticore.runtime.emf)
41+
implementation "org.eclipse.emf:org.eclipse.emf.common:$emf_version"
42+
implementation "org.eclipse.emf:org.eclipse.emf.ecore:$emf_version"
43+
implementation "org.eclipse.emf:org.eclipse.emf.ecore.xmi:$emf_version"
7044

71-
api(libs.emf.common)
72-
api(libs.emf.ecore)
73-
api(libs.emf.ecore.xmi)
45+
implementation "de.monticore:monticore-grammar-emf:$mc_version"
46+
implementation "de.monticore:monticore-runtime-emf:$mc_version"
7447

75-
grammar(libs.monticore.grammar) {
48+
grammar("de.monticore:monticore-grammar:$mc_version") {
7649
capabilities {
7750
requireCapability("de.monticore:monticore-grammar-grammars")
7851
}
7952
}
8053

81-
testImplementation(libs.junit.jupiter.api)
82-
testImplementation(libs.junit.jupiter.params)
83-
testRuntimeOnly(libs.junit.jupiter.engine)
54+
testImplementation "org.junit.jupiter:junit-jupiter-api:$junit_version"
55+
testImplementation "org.junit.jupiter:junit-jupiter-params:$junit_version"
56+
testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:$junit_version"
8457
}

‎javaDSL/build.gradle‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -62,21 +62,20 @@ tasks.withType(Test).configureEach {
6262
}
6363

6464
dependencies {
65-
implementation(platform(libs.junit.bom))
66-
implementation "de.monticore.lang:cd4analysis:$version"
65+
implementation "de.monticore.lang:cd4analysis:$mc_version"
6766

68-
api(libs.monticore.grammar)
69-
api(libs.monticore.runtime)
67+
implementation "de.monticore:monticore-grammar:$mc_version"
68+
implementation "de.monticore:monticore-runtime:$mc_version"
7069

71-
grammar(libs.monticore.grammar) {
70+
grammar("de.monticore:monticore-grammar:$mc_version") {
7271
capabilities {
7372
requireCapability("de.monticore:monticore-grammar-grammars")
7473
}
7574
}
7675

77-
testImplementation(libs.junit.jupiter.api)
78-
testImplementation(libs.junit.jupiter.params)
79-
testRuntimeOnly(libs.junit.jupiter.engine)
76+
testImplementation "org.junit.jupiter:junit-jupiter-api:$junit_version"
77+
testImplementation "org.junit.jupiter:junit-jupiter-params:$junit_version"
78+
testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:$junit_version"
8079

8180
corpus(corpus.guava)
8281
corpus(corpus.monticore.runtime)

‎javaDSL/src/main/grammars/de/monticore/java/JavaDSL.mc4‎

Lines changed: 36 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -3,75 +3,83 @@
33
package de.monticore.java;
44

55
/**
6-
* The full grammar dependency tree as of 7.4
6+
* The full grammar dependency tree as of 7.8
77
*
88
* JavaDSL
9+
* |-> de.monticore.java.TextBlock
10+
* |-> de.monticore.literals.MCJavaLiterals
11+
* |-> de.monticore.literals.MCCommonLiterals
12+
* |-> de.monticore.MCBasics
13+
* |-> de.monticore.literals.MCLiteralsBasis
914
* |-> de.monticore.JavaLight
1015
* |-> de.monticore.expressions.AssignmentExpressions
1116
* |-> de.monticore.expressions.ExpressionsBasis
12-
* |-> de.monticore.MCBasics
13-
* |-> de.monticore.literals.MCLiteralsBasis
17+
* |-> de.monticore.MCBasics (*)
18+
* |-> de.monticore.literals.MCLiteralsBasis (*)
1419
* |-> de.monticore.expressions.JavaClassExpressions
1520
* |-> de.monticore.expressions.CommonExpressions
1621
* |-> de.monticore.expressions.ExpressionsBasis (*)
17-
* |-> de.monticore.statements.MCArrayStatements
1822
* |-> de.monticore.statements.MCVarDeclarationStatements
23+
* |-> de.monticore.statements.MCStatementBasis
24+
* |-> de.monticore.types.MCBasicTypes
25+
* |-> de.monticore.MCBasics (*)
1926
* |-> de.monticore.expressions.ExpressionsBasis (*)
20-
* |-> de.monticore.statements.MCStatementsBasis
2127
* |-> de.monticore.symbols.OOSymbols
2228
* |-> de.monticore.symbols.BasicSymbols
2329
* |-> de.monticore.MCBasics (*)
24-
* |-> de.monticore.types.MCBasicTypes
25-
* |-> de.monticore.MCBasics (*)
30+
* |-> de.monticore.types.MCFullGenericTypes
31+
* |-> de.monticore.types.MCSimpleGenericTypes
32+
* |-> de.monticore.types.MCCollectionTypes
33+
* |-> de.monticore.types.MCBasicTypes (*)
34+
* |-> de.monticore.expressions.UglyExpressions
35+
* |-> de.monticore.types.MCBasicTypes (*)
36+
* |-> de.monticore.expressions.ExpressionsBasis (*)
37+
* |-> de.monticore.statements.MCCommonLiterals (*)
2638
* |-> de.monticore.statements.MCCommonStatements
2739
* |-> de.monticore.statements.MCVarDeclarationStatements (*)
40+
* |-> de.monticore.statements.MCArrayStatements
41+
* |-> de.monticore.statements.MCVarDeclarationStatements (*)
2842
* |-> de.monticore.statements.MCReturnStatements
43+
* |-> de.monticore.statements.MCStatementsBasis
2944
* |-> de.monticore.expressions.ExpressionsBasis (*)
30-
* |-> de.monticore.statements.MCStatementsBasis (*)
45+
* |-> de.monticore.types.TypeParameters
46+
* |-> de.monticore.symbols.BasicSymbols (*)
47+
* |-> de.monticore.types.MCBasicTypes (*)
3148
* |-> de.monticore.expressions.BitExpressions
3249
* |-> de.monticore.expressions.ExpressionsBasis (*)
3350
* |-> de.monticore.expressions.LambdaExpressions
34-
* |-> de.monticore.expressions.ExpressionsBasis (*)
3551
* |-> de.monticore.symbols.BasicSymbols (*)
3652
* |-> de.monticore.types.MCBasicTypes (*)
37-
* |-> de.monticore.literals.MCJavaLiterals
38-
* |-> de.monticore.literals.MCCommonLiterals (*)
39-
* |-> de.monticore.MCBasics (*)
40-
* |-> de.monticore.literals.MCLiteralsBasis (*)
53+
* |-> de.monticore.expressions.ExpressionsBasis (*)
4154
* |-> de.monticore.statements.MCFullJavaStatements
42-
* |-> de.monticore.statements.MCArrayStatements (*)
4355
* |-> de.monticore.statements.MCAssertStatements
44-
* |-> de.monticore.expressions.ExpressionsBasis (*)
4556
* |-> de.monticore.statements.MCStatementsBasis (*)
57+
* |-> de.monticore.expressions.ExpressionsBasis (*)
4658
* |-> de.monticore.statements.MCExceptionStatements
4759
* |-> de.monticore.statements.MCCommonStatements (*)
4860
* |-> de.monticore.statements.MCLowLevelStatements
49-
* |-> de.monticore.MCBasics (*)
5061
* |-> de.monticore.statements.MCStatementsBasis (*)
62+
* |-> de.monticore.MCBasics (*)
5163
* |-> de.monticore.statements.MCReturnStatements (*)
64+
* |-> de.monticore.statements.MCStatementsBasis (*)
65+
* |-> de.monticore.expressions.ExpressionsBasis (*)
5266
* |-> de.monticore.statements.MCSynchronizedStatements
5367
* |-> de.monticore.statements.MCCommonStatements (*)
68+
* |-> de.monticore.statements.MCArrayStatements (*)
69+
* |-> de.monticore.statements.MCVarDeclarationStatements (*)
5470
* |-> de.monticore.types.MCArrayTypes
55-
* |-> de.monticore.types.MCBasicTypes
56-
* |-> de.monticore.MCBasics (*)
57-
* |-> de.monticore.types.MCFullGenericTypes
58-
* |-> de.monticore.types.MCSimpleGenericTypes
59-
* |-> de.monticore.types.MCCollectionTypes
60-
* |-> de.monticore.types.MCBasicTypes (*)
61-
* |-> de.monticore.types.TypeParameters
62-
* |-> de.monticore.symbols.BasicSymbols
63-
* |-> de.monticore.MCBasics (*)
64-
* |-> de.monticore.types.MCBasicTypes
65-
* |-> de.monticore.MCBasics (*)
71+
* |-> de.monticore.types.MCBasicTypes (*)
72+
* |-> de.monticore.types.MCFullGenericTypes (*)
73+
* |-> de.monticore.types.TypeParameters (*)
6674
*
6775
* (*) Repeated Dependencies are omitted.
6876
*/
6977
grammar JavaDSL extends
7078
de.monticore.java.TextBlock,
79+
de.monticore.literals.MCJavaLiterals,
7180
de.monticore.JavaLight,
7281
de.monticore.expressions.BitExpressions,
7382
de.monticore.expressions.LambdaExpressions, // TODO: move to JavaLight?
74-
de.monticore.literals.MCJavaLiterals,
7583
de.monticore.statements.MCFullJavaStatements,
7684
de.monticore.types.MCArrayTypes,
7785
de.monticore.types.MCFullGenericTypes,

‎javaDSL/src/test/java/de/monticore/java/AbstractTest.java‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package de.monticore.java;
22

3+
import de.monticore.cd4code.CD4CodeMill;
4+
import de.monticore.java.javadsl.JavaDSLMill;
35
import de.se_rwth.commons.logging.LogStub;
46
import org.junit.jupiter.api.BeforeAll;
57
import org.junit.jupiter.api.BeforeEach;
@@ -19,6 +21,10 @@ public static void setup() {
1921
@BeforeEach
2022
public void reset() {
2123
LogStub.init();
24+
JavaDSLMill.init();
25+
JavaDSLMill.globalScope().clear();
26+
CD4CodeMill.init();
27+
CD4CodeMill.globalScope().clear();
2228
}
2329

2430
}

‎javaDSL/src/test/java/de/monticore/java/JavaDSLAssertions.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package de.monticore.java;
22

3+
import de.monticore.java.javadsl.JavaDSLMill;
34
import de.monticore.java.javadsl._ast.ASTCompilationUnit;
45
import de.monticore.java.javadsl._parser.JavaDSLParser;
56
import de.se_rwth.commons.logging.Log;
@@ -12,7 +13,7 @@
1213
public final class JavaDSLAssertions {
1314

1415
public static void assertParsingFailure(String pathToModel) {
15-
JavaDSLParser parser = new JavaDSLParser();
16+
JavaDSLParser parser = JavaDSLMill.parser();
1617

1718
Optional<ASTCompilationUnit> optCompilationUnit;
1819

@@ -28,7 +29,7 @@ public static void assertParsingFailure(String pathToModel) {
2829
}
2930

3031
public static ASTCompilationUnit assertParsingSuccess(String pathToModel) {
31-
JavaDSLParser parser = new JavaDSLParser();
32+
JavaDSLParser parser = JavaDSLMill.parser();
3233

3334
Optional<ASTCompilationUnit> optCompilationUnit;
3435
Throwable cause = null;

0 commit comments

Comments
 (0)