Skip to content

Add Vaadin 25 compatibility #22

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

Merged
javier-godoy merged 6 commits into from
Feb 10, 2026
+107 −46
Merged

Add Vaadin 25 compatibility #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8f0c5fa
ci: upgrade to vaadin 25.0.3 in v25 profile
paodb Feb 9, 2026
f5209e8
build: add dependency gwt-elemental for vaadin 25 compatibility
paodb Feb 9, 2026
f90505e
refactor: avoid use of commons.lang3
paodb Feb 9, 2026
489de91
chore: update license headers
paodb Feb 9, 2026
0212640
feat(demo): add AppShellConfiguratorImpl for Vaadin 25 compatibility
paodb Feb 9, 2026
76afcf0
build: update version to 2.1.0-SNAPSHOT
paodb Feb 9, 2026
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
13 changes: 10 additions & 3 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<groupId>org.vaadin.addons.flowingcode</groupId>
<artifactId>share-easy-addon</artifactId>
<version>2.0.2-SNAPSHOT</version>
<version>2.1.0-SNAPSHOT</version>
<name>Share Easy Add-on</name>
<description>Share Eady Add-on for Vaadin Flow</description>

Expand Down Expand Up @@ -151,6 +151,12 @@
<version>5.1.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.vaadin.external.gwt</groupId>
<artifactId>gwt-elemental</artifactId>
<version>2.8.2.vaadin2</version>
<scope>compile</scope>
</dependency>
</dependencies>

<build>
Expand Down Expand Up @@ -458,6 +464,7 @@
<exclude>**/it/*</exclude>
<exclude>**/DemoView.class</exclude>
<exclude>**/DemoLayout.class</exclude>
<exclude>**/AppShellConfiguratorImpl.class</exclude>
</excludes>
</configuration>
</execution>
Expand All @@ -472,10 +479,10 @@
<properties>
<maven.compiler.source>21</maven.compiler.source>
<maven.compiler.target>21</maven.compiler.target>
<vaadin.version>25.0.0</vaadin.version>
<vaadin.version>25.0.3</vaadin.version>
<jetty.version>11.0.26</jetty.version>
</properties>
<dependencies>
<dependencies>
<dependency>
<groupId>com.vaadin</groupId>
<artifactId>vaadin-dev</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/flowingcode/vaadin/addons/shareeasy/BaseShareEasy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* #%L
* Share Easy Add-on
* %%
* Copyright (C) 2023 - 2025 Flowing Code
* Copyright (C) 2023 - 2026 Flowing Code
* %%
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/flowingcode/vaadin/addons/shareeasy/DropdownShareEasy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* #%L
* Share Easy Add-on
* %%
* Copyright (C) 2023 - 2025 Flowing Code
* Copyright (C) 2023 - 2026 Flowing Code
* %%
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/flowingcode/vaadin/addons/shareeasy/FixedShareEasy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* #%L
* Share Easy Add-on
* %%
* Copyright (C) 2023 - 2025 Flowing Code
* Copyright (C) 2023 - 2026 Flowing Code
* %%
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/flowingcode/vaadin/addons/shareeasy/HoverShareEasy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* #%L
* Share Easy Add-on
* %%
* Copyright (C) 2023 - 2025 Flowing Code
* Copyright (C) 2023 - 2026 Flowing Code
* %%
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/flowingcode/vaadin/addons/shareeasy/NormalShareEasy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* #%L
* Share Easy Add-on
* %%
* Copyright (C) 2023 - 2025 Flowing Code
* Copyright (C) 2023 - 2026 Flowing Code
* %%
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/flowingcode/vaadin/addons/shareeasy/ShareEasyDriver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* #%L
* Share Easy Add-on
* %%
* Copyright (C) 2023 - 2025 Flowing Code
* Copyright (C) 2023 - 2026 Flowing Code
* %%
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/flowingcode/vaadin/addons/shareeasy/TextShareEasy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* #%L
* Share Easy Add-on
* %%
* Copyright (C) 2023 - 2025 Flowing Code
* Copyright (C) 2023 - 2026 Flowing Code
* %%
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/flowingcode/vaadin/addons/shareeasy/enums/Animation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* #%L
* Share Easy Add-on
* %%
* Copyright (C) 2023 - 2025 Flowing Code
* Copyright (C) 2023 - 2026 Flowing Code
* %%
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/flowingcode/vaadin/addons/shareeasy/enums/Direction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* #%L
* Share Easy Add-on
* %%
* Copyright (C) 2023 - 2025 Flowing Code
* Copyright (C) 2023 - 2026 Flowing Code
* %%
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/flowingcode/vaadin/addons/shareeasy/enums/Driver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* #%L
* Share Easy Add-on
* %%
* Copyright (C) 2023 - 2025 Flowing Code
* Copyright (C) 2023 - 2026 Flowing Code
* %%
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/flowingcode/vaadin/addons/shareeasy/enums/Locale.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* #%L
* Share Easy Add-on
* %%
* Copyright (C) 2023 - 2025 Flowing Code
* Copyright (C) 2023 - 2026 Flowing Code
* %%
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/flowingcode/vaadin/addons/shareeasy/enums/Mode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* #%L
* Share Easy Add-on
* %%
* Copyright (C) 2023 - 2025 Flowing Code
* Copyright (C) 2023 - 2026 Flowing Code
* %%
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/flowingcode/vaadin/addons/shareeasy/enums/Position.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* #%L
* Share Easy Add-on
* %%
* Copyright (C) 2023 - 2025 Flowing Code
* Copyright (C) 2023 - 2026 Flowing Code
* %%
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/flowingcode/vaadin/addons/shareeasy/enums/Type.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* #%L
* Share Easy Add-on
* %%
* Copyright (C) 2023 - 2025 Flowing Code
* Copyright (C) 2023 - 2026 Flowing Code
* %%
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
5 changes: 2 additions & 3 deletions src/main/java/com/flowingcode/vaadin/addons/shareeasy/util/CustomDriverOptions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* #%L
* Share Easy Add-on
* %%
* Copyright (C) 2023 - 2025 Flowing Code
* Copyright (C) 2023 - 2026 Flowing Code
* %%
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -20,7 +20,6 @@
package com.flowingcode.vaadin.addons.shareeasy.util;

