Skip to content

Commit

Permalink
going to version 3.3
Browse files Browse the repository at this point in the history
  • Loading branch information
stockiNail committed Oct 21, 2020
1 parent 1eec90b commit 924ec7d
Show file tree
Hide file tree
Showing 23 changed files with 617 additions and 551 deletions.
14 changes: 7 additions & 7 deletions ivymoduleconfiguration.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,25 +2,25 @@
#
# CHARBA version
#
ivy.pubrevision=3.2
ivy.pubrevision=3.3
#
# JAVA dependencies versions
#
depver.gwt=2.8.2
depver.jsinterop-base=1.0.0
depver.jsinterop-annotations=2.0.0
depver.closure-compiler=v20200504
depver.closure-compiler=v20201006
depver.ivy=2.5.0
#
# JAVASCRIPT dependencies versions
#
depver.chartjs=v2.9.3
depver.chartjs=v2.9.4
depver.datalabels=0.7.0
depver.zoom=0.7.5
depver.hammer=2.0.8
depver.chartjs.moment=0.1.1
depver.chartjs.luxon=0.2.1
depver.chartjs.moment=0.1.2
depver.chartjs.luxon=0.2.2
depver.chartjs.datefns=1.0.0
depver.moment=2.25.3
depver.luxon=1.24.1
depver.moment=2.28.0
depver.luxon=1.25.0
depver.datefns=2.9.0
12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "Charba",
"description": "Charba, J2Cl and GWT Chart library based on CHART.JS",
"version": "3.2",
"version": "3.3",
"author": "The Pepstock Team <info@pepstock.org>",
"license": "Apache-2.0",
"homepage": "https://github.com/pepstock-org/Charba/wiki",
Expand All @@ -11,11 +11,11 @@
"url": "https://github.com/pepstock-org/Charba.git"
},
"dependencies": {
"chart.js": "2.9.3",
"chartjs-adapter-moment": "0.1.1",
"moment": "2.25.3",
"chartjs-adapter-luxon": "0.2.1",
"luxon": "1.24.1",
"chart.js": "2.9.4",
"chartjs-adapter-moment": "0.1.2",
"moment": "2.28.0",
"chartjs-adapter-luxon": "0.2.2",
"luxon": "1.25.0",
"chartjs-adapter-date-fns": "1.0.0",
"chartjs-plugin-datalabels": "0.7.0",
"chartjs-plugin-zoom": "0.7.5",
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<groupId>org.pepstock</groupId>
<artifactId>charba</artifactId>
<version>3.2</version>
<version>3.3</version>
<packaging>jar</packaging>


Expand Down Expand Up @@ -59,7 +59,7 @@
<dependency>
<groupId>com.google.javascript</groupId>
<artifactId>closure-compiler</artifactId>
<version>v20200504</version>
<version>v20201006</version>
<optional>true</optional>
</dependency>
<dependency>
Expand Down
20 changes: 10 additions & 10 deletions readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ Since version **3**, **Charba** has got an own DOM tree manager which allows to
Building
--------

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

The [Ant build.xml](https://github.com/pepstock-org/Charba/blob/3.2/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/3.3/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 @@ -44,7 +44,7 @@ To build the project, execute `buildBinaryGwt` target.

It creates a `charba-[version.release]-gwt.jar` file into `dist` folder, ready to be included into your project.

[![Charba](https://github.com/pepstock-org/Charba/wiki/images/charba_jar_trend.png)](https://github.com/pepstock-org/Charba-Showcase/blob/3.2/src/org/pepstock/charba/showcase/client/views/HomeView.java)
[![Charba](https://github.com/pepstock-org/Charba/wiki/images/charba_jar_trend.png)](https://github.com/pepstock-org/Charba-Showcase/blob/3.3/src/org/pepstock/charba/showcase/client/views/HomeView.java)

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

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

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

If you are using [Gradle](https://gradle.org/):

```json
compile group: 'org.pepstock', name: 'charba', version: '3.2'
compile group: 'org.pepstock', name: 'charba', version: '3.3'

compile group: 'org.pepstock', name: 'charba', version: '3.2-gwt'
compile group: 'org.pepstock', name: 'charba', version: '3.3-gwt'
```

To install in your GWT project, both for GWT and for J2CL artifacts, you must the following configuration into your GWT project module configuration:
Expand Down Expand Up @@ -117,7 +117,7 @@ Documentation

All **Charba** documentation will be maintained into [GitHub wiki](https://github.com/pepstock-org/Charba/wiki) of **Charba** project.

API JavaDoc is published [here](http://www.pepstock.org/Charba/3.2/index.html).
API JavaDoc is published [here](http://www.pepstock.org/Charba/3.3/index.html).

Showcase
--------
Expand Down
6 changes: 3 additions & 3 deletions resources/chart.min.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions resources/chartjs-adapter-luxon.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions resources/chartjs-adapter-moment.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion resources/luxon.min.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions resources/moment.min.js

Large diffs are not rendered by default.

0 comments on commit 924ec7d

Please sign in to comment.