commit b391a04370dfa69a83264fe95062a8a3423738a4
author plumpy <plumpy@google.com> Thu Jul 13 08:28:21 2017 -0400
committer Ron Shapiro <shapiro.rd@gmail.com> Wed Sep 06 17:39:52 2017 -0400
tree d0c9bd50435414ca347d3459cca77c90096218a2
parent 65c21498c71a9c64c1bc276ee43a56ac2e7d2771

Update the plugin to use google-java-format 1.4.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=167140754

idea_plugin/README.md

diff --git a/idea_plugin/README.md b/idea_plugin/README.md
index 022b3c1..1d258ec 100644
--- a/idea_plugin/README.md
+++ b/idea_plugin/README.md
@@ -19,3 +19,4 @@
 4.  Under "File→Project Structure→Libraries" add
     `core/target/google-java-format*all-deps.jar` file. IntelliJ will ask if you
     want to add it as a dependency to the google-java-format module. You do.
+5.  Run Build→Prepare Plugin Module 'google-java-format' For Deployment.

idea_plugin/google-java-format.iml

diff --git a/idea_plugin/google-java-format.iml b/idea_plugin/google-java-format.iml
index 01b5b3e..568c04f 100644
--- a/idea_plugin/google-java-format.iml
+++ b/idea_plugin/google-java-format.iml
@@ -7,13 +7,12 @@
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/com/google/googlejavaformat/intellij/v2017_1" isTestSource="false" packagePrefix="com.google.googlejavaformat.intellij" />
+      <sourceFolder url="file://$MODULE_DIR$/src/com/google/googlejavaformat/intellij/v2017_2" isTestSource="false" packagePrefix="com.google.googlejavaformat.intellij" />
       <excludeFolder url="file://$MODULE_DIR$/src/com/google/googlejavaformat/intellij/v2016_2" />
-      <excludeFolder url="file://$MODULE_DIR$/src/com/google/googlejavaformat/intellij/v2016_3" />
       <excludeFolder url="file://$MODULE_DIR$/src/com/google/googlejavaformat/intellij/v2017_1" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="google-java-format-1.3-all-deps" level="project" />
+    <orderEntry type="library" name="google-java-format-1.4-all-deps" level="project" />
   </component>
 </module>

idea_plugin/resources/META-INF/plugin.xml

diff --git a/idea_plugin/resources/META-INF/plugin.xml b/idea_plugin/resources/META-INF/plugin.xml
index 3a48cc7..aa04d0d 100644
--- a/idea_plugin/resources/META-INF/plugin.xml
+++ b/idea_plugin/resources/META-INF/plugin.xml
@@ -1,7 +1,7 @@
-<idea-plugin version="2">
+<idea-plugin url="https://github.com/google/google-java-format/tree/master/idea_plugin">
   <id>google-java-format</id>
   <name>google-java-format</name>
-  <version>1.3.2</version>
+  <version>1.4.0.172</version>
   <vendor url="https://github.com/google/google-java-format">
     Google
   </vendor>
@@ -12,11 +12,10 @@
   <depends>com.intellij.modules.lang</depends>
 
   <description><![CDATA[
-      Formats Java source code to comply with Google Style.
+      Formats Java source code to comply with Google Style. This version of the plugin uses
+      google-java-format 1.4.
     ]]></description>
 
-  <!-- CodeStyleManager continues to change across API versions, and will need to be updated again
-       for 2017.2. -->
   <idea-version since-build="172"/>
 
   <project-components>