Iteration to previous reworks.

Author: kevzlou7979

.travis.yml

@@ -7,7 +7,7 @@ cache:
   - $HOME/.m2
 before_install:
 # install the gwt-material library before we build the demo
-- git clone -b rework/201709_mk https://github.com/GwtMaterialDesign/gwt-material.git
+- git clone -b release_2.0 https://github.com/GwtMaterialDesign/gwt-material.git
 - cd gwt-material
 - mvn install -DskipTests=true -DdryRun=true
 - cd ..
@@ -17,12 +17,12 @@ before_install:
 - mvn install -DskipTests=true -DdryRun=true
 - cd ..
 # install the gwt-material-addins library
-- git clone -b rework/201709_mk https://github.com/GwtMaterialDesign/gwt-material-addins.git
+- git clone -b release_2.0 https://github.com/GwtMaterialDesign/gwt-material-addins.git
 - cd gwt-material-addins
 - mvn install -DskipTests=true -DdryRun=true
 - cd ..
 # install the gwt-material-table library before we build the demo
-- git clone -b rework/201710bd_onload https://github.com/GwtMaterialDesign/gwt-material-table.git
+- git clone -b release_2.0 https://github.com/GwtMaterialDesign/gwt-material-table.git
 - cd gwt-material-table
 - mvn install -DskipTests=true -DdryRun=true
 - cd ..

.utility/update_demo_site.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 set -ev
-if [ "$TRAVIS_JDK_VERSION" == "oraclejdk8" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_BRANCH" == "rework/mk_09/2017" ]; then
+if [ "$TRAVIS_JDK_VERSION" == "oraclejdk8" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_BRANCH" == "release_2.0" ]; then
 
 if [[ -z "$GH_TOKEN" ]]; then
 echo -e "GH_TOKEN is not set"
@@ -24,23 +24,23 @@ git clone --quiet --branch=gh-pages https://[email protected]/GwtMaterialDesi
 cd gh-pages
 
 # remove the GwtMaterialDemo directories from git.
-if [[ -d ./rework/gwtmaterialdemo ]]; then
-git rm -rf ./rework/gwtmaterialdemo
+if [[ -d ./snapshot/gwtmaterialdemo ]]; then
+git rm -rf ./snapshot/gwtmaterialdemo
 fi
-if [[ -f ./rework/index.html ]]; then
-git rm -rf ./rework/index.html
+if [[ -f ./snapshot/index.html ]]; then
+git rm -rf ./snapshot/index.html
 fi
-if [[ -d ./rework/META-INF ]]; then
-git rm -rf ./rework/META-INF
+if [[ -d ./snapshot/META-INF ]]; then
+git rm -rf ./snapshot/META-INF
 fi
-if [[ -d ./rework/snapshot/WEB-INF ]]; then
-git rm -rf ./rework/snapshot/WEB-INF
+if [[ -d ./snapshot/snapshot/WEB-INF ]]; then
+git rm -rf ./snapshot/snapshot/WEB-INF
 fi
 
 # copy the new GwtMaterialDemo the snapshot dir.
-unzip -u $TRAVIS_BUILD_DIR/target/gwt-material-demo-*.war -d ./rework/
-rm -rf ./rework/META-INF
-rm -rf ./rework/WEB-INF
+unzip -u $TRAVIS_BUILD_DIR/target/gwt-material-demo-*.war -d ./snapshot/
+rm -rf ./snapshot/META-INF
+rm -rf ./snapshot/WEB-INF
 
 git add -f .
 git commit -m "Auto-push demo to gh-pages successful. (Travis build: $TRAVIS_BUILD_NUMBER)"