update MPS version to 2018.3

JetBrains · Aug 3, 2018 · fe37e4a · fe37e4a
1 parent 9b0b816
commit fe37e4a
Show file tree

Hide file tree

Showing 58 changed files with 116 additions and 146 deletions.
diff --git a/.idea/runConfigurations/MPSDebug.xml b/.idea/runConfigurations/MPSDebug.xml
diff --git a/.idea/runConfigurations/MPSDebug_with_profiling.xml b/.idea/runConfigurations/MPSDebug_with_profiling.xml
diff --git a/.idea/runConfigurations/MPSLauncher.xml b/.idea/runConfigurations/MPSLauncher.xml
diff --git a/.idea/runConfigurations/MPSLauncher2.xml b/.idea/runConfigurations/MPSLauncher2.xml
diff --git a/.idea/runConfigurations/MPS_Remote.xml b/.idea/runConfigurations/MPS_Remote.xml
diff --git a/IdeaPlugin/build.xml b/IdeaPlugin/build.xml
@@ -20,10 +20,10 @@
         ant -Dhome.idea_ce={IDEA_HOME_DIR} -Dhome.idea_ce.plugins={IDEA_PLUGINS_FOLDER} <task>
 
         e.g. for MacOs it will be:
-        ant -Dhome.idea_ce=/Applications/IntelliJ\ IDEA\ CE\ 2018.2.app/Contents/ -Dhome.idea_ce.plugins=~/Library/Application Support/IdeaIC2018.2 <task>
+        ant -Dhome.idea_ce=/Applications/IntelliJ\ IDEA\ CE\ 2018.3.app/Contents/ -Dhome.idea_ce.plugins=~/Library/Application Support/IdeaIC2018.3 <task>
 
      2. To run tests locally, it's sufficient to set home.idea_ce and home.jdk:
-        ant -Dhome.idea_ce=/IDEA13/ -Dhome.jdk=/Library/Java/Home/ -f IdeaPlugin/build.xml clean zip runTests
+        ant -Dhome.idea_ce=/IDEAXX/ -Dhome.jdk=/Library/Java/Home/ -f IdeaPlugin/build.xml clean zip runTests
 
      To connect to running tests and debug with Idea, uncomment/modify 'junit.debug.arg' property below
   -->

diff --git a/IdeaPlugin/mps-core/META-INF/plugin.xml b/IdeaPlugin/mps-core/META-INF/plugin.xml
@@ -19,9 +19,9 @@
   <name>MPS Core</name>
   <category>Custom Languages</category>
   <description>MPS Core</description>
-  <version>2018.2</version>
+  <version>2018.3</version>
   <vendor url="http://www.jetbrains.com/mps/">JetBrains MPS</vendor>
-  <idea-version since-build="181.1" until-build="183.*"/>
+  <idea-version since-build="182.1" until-build="183.*"/>
 
   <depends optional="true" config-file="idea-support.xml">com.intellij.modules.java</depends>
   <depends optional="true" config-file="intellij-ides-support.xml">com.intellij.modules.ultimate</depends>

diff --git a/IdeaPlugin/mps-java/META-INF/plugin.xml b/IdeaPlugin/mps-java/META-INF/plugin.xml
@@ -19,9 +19,9 @@
   <name>MPS BaseLanguage Support</name>
   <description>Support of the MPS BaseLanguage (JAVA)</description>
   <category>Custom Languages</category>
-  <version>2018.2</version>
+  <version>2018.3</version>
   <vendor url="http://www.jetbrains.com/mps/">JetBrains MPS</vendor>
-  <idea-version since-build="181.1" until-build="183.*"/>
+  <idea-version since-build="182.1" until-build="183.*"/>
   <depends>jetbrains.mps.core</depends>
   <depends>jetbrains.mps.ide.migration.idea</depends>
 

diff --git a/IdeaPlugin/mps-migration/META-INF/plugin.xml b/IdeaPlugin/mps-migration/META-INF/plugin.xml
@@ -2,9 +2,9 @@
   <id>jetbrains.mps.ide.migration.idea</id>
   <name>MPS Migration Support for Idea</name>
   <description>MPS Migration Support for Idea Plugin</description>
