Merge branch 'master' of https://github.com/GwtMaterialDesign/gwt-mat…

…erial-patterns Conflicts: src/main/java/com/github/gwtmaterialdesign/GwtMaterialPatterns.gwt.xml
GwtMaterialDesign · May 27, 2016 · e92a7cc · e92a7cc
2 parents f4aae3a + f4568b4
commit e92a7cc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/pom.xml b/pom.xml
@@ -8,7 +8,6 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>com.github.gwtmaterialdesign</groupId>
     <artifactId>gwt-material-patterns</artifactId>
     <version>1.0</version>
 
@@ -18,7 +17,7 @@
     <properties>
         <!-- client -->
         <gwt.version>2.7.0</gwt.version>
-        <gwtp.version>1.4</gwtp.version>
+        <gwtp.version>1.5.3</gwtp.version>
         <gin.version>2.1.2</gin.version>
         <gwt-material.version>1.5.1-SNAPSHOT</gwt-material.version>
         <gwt.style>OBF</gwt.style>

diff --git a/src/main/java/com/github/gwtmaterialdesign/GwtMaterialPatterns.gwt.xml b/src/main/java/com/github/gwtmaterialdesign/GwtMaterialPatterns.gwt.xml
@@ -35,7 +35,7 @@
     <!--GWT Material-->
     <inherits name="gwt.material.design.GwtMaterialBasicWithJQueryDebug"/>
     <inherits name="gwt.material.design.themes.GwtMaterialThemeBlue"/>
-    <inherits name="gwt.material.design.addins.GwtMaterialAddins"/>
+    <inherits name="gwt.material.design.addins.GwtMaterialAddinsDebug"/>
 
     <set-configuration-property name="CssResource.enableGss" value="true"/>
 </module>