Merge origin/master

Author: BuildTools

.travis.yml

@@ -5,6 +5,24 @@ branches:
   except:
     - /dev-build-.*/
 
+before_script:
+  |
+    if [ ! -z "$TRAVIS_TAG" ]; then
+      echo -e "Incrementing version for release build...\n"
+      sed -i "/^version:/ s/.*/version: $TRAVIS_TAG/" $TRAVIS_BUILD_DIR/src/plugin.yml
+
+      git config --global user.email "[email protected]"
+      git config --global user.name "travis-ci"
+
+      git add -f $TRAVIS_BUILD_DIR/src/plugin.yml
+      git commit -m "Updated version for build release"
+      git push --quiet https://[email protected]/Codisimus/PhatLoots
+    else
+      echo -e "Appending build number to version for dev build...\n"
+      sed -i "/^version:/ s/.$/+$TRAVIS_BUILD_NUMBER/" $TRAVIS_BUILD_DIR/src/plugin.yml
+      cat $TRAVIS_BUILD_DIR/src/plugin.yml
+    fi
+
 after_deploy:
   |
     if [ "$TRAVIS_BRANCH" == "master" ]; then
@@ -15,7 +33,7 @@ after_deploy:
       cd $HOME
       git config --global user.email "[email protected]"
       git config --global user.name "travis-ci"
-      git clone --quiet --branch=gh-pages https://${AUTH_TOKEN}@github.com/Codisimus/PhatLoots gh-pages > /dev/null
+      git clone --quiet --branch=gh-pages https://[email protected]/Codisimus/PhatLoots gh-pages > /dev/null
 
       cd gh-pages
       git rm -rf ./javadoc
@@ -28,11 +46,18 @@ after_deploy:
     fi
 
 before_deploy:
-  - git config --global user.email "[email protected]"
-  - git config --global user.name "Travis CI"
-  - export GIT_TAG=dev-build-$TRAVIS_BUILD_NUMBER
-  - git tag $GIT_TAG -a -m "Generated tag from TravisCI build $TRAVIS_BUILD_NUMBER on $(date -u "+%Y-%m-%d-%H-%M-%S")"
-  - git push --quiet https://[email protected]/Codisimus/PhatLoots $GIT_TAG
+  |
+    if [ -z "$TRAVIS_TAG" ]; then
+      echo -e "Creating tag for dev build...\n"
+
+      git config --global user.email "[email protected]"
+      git config --global user.name "travis-ci"
+      export GIT_TAG=dev-build-$TRAVIS_BUILD_NUMBER
+      git tag $GIT_TAG -a -m "Generated tag from TravisCI build $TRAVIS_BUILD_NUMBER on $(date -u "+%Y-%m-%d-%H-%M-%S")"
+      git push --quiet https://[email protected]/Codisimus/PhatLoots $GIT_TAG
+
+      echo -e "New tag $GIT_TAG \n"
+    fi
 
 deploy:
   - provider: releases

build.xml

@@ -16,7 +16,7 @@
         </get>-->
         <get dest="${download.lib.dir}">
             <url url="http://dev.bukkit.org/media/files/894/359/Vault.jar"/>
-            <url url="http://ci.citizensnpcs.co/job/CitizensAPI/lastSuccessfulBuild/artifact/target/citizensapi-2.0.17-SNAPSHOT.jar"/>
+            <url url="http://ci.citizensnpcs.co/job/CitizensAPI/lastSuccessfulBuild/artifact/target/citizensapi-2.0.20-SNAPSHOT.jar"/>
             <url url="http://dev.bukkit.org/media/files/619/372/Votifier.jar"/>
             <url url="http://dev.bukkit.org/media/files/881/691/worldguard-6.1.jar"/>
             <url url="http://dev.bukkit.org/media/files/880/435/worldedit-bukkit-6.1.jar"/>