From 6df3a439af54dfb58692882c2a1f8896b7b408c6 Mon Sep 17 00:00:00 2001
From: "tyler.hodgkins" <tyler.hodgkins@workday.com>
Date: Mon, 27 Aug 2018 10:42:08 -0700
Subject: [PATCH] Uptake MPS 2018.2

---
 .mps/migration.xml                            |  1 +
 build.gradle                                  |  4 ++--
 buildScripts/reviewPluginBuildScripts.xml     |  3 ++-
 .../models/ui.swing/ActiveReviewView.mpsr     | 23 ++++++++++++++++---
 4 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/.mps/migration.xml b/.mps/migration.xml
index 61c9c5d..5704813 100644
--- a/.mps/migration.xml
+++ b/.mps/migration.xml
@@ -2,6 +2,7 @@
 <project version="4">
   <component name="MigrationProperties">
     <entry key="jetbrains.mps.ide.mpsmigration.v172.JUnitLibsRepackaging" value="executed" />
+    <entry key="jetbrains.mps.ide.mpsmigration.v182.ReapplyPatternMigration" value="executed" />
     <entry key="jetbrains.mps.ide.mpsmigration.v35.EditorGeneratorRefactoring" value="executed" />
     <entry key="jetbrains.mps.ide.mpsmigration.v35.RemoveHistoryFiles" value="executed" />
     <entry key="jetbrains.mps.ide.mpsmigration.v35.SetGenRequiredToEmptyAspects" value="executed" />
