Skip to content

Commit

Permalink
ready for version 6.5
Browse files Browse the repository at this point in the history
  • Loading branch information
stockiNail committed Feb 10, 2024
1 parent f2e428c commit 50350e6
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 17 deletions.
2 changes: 1 addition & 1 deletion docs/Controllers.md
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ ControllerType myLine = new ControllerType("myline", ChartType.LINE, myControlle

A controller must implement the [Controller](https://pepstock-org.github.io/Charba/6.5/org/pepstock/charba/client/Controller.html) interface which is containing all hooks which will be invoked during the whole chart life cycle.

The interface provides **before** and **after** hooks for each phases exposes by [Chart.JS controller](https://www.chartjs.org/docs/4.3.0/developers/charts.html):
The interface provides **before** and **after** hooks for each phases exposes by [Chart.JS controller](https://www.chartjs.org/docs/4.4.1/developers/charts.html):

#### Initialization

Expand Down
20 changes: 12 additions & 8 deletions docs/Requirements.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ Even if [Chart.JS](http://www.chartjs.org/) leaves the users to select a date ad
Furthermore **Charba** has embedded a set of [Chart.JS](http://www.chartjs.org/) plugins and controllers in order to enrich own features:

* [DataLabels](https://github.com/chartjs/chartjs-plugin-datalabels) plugin
* [Labels](https://github.com/emn178/chartjs-plugin-labels) plugin (former PieceLabels). Due to the project is unmaintained, the plugin has been [imported](https://github.com/pepstock-org/Charba/blob/master/src/org/pepstock/charba/client/resources/js/chartjs-plugin-labels.js) in **Charba** project and maintained in [Charba](https://github.com/pepstock-org/Charba/blob/6.4/src/org/pepstock/charba/client/resources/js/chartjs-plugin-labels.js) project
* [Labels](https://github.com/emn178/chartjs-plugin-labels) plugin (former PieceLabels). Due to the project is unmaintained, the plugin has been [imported](https://github.com/pepstock-org/Charba/blob/master/src/org/pepstock/charba/client/resources/js/chartjs-plugin-labels.js) in **Charba** project and maintained in [Charba](https://github.com/pepstock-org/Charba/blob/6.5/src/org/pepstock/charba/client/resources/js/chartjs-plugin-labels.js) project
* [Zoom](https://github.com/chartjs/chartjs-plugin-zoom) plugin
* [Hammer.JS](https://github.com/hammerjs/hammer.js) javaScript library for detecting touch gestures, as dependency of [Zoom](https://github.com/chartjs/chartjs-plugin-zoom) plugin
* [Annotation](https://github.com/chartjs/chartjs-plugin-annotation) plugin
Expand All @@ -35,24 +35,24 @@ Furthermore **Charba** has embedded a set of [Chart.JS](http://www.chartjs.org/)

**Charba** has got embedded [ML.js](https://github.com/mljs/ml) to enable some [regressions](Regressions) models as part of machine learning tools.

To enable the minifying of javascript objects, not provided out-of-the-box, **Charba** needs also [Google Closure Compiler](https://developers.google.com/closure/compiler/), invoked only in [Ant build.xml](https://github.com/pepstock-org/Charba/blob/6.4/build.xml).
To enable the minifying of javascript objects, not provided out-of-the-box, **Charba** needs also [Google Closure Compiler](https://developers.google.com/closure/compiler/), invoked only in [Ant build.xml](https://github.com/pepstock-org/Charba/blob/6.5/build.xml).

See here the license matrix.

| Component | Version | License
| :- | :- | :-
| JSInterop Annotations | [2.0.0](https://github.com/google/jsinterop-annotations/releases/tag/2.0.0) | [Apache 2.0](https://www.apache.org/licenses/LICENSE-2.0)
| GWT Web Toolkit | [2.9.0](http://www.gwtproject.org/release-notes.html#Release_Notes_2_9_0) | [Apache 2.0](https://www.apache.org/licenses/LICENSE-2.0)
| Google Closure Compiler | v20230502 | [Apache 2.0](https://www.apache.org/licenses/LICENSE-2.0)
| Chart.JS | [4.3.0](https://github.com/chartjs/Chart.js/releases/tag/v4.3.0) | [MIT](https://raw.githubusercontent.com/chartjs/Chart.js/v4.3.0/LICENSE.md)
| Google Closure Compiler | v20231112 | [Apache 2.0](https://www.apache.org/licenses/LICENSE-2.0)
| Chart.JS | [4.4.1](https://github.com/chartjs/Chart.js/releases/tag/v4.4.1) | [MIT](https://raw.githubusercontent.com/chartjs/Chart.js/v4.4.1/LICENSE.md)
| Chart.JS Luxon adapter | [1.3.1](https://github.com/chartjs/chartjs-adapter-luxon/releases/tag/v1.3.1) | [MIT](https://raw.githubusercontent.com/chartjs/chartjs-adapter-luxon/master/LICENSE.md)
| Luxon | [3.3.0](https://github.com/moment/luxon/releases/tag/3.3.0) | [MIT](https://raw.githubusercontent.com/moment/luxon/master/license.md)
| Luxon | [3.4.4](https://github.com/moment/luxon/releases/tag/3.4.4) | [MIT](https://raw.githubusercontent.com/moment/luxon/master/license.md)
| DataLabels | [2.2.0](https://github.com/chartjs/chartjs-plugin-datalabels/releases/tag/v2.2.0) | [MIT](https://raw.githubusercontent.com/chartjs/chartjs-plugin-datalabels/master/LICENSE.md)
| Zoom | [2.0.1](https://github.com/chartjs/chartjs-plugin-zoom/releases/tag/v2.0.1) | [MIT](https://github.com/chartjs/chartjs-plugin-zoom/blob/master/LICENSE.md)
| HammerJS | [2.0.8](https://github.com/hammerjs/hammer.js/releases/tag/v2.0.8) | [MIT](https://github.com/hammerjs/hammer.js/blob/master/LICENSE.md)
| Annotation | [3.0.1](https://github.com/chartjs/chartjs-plugin-annotation/releases/tag/v3.0.1) | [MIT](https://github.com/chartjs/chartjs-plugin-annotation/blob/master/LICENSE.md)
| Gradient | [0.6.1](https://github.com/kurkle/chartjs-plugin-gradient/releases/tag/v0.6.1) | [MIT](https://github.com/kurkle/chartjs-plugin-gradient/blob/master/LICENSE)
| Chart Geo | [4.2.0](https://github.com/sgratzl/chartjs-chart-geo/releases/tag/v4.2.0) | [MIT](https://github.com/sgratzl/chartjs-chart-geo/blob/main/LICENSE)
| Chart Geo | [4.2.8](https://github.com/sgratzl/chartjs-chart-geo/releases/tag/v4.2.8) | [MIT](https://github.com/sgratzl/chartjs-chart-geo/blob/main/LICENSE)
| Chart Treemap | [2.3.0](https://github.com/kurkle/chartjs-chart-treemap/releases/tag/v2.3.0) | [MIT](https://github.com/kurkle/chartjs-chart-treemap/blob/next/LICENSE)
| Chart Matrix | [2.0.1](https://github.com/kurkle/chartjs-chart-matrix/releases/tag/v2.0.1) | [MIT](https://github.com/kurkle/chartjs-chart-matrix/blob/next/LICENSE)
| Chart Sankey | [0.12.0](https://github.com/kurkle/chartjs-chart-sankey/releases/tag/v0.11.0) | [MIT](https://github.com/kurkle/chartjs-chart-sankey/blob/master/LICENSE)
Expand All @@ -75,12 +75,13 @@ For more information about browser support, see the details **[here](https://can

The following matrixes are showing the dependencies with version of components which are released in all **Charba** versions.

<img src={useBaseUrl('/img/charba_jar_trend_64.png')} />
<img src={useBaseUrl('/img/charba_jar_trend_65.png')} />

### Java

| Charba | Version<br/>date | JDK | JsInterop<br/>Base | JsInterop<br/>Annotations | GWT Web<br/>toolkit**<sup style={{color: 'orange'}}>(1)</sup>** | Google<br/>Closure<br/>Compiler | Google<br/>Closure<br/>Stylesheets**<sup style={{color: 'orange'}}>(2)</sup>**
| :- | - | - | - | - | - | - | -
| 6.5 | Feb 10, 2024 | 11 | - | 2.0.0 | 2.9.0 | v20231112 | -
| 6.4 | May 31, 2023 | 11 | - | 2.0.0 | 2.9.0 | v20230502 | -
| 6.3 | Apr 2, 2023 | 11 | - | 2.0.0 | 2.9.0 | v20230228 | -
| 6.2 | Mar 3, 2023 | 11 | - | 2.0.0 | 2.9.0 | v20230206 | -
Expand Down Expand Up @@ -128,6 +129,7 @@ The following matrixes are showing the dependencies with version of components w

| Charba | Chart.JS | Chart.JS<br/>Luxon<br/>adapter | Luxon | Chart.JS<br/>Moment<br/>adapter**<sup style={{color: 'orange'}}>(1)</sup>** | Moment**<sup style={{color: 'orange'}}>(1)</sup>** | Chart.JS<br/>Datefns<br/>adapter**<sup style={{color: 'orange'}}>(1)</sup>** | Datefns**<sup style={{color: 'orange'}}>(1)</sup>** |
| :- | :- | - | :- | - | :- | - | :-
| 6.5 | 4.4.1 | 1.3.1 | 3.4.4 | - | - | - | -
| 6.4 | 4.3.0 | 1.3.1 | 3.3.0 | - | - | - | -
| 6.3 | 4.2.1 | 1.3.1 | 3.3.0 | - | - | - | -
| 6.2 | 4.2.1 | 1.3.1 | 3.2.1 | - | - | - | -
Expand Down Expand Up @@ -173,7 +175,8 @@ The following matrixes are showing the dependencies with version of components w

| Charba | Datalabels | Labels**<sup style={{color: 'orange'}}>(1)</sup>** | Zoom | HammerJS | Annotation | Gradient | Geo | Treemap | Matrix | Sankey
| :- | :- | :- | :- | :- | :- | :- | :- | :- | :-
| 6.4 | 2.2.0 | 1.1.0 | 2.0.1 | 2.0.8 | 3.0.1 | 0.6.1 | 4.3.0 | 2.3.0 | 2.0.1 | 0.12.0
| 6.5 | 2.2.0 | 1.1.0 | 2.0.1 | 2.0.8 | 3.0.1 | 0.6.1 | 4.2.8 | 2.3.0 | 2.0.1 | 0.12.0
| 6.4 | 2.2.0 | 1.1.0 | 2.0.1 | 2.0.8 | 3.0.1 | 0.6.1 | 4.2.0 | 2.3.0 | 2.0.1 | 0.12.0
| 6.3 | 2.2.0 | 1.1.0 | 2.0.1 | 2.0.8 | 2.2.1 | 0.6.1 | 4.1.2 | 2.3.0 | 2.0.1 | 0.12.0
| 6.2 | 2.2.0 | 1.1.0 | 2.0.0 | 2.0.8 | 2.1.2 | 0.6.1 | 4.1.2 | 2.3.0 | 2.0.1 | 0.12.0
| 6.1 | 2.2.0 | 1.1.0 | 2.0.0 | 2.0.8 | 2.1.2 | 0.6.1 | 4.1.2 | 2.3.0 | 2.0.1 | 0.12.0
Expand Down Expand Up @@ -218,6 +221,7 @@ The following matrixes are showing the dependencies with version of components w

| Charba | ML.js
| :- | :-
| 6.5 | 6.0.0
| 6.4 | 6.0.0
| 6.3 | 6.0.0
| 6.2 | 6.0.0
Expand Down
12 changes: 6 additions & 6 deletions docs/getting-started/Building.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import useBaseUrl from '@docusaurus/useBaseUrl';

## Building

To build **Charba**, you can check out the project and to run [Ant build.xml](https://github.com/pepstock-org/Charba/blob/6.4/build.xml).
To build **Charba**, you can check out the project and to run [Ant build.xml](https://github.com/pepstock-org/Charba/blob/6.5/build.xml).

The [Ant build.xml](https://github.com/pepstock-org/Charba/blob/6.4/build.xml) is able to build the 2 artifacts, related to the 2 distributions available.
The [Ant build.xml](https://github.com/pepstock-org/Charba/blob/6.5/build.xml) is able to build the 2 artifacts, related to the 2 distributions available.

The first distribution is a **Charba** file without any GWT dependency (but working on GWT anyway), consumable also in other [J2CL - JavaToClosure](https://github.com/google/j2cl) frameworks, like [Google Elemental2](https://github.com/google/elemental2) and [Elemento](https://github.com/hal/elemento).

Expand All @@ -36,18 +36,18 @@ If you are using [Apache Maven](https://maven.apache.org/):
<dependency>
<groupId>org.pepstock</groupId>
<artifactId>charba</artifactId>
<version>6.4</version>
<version>6.5</version>
<!-- for GWT -->
<version>6.4-gwt</version>
<version>6.5-gwt</version>
</dependency>
```

If you are using [Apache Ivy](http://ant.apache.org/ivy/):

```xml
<dependency org="org.pepstock" name="charba" rev="6.4"/>
<dependency org="org.pepstock" name="charba" rev="6.5"/>
<!-- for GWT -->
<dependency org="org.pepstock" name="charba" rev="6.4-gwt"/>
<dependency org="org.pepstock" name="charba" rev="6.5-gwt"/>
```

To install in your GWT project, both for GWT and for J2CL artifacts, you must the following configuration in your GWT project module configuration:
Expand Down
2 changes: 1 addition & 1 deletion docs/plugins/Import.md
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ Usually all [Chart.JS](http://www.chartjs.org/) are registering themselves autom
:::

:::note PAY ATTENTION
Unfortunately some [Chart.JS](https://www.chartjs.org/docs/4.3.0/developers/plugins.html#plugin-options) plugins implementations are not respecting the described standard way to store the plugin options.
Unfortunately some [Chart.JS](https://www.chartjs.org/docs/4.4.1/developers/plugins.html#plugin-options) plugins implementations are not respecting the described standard way to store the plugin options.

Therefore **Charba** provides a method to add an additional configuration to whatever chart configuration.

Expand Down
2 changes: 1 addition & 1 deletion versioned_docs/version-6.4/Requirements.md
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ The following matrixes are showing the dependencies with version of components w

| Charba | Datalabels | Labels**<sup style={{color: 'orange'}}>(1)</sup>** | Zoom | HammerJS | Annotation | Gradient | Geo | Treemap | Matrix | Sankey
| :- | :- | :- | :- | :- | :- | :- | :- | :- | :-
| 6.4 | 2.2.0 | 1.1.0 | 2.0.1 | 2.0.8 | 3.0.1 | 0.6.1 | 4.3.0 | 2.3.0 | 2.0.1 | 0.12.0
| 6.4 | 2.2.0 | 1.1.0 | 2.0.1 | 2.0.8 | 3.0.1 | 0.6.1 | 4.2.0 | 2.3.0 | 2.0.1 | 0.12.0
| 6.3 | 2.2.0 | 1.1.0 | 2.0.1 | 2.0.8 | 2.2.1 | 0.6.1 | 4.1.2 | 2.3.0 | 2.0.1 | 0.12.0
| 6.2 | 2.2.0 | 1.1.0 | 2.0.0 | 2.0.8 | 2.1.2 | 0.6.1 | 4.1.2 | 2.3.0 | 2.0.1 | 0.12.0
| 6.1 | 2.2.0 | 1.1.0 | 2.0.0 | 2.0.8 | 2.1.2 | 0.6.1 | 4.1.2 | 2.3.0 | 2.0.1 | 0.12.0
Expand Down

0 comments on commit 50350e6

Please sign in to comment.