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.

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

chore: replace formatter with spotless [skip ci] #6512

Merged
merged 3 commits into from
Aug 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ If you need to make any modification in a component, consider whether it is conv

### Formatting

Run `mvn formatter:format` before pushing your code.
Run `mvn spotless:apply` before pushing your code.

## Bug and enhancement tickets
- Bug tickets and enhancement requests for the web component implementations should go to the Vaadin web components monorepo https://github.com/vaadin/web-components/.
Expand Down
17 changes: 9 additions & 8 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
<maven.surefire.plugin.version>3.3.1</maven.surefire.plugin.version>
<maven.failsafe.plugin.version>3.3.1</maven.failsafe.plugin.version>
<maven.resources.plugin.version>3.3.1</maven.resources.plugin.version>
<spotless.plugin.version>2.43.0</spotless.plugin.version>
<failsafe.forkCount>4</failsafe.forkCount>
<com.vaadin.tests.SharedBrowser.reuseBrowser>true</com.vaadin.tests.SharedBrowser.reuseBrowser>
<com.vaadin.testbench.Parameters.testsInParallel>1</com.vaadin.testbench.Parameters.testsInParallel>
Expand Down Expand Up @@ -442,15 +443,15 @@
</pluginManagement>
<plugins>
<plugin>
<groupId>net.revelc.code.formatter</groupId>
<artifactId>formatter-maven-plugin</artifactId>
<version>2.24.1</version>
<groupId>com.diffplug.spotless</groupId>
<artifactId>spotless-maven-plugin</artifactId>
<version>${spotless.plugin.version}</version>
<configuration>
<configFile>https://raw.githubusercontent.com/vaadin/flow/main/eclipse/VaadinJavaConventions.xml</configFile>
<skipHtmlFormatting>true</skipHtmlFormatting>
<excludes>
<exclude>**/*.css</exclude>
</excludes>
<java>
<eclipse>
<file>https://raw.githubusercontent.com/vaadin/flow/main/eclipse/VaadinJavaConventions.xml</file>
</eclipse>
</java>
</configuration>
</plugin>
</plugins>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ public final native void parseColRow(String str)
}
[email protected]::parsedRow = r;
[email protected]::parsedCol = c;
}-*/;

public int getParsedCol() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -453,17 +453,17 @@ private static native JsoConfiguration init(String appId,
jsoConfiguration.getConfig = function(name) {
return this[name];
}
jsoConfiguration.rootElement = rootElement;
jsoConfiguration.versionInfo = {
vaadinVersion: '8.0.0'
};
jsoConfiguration.theme = 'valo';
$wnd.vaadin.clients = {};
$wnd.vaadin.gwtStatsEvents = false;
}-*/;

Expand Down