Skip to content

Commit

Permalink
Merge pull request #79 from GwtMaterialDesign/release_1.5.1
Browse files Browse the repository at this point in the history
Release 1.5.1
  • Loading branch information
kevzlou7979 committed Jun 2, 2016
2 parents a2d0e6a + f6a0a85 commit 9e1864c
Show file tree
Hide file tree
Showing 50 changed files with 840 additions and 624 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ cache:
- $HOME/.m2
before_install:
# install the gwt-material library before we build the demo
- git clone -b release_1.5 https://github.com/GwtMaterialDesign/gwt-material.git
- git clone -b release_1.5.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" == "oraclejdk7" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_BRANCH" == "master" ]; then
if [ "$TRAVIS_JDK_VERSION" == "oraclejdk7" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_BRANCH" == "release_1.5.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
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Gwt Material Design Extra Components for https://github.com/GwtMaterialDesign/gw
<dependency>
<groupId>com.github.gwtmaterialdesign</groupId>
<artifactId>gwt-material-addins</artifactId>
<version>1.5.0</version>
<version>1.5.1</version>
</dependency>
```

Expand All @@ -16,13 +16,13 @@ Gwt Material Design Extra Components for https://github.com/GwtMaterialDesign/gw
<dependency>
<groupId>com.github.gwtmaterialdesign</groupId>
<artifactId>gwt-material-addins</artifactId>
<version>1.5.1-SNAPSHOT</version>
<version>1.6.0-SNAPSHOT</version>
</dependency>
```

Import the theme in your GWT Module
```xml
<inherits name="gwt.material.design.addins.GWTMaterialAddins"/>
<inherits name="gwt.material.design.addins.GwtMaterialAddins"/>
```
Define the ui:binder with single import (e.g Bubble and Timer Picker using a single package import)
```xml
Expand Down
7 changes: 4 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,24 +3,25 @@
<parent>
<artifactId>gwt-material-parent</artifactId>
<groupId>com.github.gwtmaterialdesign</groupId>
<version>1.5.0</version>
<version>1.5.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>

<artifactId>gwt-material-addins</artifactId>

<name>Gwt Material Addins</name>
<version>1.5.1</version>
<description>Extra Components of GWT Material Framework</description>

<properties>
<gwt-material.version>1.5.0</gwt-material.version>
<gwt-material.version>1.5.1</gwt-material.version>
</properties>

<scm>
<connection>scm:git:git@github.com:GwtMaterialDesign/gwt-material-addins.git</connection>
<developerConnection>scm:git:git@github.com:GwtMaterialDesign/gwt-material-addins.git</developerConnection>
<url>http://github.com/GwtMaterialDesign/gwt-material-addins</url>
<tag>HEAD</tag>
<tag>v1.5.1</tag>
</scm>

<licenses>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,32 @@
* #L%
*/


import com.google.gwt.core.client.EntryPoint;
import com.google.gwt.core.client.GWT;
import gwt.material.design.addins.client.StartupState.DebugState;

public class MaterialAddins implements EntryPoint {

private static StartupState startupState;

@Override
public void onModuleLoad() {
MaterialResourceInjector.setDebug(false);
// Initialize the startup state.
checkStartupState();
}

private static void checkStartupState() {
if(startupState == null) {
startupState = GWT.create(StartupState.class);
}
}

public static StartupState getStartupState() {
checkStartupState();
return startupState;
}

public static boolean isDebug() {
return MaterialAddins.getStartupState() instanceof DebugState;
}
}

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,11 @@
* #L%
*/

public class StartupState {
public StartupState() {
}

import com.google.gwt.core.client.EntryPoint;

public class MaterialAddinsDebug implements EntryPoint {

@Override
public void onModuleLoad() {
MaterialResourceInjector.setDebug(true);
public static class DebugState extends StartupState {
public DebugState() {}
}
}
Loading

0 comments on commit 9e1864c

Please sign in to comment.