From 259f7ea19c66d57e1fb6e8319d43cf51850dca4c Mon Sep 17 00:00:00 2001 From: Paola De Bartolo Date: Mon, 6 Apr 2026 14:39:31 -0300 Subject: [PATCH 1/8] ci: update vaadin version to 25.1.0 in v25 profile --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 007941a..a2a5e42 100644 --- a/pom.xml +++ b/pom.xml @@ -405,11 +405,11 @@ 21 21 - 25.0.0-beta2 + 25.1.0 11.0.26 - + - + com.flowingcode.vaadin.addons.demo commons-demo 5.0.0 From a6bb9f5158acaa7db64c6548ca91d1d342f65dd5 Mon Sep 17 00:00:00 2001 From: Paola De Bartolo Date: Mon, 6 Apr 2026 14:40:13 -0300 Subject: [PATCH 2/8] build: add vaadin-dev dependency in v25 profile --- pom.xml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a2a5e42..0aa7981 100644 --- a/pom.xml +++ b/pom.xml @@ -409,7 +409,12 @@ 11.0.26 - + + com.vaadin + vaadin-dev + true + + com.flowingcode.vaadin.addons.demo commons-demo 5.0.0 From 1246083df9d8f677ded9513bcb00688280d14240 Mon Sep 17 00:00:00 2001 From: Paola De Bartolo Date: Mon, 6 Apr 2026 14:42:57 -0300 Subject: [PATCH 3/8] build(demo): move commons-demo version to property --- pom.xml | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index 0aa7981..fa8911c 100644 --- a/pom.xml +++ b/pom.xml @@ -15,6 +15,7 @@ UTF-8 UTF-8 9.4.36.v20210114 + 3.5.0 Flowing Code @@ -133,7 +134,7 @@ com.flowingcode.vaadin.addons.demo commons-demo - 3.5.0 + ${flowingcode.commons.demo.version} test @@ -407,6 +408,7 @@ 21 25.1.0 11.0.26 + 5.0.0 @@ -414,12 +416,6 @@ vaadin-dev true - - com.flowingcode.vaadin.addons.demo - commons-demo - 5.0.0 - test - From d3b39deca1e272b76f89dbf5554b367095586ed0 Mon Sep 17 00:00:00 2001 From: Paola De Bartolo Date: Mon, 6 Apr 2026 14:44:35 -0300 Subject: [PATCH 4/8] ci(demo): upgrade commons-demo to 5.2.0 in v24 and v25 profiles --- pom.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index fa8911c..ead062c 100644 --- a/pom.xml +++ b/pom.xml @@ -377,6 +377,7 @@ 17 24.2.6 11.0.12 + 5.2.0 @@ -408,7 +409,7 @@ 21 25.1.0 11.0.26 - 5.0.0 + 5.2.0 From 367b0000e4e2cde62f71f3a80a11bb73a22e13d6 Mon Sep 17 00:00:00 2001 From: Paola De Bartolo Date: Mon, 6 Apr 2026 17:01:59 -0300 Subject: [PATCH 5/8] build(demo): upgrade commons-demo to 3.10.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ead062c..1f90c95 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ UTF-8 UTF-8 9.4.36.v20210114 - 3.5.0 + 3.10.0 Flowing Code From 3337f8fbf3ae3b7db1c7878046b07b55ecbc51fa Mon Sep 17 00:00:00 2001 From: Paola De Bartolo Date: Mon, 6 Apr 2026 15:42:28 -0300 Subject: [PATCH 6/8] feat: add polymer dependency for Vaadin 25 support Close #44 --- .../com/flowingcode/vaadin/addons/simpletimer/SimpleTimer.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/com/flowingcode/vaadin/addons/simpletimer/SimpleTimer.java b/src/main/java/com/flowingcode/vaadin/addons/simpletimer/SimpleTimer.java index 45302ab..166fe8c 100644 --- a/src/main/java/com/flowingcode/vaadin/addons/simpletimer/SimpleTimer.java +++ b/src/main/java/com/flowingcode/vaadin/addons/simpletimer/SimpleTimer.java @@ -28,6 +28,7 @@ import com.vaadin.flow.component.Synchronize; import com.vaadin.flow.component.Tag; import com.vaadin.flow.component.dependency.JsModule; +import com.vaadin.flow.component.dependency.NpmPackage; import com.vaadin.flow.dom.PropertyChangeListener; import com.vaadin.flow.shared.Registration; import java.io.Serializable; @@ -37,6 +38,7 @@ /** @author Leonardo Scardanzan / Flowing Code */ @Tag("simple-timer") +@NpmPackage(value = "@polymer/polymer", version = "3.5.2") @JsModule("./simple-timer/simple-timer.js") public class SimpleTimer extends Component implements HasSize, HasStyle, Serializable { From 40de83274c267b9e790e5d47b03e05f8e95d6e9f Mon Sep 17 00:00:00 2001 From: Paola De Bartolo Date: Mon, 6 Apr 2026 15:42:45 -0300 Subject: [PATCH 7/8] chore(demo): add dynamic theme properties --- pom.xml | 1 + src/test/resources/META-INF/dynamic-theme.properties | 1 + 2 files changed, 2 insertions(+) create mode 100644 src/test/resources/META-INF/dynamic-theme.properties diff --git a/pom.xml b/pom.xml index 1f90c95..e31f9bb 100644 --- a/pom.xml +++ b/pom.xml @@ -352,6 +352,7 @@ **/integration/* **/DemoView.class **/DemoLayout.class + **/dynamic-theme.properties diff --git a/src/test/resources/META-INF/dynamic-theme.properties b/src/test/resources/META-INF/dynamic-theme.properties new file mode 100644 index 0000000..62d1f6f --- /dev/null +++ b/src/test/resources/META-INF/dynamic-theme.properties @@ -0,0 +1 @@ +theme=LUMO \ No newline at end of file From f69da704042a3bba59493a2e930a6e1e733aca10 Mon Sep 17 00:00:00 2001 From: Paola De Bartolo Date: Mon, 6 Apr 2026 17:05:26 -0300 Subject: [PATCH 8/8] chore: update license headers --- .../com/flowingcode/vaadin/addons/simpletimer/SimpleTimer.java | 2 +- .../flowingcode/addons/simpletimer/test/SerializationTest.java | 2 +- src/test/java/com/flowingcode/vaadin/addons/DemoLayout.java | 2 +- .../com/flowingcode/vaadin/addons/simpletimer/DemoView.java | 2 +- .../flowingcode/vaadin/addons/simpletimer/SimpletimerDemo.java | 2 +- .../vaadin/addons/simpletimer/SimpletimerDemoView.java | 2 +- .../META-INF/resources/frontend/styles/shared-styles.html | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/flowingcode/vaadin/addons/simpletimer/SimpleTimer.java b/src/main/java/com/flowingcode/vaadin/addons/simpletimer/SimpleTimer.java index 166fe8c..29050f0 100644 --- a/src/main/java/com/flowingcode/vaadin/addons/simpletimer/SimpleTimer.java +++ b/src/main/java/com/flowingcode/vaadin/addons/simpletimer/SimpleTimer.java @@ -2,7 +2,7 @@ * #%L * Simple Timer Addon * %% - * Copyright (C) 2019 - 2020 Flowing Code + * Copyright (C) 2019 - 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. diff --git a/src/test/java/com/flowingcode/addons/simpletimer/test/SerializationTest.java b/src/test/java/com/flowingcode/addons/simpletimer/test/SerializationTest.java index 74281cb..a757b97 100644 --- a/src/test/java/com/flowingcode/addons/simpletimer/test/SerializationTest.java +++ b/src/test/java/com/flowingcode/addons/simpletimer/test/SerializationTest.java @@ -2,7 +2,7 @@ * #%L * Simple Timer Addon * %% - * Copyright (C) 2019 Flowing Code + * Copyright (C) 2019 - 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. diff --git a/src/test/java/com/flowingcode/vaadin/addons/DemoLayout.java b/src/test/java/com/flowingcode/vaadin/addons/DemoLayout.java index 50796c0..960371c 100644 --- a/src/test/java/com/flowingcode/vaadin/addons/DemoLayout.java +++ b/src/test/java/com/flowingcode/vaadin/addons/DemoLayout.java @@ -2,7 +2,7 @@ * #%L * Simple Timer Addon * %% - * Copyright (C) 2019 - 2020 Flowing Code + * Copyright (C) 2019 - 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. diff --git a/src/test/java/com/flowingcode/vaadin/addons/simpletimer/DemoView.java b/src/test/java/com/flowingcode/vaadin/addons/simpletimer/DemoView.java index 64d1e0e..2078570 100644 --- a/src/test/java/com/flowingcode/vaadin/addons/simpletimer/DemoView.java +++ b/src/test/java/com/flowingcode/vaadin/addons/simpletimer/DemoView.java @@ -2,7 +2,7 @@ * #%L * Simple Timer Addon * %% - * Copyright (C) 2019 - 2020 Flowing Code + * Copyright (C) 2019 - 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. diff --git a/src/test/java/com/flowingcode/vaadin/addons/simpletimer/SimpletimerDemo.java b/src/test/java/com/flowingcode/vaadin/addons/simpletimer/SimpletimerDemo.java index adb133a..d2d8bd6 100644 --- a/src/test/java/com/flowingcode/vaadin/addons/simpletimer/SimpletimerDemo.java +++ b/src/test/java/com/flowingcode/vaadin/addons/simpletimer/SimpletimerDemo.java @@ -2,7 +2,7 @@ * #%L * Simple Timer Addon * %% - * Copyright (C) 2019 - 2020 Flowing Code + * Copyright (C) 2019 - 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. diff --git a/src/test/java/com/flowingcode/vaadin/addons/simpletimer/SimpletimerDemoView.java b/src/test/java/com/flowingcode/vaadin/addons/simpletimer/SimpletimerDemoView.java index 9367ae6..94a4b7d 100644 --- a/src/test/java/com/flowingcode/vaadin/addons/simpletimer/SimpletimerDemoView.java +++ b/src/test/java/com/flowingcode/vaadin/addons/simpletimer/SimpletimerDemoView.java @@ -2,7 +2,7 @@ * #%L * Simple Timer Addon * %% - * Copyright (C) 2019 - 2020 Flowing Code + * Copyright (C) 2019 - 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. diff --git a/src/test/resources/META-INF/resources/frontend/styles/shared-styles.html b/src/test/resources/META-INF/resources/frontend/styles/shared-styles.html index 8aa043f..9009472 100644 --- a/src/test/resources/META-INF/resources/frontend/styles/shared-styles.html +++ b/src/test/resources/META-INF/resources/frontend/styles/shared-styles.html @@ -2,7 +2,7 @@ #%L Simple Timer Addon %% - Copyright (C) 2019 - 2020 Flowing Code + Copyright (C) 2019 - 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.