Skip to content

Commit

Permalink
Merge pull request #15 from GwtMaterialDesign/release_2.4.1
Browse files Browse the repository at this point in the history
Release 2.4.1
  • Loading branch information
kevzlou7979 authored Sep 26, 2020
2 parents 07a1418 + 455fabc commit f4b3832
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 18 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ cache:
- $HOME/.m2
before_install:
# install the gwt-material-jquery library
- git clone -b release_2.4.0 https://github.com/GwtMaterialDesign/gwt-material-jquery.git
- git clone -b release_2.4.1 https://github.com/GwtMaterialDesign/gwt-material-jquery.git
- cd gwt-material-jquery
- mvn install -DskipTests=true -DdryRun=true
- cd ..
# install the gwt-material library
- git clone -b release_2.4.0 https://github.com/GwtMaterialDesign/gwt-material.git
- git clone -b release_2.4.1 https://github.com/GwtMaterialDesign/gwt-material.git
- cd gwt-material
- mvn install -DskipTests=true -DdryRun=true
- cd ..
Expand Down
2 changes: 1 addition & 1 deletion .utility/deploy.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash
set -ev
if [ "$TRAVIS_JDK_VERSION" == "oraclejdk8" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_BRANCH" == "release_2.4.0" ]; then
if [ "$TRAVIS_JDK_VERSION" == "oraclejdk8" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_BRANCH" == "release_2.4.1" ]; then
echo "<settings><servers><server><id>ossrh</id><username>\${env.OSSRH_USER}</username><password>\${env.OSSRH_PASS}</password></server></servers></settings>" > ~/settings.xml
mvn deploy --settings ~/settings.xml
fi
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ AmCharts V4 Official Documentation can be found [here](https://www.amcharts.com/


## Maven
### Current Version 2.4.0
### Current Version 2.4.1
```xml
<dependency>
<groupId>com.github.gwtmaterialdesign</groupId>
<artifactId>gwt-material-am4charts</artifactId>
<version>2.4.0</version>
<version>2.4.1</version>
</dependency>
```

Expand Down
22 changes: 11 additions & 11 deletions gwt-material-am4charts.iml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<setting name="additionalCompilerParameters" value="-Xms1g -XX:CompileThreshold=7000" />
<setting name="compilerParameters" value="-compileReport -XcompilerMetrics -failOnError -logLevel INFO -optimize 9 -sourceLevel 1.8" />
<setting name="compilerMaxHeapSize" value="1024" />
<setting name="gwtSdkUrl" value="file://$MAVEN_REPOSITORY$/com/google/gwt/gwt-dev/2.8.2/" />
<setting name="gwtSdkUrl" value="file://$MAVEN_REPOSITORY$/com/google/gwt/gwt-dev/2.9.0/" />
<setting name="gwtSdkType" value="maven" />
<packaging>
<module name="gwt.material.design.amcharts.GwtMaterialAmChartsBase" enabled="false" />
Expand All @@ -21,6 +21,7 @@
<module name="gwt.material.design.amplugin.slicegrouper.SliceGrouper" enabled="false" />
<module name="gwt.material.design.amplugin.sunburst.Sunburst" enabled="false" />
<module name="gwt.material.design.amplugin.timeline.Timeline" enabled="false" />
<module name="gwt.material.design.amplugin.venn.VennDiagram" enabled="false" />
<module name="gwt.material.design.amplugin.wordcloud.WordCloud" enabled="false" />
</packaging>
</configuration>
Expand All @@ -36,26 +37,25 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="Maven: com.github.gwtmaterialdesign:gwt-material-jquery:2.3.1-SNAPSHOT" level="project" />
<orderEntry type="library" name="Maven: com.google.gwt:gwt-user:2.8.2" level="project" />
<orderEntry type="library" name="Maven: com.google.jsinterop:jsinterop-annotations:1.0.2" level="project" />
<orderEntry type="library" name="Maven: com.google.jsinterop:jsinterop-annotations:sources:1.0.2" level="project" />
<orderEntry type="library" name="Maven: com.google.gwt:gwt-user:2.9.0" level="project" />
<orderEntry type="library" name="Maven: com.google.jsinterop:jsinterop-annotations:2.0.0" level="project" />
<orderEntry type="library" name="Maven: javax.validation:validation-api:1.0.0.GA" level="project" />
<orderEntry type="library" name="Maven: javax.validation:validation-api:sources:1.0.0.GA" level="project" />
<orderEntry type="library" name="Maven: javax.servlet:javax.servlet-api:3.1.0" level="project" />
<orderEntry type="library" name="Maven: org.w3c.css:sac:1.3" level="project" />
<orderEntry type="library" name="Maven: com.google.gwt:gwt-dev:2.8.2" level="project" />
<orderEntry type="library" name="Maven: com.google.gwt:gwt-dev:2.9.0" level="project" />
<orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:1.3.9" level="project" />
<orderEntry type="library" name="Maven: com.google.code.gson:gson:2.6.2" level="project" />
<orderEntry type="library" name="Maven: org.ow2.asm:asm:5.0.3" level="project" />
<orderEntry type="library" name="Maven: org.ow2.asm:asm-util:5.0.3" level="project" />
<orderEntry type="library" name="Maven: org.ow2.asm:asm-tree:5.0.3" level="project" />
<orderEntry type="library" name="Maven: org.ow2.asm:asm-commons:5.0.3" level="project" />
<orderEntry type="library" name="Maven: org.ow2.asm:asm:7.1" level="project" />
<orderEntry type="library" name="Maven: org.ow2.asm:asm-util:7.1" level="project" />
<orderEntry type="library" name="Maven: org.ow2.asm:asm-tree:7.1" level="project" />
<orderEntry type="library" name="Maven: org.ow2.asm:asm-analysis:7.1" level="project" />
<orderEntry type="library" name="Maven: org.ow2.asm:asm-commons:7.1" level="project" />
<orderEntry type="library" name="Maven: colt:colt:1.2.0" level="project" />
<orderEntry type="library" name="Maven: ant:ant:1.6.5" level="project" />
<orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.2" level="project" />
<orderEntry type="library" name="Maven: commons-io:commons-io:2.4" level="project" />
<orderEntry type="library" name="Maven: com.ibm.icu:icu4j:50.1.1" level="project" />
<orderEntry type="library" name="Maven: com.ibm.icu:icu4j:63.1" level="project" />
<orderEntry type="library" name="Maven: tapestry:tapestry:4.0.2" level="project" />
<orderEntry type="library" name="Maven: net.sourceforge.htmlunit:htmlunit:2.19" level="project" />
<orderEntry type="library" name="Maven: xalan:xalan:2.7.2" level="project" />
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

<groupId>com.github.gwtmaterialdesign</groupId>
<artifactId>gwt-material-am4charts</artifactId>
<version>2.4.0</version>
<version>2.4.1</version>
<packaging>gwt-lib</packaging>

<name>Gwt Material AmCharts V4</name>
Expand Down Expand Up @@ -38,7 +38,7 @@
<connection>scm:git:[email protected]:GwtMaterialDesign/gwt-material.git</connection>
<developerConnection>scm:git:[email protected]:GwtMaterialDesign/gwt-material.git</developerConnection>
<url>http://github.com/GwtMaterialDesign/gwt-material</url>
<tag>v2.4.0</tag>
<tag>v2.4.1</tag>
</scm>

<licenses>
Expand Down

0 comments on commit f4b3832

Please sign in to comment.