Merge branch 'feature/develop' of github.com:stealthcopter/AndroidNetworkTools into feature/develop

Author: stealthcopter

.circleci/config.yml

@@ -31,12 +31,13 @@ jobs:
           name: Run Tests
           command: ./gradlew test
 
-      - store_artifacts:
+      - store_test_results:
           path: app/build/reports
           destination: reports
 
       - store_test_results:
-          path: app/build/test-results
+          path: library/build/reports
+          destination: reports
 
       # Compile release apks
       - run:

app/build.gradle

@@ -30,8 +30,8 @@ android {
     applicationId "com.stealthcotper.networktools"
     minSdkVersion minSdkVer
     targetSdkVersion targetSdkVer
-    versionCode 8
-    versionName "0.1.12"
+    versionCode 9
+    versionName "0.1.14"
     testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
   }
 

library/build.gradle

@@ -7,8 +7,8 @@ android {
   defaultConfig {
     minSdkVersion minSdkVer
     targetSdkVersion targetSdkVer
-    versionCode 4
-    versionName "0.2.2"
+    versionCode 7
+    versionName "0.2.34"
   }
   buildTypes {
     release {

scripts/config.sh

@@ -1,35 +1,29 @@
 #!/usr/bin/env bash
 ENV_VAR_PREFIX="ANDROID_NETWORK_TOOLS"
 
-APP_NAME="Android Network Tools Sample App"
-
 # Slack webhook settings
 SLACK_CHANNEL="#mat-testing"
 SLACK_WEBHOOK_URL="https://hooks.slack.com/services/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"
 ICON_URL="https://github.com/stealthcopter/AndroidNetworkTools/raw/master/app/src/main/res/mipmap-xhdpi/ic_launcher.png"
 
-# Settings for github releases
-GITHUB_RELEASE_MODULE="library"
-GITHUB_RELEASE_DESC="This release was automatically generated by the CI server"
-GITHUB_RELEASE_URL="https://api.github.com/repos/stealthcopter/AndroidNetworkTools/releases"
-GITHUB_RELEASE_TOKEN=$ANDROID_NETWORK_TOOLS_GITHUB_RELEASE_TOKEN
-
+# Git info
+GIT_URL="https://github.com/stealthcopter/AndroidNetworkTools"
+GIT_TAG=`git name-rev --name-only --tags HEAD`
 GIT_COMMIT_DESC=`git log -n 1 $CIRCLE_SHA1`
 GIT_CURRENT_BRANCH=`git rev-parse --abbrev-ref HEAD`
 
 # Fires a webhook to slack to notify of successful upload to beta
 function webhook {
 
     gradle_app_name="$1"
-    message="$2"
+    app_name="$2"
+    message="$3"
     git_hash=`git rev-parse --short HEAD`
     version=`cat ${gradle_app_name}/build.gradle | grep -m 1 versionName | cut -d'"' -f 2`
 
-    # TESTING WEBHOOK https://hooks.slack.com/services/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
-    
     echo $message
-    echo $channel $gradle_app_name $APP_NAME $version $ICON_URL
+    echo $channel $gradle_app_name $app_name $version $ICON_URL
 
-    curl -X POST --data-urlencode 'payload={"channel": "'"$SLACK_CHANNEL"'", "username": "CirclCI Deployment Bot", "text": "*'"$APP_NAME"'* version *'"$version"'*  <'"https://github.com/scottyab/rootbeer/commits/$git_hash"'|'"$git_hash"'> '"$message"'", "icon_url": "'"$ICON_URL"'"}' $SLACK_WEBHOOK_URL
+    curl -X POST --data-urlencode 'payload={"channel": "'"$SLACK_CHANNEL"'", "username": "CirclCI Deployment Bot", "text": "*'"$app_name"'* version *'"$version"'*  <'"$GIT_URL/commits/$git_hash"'|'"$git_hash"'> '"$message"'", "icon_url": "'"$ICON_URL"'"}' $SLACK_WEBHOOK_URL
 
-}  
+}  

scripts/github-release.sh

@@ -5,14 +5,38 @@ DIR="${BASH_SOURCE%/*}"
 if [[ ! -d "$DIR" ]]; then DIR="$PWD"; fi
 . "$DIR/config.sh"
 
+# Settings for github releases
 
+GITHUB_RELEASE_NAME="Android Network Tools Library"
+GITHUB_RELEASE_MODULE="library"
+GITHUB_RELEASE_DESC="This release was automatically generated by the CI server"
+GITHUB_RELEASE_URL="https://api.github.com/repos/stealthcopter/AndroidNetworkTools/releases"
+GITHUB_RELEASE_TOKEN=$ANDROID_NETWORK_TOOLS_GITHUB_RELEASE_TOKEN
+GITHUB_RELEASE_FILE_PATH="app/build/outputs/apk/app-regular-release.apk"
+GITHUB_RELASE_FILENAME="AndroidNetworkTools.apk"
+GITHUB_UPLOAD_URL="https://uploads.github.com/repos/stealthcopter/AndroidNetworkTools/releases/"
 
 function create_github_release { 
 
     version=`cat $1/build.gradle | grep -m 1 versionName | cut -d'"' -f 2`
 
-    curl -v -i -X POST -H "Content-Type:application/json" -H "Authorization: token $GITHUB_RELEASE_TOKEN" -d '{"tag_name": "'$version'","name": "'$version'","body": '$GITHUB_RELEASE_DESC',"draft": true}' $GITHUB_RELEASE_URL
+    echo "Uploading release"
+    
+    response=`curl -X POST -H "Content-Type:application/json" -H "Authorization: token $GITHUB_RELEASE_TOKEN" -d '{"tag_name": "'$version'","name": "'$version'","body": "'"$GITHUB_RELEASE_DESC"'","draft": true}' $GITHUB_RELEASE_URL`
+    
+    echo "Got response $response"
+    
+    id=`echo $response | python -c "import json,sys;obj=json.load(sys.stdin);print obj['id'];"`
+    
+    if [ -z "$id" ]; then
+        return 1
+    fi
+    
+    echo "Found id $id"
+    
+    curl -H "Content-Type:application/zip" -H "Authorization: token $GITHUB_RELEASE_TOKEN" --data-binary @"$GITHUB_RELEASE_FILE_PATH" $GITHUB_UPLOAD_URL$id/assets?name=$GITHUB_RELASE_FILENAME
 
+    return
 }
 
 # Only deploy releases if we are on the master branch
@@ -21,11 +45,15 @@ function create_github_release {
 #     exit 0
 # fi
 
-if [[ $GIT_COMMIT_DESC == *"#RELEASE"* ]]; then
-    echo "Creating github release"
+# This will push a github release every time a new tag is pushed
+# you should ensure tags are push with commits by doing the following:
+# git config --global push.followTags true
+
+if [[ $GIT_COMMIT_DESC != *"undefined"* ]]; then
+    echo "Creating github release for tag $GIT_TAG"
     if create_github_release $GITHUB_RELEASE_MODULE; then
-        webhook $GITHUB_RELEASE_MODULE "Created github release"
+        webhook $GITHUB_RELEASE_MODULE "$GITHUB_RELEASE_NAME" "Created github release for tag $TAG"
     else
-        webhook $GITHUB_RELEASE_MODULE "Failed to create github release :("
+        webhook $GITHUB_RELEASE_MODULE "$GITHUB_RELEASE_NAME" "Failed to create github release for tag $TAG :("
     fi
-fi
+fi

scripts/upload-apks.sh

@@ -5,16 +5,16 @@ DIR="${BASH_SOURCE%/*}"
 if [[ ! -d "$DIR" ]]; then DIR="$PWD"; fi
 . "$DIR/config.sh"
 
-
+APP_RELEASE_NAME="Android Network Tools Sample App"
 
 # Uploads a build to Beta
 function upload_to_beta {
     echo "Uploading $1 to Beta"
 
     if ./gradlew :$1:crashlyticsUploadDistributionRelease ; then
-        webhook "${1}" "Uploading to Beta Succeeded"
+        webhook $1 "$APP_RELEASE_NAME" "Uploading to Beta Succeeded"
     else
-        webhook "${1}" "Uploading to Beta Play FAILED :("
+        webhook $1 "$APP_RELEASE_NAME" "Uploading to Beta Play FAILED :("
     fi
 }
 
@@ -23,9 +23,9 @@ function upload_to_google_play {
     echo "Uploading $1 to Google Play"
 
     if ./gradlew :$1:publishApkRegularRelease ; then
-        webhook "${1}" "Uploading to Google Play Succeeded"
+        webhook $1 "$APP_RELEASE_NAME" "Uploading to Google Play Succeeded"
     else
-        webhook "${1}" "Uploading to Google Play FAILED :("
+        webhook $1 "$APP_RELEASE_NAME" "Uploading to Google Play FAILED :("
     fi
 }