Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .github/workflows/maven.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ jobs:
- name: Set up JDK 17
uses: actions/setup-java@v3
with:
java-version: 17
java-version: 21
architecture: x64
distribution: corretto
distribution: temurin
cache: maven
- name: Build with Maven
run: mvn -B package --file sources/pom.xml
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ jobs:
- name: Set up JDK 17
uses: actions/setup-java@v4
with:
java-version: 17
java-version: 21
architecture: x64
distribution: corretto
distribution: temurin
cache: maven
server-id: ossrh
server-username: MAVEN_USERNAME # env variable for username in deploy
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[![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)
[![Maven Build](https://github.com/dynamiatools/theme-dynamical/actions/workflows/maven.yml/badge.svg)](https://github.com/dynamiatools/theme-dynamical/actions/workflows/maven.yml)
[![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)
![Java Version Required](https://img.shields.io/badge/java-17-blue)
![Java Version Required](https://img.shields.io/badge/java-21-blue)

# Bootstrap theme for DynamiaTools

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

**Gradle**
```groovy
compile 'tools.dynamia.themes:tools.dynamia.themes.dynamical:5.1.3'
compile 'tools.dynamia.themes:tools.dynamia.themes.dynamical:5.4.0'
```

Edit Spring Boot properties ```application.properties```
Expand Down
17 changes: 12 additions & 5 deletions sources/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

<groupId>tools.dynamia.themes</groupId>
<artifactId>tools.dynamia.themes.dynamical</artifactId>
<version>5.3.6</version>
<version>5.4.0</version>
<name>Themes - ZK Dynamical</name>
<url>https://www.dynamia.tools/themes/dynamical</url>
<description>Boostrap theme for DynamiaTools apps</description>
Expand Down Expand Up @@ -56,9 +56,9 @@
</scm>

<properties>
<dynamiatools.version>5.3.6</dynamiatools.version>
<java.version>17</java.version>
<maven.compiler>3.13.0</maven.compiler>
<dynamiatools.version>5.4.0</dynamiatools.version>
<java.version>21</java.version>
<maven.compiler>3.14.0</maven.compiler>
<source.encoding>UTF-8</source.encoding>
</properties>

Expand Down Expand Up @@ -122,7 +122,7 @@
<dependency>
<groupId>org.zkoss.theme</groupId>
<artifactId>iceblue_c</artifactId>
<version>10.0.0</version>
<version>10.0.0.1</version>
</dependency>
</dependencies>

Expand All @@ -137,6 +137,13 @@
</repository>
</distributionManagement>

<repositories>
<repository>
<id>zkoss-ce</id>
<url>https://mavensync.zkoss.org/maven2/</url>
</repository>
</repositories>

<profiles>
<profile>
<id>release-sign-artifacts</id>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import tools.dynamia.templates.ApplicationTemplate;
import tools.dynamia.templates.ApplicationTemplateSkin;
import tools.dynamia.templates.InstallApplicationTemplate;
import tools.dynamia.themes.dynamical.viewers.DynamicalCrudViewRenderer;
import tools.dynamia.viewers.ViewTypeFactory;
import tools.dynamia.zk.viewers.BootstrapConfigViewRender;
import tools.dynamia.zk.viewers.BootstrapCrudViewRenderer;
Expand Down Expand Up @@ -60,7 +61,7 @@ public DynamicalTemplate(ViewTypeFactory viewTypeFactory) {
createSkins();

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

}

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

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

viewTypeFactory.setCustomViewRenderer("crud", BootstrapCrudViewRenderer.class);
viewTypeFactory.setCustomViewRenderer("crud", DynamicalCrudViewRenderer.class);
viewTypeFactory.setCustomViewRenderer("table", BootstrapTableViewRenderer.class);
viewTypeFactory.setCustomViewRenderer("form", BootstrapFormViewRenderer.class);
viewTypeFactory.setCustomViewRenderer("config", BootstrapConfigViewRender.class);
Expand Down
Loading