-  <version>2018.2</version>
+  <version>2018.3</version>
   <vendor url="http://www.jetbrains.com/mps/">JetBrains</vendor>
-  <idea-version since-build="181.1" until-build="183.*"/>
+  <idea-version since-build="182.1" until-build="183.*"/>
 
   <xi:include href="pluginBase.xml" xpointer="xpointer(/idea-plugin/*)"/>
 

diff --git a/IdeaPlugin/mps-vcs/META-INF/plugin.xml b/IdeaPlugin/mps-vcs/META-INF/plugin.xml
@@ -19,9 +19,9 @@
   <name>MPS Version Control Support</name>
   <category>Custom Languages</category>
   <description>MPS Version Control support</description>
-  <version>2018.2</version>
+  <version>2018.3</version>
   <vendor url="http://www.jetbrains.com/mps/">JetBrains MPS</vendor>
-  <idea-version since-build="181.1" until-build="183.*"/>
+  <idea-version since-build="182.1" until-build="183.*"/>
   <depends>jetbrains.mps.core</depends>
 
   <depends optional="true">Subversion</depends>

diff --git a/build.txt b/build.txt
@@ -1 +1 @@
-182.SNAPSHOT
+183.SNAPSHOT
diff --git a/build/mps.xml b/build/mps.xml
@@ -59,7 +59,7 @@
     <mkdir dir="${build.tmp}/default/branding.jar/idea" />
     <echoxml file="${build.tmp}/default/branding.jar/idea/IdeaApplicationInfo.xml">
       <component>
-        <version codename="MPS" major="2018" minor="2" eap="false" update-channel="MPS182" />
+        <version codename="MPS" major="2018" minor="3" eap="true" update-channel="MPS183EAP" />
         <company name="JetBrains s.r.o." url="https://www.jetbrains.com/?fromIDE" copyrightStart="2009" />
         <build number="${build.number}" date="${date}" />
         <logo url="/splash.png" textcolor="FFFFFF" progressColor="FFFFFF" progressX="117" progressY="280" progressHeight="3" />
@@ -77,9 +77,9 @@
         <help root="mps" webhelp-url="http://www.jetbrains.com/mps/webhelp/" />
         <documentation url="https://www.jetbrains.com/mps/documentation" />
         <support url="https://www.jetbrains.com/support/mps/index.html" />
-        <feedback release-url="https://www.jetbrains.com/feedback/feedback.jsp?product=mps" />
+        <feedback eap-url="https://www.jetbrains.com/feedback/feedback.jsp?product=mps" />
         <whatsnew url="https://www.jetbrains.com/mps/whatsnew/index.html" />
-        <keymap win="https://confluence.jetbrains.com/display/MPSD20181/Default+Keymap+Reference" mac="https://confluence.jetbrains.com/display/MPSD20181/Default+Keymap+Reference" />
+        <keymap win="https://confluence.jetbrains.com/display/MPSD20183/Default+Keymap+Reference" mac="https://confluence.jetbrains.com/display/MPSD20183/Default+Keymap+Reference" />
         <third-party url="http://www.jetbrains.org/" />
         <jetbrains-tv url="http://www.youtube.com/user/JetBrainsTV/search?query=MPS" />
 

diff --git a/build/mpsBootstrapCore.xml b/build/mpsBootstrapCore.xml
@@ -3,7 +3,7 @@
   <property name="build.dir" location="build" />
   <property name="build.tmp" location="${build.dir}/tmp/mpsBootstrapCore" />
   <property name="build.layout" location="${build.dir}/artifacts/mpsBootstrapCore" />
-  <property name="version" value="2018.2" />
+  <property name="version" value="2018.3 EAP" />
   <property name="idea_home" location="" />
   <property name="mps_home" location="${basedir}" />
   <property name="platform_lib" location="${basedir}/lib" />

