diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 4c981e3a34..fbac9cb89d 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -17,10 +17,10 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Set up JDK 11 + - name: Set up JDK 17 uses: actions/setup-java@v1 with: - java-version: 11 + java-version: 17 - name: Grant execute permission for gradlew run: chmod +x gradlew - name: Build with Gradle diff --git a/.github/workflows/publish-maven.yml b/.github/workflows/publish-maven.yml index b2ff2b9bf8..1c1ac9b3f5 100644 --- a/.github/workflows/publish-maven.yml +++ b/.github/workflows/publish-maven.yml @@ -16,10 +16,10 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Set up JDK 11 + - name: Set up JDK 17 uses: actions/setup-java@v1 with: - java-version: 11 + java-version: 17 - name: Grant execute permission for gradlew run: chmod +x gradlew - name: Publish with Gradle diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 4ecc26b225..1749a5a8c0 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -13,10 +13,10 @@ jobs: steps: - uses: actions/checkout@v2.3.4 - - name: Set up JDK 11 + - name: Set up JDK 17 uses: actions/setup-java@v1 with: - java-version: 11 + java-version: 17 - name: Grant execute permission for gradlew run: chmod +x gradlew - name: release to github with gradle diff --git a/.mps/migration.xml b/.mps/migration.xml index 84ab930c7c..a7d5049dba 100644 --- a/.mps/migration.xml +++ b/.mps/migration.xml @@ -7,6 +7,6 @@ - + \ No newline at end of file diff --git a/build.gradle b/build.gradle index f449fe2f67..33f36eba72 100644 --- a/build.gradle +++ b/build.gradle @@ -18,7 +18,7 @@ buildscript { plugins { id 'base' id 'maven-publish' - id "co.riiid.gradle" version "0.4.2" + id "io.github.humblerookie.gradle" version "0.5.0" } def incrementalBuild = !project.hasProperty("disableIncrementalBuild") @@ -32,8 +32,8 @@ configurations { } dependencies { - mps "com.jetbrains:mps:2021.3.+" - languageLibs "com.mbeddr:mbeddr:2021.3.+" + mps "com.jetbrains:mps:2022.2.+" + languageLibs "com.mbeddr:mbeddr:2022.2.+" junitAnt 'org.apache.ant:ant-junit:1.10.6' } diff --git a/gradle.properties b/gradle.properties index fb38fa1182..1433b2ce8e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ -mbeddrCppVersion = 2021.3 +mbeddrCppVersion = 2022.2 systemProp.org.gradle.internal.http.connectionTimeout=180000 systemProp.org.gradle.internal.http.socketTimeout=180000 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 2a563242c1..ffed3a254e 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/languages/com.mbeddr.cpp.base/models/com.mbeddr.cpp.base.editor.mps b/languages/com.mbeddr.cpp.base/models/com.mbeddr.cpp.base.editor.mps index b4f7f0af9d..b51a610cbf 100644 --- a/languages/com.mbeddr.cpp.base/models/com.mbeddr.cpp.base.editor.mps +++ b/languages/com.mbeddr.cpp.base/models/com.mbeddr.cpp.base.editor.mps @@ -296,14 +296,14 @@ - - - + + + - + diff --git a/scripts/allScripts.xml b/scripts/allScripts.xml index 2f0d3554fb..0596bba75a 100644 --- a/scripts/allScripts.xml +++ b/scripts/allScripts.xml @@ -141,6 +141,7 @@ + diff --git a/tests/test.ts.com.mbeddr.cpp/models/arrayinit@tests.mps b/tests/test.ts.com.mbeddr.cpp/models/arrayinit@tests.mps index ac1ba4540d..5b32f05689 100644 --- a/tests/test.ts.com.mbeddr.cpp/models/arrayinit@tests.mps +++ b/tests/test.ts.com.mbeddr.cpp/models/arrayinit@tests.mps @@ -2,7 +2,7 @@ - + @@ -33,6 +33,7 @@ + @@ -148,6 +149,7 @@ + diff --git a/tests/test.ts.com.mbeddr.cpp/models/attributes@tests.mps b/tests/test.ts.com.mbeddr.cpp/models/attributes@tests.mps index 74ac3d5131..87adf1c920 100644 --- a/tests/test.ts.com.mbeddr.cpp/models/attributes@tests.mps +++ b/tests/test.ts.com.mbeddr.cpp/models/attributes@tests.mps @@ -2,7 +2,7 @@ - + @@ -36,6 +36,7 @@ + @@ -148,6 +149,7 @@ + diff --git a/tests/test.ts.com.mbeddr.cpp/models/casting@tests.mps b/tests/test.ts.com.mbeddr.cpp/models/casting@tests.mps index 5f25560c2f..0f13b08e69 100644 --- a/tests/test.ts.com.mbeddr.cpp/models/casting@tests.mps +++ b/tests/test.ts.com.mbeddr.cpp/models/casting@tests.mps @@ -2,7 +2,7 @@ - + @@ -37,6 +37,7 @@ + @@ -204,6 +205,7 @@ + diff --git a/tests/test.ts.com.mbeddr.cpp/models/classnesting@tests.mps b/tests/test.ts.com.mbeddr.cpp/models/classnesting@tests.mps index facc6b19bb..0cf332bff9 100644 --- a/tests/test.ts.com.mbeddr.cpp/models/classnesting@tests.mps +++ b/tests/test.ts.com.mbeddr.cpp/models/classnesting@tests.mps @@ -2,7 +2,7 @@ - + @@ -28,6 +28,7 @@ + @@ -137,6 +138,7 @@ + diff --git a/tests/test.ts.com.mbeddr.cpp/models/constructor@tests.mps b/tests/test.ts.com.mbeddr.cpp/models/constructor@tests.mps index 8978fb4d8a..fb0c5ecedb 100644 --- a/tests/test.ts.com.mbeddr.cpp/models/constructor@tests.mps +++ b/tests/test.ts.com.mbeddr.cpp/models/constructor@tests.mps @@ -2,7 +2,7 @@ - + @@ -34,6 +34,7 @@ + @@ -167,6 +168,7 @@ + diff --git a/tests/test.ts.com.mbeddr.cpp/models/constructorinitializable@tests.mps b/tests/test.ts.com.mbeddr.cpp/models/constructorinitializable@tests.mps index ad237618f3..911ad54b9f 100644 --- a/tests/test.ts.com.mbeddr.cpp/models/constructorinitializable@tests.mps +++ b/tests/test.ts.com.mbeddr.cpp/models/constructorinitializable@tests.mps @@ -2,7 +2,7 @@ - + @@ -32,6 +32,7 @@ + @@ -127,6 +128,7 @@ + diff --git a/tests/test.ts.com.mbeddr.cpp/models/dynamicmemory@tests.mps b/tests/test.ts.com.mbeddr.cpp/models/dynamicmemory@tests.mps index 986122cc78..2df34c1cd5 100644 --- a/tests/test.ts.com.mbeddr.cpp/models/dynamicmemory@tests.mps +++ b/tests/test.ts.com.mbeddr.cpp/models/dynamicmemory@tests.mps @@ -2,7 +2,7 @@ - + @@ -31,6 +31,7 @@ + @@ -209,6 +210,7 @@ + diff --git a/tests/test.ts.com.mbeddr.cpp/models/globalvars@tests.mps b/tests/test.ts.com.mbeddr.cpp/models/globalvars@tests.mps index 449aaf7ed2..b7e0d5e483 100644 --- a/tests/test.ts.com.mbeddr.cpp/models/globalvars@tests.mps +++ b/tests/test.ts.com.mbeddr.cpp/models/globalvars@tests.mps @@ -2,7 +2,7 @@ - + @@ -35,6 +35,7 @@ + @@ -141,6 +142,7 @@ + diff --git a/tests/test.ts.com.mbeddr.cpp/models/identifiernames@tests.mps b/tests/test.ts.com.mbeddr.cpp/models/identifiernames@tests.mps index c5552ff057..2e583b38e7 100644 --- a/tests/test.ts.com.mbeddr.cpp/models/identifiernames@tests.mps +++ b/tests/test.ts.com.mbeddr.cpp/models/identifiernames@tests.mps @@ -2,7 +2,7 @@ - + @@ -32,6 +32,7 @@ + @@ -112,6 +113,7 @@ + diff --git a/tests/test.ts.com.mbeddr.cpp/models/inheritance@tests.mps b/tests/test.ts.com.mbeddr.cpp/models/inheritance@tests.mps index d13ddef868..ef7cc22f1d 100644 --- a/tests/test.ts.com.mbeddr.cpp/models/inheritance@tests.mps +++ b/tests/test.ts.com.mbeddr.cpp/models/inheritance@tests.mps @@ -2,7 +2,7 @@ - + @@ -33,6 +33,7 @@ + @@ -129,6 +130,7 @@ + diff --git a/tests/test.ts.com.mbeddr.cpp/models/method@tests.mps b/tests/test.ts.com.mbeddr.cpp/models/method@tests.mps index 4360605749..ec7baaf0be 100644 --- a/tests/test.ts.com.mbeddr.cpp/models/method@tests.mps +++ b/tests/test.ts.com.mbeddr.cpp/models/method@tests.mps @@ -2,7 +2,7 @@ - + @@ -33,6 +33,7 @@ + @@ -153,6 +154,7 @@ + diff --git a/tests/test.ts.com.mbeddr.cpp/models/namespace@tests.mps b/tests/test.ts.com.mbeddr.cpp/models/namespace@tests.mps index c8b1ca31fa..754fc82113 100644 --- a/tests/test.ts.com.mbeddr.cpp/models/namespace@tests.mps +++ b/tests/test.ts.com.mbeddr.cpp/models/namespace@tests.mps @@ -2,7 +2,7 @@ - + @@ -36,6 +36,7 @@ + @@ -241,6 +242,7 @@ + @@ -540,6 +542,7 @@ + @@ -681,6 +684,7 @@ + diff --git a/tests/test.ts.com.mbeddr.cpp/models/operatorOverloading@tests.mps b/tests/test.ts.com.mbeddr.cpp/models/operatorOverloading@tests.mps index f5fc9269d8..8ddb7f42aa 100644 --- a/tests/test.ts.com.mbeddr.cpp/models/operatorOverloading@tests.mps +++ b/tests/test.ts.com.mbeddr.cpp/models/operatorOverloading@tests.mps @@ -2,7 +2,7 @@ - + @@ -33,6 +33,7 @@ + @@ -239,6 +240,7 @@ + diff --git a/tests/test.ts.com.mbeddr.cpp/models/polymorphism@tests.mps b/tests/test.ts.com.mbeddr.cpp/models/polymorphism@tests.mps index 65944a3db4..934e15353b 100644 --- a/tests/test.ts.com.mbeddr.cpp/models/polymorphism@tests.mps +++ b/tests/test.ts.com.mbeddr.cpp/models/polymorphism@tests.mps @@ -2,7 +2,7 @@ - + @@ -29,6 +29,7 @@ + @@ -196,6 +197,7 @@ + diff --git a/tests/test.ts.com.mbeddr.cpp/models/scope@tests.mps b/tests/test.ts.com.mbeddr.cpp/models/scope@tests.mps index 22d01a3818..e52938d9ef 100644 --- a/tests/test.ts.com.mbeddr.cpp/models/scope@tests.mps +++ b/tests/test.ts.com.mbeddr.cpp/models/scope@tests.mps @@ -2,7 +2,7 @@ - + @@ -32,6 +32,7 @@ + @@ -196,6 +197,7 @@ + @@ -703,6 +705,7 @@ + @@ -869,6 +872,7 @@ + diff --git a/tests/test.ts.com.mbeddr.cpp/models/staticContext@tests.mps b/tests/test.ts.com.mbeddr.cpp/models/staticContext@tests.mps index f4f6e4032f..3391c39d15 100644 --- a/tests/test.ts.com.mbeddr.cpp/models/staticContext@tests.mps +++ b/tests/test.ts.com.mbeddr.cpp/models/staticContext@tests.mps @@ -2,7 +2,7 @@ - + @@ -30,6 +30,7 @@ + @@ -145,6 +146,7 @@ + diff --git a/tests/test.ts.com.mbeddr.cpp/models/staticclassmethodcall@tests.mps b/tests/test.ts.com.mbeddr.cpp/models/staticclassmethodcall@tests.mps index 9721b8473c..3f1ad2c31b 100644 --- a/tests/test.ts.com.mbeddr.cpp/models/staticclassmethodcall@tests.mps +++ b/tests/test.ts.com.mbeddr.cpp/models/staticclassmethodcall@tests.mps @@ -2,7 +2,7 @@ - + @@ -33,6 +33,7 @@ + @@ -155,6 +156,7 @@ + diff --git a/tests/test.ts.com.mbeddr.cpp/models/templates@tests.mps b/tests/test.ts.com.mbeddr.cpp/models/templates@tests.mps index af8d9c551e..6d5adef32c 100644 --- a/tests/test.ts.com.mbeddr.cpp/models/templates@tests.mps +++ b/tests/test.ts.com.mbeddr.cpp/models/templates@tests.mps @@ -2,7 +2,7 @@ - + @@ -30,6 +30,7 @@ + @@ -234,6 +235,7 @@ + @@ -648,6 +650,7 @@ + diff --git a/tests/test.ts.com.mbeddr.cpp/models/templatetypes@tests.mps b/tests/test.ts.com.mbeddr.cpp/models/templatetypes@tests.mps index f068d57c25..9b40b6ce5b 100644 --- a/tests/test.ts.com.mbeddr.cpp/models/templatetypes@tests.mps +++ b/tests/test.ts.com.mbeddr.cpp/models/templatetypes@tests.mps @@ -2,7 +2,7 @@ - + @@ -32,6 +32,7 @@ + @@ -120,6 +121,7 @@ + diff --git a/tests/test.ts.com.mbeddr.cpp/models/thisPointer@tests.mps b/tests/test.ts.com.mbeddr.cpp/models/thisPointer@tests.mps index 5f8bba229d..0bb3687b57 100644 --- a/tests/test.ts.com.mbeddr.cpp/models/thisPointer@tests.mps +++ b/tests/test.ts.com.mbeddr.cpp/models/thisPointer@tests.mps @@ -2,7 +2,7 @@ - + @@ -23,6 +23,7 @@ + @@ -145,6 +146,7 @@ + diff --git a/tests/test.ts.com.mbeddr.cpp/models/trycatch@tests.mps b/tests/test.ts.com.mbeddr.cpp/models/trycatch@tests.mps index 48a7d520b6..fe64992672 100644 --- a/tests/test.ts.com.mbeddr.cpp/models/trycatch@tests.mps +++ b/tests/test.ts.com.mbeddr.cpp/models/trycatch@tests.mps @@ -2,7 +2,7 @@ - + @@ -33,6 +33,7 @@ + @@ -160,6 +161,7 @@ + diff --git a/tests/test.ts.com.mbeddr.cpp/models/typeInference@tests.mps b/tests/test.ts.com.mbeddr.cpp/models/typeInference@tests.mps index b83f4f962b..b52ca2c4c1 100644 --- a/tests/test.ts.com.mbeddr.cpp/models/typeInference@tests.mps +++ b/tests/test.ts.com.mbeddr.cpp/models/typeInference@tests.mps @@ -2,7 +2,7 @@ - + @@ -37,6 +37,7 @@ + @@ -143,6 +144,7 @@ + diff --git a/tests/test.ts.com.mbeddr.cpp/test.ts.com.mbeddr.cpp.msd b/tests/test.ts.com.mbeddr.cpp/test.ts.com.mbeddr.cpp.msd index d604018b08..ad9571ca58 100644 --- a/tests/test.ts.com.mbeddr.cpp/test.ts.com.mbeddr.cpp.msd +++ b/tests/test.ts.com.mbeddr.cpp/test.ts.com.mbeddr.cpp.msd @@ -65,7 +65,7 @@ - +