import java.util.Optional;
import org.apache.commons.lang3.StringUtils;
import com.flowingcode.vaadin.addons.shareeasy.ShareEasyDriver;
import elemental.json.Json;
import elemental.json.JsonObject;
Expand Down Expand Up @@ -157,7 +156,7 @@ public JsonObject getJsonObject() {
Optional.ofNullable(name).ifPresent(value -> js.put("name", value));

js.put("linkWithParams",
StringUtils.isNotBlank(shareLinkParam) || StringUtils.isNotBlank(shareTextParam));
OptionsUtils.isNotBlank(shareLinkParam) || OptionsUtils.isNotBlank(shareTextParam));

return js;
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/flowingcode/vaadin/addons/shareeasy/util/LanguageKeys.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* #%L
* Share Easy Add-on
* %%
* Copyright (C) 2023 - 2025 Flowing Code
* Copyright (C) 2023 - 2026 Flowing Code
* %%
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
5 changes: 2 additions & 3 deletions src/main/java/com/flowingcode/vaadin/addons/shareeasy/util/Options.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* #%L
* Share Easy Add-on
* %%
* Copyright (C) 2023 - 2025 Flowing Code
* Copyright (C) 2023 - 2026 Flowing Code
* %%
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -20,7 +20,6 @@
package com.flowingcode.vaadin.addons.shareeasy.util;

