Skip to content

Commit fa1cc3a

Browse files
Merge pull request #14 from dynamiatools/5.4.x
Dynamia Tools v5.4.0 support, with Java 21 as minimum required JDK
2 parents 1f525fd + 2ea7ff2 commit fa1cc3a

7 files changed

Lines changed: 28 additions & 332 deletions

File tree

.github/workflows/maven.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ jobs:
2020
- name: Set up JDK 17
2121
uses: actions/setup-java@v3
2222
with:
23-
java-version: 17
23+
java-version: 21
2424
architecture: x64
25-
distribution: corretto
25+
distribution: temurin
2626
cache: maven
2727
- name: Build with Maven
2828
run: mvn -B package --file sources/pom.xml

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ jobs:
1818
- name: Set up JDK 17
1919
uses: actions/setup-java@v4
2020
with:
21-
java-version: 17
21+
java-version: 21
2222
architecture: x64
23-
distribution: corretto
23+
distribution: temurin
2424
cache: maven
2525
server-id: ossrh
2626
server-username: MAVEN_USERNAME # env variable for username in deploy

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[![Maven Central](https://img.shields.io/maven-central/v/tools.dynamia.themes/tools.dynamia.themes.dynamical.svg?label=Maven%20Central)](https://search.maven.org/search?q=g:%22tools.dynamia.themes%22%20AND%20a:%22tools.dynamia.themes.dynamical%22)
22
[![Maven Build](https://github.com/dynamiatools/theme-dynamical/actions/workflows/maven.yml/badge.svg)](https://github.com/dynamiatools/theme-dynamical/actions/workflows/maven.yml)
33
[![Release and Deploy](https://github.com/dynamiatools/theme-dynamical/actions/workflows/release.yml/badge.svg)](https://github.com/dynamiatools/theme-dynamical/actions/workflows/release.yml)
4-
![Java Version Required](https://img.shields.io/badge/java-17-blue)
4+
![Java Version Required](https://img.shields.io/badge/java-21-blue)
55

66
# Bootstrap theme for DynamiaTools
77

@@ -26,13 +26,13 @@ This template is based on https://adminlte.io/ free (MIT) admin template. Which
2626
<dependency>
2727
<groupId>tools.dynamia.themes</groupId>
2828
<artifactId>tools.dynamia.themes.dynamical</artifactId>
29-
<version>5.1.3</version>
29+
<version>5.4.0</version>
3030
</dependency>
3131
```
3232

3333
**Gradle**
3434
```groovy
35-
compile 'tools.dynamia.themes:tools.dynamia.themes.dynamical:5.1.3'
35+
compile 'tools.dynamia.themes:tools.dynamia.themes.dynamical:5.4.0'
3636
```
3737

3838
Edit Spring Boot properties ```application.properties```

sources/pom.xml

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
<groupId>tools.dynamia.themes</groupId>
2525
<artifactId>tools.dynamia.themes.dynamical</artifactId>
26-
<version>5.3.6</version>
26+
<version>5.4.0</version>
2727
<name>Themes - ZK Dynamical</name>
2828
<url>https://www.dynamia.tools/themes/dynamical</url>
2929
<description>Boostrap theme for DynamiaTools apps</description>
@@ -56,9 +56,9 @@
5656
</scm>
5757

5858
<properties>
59-
<dynamiatools.version>5.3.6</dynamiatools.version>
60-
<java.version>17</java.version>
61-
<maven.compiler>3.13.0</maven.compiler>
59+
<dynamiatools.version>5.4.0</dynamiatools.version>
60+
<java.version>21</java.version>
61+
<maven.compiler>3.14.0</maven.compiler>
6262
<source.encoding>UTF-8</source.encoding>
6363
</properties>
6464

@@ -122,7 +122,7 @@
122122
<dependency>
123123
<groupId>org.zkoss.theme</groupId>
124124
<artifactId>iceblue_c</artifactId>
125-
<version>10.0.0</version>
125+
<version>10.0.0.1</version>
126126
</dependency>
127127
</dependencies>
128128

@@ -137,6 +137,13 @@
137137
</repository>
138138
</distributionManagement>
139139

140+
<repositories>
141+
<repository>
142+
<id>zkoss-ce</id>
143+
<url>https://mavensync.zkoss.org/maven2/</url>
144+
</repository>
145+
</repositories>
146+
140147
<profiles>
141148
<profile>
142149
<id>release-sign-artifacts</id>

sources/src/main/java/tools/dynamia/themes/dynamical/DynamicalTemplate.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import tools.dynamia.templates.ApplicationTemplate;
2525
import tools.dynamia.templates.ApplicationTemplateSkin;
2626
import tools.dynamia.templates.InstallApplicationTemplate;
27+
import tools.dynamia.themes.dynamical.viewers.DynamicalCrudViewRenderer;
2728
import tools.dynamia.viewers.ViewTypeFactory;
2829
import tools.dynamia.zk.viewers.BootstrapConfigViewRender;
2930
import tools.dynamia.zk.viewers.BootstrapCrudViewRenderer;
@@ -60,7 +61,7 @@ public DynamicalTemplate(ViewTypeFactory viewTypeFactory) {
6061
createSkins();
6162

6263
properties = MapBuilder.put(AUTHOR, "Mario Serrano", DATE, "2017", COPYRIGHT, "Dynamia Soluciones IT 2017",
63-
VERSION, "5.3.1", ORIGINAL_AUTHOR, "Almsaeed Studio");
64+
VERSION, "5.4.0", ORIGINAL_AUTHOR, "Almsaeed Studio");
6465

6566
}
6667

@@ -79,7 +80,7 @@ public void init() {
7980

8081
Library.setProperty("org.zkoss.theme.preferred", "iceblue_c");
8182

82-
viewTypeFactory.setCustomViewRenderer("crud", BootstrapCrudViewRenderer.class);
83+
viewTypeFactory.setCustomViewRenderer("crud", DynamicalCrudViewRenderer.class);
8384
viewTypeFactory.setCustomViewRenderer("table", BootstrapTableViewRenderer.class);
8485
viewTypeFactory.setCustomViewRenderer("form", BootstrapFormViewRenderer.class);
8586
viewTypeFactory.setCustomViewRenderer("config", BootstrapConfigViewRender.class);

0 commit comments

Comments
 (0)