Skip to content

Commit

Permalink
Upgrade 2019.1.5
Browse files Browse the repository at this point in the history
  • Loading branch information
diederikd committed Jul 28, 2019
1 parent 8a762b7 commit 1860389
Show file tree
Hide file tree
Showing 84 changed files with 5,961 additions and 5,588 deletions.
2 changes: 2 additions & 0 deletions .mps/migration.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,7 @@
<project version="4">
<component name="MigrationProperties">
<entry key="jetbrains.mps.ide.mpsmigration.v182.ReapplyPatternMigration" value="executed" />
<entry key="jetbrains.mps.ide.mpsmigration.v191.SaveAllJavaStubMethodRefsToShortForeignFormat" value="executed" />
<entry key="jetbrains.mps.ide.mpsmigration.v191.UpdateJavaStubMethodRefs" value="executed" />
</component>
</project>
1 change: 1 addition & 0 deletions .mps/modules.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
<project version="4">
<component name="MPSProject">
<projectModules>
<modulePath path="$PROJECT_DIR$/_spreferences/CodeReviewPreferences/module.msd" folder="_spreferences" />
<modulePath path="$PROJECT_DIR$/devkits/DemoSpecificationLanguage/DemoSpecificationLanguage.devkit" folder="Languages" />
<modulePath path="$PROJECT_DIR$/languages/AWSStateMachine/AWSStateMachine.mpl" folder="Languages" />
<modulePath path="$PROJECT_DIR$/languages/AWSStateMachine/sandbox/AWSStateMachine.sandbox.msd" folder="Tests" />
Expand Down
2,473 changes: 1,355 additions & 1,118 deletions .mps/workspace.xml

Large diffs are not rendered by default.

14 changes: 7 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@ language: java
jdk:
- openjdk8
before_install:
- wget https://download-cf.jetbrains.com/mps/2018.3/MPS-2018.3.zip
- wget https://github.com/JetBrains/MPS-extensions/releases/download/nightly-2018.3.934.4e4b4f5/de.itemis.mps.extensions-2018.3.934.4e4b4f5.zip
- wget https://github.com/mbeddr/mbeddr.core/releases/download/nightly-619/platform-distribution-1.2.21172.355f4af-MPS-2018.3.2.zip
- wget https://download-cf.jetbrains.com/mps/2019.1/MPS-2019.1.zip
- wget https://github.com/JetBrains/MPS-extensions/releases/download/nightly-2019.1.1037.4955bbc/de.itemis.mps.extensions-2019.1.1037.4955bbc.zip
- wget https://build.mbeddr.com/repository/downloadAll/Mbeddr2_Mbeddr_Gradle_platform/256369:id/artifacts.zip
install:
- unzip MPS-2018.3.zip
- unzip de.itemis.mps.extensions-2018.3.934.4e4b4f5.zip -d plugins
- unzip platform-distribution-1.2.21172.355f4af-MPS-2018.3.2.zip -d plugins
- unzip de.itemis.mps.extensions-2019.1.1037.4955bbc.zip
- unzip artifacts.zip
script:
- ant -Dmps_home=./MPS\ 2018.3 -Dmbeddr_home=./plugins clean generate assemble
- ant -f buildDistribution.xml -Dmps_home=./MPS\ 2018.3
- ant -Dmps_home=./MPS\ 2019.1 -Dmbeddr_home=./artifacts/com.mbeddr.platform -Dmps_extensions=./de.itemis.mps.extensions clean generate assemble
- ant -f buildDistribution.xml -Dmps_home=./MPS\ 2019.1
deploy:
provider: releases
name: Demo-Workbench-Build-$TRAVIS_TAG
Expand Down
268 changes: 163 additions & 105 deletions build.xml

Large diffs are not rendered by default.

7 changes: 3 additions & 4 deletions languages/AWSStateMachine/AWSStateMachine.mpl
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@
<language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
<language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
<language slang="l:b401a680-8325-4110-8fd3-84331ff25bef:jetbrains.mps.lang.generator" version="2" />
<language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="0" />
<language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="1" />
<language slang="l:289fcc83-6543-41e8-a5ca-768235715ce4:jetbrains.mps.lang.generator.generationParameters" version="0" />
<language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
<language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="0" />
<language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="1" />
<language slang="l:13744753-c81f-424a-9c1b-cf8943bf4e86:jetbrains.mps.lang.sharedConcepts" version="0" />
<language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="13" />
<language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
Expand All @@ -51,7 +51,6 @@
<dependency reexport="false" scope="generate-into">b401a680-8325-4110-8fd3-84331ff25bef(jetbrains.mps.lang.generator)</dependency>
</dependencies>
<languageVersions>
<language slang="l:7d323e61-8358-4656-a071-a2bb68438615:com.mbeddr.core.codereview" version="0" />
<language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="8" />
<language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
<language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
Expand All @@ -67,7 +66,7 @@
<language slang="l:18bc6592-03a6-4e29-a83a-7ff23bde13ba:jetbrains.mps.lang.editor" version="12" />
<language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
<language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="1" />
<language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="0" />
<language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="1" />
<language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
<language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="13" />
<language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="7" />
Expand Down
Binary file not shown.
Binary file not shown.
Loading

0 comments on commit 1860389

Please sign in to comment.