import java.util.Optional;
import org.apache.commons.lang3.StringUtils;
import com.flowingcode.vaadin.addons.shareeasy.ShareEasyDriver;
import com.flowingcode.vaadin.addons.shareeasy.enums.Driver;
import com.flowingcode.vaadin.addons.shareeasy.enums.Locale;
Expand Down Expand Up @@ -115,7 +114,7 @@ public JsonObject getJsonObject() {
js.put("showTransitionDuration", showTransitionDuration);
js.put("lang", locale);

if (languageKeys != null && StringUtils.isNotBlank(locale)) {
if (languageKeys != null && OptionsUtils.isNotBlank(locale)) {
JsonObject langs = Json.createObject();
langs.put(locale, languageKeys.getJsonObject());
js.put("langs", langs);
Expand Down
28 changes: 28 additions & 0 deletions src/main/java/com/flowingcode/vaadin/addons/shareeasy/util/OptionsUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
/*-
* #%L
* Share Easy Add-on
* %%
* Copyright (C) 2023 - 2026 Flowing Code
* %%
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* #L%
*/
package com.flowingcode.vaadin.addons.shareeasy.util;

class OptionsUtils {

static boolean isNotBlank(String value) {
return value != null && !value.isBlank();
}

}
2 changes: 1 addition & 1 deletion src/main/resources/META-INF/VAADIN/package.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# #%L
# Share Easy Add-on
# %%
# Copyright (C) 2023 - 2025 Flowing Code
# Copyright (C) 2023 - 2026 Flowing Code
# %%
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/META-INF/resources/frontend/src/fc-sharee-connector.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* #%L
* Share Easy Add-on
* %%
* Copyright (C) 2023 - 2025 Flowing Code
* Copyright (C) 2023 - 2026 Flowing Code
* %%
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
28 changes: 28 additions & 0 deletions src/test/java/com/flowingcode/vaadin/addons/AppShellConfiguratorImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
/*-
* #%L
* Share Easy Add-on
* %%
* Copyright (C) 2023 - 2026 Flowing Code
* %%
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* #L%
*/
package com.flowingcode.vaadin.addons;

import com.vaadin.flow.component.page.AppShellConfigurator;
import com.vaadin.flow.theme.Theme;

@Theme
public class AppShellConfiguratorImpl implements AppShellConfigurator {

}
2 changes: 1 addition & 1 deletion src/test/java/com/flowingcode/vaadin/addons/DemoLayout.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* #%L
* Share Easy Add-on
* %%
* Copyright (C) 2023 - 2025 Flowing Code
* Copyright (C) 2023 - 2026 Flowing Code
* %%
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/com/flowingcode/vaadin/addons/shareeasy/BaseShareEasyDemo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* #%L
* Share Easy Add-on
* %%
* Copyright (C) 2023 - 2025 Flowing Code
* Copyright (C) 2023 - 2026 Flowing Code
* %%
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/com/flowingcode/vaadin/addons/shareeasy/DefaultValuesDemo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* #%L
* Share Easy Add-on
* %%
* Copyright (C) 2023 - 2025 Flowing Code
* Copyright (C) 2023 - 2026 Flowing Code
* %%
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/com/flowingcode/vaadin/addons/shareeasy/DemoView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* #%L
* Share Easy Add-on
* %%
* Copyright (C) 2023 - 2025 Flowing Code
* Copyright (C) 2023 - 2026 Flowing Code
* %%
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/com/flowingcode/vaadin/addons/shareeasy/DropdownModeDemo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* #%L
* Share Easy Add-on
* %%
* Copyright (C) 2023 - 2025 Flowing Code
* Copyright (C) 2023 - 2026 Flowing Code
* %%
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/com/flowingcode/vaadin/addons/shareeasy/FixedModeDemo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* #%L
* Share Easy Add-on
* %%
* Copyright (C) 2023 - 2025 Flowing Code
* Copyright (C) 2023 - 2026 Flowing Code
* %%
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/com/flowingcode/vaadin/addons/shareeasy/HoverModeDemo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* #%L
* Share Easy Add-on
* %%
* Copyright (C) 2023 - 2025 Flowing Code
* Copyright (C) 2023 - 2026 Flowing Code
* %%
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/com/flowingcode/vaadin/addons/shareeasy/NormalModeDemo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* #%L
* Share Easy Add-on
* %%
* Copyright (C) 2023 - 2025 Flowing Code
* Copyright (C) 2023 - 2026 Flowing Code
* %%
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/com/flowingcode/vaadin/addons/shareeasy/ShareEasyDemoView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* #%L
* Share Easy Add-on
* %%
* Copyright (C) 2023 - 2025 Flowing Code
* Copyright (C) 2023 - 2026 Flowing Code
* %%
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/com/flowingcode/vaadin/addons/shareeasy/SpecialCustomizationsDemo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* #%L
* Share Easy Add-on
* %%
* Copyright (C) 2023 - 2025 Flowing Code
* Copyright (C) 2023 - 2026 Flowing Code
* %%
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
Loading