Added new circleCI config

Author: stealthcopter

.circleci/config.yml

@@ -0,0 +1,66 @@
+version: 2
+jobs:
+  build:
+    docker:
+      - image: circleci/android:api-25-alpha
+    environment:
+        GRADLE_OPTS: '-Dorg.gradle.jvmargs="-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError"'
+    steps:
+      - checkout
+      - restore_cache:
+          key: jars-{{ checksum "build.gradle" }}-{{ checksum  "app/build.gradle" }}
+          
+      # Copy environment vars to gradle.properties
+      - run:
+          name: Copy Environment Vars
+          command: scripts/cp-env-to-properties.sh
+          
+      # Decrypt any secret files / keys
+      - run:
+          name: Decrypt secret files
+          command: scripts/decrypt-secrets.sh
+          
+      - run:
+          name: Download Dependencies
+          command: ./gradlew androidDependencies
+      - save_cache:
+          paths:
+            - ~/.gradle
+          key: jars-{{ checksum "build.gradle" }}-{{ checksum  "app/build.gradle" }}
+      - run:
+          name: Run Tests
+          command: ./gradlew test
+
+      - store_artifacts:
+          path: app/build/reports
+          destination: reports
+
+      - store_test_results:
+          path: app/build/test-results
+
+      # Compile release apks
+      - run:
+          name: Compile APKs
+          command: ./gradlew assembleRelease
+
+
+      # Copy APK files to artifacts
+      - run:
+          name: Copy APK Files
+          command: |
+            set -xu
+            mkdir -p /tmp/artifacts 
+            find . -name "*release.apk" -type f -exec echo {} \;
+            find . -name "*release.apk" -type f -exec cp {} /tmp/artifacts/ \;
+
+      # Save artifacts
+      - store_artifacts:
+          name: Save APK Files
+          path: /tmp/artifacts
+          destination: build
+       
+      # Upload to beta if requested and then publish webhooks
+      - run:
+          name: Publish to Google Play
+          command: scripts/webhooks.sh
+

.circleci/key.p12.enc

@@ -9,3 +9,4 @@
 /build
 /captures
 TODO
+key.p12

circle.yml renamed to .circleci/old_config.yml

@@ -6,11 +6,21 @@ buildscript {
 
   dependencies {
     classpath 'com.stanfy.spoon:spoon-gradle-plugin:1.2.2'
+
+    // This is so we can publish straight to Google Play
+    classpath 'com.github.triplet.gradle:play-publisher:1.1.5'
   }
 }
 
 apply plugin: 'com.android.application'
 apply plugin: 'spoon'
+apply plugin: 'com.github.triplet.play'
+
+play {
+  track = 'alpha'
+  serviceAccountEmail = 'androidnetworktoolspublisher@api-6650335122940819061-609121.iam.gserviceaccount.com'
+  pk12File = file('../key.p12')
+}
 
 android {
   compileSdkVersion compileSdkVer
@@ -20,8 +30,8 @@ android {
     applicationId "com.stealthcotper.networktools"
     minSdkVersion minSdkVer
     targetSdkVersion targetSdkVer
-    versionCode 7
-    versionName "0.1.10"
+    versionCode 8
+    versionName "0.1.12"
     testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
   }
 

.gitignore

@@ -6,7 +6,6 @@ buildscript {
   }
   dependencies {
     classpath 'com.android.tools.build:gradle:2.2.2'
-
     // NOTE: Do not place your application dependencies here; they belong
     // in the individual module build.gradle files
   }

app/build.gradle

@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+#
+# Copy env variables to app module gradle properties file
+#
+
+set +x // dont print the next lines on run script
+mkdir ~/.gradle
+printenv | tr ' ' '\n' | grep ANDROID_NETWORK_TOOLS > ~/.gradle/gradle.properties
+set -x

build.gradle

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+# Following this guide to encrypt / decrypt files
+# https://github.com/circleci/encrypted-files
+
+openssl aes-256-cbc -d -in .circleci/key.p12.enc -out key.p12 -k $ANDROID_NETWORK_TOOLS_DECRYPTKEY1

scripts/cp-env-to-properties.sh

@@ -0,0 +1,65 @@
+#!/bin/bash
+
+# Fires a webhook to slack to notify of successful upload to beta
+function webhook {
+
+    gradle_app_name="$1"
+    message="$2"
+    channel="#mat-testing"
+    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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
+    
+    app_name="Sample App"
+    icon_url="https://github.com/stealthcopter/AndroidNetworkTools/raw/master/app/src/main/res/mipmap-xhdpi/ic_launcher.png"
+    
+    echo $message
+    echo $channel $gradle_app_name $app_name $version $icon_url
+
+    curl -X POST --data-urlencode 'payload={"channel": "'"$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"'"}'   https://hooks.slack.com/services/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
+
+}  
+
+# 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"
+    else
+        webhook "${1}" "Uploading to Beta Play FAILED :("
+    fi
+}
+
+# Uploads a build to Google Play
+function upload_to_google_play {
+    echo "Uploading $1 to Google Play"
+    
+    if ./gradlew :$1:publishApkRegularRelease ; then
+        webhook "${1}" "Uploading to Google Play Succeeded"
+    else
+        webhook "${1}" "Uploading to Google Play FAILED :("
+    fi
+}
+
+GIT_COMMIT_DESC=`git log -n 1 $CIRCLE_SHA1`
+GIT_CURRENT_BRANCH=`git rev-parse --abbrev-ref HEAD`
+
+
+# Only deploy releases if we are on the master branch
+# if [[ $GIT_CURRENT_BRANCH != "master" ]]; then
+#     echo "Not on master branch, so not deploying"
+#     exit 0
+# fi
+
+
+# UNCOMMENT TO TEST
+GIT_COMMIT_DESC="#DEPLOY"
+
+# Print the git commit message
+echo "Git commit message: ${GIT_COMMIT_DESC}"
+
+if [[ $GIT_COMMIT_DESC == *"#DEPLOY"* ]]; then
+    upload_to_google_play "app"  
+fi