Skip to content

Commit

Permalink
Fix and enable the Eclipse plugin build
Browse files Browse the repository at this point in the history
These changes were mostly selected from google#331
  • Loading branch information
Stephan202 committed Jan 27, 2019
1 parent 69e2efc commit 148f08d
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>com.google.googlejavaformat</groupId>
<artifactId>google-java-format-parent</artifactId>
<version>1.7-SNAPSHOT</version>
<version>1.7</version>
</parent>

<artifactId>google-java-format</artifactId>
Expand Down
6 changes: 3 additions & 3 deletions eclipse_plugin/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: google-java-format
Bundle-SymbolicName: google-java-format-eclipse-plugin;singleton:=true
Bundle-Version: 1.6.0
Bundle-Version: 1.7.0
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Require-Bundle: org.eclipse.jdt.core;bundle-version="3.10.0",
org.eclipse.jface,
org.eclipse.text,
org.eclipse.ui,
org.eclipse.equinox.common
Bundle-ClassPath: .,
lib/guava-22.0.jar,
lib/guava-27.0.1-jre.jar,
lib/javac-shaded-9+181-r4173-1.jar,
lib/google-java-format-1.6.jar
lib/google-java-format-1.7.jar
4 changes: 2 additions & 2 deletions eclipse_plugin/build.properties
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ bin.includes = META-INF/,\
.,\
plugin.xml,\
lib/javac-shaded-9+181-r4173-1.jar,\
lib/guava-22.0.jar,\
lib/google-java-format-1.6.jar
lib/guava-27.0.1-jre.jar,\
lib/google-java-format-1.7.jar
6 changes: 3 additions & 3 deletions eclipse_plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@
<parent>
<groupId>com.google.googlejavaformat</groupId>
<artifactId>google-java-format-parent</artifactId>
<version>1.6</version>
<version>1.7</version>
</parent>

<artifactId>google-java-format-eclipse-plugin</artifactId>
<version>1.6.0</version>
<version>1.7.0</version>
<packaging>eclipse-plugin</packaging>
<name>google-java-format Plugin for Eclipse 4.5+</name>

Expand All @@ -48,7 +48,7 @@
<dependency>
<groupId>com.google.googlejavaformat</groupId>
<artifactId>google-java-format</artifactId>
<version>1.6</version>
<version>1.7</version>
</dependency>
</dependencies>

Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,14 @@
<groupId>com.google.googlejavaformat</groupId>
<artifactId>google-java-format-parent</artifactId>
<packaging>pom</packaging>
<version>1.7-SNAPSHOT</version>
<version>1.7</version>

<modules>
<module>core</module>
<!-- google-java-format#24
<module>idea_plugin</module>
<module>eclipse_plugin</module>
-->
<module>eclipse_plugin</module>
</modules>

<name>Google Java Format Parent</name>
Expand Down

0 comments on commit 148f08d

Please sign in to comment.