Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgrade formatter / impsort plugins #403

Merged
merged 1 commit into from Apr 28, 2021
Merged

Upgrade formatter / impsort plugins #403

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 7 additions & 1 deletion build/eclipse-formatter-config.xml
View file
Open in desktop
Expand Up @@ -89,7 +89,13 @@
<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.indentation.size" value="8"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_enum_constant" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement" value="do not insert"/>
Expand Down
6 changes: 4 additions & 2 deletions pom.xml
View file
Open in desktop
Expand Up @@ -52,9 +52,9 @@
<!-- plugin versions a..z -->
<buildnumber-maven-plugin.version>1.4</buildnumber-maven-plugin.version>
<compiler.version>3.8.1</compiler.version>
<formatter-maven-plugin.version>2.12.1</formatter-maven-plugin.version>
<formatter-maven-plugin.version>2.15.0</formatter-maven-plugin.version>
<groovy-maven-plugin.version>2.1.1</groovy-maven-plugin.version>
<impsort-maven-plugin.version>1.4.1</impsort-maven-plugin.version>
<impsort-maven-plugin.version>1.6.0</impsort-maven-plugin.version>
<license-maven-plugin.version>3.0</license-maven-plugin.version>
<maven-jar-plugin.version>3.2.0</maven-jar-plugin.version>
<maven-install-plugin.version>2.4</maven-install-plugin.version>
Expand Down Expand Up @@ -334,6 +334,7 @@ limitations under the License.</inlineHeader>
<configFile>${maven.multiModuleProjectDirectory}/build/eclipse-formatter-config.xml</configFile>
<skip>${format.skip}</skip>
<lineEnding>KEEP</lineEnding>
<cachedir>${build.directory}/cache</cachedir>
</configuration>
</plugin>
<plugin>
Expand All @@ -345,6 +346,7 @@ limitations under the License.</inlineHeader>
<staticAfter>true</staticAfter>
<lineEnding>KEEP</lineEnding>
<skip>${format.skip}</skip>
<cachedir>${build.directory}/cache</cachedir>
</configuration>
</plugin>
<plugin>
Expand Down