Update the google-java-format plugin to use GJF 1.6.

plumpy · cushon · commit 907d46a5f025 · 2018-06-26T14:28:53.000-07:00
Also remove some redundant info from the plugin.xml file (it gets
overwritten/added by the gradle build anyway).

MOE_MIGRATED_REVID=199168149
diff --git a/idea_plugin/build.gradle b/idea_plugin/build.gradle
@@ -18,18 +18,12 @@ plugins {
   id "org.jetbrains.intellij" version "0.3.1"
 }
 
-task showProps {
-  doLast {
-    println "Your password is ${jetbrainsPluginRepoPassword}"
-  }
-}
-
 repositories {
   mavenCentral()
 }
 
 ext {
-  googleJavaFormatVersion = '1.5'
+  googleJavaFormatVersion = '1.6'
 }
 
 apply plugin: 'org.jetbrains.intellij'
@@ -44,7 +38,7 @@ intellij {
 patchPluginXml {
   pluginDescription = "Formats source code using the google-java-format tool. This version of " +
                       "the plugin uses version ${googleJavaFormatVersion} of the tool."
-  version = "${googleJavaFormatVersion}.1"
+  version = "${googleJavaFormatVersion}.0"
   sinceBuild = '171'
 }
 
diff --git a/idea_plugin/resources/META-INF/plugin.xml b/idea_plugin/resources/META-INF/plugin.xml
@@ -1,7 +1,6 @@
 <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.4.0.172</version>
   <vendor url="https://github.com/google/google-java-format">
     Google
   </vendor>
@@ -11,13 +10,6 @@
        reason. It won't crash PyCharm or anything, so whatever. -->
   <depends>com.intellij.modules.lang</depends>
 
-  <description><![CDATA[
-      Formats Java source code to comply with Google Style. This version of the plugin uses
-      google-java-format 1.4.
-    ]]></description>
-
-  <idea-version since-build="172"/>
-
   <project-components>
     <component>
       <implementation-class>

Original file line number	Diff line number	Diff line change
`@@ -18,18 +18,12 @@ plugins {`
`18`	`18`	`id "org.jetbrains.intellij" version "0.3.1"`
`19`	`19`	`}`
`20`	`20`
`21`		`-task showProps {`
`22`		`- doLast {`
`23`		`- println "Your password is ${jetbrainsPluginRepoPassword}"`
`24`		`- }`
`25`		`-}`
`26`		`-`
`27`	`21`	`repositories {`
`28`	`22`	`mavenCentral()`
`29`	`23`	`}`
`30`	`24`
`31`	`25`	`ext {`
`32`		`- googleJavaFormatVersion = '1.5'`
	`26`	`+ googleJavaFormatVersion = '1.6'`
`33`	`27`	`}`
`34`	`28`
`35`	`29`	`apply plugin: 'org.jetbrains.intellij'`
`@@ -44,7 +38,7 @@ intellij {`
`44`	`38`	`patchPluginXml {`
`45`	`39`	`pluginDescription = "Formats source code using the google-java-format tool. This version of " +`
`46`	`40`	`"the plugin uses version ${googleJavaFormatVersion} of the tool."`
`47`		`- version = "${googleJavaFormatVersion}.1"`
	`41`	`+ version = "${googleJavaFormatVersion}.0"`
`48`	`42`	`sinceBuild = '171'`
`49`	`43`	`}`
`50`	`44`