diff --git a/build/run_build.sh b/build/run_build.sh
@@ -21,4 +21,4 @@ if [ $# -eq 0 ]; then
 else
   targets="$@"
 fi
-ant -f $mps_home/build/build.xml $targets -Dmps_home=$mps_home -Dbuild.number=182.1 -Dversion=2018.2 -Dbuild.vcs.number=HEAD -Dteamcity.buildConfName=local
+ant -f $mps_home/build/build.xml $targets -Dmps_home=$mps_home -Dbuild.number=183.1 -Dversion=2018.3 -Dbuild.vcs.number=HEAD -Dteamcity.buildConfName=local
diff --git a/plugins/debugger-api/runtime/jetbrains/mps/debugger/api/ui/actions.mps b/plugins/debugger-api/runtime/jetbrains/mps/debugger/api/ui/actions.mps
@@ -2015,8 +2015,8 @@
     <property role="9BnSM" value="JetBrains" />
     <property role="1qHB85" value="/MPS_16.png" />
     <property role="TrG5h" value="Debugger API for MPS" />
-    <property role="9BnSO" value="181.1" />
-    <property role="9BnSK" value="2018.2" />
+    <property role="9BnSO" value="182.1" />
+    <property role="9BnSK" value="2018.3" />
   </node>
   <node concept="312cEu" id="24OxoGwTqg6">
     <property role="TrG5h" value="MuteBreakpoints" />

diff --git a/...ns/debugger-api/runtime/source_gen.caches/jetbrains/mps/debugger/api/ui/actions/generated b/...ns/debugger-api/runtime/source_gen.caches/jetbrains/mps/debugger/api/ui/actions/generated
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<dependencies version="2" modelHash="5uhnoj44982lc09x68lzrm20bb2x5v0" />
+<dependencies version="2" modelHash="3st6nceckj1mb3m8dp3m3deorh1hnlx" />
 
diff --git a/plugins/debugger-api/runtime/source_gen/jetbrains/mps/debugger/api/ui/actions/plugin.xml b/plugins/debugger-api/runtime/source_gen/jetbrains/mps/debugger/api/ui/actions/plugin.xml
@@ -4,9 +4,9 @@
   <id>jetbrains.mps.debugger.api</id>
   <name>Debugger API for MPS</name>
   <description>Base debugging support for MPS</description>
-  <version>2018.2</version>
+  <version>2018.3</version>
   <vendor url="http://www.jetbrains.com/mps/">JetBrains</vendor>
-  <idea-version since-build="181.1" />
+  <idea-version since-build="182.1" />
 
 
   <extensions defaultExtensionNs="com.intellij">

diff --git a/...ger-java/customViewers/models/jetbrains/mps/debugger/java/customViewers/plugin/plugin.mps b/...ger-java/customViewers/models/jetbrains/mps/debugger/java/customViewers/plugin/plugin.mps
@@ -240,8 +240,8 @@
     <property role="9BnSM" value="JetBrains" />
     <property role="1qHB85" value="/MPS_16.png" />
     <property role="TrG5h" value="BaseLanguage Debugger Support" />
-    <property role="9BnSO" value="181.1" />
-    <property role="9BnSK" value="2018.2" />
+    <property role="9BnSO" value="182.1" />
+    <property role="9BnSK" value="2018.3" />
     <node concept="2Tc6Op" id="5ODR6dNebC9" role="2Tc6Ou">
       <property role="2Tc6Oq" value="jetbrains.mps.debugger.java" />
     </node>

diff --git a/...ewers/source_gen.caches/jetbrains/mps/debugger/java/customViewers/plugin/plugin/generated b/...ewers/source_gen.caches/jetbrains/mps/debugger/java/customViewers/plugin/plugin/generated
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<dependencies version="2" modelHash="-9mbs3wjqwyx933lye76se1d5dfehbil" />
+<dependencies version="2" modelHash="-exkmknfrfx78wuyfyod9scdw34um6y7" />
 
diff --git a/...stomViewers/source_gen/jetbrains/mps/debugger/java/customViewers/plugin/plugin/plugin.xml b/...stomViewers/source_gen/jetbrains/mps/debugger/java/customViewers/plugin/plugin/plugin.xml
@@ -4,9 +4,9 @@
   <id>jetbrains.mps.debugger.java.customViewers</id>
   <name>BaseLanguage Debugger Support</name>
   <description>Debugger support for baseLanguage extensions</description>
-  <version>2018.2</version>
+  <version>2018.3</version>
   <vendor url="http://www.jetbrains.com/mps/">JetBrains</vendor>
-  <idea-version since-build="181.1" />
+  <idea-version since-build="182.1" />
 
   <depends>jetbrains.mps.debugger.java</depends>
 

diff --git a/plugins/debugger-java/runtime/models/jetbrains/mps/debugger/java/runtime/ui/actions.mps b/plugins/debugger-java/runtime/models/jetbrains/mps/debugger/java/runtime/ui/actions.mps
@@ -630,7 +630,7 @@
     <property role="9BnSM" value="vendor" />
     <property role="1qHB85" value="mock" />
     <property role="TrG5h" value="name" />
-    <property role="9BnSO" value="181.1" />
+    <property role="9BnSO" value="182.1" />
     <property role="9BnSK" value="version" />
   </node>
   <node concept="tC5Ba" id="7V1YZ6sOyPD">

diff --git a/...r-java/runtime/source_gen.caches/jetbrains/mps/debugger/java/runtime/ui/actions/generated b/...r-java/runtime/source_gen.caches/jetbrains/mps/debugger/java/runtime/ui/actions/generated
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<dependencies version="2" modelHash="cpua3u2pmf0ub5464dnt6rg23fxuo8l" />
+<dependencies version="2" modelHash="-7j5gmjpz8dz4ruri7chvl4oawm20ugq" />
 
diff --git a/...ebugger-java/runtime/source_gen/jetbrains/mps/debugger/java/runtime/ui/actions/plugin.xml b/...ebugger-java/runtime/source_gen/jetbrains/mps/debugger/java/runtime/ui/actions/plugin.xml
@@ -6,7 +6,7 @@
   <description>description</description>
   <version>version</version>
   <vendor url="url">vendor</vendor>
-  <idea-version since-build="181.1" />
+  <idea-version since-build="182.1" />
 
 
   <extensions defaultExtensionNs="com.intellij">

diff --git a/plugins/execution-languages/languages/demo/pluginSolution/models/plugin.mps b/plugins/execution-languages/languages/demo/pluginSolution/models/plugin.mps
@@ -658,7 +658,7 @@
     <property role="9BnSM" value="a" />
     <property role="1qHB85" value="a" />
     <property role="TrG5h" value="a" />
-    <property role="9BnSO" value="181.1" />
+    <property role="9BnSO" value="182.1" />
     <property role="9BnSK" value="a" />
   </node>
   <node concept="2DaZZR" id="6dAEaqvbGv_" />

diff --git a/...inSolution/source_gen.caches/jetbrains/mps/execution/demo/pluginSolution/plugin/generated b/...inSolution/source_gen.caches/jetbrains/mps/execution/demo/pluginSolution/plugin/generated
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<dependencies version="2" modelHash="-7p0pojx8bh3v7whdd0dyk12ylrvdjnb" />
+<dependencies version="2" modelHash="ct2lfu7apnxg29ftx71uwct7ohskj4x" />
 
diff --git a/...o/pluginSolution/source_gen/jetbrains/mps/execution/demo/pluginSolution/plugin/plugin.xml b/...o/pluginSolution/source_gen/jetbrains/mps/execution/demo/pluginSolution/plugin/plugin.xml
@@ -6,7 +6,7 @@
   <description>a</description>
   <version>a</version>
   <vendor url="a">a</vendor>
-  <idea-version since-build="181.1" />
+  <idea-version since-build="182.1" />
 
 
   <extensions defaultExtensionNs="com.intellij">