Skip to content

Commit

Permalink
Merge pull request #24 from GwtMaterialDesign/release_2.6.0
Browse files Browse the repository at this point in the history
Release 2.6.0
  • Loading branch information
kevzlou7979 authored Jul 23, 2022
2 parents c5891cf + ca2fe49 commit cc2b379
Show file tree
Hide file tree
Showing 6 changed files with 25 additions and 107 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.5.0 https://github.com/GwtMaterialDesign/gwt-material-jquery.git
- git clone -b release_2.6.0 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.5.0 https://github.com/GwtMaterialDesign/gwt-material.git
- git clone -b release_2.6.0 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.5.0" ]; then
if [ "$TRAVIS_JDK_VERSION" == "oraclejdk8" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_BRANCH" == "release_2.6.0" ]; 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.5.0
### Current Version 2.6.0
```xml
<dependency>
<groupId>com.github.gwtmaterialdesign</groupId>
<artifactId>gwt-material-am4charts</artifactId>
<version>2.5.0</version>
<version>2.6.0</version>
</dependency>
```

Expand Down
100 changes: 0 additions & 100 deletions gwt-material-am4charts.iml

This file was deleted.

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.5.0</version>
<version>2.6.0</version>
<packaging>gwt-lib</packaging>

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

<licenses>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@

public class GwtMaterialAmCore implements EntryPoint {

private static boolean enableSourceMap = false;

@Override
public void onModuleLoad() {
// Inject Am4chart resources
Expand All @@ -45,10 +47,26 @@ protected static void directInjectJs(TextResource resource, boolean removeTag, b
String text = resource.getText() + (sourceUrl ?
"//# sourceURL=" + resource.getName() + ".js" : "");

if (!enableSourceMap) {
String sourceMapImport = "//# sourceMappingURL=";
if (text.contains(sourceMapImport)) {
sourceMapImport = text.substring(text.indexOf(sourceMapImport), text.length());
}
text = text.replace(sourceMapImport, "");
}

// Inject the script resource
ScriptInjector.fromString(text)
.setWindow(ScriptInjector.TOP_WINDOW)
.setRemoveTag(removeTag)
.inject();
}

public static void setEnableSourceMap(boolean enableSourceMap) {
GwtMaterialAmCore.enableSourceMap = enableSourceMap;
}

public static boolean isEnableSourceMap() {
return enableSourceMap;
}
}

0 comments on commit cc2b379

Please sign in to comment.