Skip to content

Commit

Permalink
chore: replace formatter with spotless [skip ci] (#6512) (CP: 24.4)
Browse files Browse the repository at this point in the history
(cherry picked from commit aa143ec)
  • Loading branch information
sissbruecker committed Aug 9, 2024
1 parent 3cb8d81 commit 6ca3f3d
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 15 deletions.
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.2.5</maven.surefire.plugin.version>
<maven.failsafe.plugin.version>3.2.5</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 @@ -441,15 +442,15 @@
</pluginManagement>
<plugins>
<plugin>
<groupId>net.revelc.code.formatter</groupId>
<artifactId>formatter-maven-plugin</artifactId>
<version>2.23.0</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

0 comments on commit 6ca3f3d

Please sign in to comment.