Skip to content

Commit

Permalink
Merge pull request #22 from GwtMaterialDesign/release_2.1
Browse files Browse the repository at this point in the history
Release 2.1
  • Loading branch information
kevzlou7979 authored Jul 22, 2018
2 parents 3e3cfc6 + 189d94b commit 2e662b2
Show file tree
Hide file tree
Showing 64 changed files with 830 additions and 57 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ cache:
- $HOME/.m2
before_install:
# install the gwt-material-jquery library before we build the demo
- git clone -b release_2.0.1 https://github.com/GwtMaterialDesign/gwt-material-jquery.git
- git clone -b master https://github.com/GwtMaterialDesign/gwt-material-jquery.git
- cd gwt-material-jquery
- mvn install -DskipTests=true -DdryRun=true
- cd ..
# install the gwt-material library before we build the demo
- git clone -b release_2.0.1 https://github.com/GwtMaterialDesign/gwt-material.git
- git clone -b master 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.0.1" ]; then
if [ "$TRAVIS_JDK_VERSION" == "oraclejdk8" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_BRANCH" == "master" ]; 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
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Gwt Material Design Themes for https://github.com/GwtMaterialDesign/gwt-material
<dependency>
<groupId>com.github.gwtmaterialdesign</groupId>
<artifactId>gwt-material-themes</artifactId>
<version>2.0.1</version>
<version>2.1</version>
</dependency>
```

Expand Down
49 changes: 36 additions & 13 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,13 @@
<parent>
<artifactId>gwt-material-parent</artifactId>
<groupId>com.github.gwtmaterialdesign</groupId>
<version>2.0.1</version>
<version>2.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>

<artifactId>gwt-material-themes</artifactId>
<version>2.0.1</version>
<packaging>gwt-lib</packaging>
<version>2.1</version>

<name>Gwt Material Themes</name>
<description>Themes for gwt-material</description>
Expand All @@ -23,7 +24,8 @@
<connection>scm:git:[email protected]:GwtMaterialDesign/gwt-material-themes.git</connection>
<developerConnection>scm:git:[email protected]:GwtMaterialDesign/gwt-material-themes.git</developerConnection>
<url>http://github.com/GwtMaterialDesign/gwt-material-themes</url>
<tag>v2.0.1</tag>
<tag>v2.1</tag>

</scm>

<licenses>
Expand Down Expand Up @@ -78,7 +80,7 @@
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.6</version>
<version>${surefire.version}</version>
<configuration>
<excludes>
<exclude>**/*Test.java</exclude>
Expand All @@ -92,16 +94,37 @@
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<groupId>net.ltgt.gwt.maven</groupId>
<artifactId>gwt-maven-plugin</artifactId>
<version>${gwt.version}</version>
<executions>
<execution>
<goals>
<goal>test</goal>
</goals>
</execution>
</executions>
<version>${tbroyer.version}</version>
<extensions>true</extensions>
<configuration>
<moduleName>gwt.material.design.themes.ThemeBase</moduleName>
<style>OBFUSCATED</style>
<logLevel>INFO</logLevel>
<sourceLevel>1.8</sourceLevel>
<jvmArgs>
<jvmArg>-Xmx1g</jvmArg>
<jvmArg>-Xms1g</jvmArg>
<jvmArg>-XX:CompileThreshold=7000</jvmArg>
</jvmArgs>
<optimize>9</optimize>
<compilerArgs>
<compilerArg>-compileReport</compilerArg>
<compilerArg>-XcompilerMetrics</compilerArg>
</compilerArgs>
<skipModule>true</skipModule>
<classpathScope>compile+runtime</classpathScope>
<failOnError>true</failOnError>
</configuration>
<executions>
<execution>
<goals>
<goal>compile</goal>
<goal>test</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@
public interface ThemeAmber extends ThemeLoader.ThemeBundle {
ThemeAmber INSTANCE = GWT.create(ThemeAmber.class);

@ClientBundle.Source("gwt/material/design/themes/amber/css/materialize.amber.css")
@ClientBundle.Source("gwt/material/design/themes/amber/css/materialize.amber.min.css")
TextResource style();

@ClientBundle.Source("gwt/material/design/themes/amber/css/overridecss.amber.css")
@ClientBundle.Source("gwt/material/design/themes/amber/css/overridecss.amber.min.css")
TextResource overrides();
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
/*
* #%L
* GwtMaterial
* %%
* Copyright (C) 2015 - 2017 GwtMaterialDesign
* %%
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* #L%
*/
package gwt.material.design.themes.amber;

import com.google.gwt.core.client.GWT;
import com.google.gwt.resources.client.TextResource;
import gwt.material.design.themes.client.ThemeLoader;

public interface ThemeAmberDebug extends ThemeLoader.ThemeBundle {
ThemeAmberDebug INSTANCE = GWT.create(ThemeAmberDebug.class);

@Source("gwt/material/design/themes/amber/css/materialize.amber.css")
TextResource style();

@Source("gwt/material/design/themes/amber/css/overridecss.amber.css")
TextResource overrides();
}
4 changes: 2 additions & 2 deletions src/main/java/gwt/material/design/themes/blue/ThemeBlue.java
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@
public interface ThemeBlue extends ThemeLoader.ThemeBundle {
ThemeBlue INSTANCE = GWT.create(ThemeBlue.class);

@Source("gwt/material/design/themes/blue/css/materialize.blue.css")
@Source("gwt/material/design/themes/blue/css/materialize.blue.min.css")
TextResource style();

@Source("gwt/material/design/themes/blue/css/overridecss.blue.css")
@Source("gwt/material/design/themes/blue/css/overridecss.blue.min.css")
TextResource overrides();
}
34 changes: 34 additions & 0 deletions src/main/java/gwt/material/design/themes/blue/ThemeBlueDebug.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
/*
* #%L
* GwtMaterial
* %%
* Copyright (C) 2015 - 2017 GwtMaterialDesign
* %%
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* #L%
*/
package gwt.material.design.themes.blue;

import com.google.gwt.core.client.GWT;
import com.google.gwt.resources.client.TextResource;
import gwt.material.design.themes.client.ThemeLoader;

public interface ThemeBlueDebug extends ThemeLoader.ThemeBundle {
ThemeBlueDebug INSTANCE = GWT.create(ThemeBlueDebug.class);

@Source("gwt/material/design/themes/blue/css/materialize.blue.css")
TextResource style();

@Source("gwt/material/design/themes/blue/css/overridecss.blue.css")
TextResource overrides();
}
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@
public interface ThemeBrown extends ThemeLoader.ThemeBundle {
ThemeBrown INSTANCE = GWT.create(ThemeBrown.class);

@Source("gwt/material/design/themes/brown/css/materialize.brown.css")
@Source("gwt/material/design/themes/brown/css/materialize.brown.min.css")
TextResource style();

@Source("gwt/material/design/themes/brown/css/overridecss.brown.css")
@Source("gwt/material/design/themes/brown/css/overridecss.brown.min.css")
TextResource overrides();
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
/*
* #%L
* GwtMaterial
* %%
* Copyright (C) 2015 - 2017 GwtMaterialDesign
* %%
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* #L%
*/
package gwt.material.design.themes.brown;

import com.google.gwt.core.client.GWT;
import com.google.gwt.resources.client.TextResource;
import gwt.material.design.themes.client.ThemeLoader;

public interface ThemeBrownDebug extends ThemeLoader.ThemeBundle {
ThemeBrownDebug INSTANCE = GWT.create(ThemeBrownDebug.class);

@Source("gwt/material/design/themes/brown/css/materialize.brown.css")
TextResource style();

@Source("gwt/material/design/themes/brown/css/overridecss.brown.css")
TextResource overrides();
}
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@
public interface ThemeGreen extends ThemeLoader.ThemeBundle {
ThemeGreen INSTANCE = GWT.create(ThemeGreen.class);

@Source("gwt/material/design/themes/green/css/materialize.green.css")
@Source("gwt/material/design/themes/green/css/materialize.green.min.css")
TextResource style();

@Source("gwt/material/design/themes/green/css/overridecss.green.css")
@Source("gwt/material/design/themes/green/css/overridecss.green.min.css")
TextResource overrides();
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
/*
* #%L
* GwtMaterial
* %%
* Copyright (C) 2015 - 2017 GwtMaterialDesign
* %%
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* #L%
*/
package gwt.material.design.themes.green;

import com.google.gwt.core.client.GWT;
import com.google.gwt.resources.client.TextResource;
import gwt.material.design.themes.client.ThemeLoader;

public interface ThemeGreenDebug extends ThemeLoader.ThemeBundle {
ThemeGreenDebug INSTANCE = GWT.create(ThemeGreenDebug.class);

@Source("gwt/material/design/themes/green/css/materialize.green.css")
TextResource style();

@Source("gwt/material/design/themes/green/css/overridecss.green.css")
TextResource overrides();
}
4 changes: 2 additions & 2 deletions src/main/java/gwt/material/design/themes/grey/ThemeGrey.java
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@
public interface ThemeGrey extends ThemeLoader.ThemeBundle {
ThemeGrey INSTANCE = GWT.create(ThemeGrey.class);

@Source("gwt/material/design/themes/grey/css/materialize.grey.css")
@Source("gwt/material/design/themes/grey/css/materialize.grey.min.css")
TextResource style();

@Source("gwt/material/design/themes/grey/css/overridecss.grey.css")
@Source("gwt/material/design/themes/grey/css/overridecss.grey.min.css")
TextResource overrides();
}
34 changes: 34 additions & 0 deletions src/main/java/gwt/material/design/themes/grey/ThemeGreyDebug.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
/*
* #%L
* GwtMaterial
* %%
* Copyright (C) 2015 - 2017 GwtMaterialDesign
* %%
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* #L%
*/
package gwt.material.design.themes.grey;

import com.google.gwt.core.client.GWT;
import com.google.gwt.resources.client.TextResource;
import gwt.material.design.themes.client.ThemeLoader;

public interface ThemeGreyDebug extends ThemeLoader.ThemeBundle {
ThemeGreyDebug INSTANCE = GWT.create(ThemeGreyDebug.class);

@Source("gwt/material/design/themes/grey/css/materialize.grey.css")
TextResource style();

@Source("gwt/material/design/themes/grey/css/overridecss.grey.css")
TextResource overrides();
}
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@
public interface ThemeOrange extends ThemeLoader.ThemeBundle {
ThemeOrange INSTANCE = GWT.create(ThemeOrange.class);

@Source("gwt/material/design/themes/orange/css/materialize.orange.css")
@Source("gwt/material/design/themes/orange/css/materialize.orange.min.css")
TextResource style();

@Source("gwt/material/design/themes/orange/css/overridecss.orange.css")
@Source("gwt/material/design/themes/orange/css/overridecss.orange.min.css")
TextResource overrides();
}
Loading

0 comments on commit 2e662b2

Please sign in to comment.