Merge pull request #5 from mateusz-bajorek/master

commit next snapshot version to repository

Author: mateusz-bajorek

.travis.yml

@@ -31,8 +31,9 @@ deploy:
 
 notifications:
   slack:
-    secure: "DpNAA/yc3b2J3d916wGj0MYiia8mecFDMMP5U8R2vaRHaCNkQmbTBhF6oCCFUrL+d6hH0lpb4xKDqEiZ2wM5gMznZVTMEeCw2bD1ika2uYdX2GyU0qzfEgiAU4LPyl1fBTtrweQ4D9yTtFTrijV63mG3Nq2XVRm/+9sNhZ/j8ZaudBttsWrIdNSsCyY6pKQLyBLUVWj7H6+1hybbKw6iipOyKsHBVOhl9BOSXXbPz4FZbZ5RuEVZ1aUmc8+Ygd7xxQZUVpGY23UlwaTUUpufds9XzjVZ8JyebbymcK6p7LJwZEAEy2YnNMVDMM8jndyS23soNiRpdxEutSlcHBM10kIeYfDmecq0VnyCBoswtppe6otKcov3isoMEcqMmYD3de9WALQghXOeKLi8Y9Jd7KRIUr3hL0bcAHpawboZxFqqNSJTxb9+plD6EeZCBYVf/49zYrDDBysqHzAALvjAEN4mOHIIiDmzPuyzQCmsSWCDK9hf1HztWn6HDoq2HTsGQGLBZYMC4ZM+kenj3I0BLjW9buQnFCafUV4WzYx36lyXjhJgje323nOM7Ym31gfLK29slnODwaUWL3O/c2hLwdiUbKEX8merzN3NTRruHQgdHgLNPVWmYi4rIOJHJVrSLY0ArquX/DGQjIsMbG3dxkkoxCpWYsbzaXb6hsTWow0="
-    on_success: change
+    rooms:
+      - secure: "VlqeD7HK9kDHeYTcqNZoGTD3H8a6qIrDBWXXxQ5w62jczFcCLUJozDRN1xqtmsOvRANQdEO7NzPwM+viOLIEU1vdgLk27Fx8yxzKYMlfScwT+NFLeK9Z8l5ZTbPB0mH1TnY1VqSdKX0JZo0RBYz1IKprWEXmnzwZEXXzufS4On8hxyn29r55x3kasCU1HCyAUmiL/qRde7Q3oqIl1sUbKfTgbO4OzuR75zUfDQt3NTmVc/HkVKhtj7xNxHkdy9ERNKY1YNGG4hVUTcjaUn3NSpIFP1zw5Bz05Im2dIuc9S6cmnCeT/ee3JKaC02x/Ra5TbJKWZB3u4ZOZ/i++R+u7Ku6csncbsZPANJE1Kqcgw9FazCxejMp1xhF1Nqqsw6tXwQWyrxyXVk2a+dhejn5d/AJAWVGeAYbpQmdeFMdabUcfSlfPU8CLOO9c1EliN1R9oBaijhhwcC8OauS/1/GIOvhu5PjxZ32szRA3jk5ijdGfZKA8OPUMBfF1CcU5cwT/CEk2WGYzHlx0we+DJBbbZehQ1bqIo6pW6LYeO/0CyKm0FO/jT8C71BNf1rgQa//4z6opjYexSkmuC9IV2Kk4x28vOzW9No7dN5QPytXp3mp0/QYO2egi3c3BjOH0fB/QY17EVad0820RdyH1wSxmC8CnPJkemK9nY/ZEn/8ulI="
+    on_success: always
     on_failure: always
   email:
     recipients:

.travis/deploy.sh

@@ -1,24 +1,61 @@
 #!/usr/bin/env bash
 set -e
 
+increment_version_to_next_snapshot ()
+# http://stackoverflow.com/a/8659330/5226815
+{
+  declare -a part=( ${1//\./ } )
+  declare    new
+  declare -i carry=1
+
+  for (( CNTR=${#part[@]}-1; CNTR>=0; CNTR-=1 )); do
+    len=${#part[CNTR]}
+    new=$((part[CNTR]+carry))
+    [ ${#new} -gt $len ] && carry=1 || carry=0
+    [ $CNTR -gt 0 ] && part[CNTR]=${new: -len} || part[CNTR]=${new}
+  done
+  new="${part[*]}"
+  new_snapshot="${new// /.}-SNAPSHOT"
+}
+
+# update current version number to a TAG version if this is a tag build
 if [ ! -z "$TRAVIS_TAG" ]
 then
-    echo "on a tag -> set pom.xml <version> to $TRAVIS_TAG"
+    echo "on a tag -> set pom.xml <version> to $TRAVIS_TAG for release"
     mvn --settings .travis/mvnsettings.xml org.codehaus.mojo:versions-maven-plugin:2.3:set -DnewVersion=$TRAVIS_TAG
 else
     echo "not on a tag -> keep snapshot version in pom.xml"
 fi
 
+# cleanup and generate gpg keys
 if [ ! -z "$TRAVIS" -a -f "$HOME/.gnupg" ]; then
     shred -v ~/.gnupg/*
     rm -rf ~/.gnupg
 fi
 
 source .travis/gpg.sh
 
+# DEPLOY \o/
 mvn clean deploy --settings .travis/mvnsettings.xml -DskipTests=true --batch-mode --update-snapshots
 
+# cleanup gpg keys, just to be safe
 if [ ! -z "$TRAVIS" ]; then
     shred -v ~/.gnupg/*
     rm -rf ~/.gnupg
 fi
+
+# increment version to the next snapshot version, commit and push to repository
+if [ ! -z "$TRAVIS_TAG" ]
+then
+    increment_version_to_next_snapshot $TRAVIS_TAG
+    echo "on a tag -> set pom.xml <version> to next SNAPSHOT $new_snapshot"
+    mvn --settings .travis/mvnsettings.xml org.codehaus.mojo:versions-maven-plugin:2.3:set -DnewVersion=$new_snapshot
+    mvn --settings .travis/mvnsettings.xml org.codehaus.mojo:versions-maven-plugin:2.3:commit
+    git config user.name "Travis CI"
+    git config user.email "[email protected]"
+    git remote add upstream "https://$GITHUB_API_TOKEN@github.com/CurrencyFair/OneSignal-Java-SDK.git"
+    git fetch upstream
+    git add pom.xml
+    git commit -m "[Travis-CI] next snapshot version"
+    git push --quiet upstream master > /dev/null 2>&1
+fi

pom.xml

@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.currencyfair</groupId>
     <artifactId>onesignal</artifactId>
-    <version>1.0.5-SNAPSHOT</version>
+    <version>1.0.6-SNAPSHOT</version>
 
     <name>OneSignal Java SDK</name>
     <description>OneSignal Java SDK is a java library enabling easy usage of OneSignal REST API</description>