Skip to content

Commit d6064b1

Browse files
AB-xdevAB-xdev
authored
Merge pull request #263 from xdev-software/develop
Release
2 parents 1da98c2 + 32a1930 commit d6064b1

File tree

13 files changed

+65
-22
lines changed

13 files changed

+65
-22
lines changed

‎.github/workflows/broken-links.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818

1919
- name: Link Checker
2020
id: lychee
21-
uses: lycheeverse/lychee-action@v1
21+
uses: lycheeverse/lychee-action@v2
2222

2323
- name: Find already existing issue
2424
id: find-issue

‎CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 2.3.1
2+
* Synced ``LineOptions/DataSet`` ``stepped`` and ``tension`` with ChartJS source #262
3+
* Updated dependencies
4+
15
## 2.3.0
26
* Update available datasets fields from ChartJS source code #244
37
* Removed deprecated code

‎chartjs-java-model-demo/src/main/java/software/xdev/Application.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,7 @@ private static void createAndOpenTestFile(final Chart<?, ?, ?> chart)
4545
+ "<html lang='en'>\n"
4646
+ "\t<head>\n"
4747
+ "\t\t<meta charset='UTF-8'>\n"
48-
+ "\t\t<script src=\"https://cdnjs.cloudflare.com/ajax/libs/Chart.js/4.3.0/chart.umd"
49-
+ ".js\"></script>\n"
48+
+ "\t\t<script src=\"https://cdn.jsdelivr.net/npm/[email protected]/dist/chart.umd.js\"></script>\n"
5049
+ "\t</head>\n"
5150
+ "\t<body>\n"
5251
+ "\t\t<canvas id='c' style='border:1px solid #555;'></canvas>\n"

‎chartjs-java-model/pom.xml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@
4949
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
5050

5151
<slf4j-version>2.0.16</slf4j-version>
52-
<log4j-version>2.24.0</log4j-version>
53-
<testcontainers-version>1.20.1</testcontainers-version>
52+
<log4j-version>2.24.1</log4j-version>
53+
<testcontainers-version>1.20.2</testcontainers-version>
5454

5555
<!-- by default run no tests as Docker is required -->
5656
<skipTests>true</skipTests>
@@ -95,7 +95,7 @@
9595
<dependency>
9696
<groupId>com.fasterxml.jackson.core</groupId>
9797
<artifactId>jackson-databind</artifactId>
98-
<version>2.17.2</version>
98+
<version>2.18.0</version>
9999
</dependency>
100100

101101
<!-- Tests -->
@@ -129,7 +129,7 @@
129129
<dependency>
130130
<groupId>org.junit.jupiter</groupId>
131131
<artifactId>junit-jupiter</artifactId>
132-
<version>5.11.0</version>
132+
<version>5.11.2</version>
133133
<scope>test</scope>
134134
</dependency>
135135

@@ -170,7 +170,7 @@
170170
<dependency>
171171
<groupId>org.seleniumhq.selenium</groupId>
172172
<artifactId>selenium-chrome-driver</artifactId>
173-
<version>4.24.0</version>
173+
<version>4.25.0</version>
174174
<scope>test</scope>
175175
<exclusions>
176176
<!-- Tracing is not needed -->
@@ -201,7 +201,7 @@
201201
<plugin>
202202
<groupId>com.mycila</groupId>
203203
<artifactId>license-maven-plugin</artifactId>
204-
<version>4.5</version>
204+
<version>4.6</version>
205205
<configuration>
206206
<properties>
207207
<email>${project.organization.url}</email>
@@ -241,7 +241,7 @@
241241
<plugin>
242242
<groupId>org.apache.maven.plugins</groupId>
243243
<artifactId>maven-javadoc-plugin</artifactId>
244-
<version>3.10.0</version>
244+
<version>3.10.1</version>
245245
<executions>
246246
<execution>
247247
<id>attach-javadocs</id>
@@ -274,7 +274,7 @@
274274
<plugin>
275275
<groupId>org.apache.maven.plugins</groupId>
276276
<artifactId>maven-surefire-plugin</artifactId>
277-
<version>3.5.0</version>
277+
<version>3.5.1</version>
278278
<configuration>
279279
<skipTests>${skipTests}</skipTests>
280280
</configuration>
@@ -312,7 +312,7 @@
312312
<plugin>
313313
<groupId>org.apache.maven.plugins</groupId>
314314
<artifactId>maven-gpg-plugin</artifactId>
315-
<version>3.2.5</version>
315+
<version>3.2.7</version>
316316
<executions>
317317
<execution>
318318
<id>sign-artifacts</id>
@@ -360,7 +360,7 @@
360360
<dependency>
361361
<groupId>com.puppycrawl.tools</groupId>
362362
<artifactId>checkstyle</artifactId>
363-
<version>10.18.1</version>
363+
<version>10.18.2</version>
364364
</dependency>
365365
</dependencies>
366366
<configuration>
@@ -397,12 +397,12 @@
397397
<dependency>
398398
<groupId>net.sourceforge.pmd</groupId>
399399
<artifactId>pmd-core</artifactId>
400-
<version>7.5.0</version>
400+
<version>7.6.0</version>
401401
</dependency>
402402
<dependency>
403403
<groupId>net.sourceforge.pmd</groupId>
404404
<artifactId>pmd-java</artifactId>
405-
<version>7.5.0</version>
405+
<version>7.6.0</version>
406406
</dependency>
407407
</dependencies>
408408
</plugin>