diff --git a/build.gradle b/build.gradle
index f343fb2..e279523 100644
--- a/build.gradle
+++ b/build.gradle
@@ -31,13 +31,13 @@ configurations {
 
 dependencies {
   // Plugin dependencies for project
-  mpsPlugins group: 'com.mbeddr', name: 'platform', version: '1.0.20107.+'
+  mpsPlugins group: 'com.mbeddr', name: 'platform', version: '1.0.20678.+'
 
   // Compile-time dependencies
   // Multiple configurations allow us to easily copy the deps to the required locations
   compile group: 'com.google.code.gson', name: 'gson', version: '2.8.2'
   compile group: 'com.squareup.okhttp3', name: 'okhttp', version: '3.10.0'
-  mps group: 'com.jetbrains', name: 'mps', version: '2018.1.5'
+  mps group: 'com.jetbrains', name: 'mps', version: '2018.2'
   git4mpsCompile files('artifacts/MPS/plugins/git4idea/lib/git4idea.jar')
   git4mpsCompile files('artifacts/MPS/plugins/git4idea/lib/git4idea-rt.jar')
 }
diff --git a/buildScripts/reviewPluginBuildScripts.xml b/buildScripts/reviewPluginBuildScripts.xml
index a61987c..bff4dec 100644
--- a/buildScripts/reviewPluginBuildScripts.xml
+++ b/buildScripts/reviewPluginBuildScripts.xml
@@ -26,6 +26,7 @@
   <property name="environment" value="env" />
   <property name="env.JAVA_HOME" value="${java.home}/.." />
   <property name="jdk.home" value="${env.JAVA_HOME}" />
+  <property name="mps.generator.skipUnmodifiedModels" value="false" />
   
   <path id="path.mps.ant.path">
     <pathelement location="${artifacts.mps}/lib/ant/lib/ant-mps.jar" />
@@ -119,7 +120,7 @@
   
   <target name="generate" depends="declare-mps-tasks, fetchDependencies">
     <echo message="generating" />
-    <generate strictMode="true" parallelMode="true" parallelThreads="8" useInplaceTransform="false" hideWarnings="false" createStaticRefs="true" fork="true">
+    <generate strictMode="true" parallelMode="true" parallelThreads="8" useInplaceTransform="false" hideWarnings="false" createStaticRefs="true" fork="true" skipUnmodifiedModels="${mps.generator.skipUnmodifiedModels}">
       <library file="${artifacts.com.mbeddr.platform}/com.mbeddr.platform.jar" />
       <library file="${artifacts.com.mbeddr.platform}/de.slisson.mps.all/languages/de.slisson.mps.all/de.slisson.mps.all.build.jar" />
       <library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.blTypes.jar" />
diff --git a/solutions/com.workday.mps.review/models/ui.swing/ActiveReviewView.mpsr b/solutions/com.workday.mps.review/models/ui.swing/ActiveReviewView.mpsr
index b6a7292..f380a82 100644
--- a/solutions/com.workday.mps.review/models/ui.swing/ActiveReviewView.mpsr
+++ b/solutions/com.workday.mps.review/models/ui.swing/ActiveReviewView.mpsr
@@ -205,6 +205,7 @@
         <ref role="3uigEE" to="ee8f:3c3vDUkV4xB" resolve="Dispatcher" />
       </node>
     </node>
+    <node concept="2tJIrI" id="313akJaSz5R" role="jymVt" />
     <node concept="312cEg" id="6hum7g6KdXk" role="jymVt">
       <property role="34CwA1" value="false" />
       <property role="eg7rD" value="false" />
@@ -235,6 +236,7 @@
         <ref role="3uigEE" to="czez:3c3vDUl1opO" resolve="UiProxyStore" />
       </node>
     </node>
+    <node concept="2tJIrI" id="313akJaSwiM" role="jymVt" />
     <node concept="312cEg" id="2hVa5mzZcjx" role="jymVt">
       <property role="34CwA1" value="false" />
       <property role="eg7rD" value="false" />
@@ -417,6 +419,7 @@
         </node>
       </node>
     </node>
+    <node concept="2tJIrI" id="313akJaS_T7" role="jymVt" />
     <node concept="312cEg" id="5ihn07CdkCZ" role="jymVt">
       <property role="34CwA1" value="false" />
       <property role="eg7rD" value="false" />
@@ -791,6 +794,22 @@
       <node concept="3clFbS" id="3c3vDUlbPGe" role="3clF47">
         <node concept="3clFbJ" id="6hum7g6OlgF" role="3cqZAp">
           <node concept="3clFbS" id="6hum7g6OlgH" role="3clFbx">
+            <node concept="3clFbF" id="3uUMJIiQfxC" role="3cqZAp">
+              <node concept="2OqwBi" id="3uUMJIiQgIO" role="3clFbG">
+                <node concept="2OqwBi" id="3uUMJIiQg5c" role="2Oq$k0">
+                  <node concept="Xjq3P" id="3uUMJIiQfxA" role="2Oq$k0" />
+                  <node concept="2OwXpG" id="3uUMJIiQgdB" role="2OqNvi">
+                    <ref role="2Oxat5" node="4dp0YvdxHQr" resolve="root" />
+                  </node>
+                </node>
+                <node concept="liA8E" id="3uUMJIiQhuf" role="2OqNvi">
+                  <ref role="37wK5l" to="dxuu:~JComponent.setVisible(boolean):void" resolve="setVisible" />
+                  <node concept="3clFbT" id="3uUMJIiQhMy" role="37wK5m">
+                    <property role="3clFbU" value="true" />
+                  </node>
+                </node>
+              </node>
+            </node>
             <node concept="3clFbF" id="2hVa5m$0VOd" role="3cqZAp">
               <node concept="2OqwBi" id="2hVa5m$0WZx" role="3clFbG">
                 <node concept="2OqwBi" id="2hVa5m$0Wja" role="2Oq$k0">
@@ -988,9 +1007,7 @@
                   </node>
                   <node concept="liA8E" id="2hVa5m$0V62" role="2OqNvi">
                     <ref role="37wK5l" to="dxuu:~JComponent.setVisible(boolean):void" resolve="setVisible" />
-                    <node concept="3clFbT" id="2hVa5m$0Vqg" role="37wK5m">
-                      <property role="3clFbU" value="true" />
-                    </node>
+                    <node concept="3clFbT" id="2hVa5m$0Vqg" role="37wK5m" />
                   </node>
                 </node>
               </node>