Merge pull request #13 from GwtMaterialDesign/release_2.0

Release 2.0-rc5
GwtMaterialDesign · May 11, 2017 · 6db7f2e · 6db7f2e
2 parents 4cad779 + 2c2c25f
commit 6db7f2e
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 17 deletions.
diff --git a/README.md b/README.md
@@ -1,17 +1,16 @@
 # gwt-material-archetype
 Archetype for a web application that uses GWT Material Design
 
-# Current Version - 2.0-rc4
+# Current Version - 2.0-rc5
 ### Includes
 - Updated GWT Version to 2.8.0
 - Updated GWTP Version to 1.5.3
-- Updated GMD Version to 2.0-rc4
-- Added GMD Table 1.0-rc4
+- Updated GMD Version to 2.0-rc5
 
 # Usage:
 1. Download the archetype
 2. From the download folder, install the archetype in your local Maven repo by running this command: <code>mvn clean install</code>
-3. Create a new project by running the following command in a folder of your choice: <code>mvn archetype:generate -DarchetypeGroupId=com.github.gwtmaterialdesign -DarchetypeArtifactId=gwt-material-archetype -DarchetypeVersion=2.0-rc4</code>
+3. Create a new project by running the following command in a folder of your choice: <code>mvn archetype:generate -DarchetypeGroupId=com.github.gwtmaterialdesign -DarchetypeArtifactId=gwt-material-archetype -DarchetypeVersion=2.0-rc5</code>
 4. Follow the prompts
 
 That's it!

diff --git a/pom.xml b/pom.xml
@@ -4,12 +4,12 @@
     <parent>
         <artifactId>gwt-material-parent</artifactId>
         <groupId>com.github.gwtmaterialdesign</groupId>
-        <version>2.0-rc4</version>
+        <version>2.0-rc5</version>
     </parent>
 
     <groupId>com.github.gwtmaterialdesign</groupId>
     <artifactId>gwt-material-archetype</artifactId>
-    <version>2.0-rc4</version>
+    <version>2.0-rc5</version>
     <packaging>jar</packaging>
 
     <distributionManagement>

diff --git a/src/main/resources/META-INF/maven/archetype-metadata.xml b/src/main/resources/META-INF/maven/archetype-metadata.xml
@@ -14,10 +14,7 @@
             <defaultValue>${groupId}.${artifactId}</defaultValue>
         </requiredProperty>
         <requiredProperty key="gwt-material-version">
-            <defaultValue>2.0-rc4</defaultValue>
-        </requiredProperty>
-        <requiredProperty key="gwt-material-table-version">
-            <defaultValue>1.0-rc4</defaultValue>
+            <defaultValue>2.0-rc5</defaultValue>
         </requiredProperty>
     </requiredProperties>
     <fileSets>

diff --git a/src/main/resources/archetype-resources/pom.xml b/src/main/resources/archetype-resources/pom.xml
@@ -18,7 +18,6 @@
         <gwtp.version>1.5.3</gwtp.version>
         <gin.version>2.1.2</gin.version>
         <gwt-material.version>${gwt-material-version}</gwt-material.version>
-        <gwt-material-table.version>${gwt-material-table-version}</gwt-material-table.version>
         <gwt.style>OBF</gwt.style>
 
         <!-- maven -->
@@ -149,7 +148,7 @@
         <dependency>
             <groupId>com.github.gwtmaterialdesign</groupId>
             <artifactId>gwt-material-table</artifactId>
-            <version>${gwt-material-table.version}</version>
+            <version>${gwt-material.version}</version>
         </dependency>
 
         <!-- DI -->

diff --git a/...esources/archetype-resources/src/main/resources/client/application/ApplicationView.ui.xml b/...esources/archetype-resources/src/main/resources/client/application/ApplicationView.ui.xml
@@ -13,13 +13,14 @@
                     <m:MaterialLink iconType="POLYMER" />
                 </m:MaterialNavSection>
             </m:MaterialNavBar>
-            <m:MaterialSideNav m:id="sidenav" type="PUSH" width="280" alwaysShowActivator="true" showOnAttach="true">
-                <m:MaterialLink text="Link 1" iconType="POLYMER"/>
-                <m:MaterialLink text="Link 2" iconType="POLYMER"/>
-                <m:MaterialLink text="Link 3" iconType="POLYMER"/>
-            </m:MaterialSideNav>
         </m:MaterialHeader>
 
+        <m:MaterialSideNavPush m:id="sidenav" width="280">
+            <m:MaterialLink text="Link 1" iconType="POLYMER"/>
+            <m:MaterialLink text="Link 2" iconType="POLYMER"/>
+            <m:MaterialLink text="Link 3" iconType="POLYMER"/>
+        </m:MaterialSideNavPush>
+
         <m:MaterialContainer>
             <m:MaterialPanel textAlign="CENTER">
                 <m:MaterialIcon marginTop="120" textColor="BLUE_DARKEN_1" iconType="POLYMER" iconSize="LARGE"/>