wip #4097 @0.25

diff --git a/fluidbook/tools/fwstk/.idea/codeStyles/Project.xml b/fluidbook/tools/fwstk/.idea/codeStyles/Project.xml
new file mode 100644 (file)
index 0000000..da6b07e
--- /dev/null
+++ b/fluidbook/tools/fwstk/.idea/codeStyles/Project.xml
@@ -0,0 +1,22 @@
+<component name="ProjectCodeStyleConfiguration">\r
+  <code_scheme name="Project" version="173">\r
+    <JetCodeStyleSettings>\r
+      <option name="PACKAGES_TO_USE_STAR_IMPORTS">\r
+        <value>\r
+          <package name="java.util" alias="false" withSubpackages="false" />\r
+          <package name="kotlinx.android.synthetic" alias="false" withSubpackages="true" />\r
+          <package name="io.ktor" alias="false" withSubpackages="true" />\r
+        </value>\r
+      </option>\r
+      <option name="PACKAGES_IMPORT_LAYOUT">\r
+        <value>\r
+          <package name="" alias="false" withSubpackages="true" />\r
+          <package name="java" alias="false" withSubpackages="true" />\r
+          <package name="javax" alias="false" withSubpackages="true" />\r
+          <package name="kotlin" alias="false" withSubpackages="true" />\r
+          <package name="" alias="true" withSubpackages="true" />\r
+        </value>\r
+      </option>\r
+    </JetCodeStyleSettings>\r
+  </code_scheme>\r
+</component>
\ No newline at end of file

diff --git a/fluidbook/tools/fwstk/.idea/codeStyles/codeStyleConfig.xml b/fluidbook/tools/fwstk/.idea/codeStyles/codeStyleConfig.xml
new file mode 100644 (file)
index 0000000..df5f35d
--- /dev/null
+++ b/fluidbook/tools/fwstk/.idea/codeStyles/codeStyleConfig.xml
@@ -0,0 +1,5 @@
+<component name="ProjectCodeStyleConfiguration">\r
+  <state>\r
+    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />\r
+  </state>\r
+</component>
\ No newline at end of file

diff --git a/fluidbook/tools/fwstk/.idea/workspace.xml b/fluidbook/tools/fwstk/.idea/workspace.xml
index 00ef263db64b2742af9da83b03f54d967892229a..a5cf44a73da57950b9b1a55d1028d87cb86a10cd 100644 (file)
--- a/fluidbook/tools/fwstk/.idea/workspace.xml
+++ b/fluidbook/tools/fwstk/.idea/workspace.xml
@@ -7,9 +7,10 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="f146bc67-2578-4de3-9db2-94d2d43e9e83" name="Default" comment="wip #3135">
-      <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/.idea/codeStyles" afterDir="true" />
+      <change afterPath="$PROJECT_DIR$/.idea/codeStyles/Project.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/.idea/codeStyles/codeStyleConfig.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/out/artifacts/fwstk_jar/fwstk.jar" beforeDir="false" afterPath="$PROJECT_DIR$/out/artifacts/fwstk_jar/fwstk.jar" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/com/fluidbook/fwstk/Main.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/fluidbook/fwstk/Main.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
@@ -96,6 +97,7 @@
     <property name="project.structure.proportion" value="0.15193799" />
     <property name="project.structure.side.proportion" value="0.2" />
     <property name="settings.editor.selected.configurable" value="configurable.group.language" />
+    <property name="vue.rearranger.settings.migration" value="true" />
   </component>
   <component name="RecentsManager">
     <key name="CopyFile.RECENT_KEYS">
@@ -392,6 +394,7 @@
       <item itemvalue="Application.extract layout" />
     </list>
   </component>
+  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
   <component name="SvnConfiguration" cleanupOnStartRun="true">
     <configuration>C:\Users\Vincent\AppData\Roaming\Subversion</configuration>
     <supportedVersion>125</supportedVersion>
@@ -464,6 +467,7 @@
       <workItem from="1575379759151" duration="1198000" />
       <workItem from="1589879021642" duration="2421000" />
       <workItem from="1595346736329" duration="5317000" />
+      <workItem from="1606322492928" duration="1212000" />
     </task>
     <task id="LOCAL-00001" summary="wip #1111 @0.5">
       <created>1487172253077</created>
@@ -548,7 +552,7 @@
     </todo-panel>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
-    <option name="version" value="2" />
+    <option name="version" value="3" />
   </component>
   <component name="Vcs.Log.UiProperties">
     <option name="RECENTLY_FILTERED_USER_GROUPS">

diff --git a/fluidbook/tools/fwstk/out/artifacts/fwstk_jar/fwstk.jar b/fluidbook/tools/fwstk/out/artifacts/fwstk_jar/fwstk.jar
index e77b60ace6c8acd88c104e8e03e99f932f43d012..d7a9ba26fa0f299efabd27a5d74085416e3def5a 100644 (file)
Binary files a/fluidbook/tools/fwstk/out/artifacts/fwstk_jar/fwstk.jar and b/fluidbook/tools/fwstk/out/artifacts/fwstk_jar/fwstk.jar differ