Skip to content

Commit e0c8065

Browse files
mlopezFCjavier-godoy
authored andcommitted
feat: upgrade to Vaadin 24.1.2
1 parent d8f1fca commit e0c8065

File tree

2 files changed

+20
-18
lines changed

2 files changed

+20
-18
lines changed

pom.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,17 @@
99
<description>Integration of app-layout for Vaadin Flow</description>
1010

1111
<properties>
12-
<vaadin.version>23.2.10</vaadin.version>
12+
<vaadin.version>24.1.2</vaadin.version>
1313
<hilla.version>1.2.10</hilla.version>
1414

15-
<maven.compiler.source>11</maven.compiler.source>
16-
<maven.compiler.target>11</maven.compiler.target>
15+
<maven.compiler.source>17</maven.compiler.source>
16+
<maven.compiler.target>17</maven.compiler.target>
1717
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1818
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
1919

2020
<drivers.dir>${project.basedir}/drivers</drivers.dir>
2121

22-
<jetty.version>9.4.36.v20210114</jetty.version>
22+
<jetty.version>11.0.14</jetty.version>
2323
</properties>
2424
<organization>
2525
<name>Flowing Code</name>
@@ -94,7 +94,7 @@
9494
<dependency>
9595
<groupId>org.springframework.boot</groupId>
9696
<artifactId>spring-boot-autoconfigure</artifactId>
97-
<version>2.4.5</version>
97+
<version>3.1.0</version>
9898
<optional>true</optional>
9999
</dependency>
100100
<dependency>
@@ -105,7 +105,7 @@
105105
<dependency>
106106
<groupId>org.springframework</groupId>
107107
<artifactId>spring-context</artifactId>
108-
<version>5.3.0</version>
108+
<version>6.0.9</version>
109109
<optional>true</optional>
110110
</dependency>
111111
<dependency>
@@ -219,11 +219,11 @@
219219
<!-- Use test scope because the UI/demo classes are in
220220
the test package. -->
221221
<useTestScope>true</useTestScope>
222-
<webAppConfig>
222+
<webApp>
223223
<resourceBases>
224224
<resourceBase>src/test/resources/META-INF/resources</resourceBase>
225225
</resourceBases>
226-
</webAppConfig>
226+
</webApp>
227227
<supportedPackagings>
228228
<supportedPackaging>jar</supportedPackaging>
229229
</supportedPackagings>

src/test/java/com/flowingcode/addons/applayout/menu/PaperIconItem.java

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919
*/
2020
package com.flowingcode.addons.applayout.menu;
2121

22+
import java.util.Optional;
23+
2224
import com.vaadin.flow.component.Component;
2325
import com.vaadin.flow.component.HasComponents;
2426
import com.vaadin.flow.component.HasSize;
@@ -27,9 +29,9 @@
2729
import com.vaadin.flow.component.Text;
2830
import com.vaadin.flow.component.dependency.JsModule;
2931
import com.vaadin.flow.component.dependency.NpmPackage;
32+
import com.vaadin.flow.component.icon.Icon;
3033
import com.vaadin.flow.dom.Element;
3134
import com.vaadin.flow.server.Command;
32-
import java.util.Optional;
3335

3436
/**
3537
* Component that renders a paper-item
@@ -42,7 +44,7 @@
4244
@Tag("paper-icon-item")
4345
class PaperIconItem extends Component implements HasComponents, HasText, HasSize {
4446

45-
private com.vaadin.flow.component.icon.IronIcon ironIcon;
47+
private com.vaadin.flow.component.icon.Icon icon;
4648
private Text text;
4749

4850
public PaperIconItem(String title) {
@@ -91,16 +93,16 @@ public void setImage(String image) {
9193

9294
private Optional<Element> withIronIcon(boolean create) {
9395
if (create) {
94-
if (this.ironIcon == null) {
95-
this.ironIcon = new com.vaadin.flow.component.icon.IronIcon("", "");
96-
ironIcon.getElement().setAttribute("slot", "item-icon");
97-
add(ironIcon);
96+
if (this.icon == null) {
97+
this.icon = new Icon("", "");
98+
icon.getElement().setAttribute("slot", "item-icon");
99+
add(icon);
98100
}
99-
return Optional.of(ironIcon.getElement());
101+
return Optional.of(icon.getElement());
100102
} else {
101-
if (this.ironIcon != null) {
102-
remove(ironIcon);
103-
this.ironIcon = null;
103+
if (this.icon != null) {
104+
remove(icon);
105+
this.icon = null;
104106
}
105107
return Optional.empty();
106108
}

0 commit comments

Comments
 (0)