‎chartjs-java-model/src/main/java/software/xdev/chartjs/model/dataset/LineDatasetBase.java

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@ public abstract class LineDatasetBase<T extends PointDataset<T, O>, O> extends P
3232

3333
private final List<Integer> pointHitRadius = new OptionalArray<>();
3434

35-
private Boolean stepped;
35+
protected Number tension;
36+
protected Object stepped;
3637

3738
public String getXAxisID()
3839
{
@@ -78,12 +79,23 @@ public T setSpanGaps(final Object spanGaps)
7879
return this.self();
7980
}
8081

81-
public Boolean getStepped()
82+
public Number getTension()
83+
{
84+
return this.tension;
85+
}
86+
87+
public T setTension(final Number tension)
88+
{
89+
this.tension = tension;
90+
return this.self();
91+
}
92+
93+
public Object getStepped()
8294
{
8395
return this.stepped;
8496
}
8597

86-
public T setStepped(final Boolean stepped)
98+
public T setStepped(final Object stepped)
8799
{
88100
this.stepped = stepped;
89101
return this.self();

‎chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/LineOptions.java

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,14 @@
1919
import software.xdev.chartjs.model.options.elements.LineElements;
2020

2121

22+
/**
23+
* @see <a href="https://github.com/chartjs/Chart.js/blob/v4.4.5/src/types/index.d.ts#L1892">ChartJS Source</a>
24+
*/
2225
public class LineOptions extends Options<LineOptions, DefaultAnimation>
2326
{
27+
protected Number tension;
28+
protected Object stepped;
29+
2430
/**
2531
* @see #setShowLine(Boolean)
2632
*/
@@ -31,6 +37,28 @@ public class LineOptions extends Options<LineOptions, DefaultAnimation>
3137
protected Boolean spanGaps;
3238
protected LineElements elements;
3339

40+
public Number getTension()
41+
{
42+
return this.tension;
43+
}
44+
45+
public LineOptions setTension(final Number tension)
46+
{
47+
this.tension = tension;
48+
return this;
49+
}
50+
51+
public Object getStepped()
52+
{
53+
return this.stepped;
54+
}
55+
56+
public LineOptions setStepped(final Object stepped)
57+
{
58+
this.stepped = stepped;
59+
return this;
60+
}
61+
3462
/**
3563
* @see #setShowLine(Boolean)
3664
*/

‎chartjs-java-model/src/test/resources/screenshotReferences/DoughnutChartBasic.png

1 Byte
Loading

‎chartjs-java-model/src/test/resources/screenshotReferences/PieChartBasic.png

0 Bytes
Loading

‎chartjs-java-model/src/test/resources/screenshotReferences/PolarChartBasic.png

1 Byte
Loading

‎chartjs-java-model/src/test/resources/screenshotReferences/RadarChartBasic.png

4 Bytes
Loading

‎chartjs-java-model/src/test/resources/screenshotReferences/RadarChartBasicRadialScale.png

-2 Bytes
Loading

‎chartjs-java-model/src/test/resources/test-template.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<html lang="en">
33
<head>
44
<meta charset="UTF-8">
5-
<script src="https://cdnjs.cloudflare.com/ajax/libs/Chart.js/4.4.1/chart.umd.js"></script>
5+
<script src="https://cdn.jsdelivr.net/npm/chart.js@4.4.5/dist/chart.umd.js"></script>
66
</head>
77
<body>
88
<canvas id='c' style='border:1px solid #555;'></canvas>

‎pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
<dependency>
4646
<groupId>com.puppycrawl.tools</groupId>
4747
<artifactId>checkstyle</artifactId>
48-
<version>10.18.1</version>
48+
<version>10.18.2</version>
4949
</dependency>
5050
</dependencies>
5151
<configuration>
@@ -82,12 +82,12 @@
8282
<dependency>
8383
<groupId>net.sourceforge.pmd</groupId>
8484
<artifactId>pmd-core</artifactId>
85-
<version>7.5.0</version>
85+
<version>7.6.0</version>
8686
</dependency>
8787
<dependency>
8888
<groupId>net.sourceforge.pmd</groupId>
8989
<artifactId>pmd-java</artifactId>
90-
<version>7.5.0</version>
90+
<version>7.6.0</version>
9191
</dependency>
9292
</dependencies>
9393
</plugin>

0 commit comments

Comments
 (0)