Android Studio 2.2 / Gradle 2.2.0 compatibility

app/build.gradle

@@ -133,13 +133,23 @@ android {
     }
 }
 
-// jamorham auto test rig
-task jamorhamAutoInstall(type: Exec) {
-    // just comment out the line below if it causes compile problems
+// auto test rig
+task AutoInstall(type: Exec) {
     commandLine "bash", "$projectDir/autoinstallviausb"
 }
-assembleRelease.doLast {
-    jamorhamAutoInstall.execute()
+
+// auto tester
+tasks.whenTaskAdded { task ->
+    if (task.name == 'assembleRelease') {
+        if (System.getenv('USERDOMAIN') == "PC-PC") {
+            task.finalizedBy 'AutoTestRig'
+            AutoTestRig.outputs.upToDateWhen { false }
+        }
+    }
+}
+
+task AutoTestRig() << {
+    AutoInstall.execute()
 }
 
 dependencies {
@@ -182,6 +192,7 @@ dependencies {
     }
     compile 'uk.com.robust-it:cloning:1.9.2'
     compile 'com.github.amlcurran.showcaseview:library:5.4.3'
+   // compile 'com.itextpdf:itextg:5.5.9'
 
     // Pebble-Trend, needs to be checked if really needed
     //compile 'com.android.support:multidex:1.0.1'

build.gradle

@@ -6,7 +6,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.1.3'
+        classpath 'com.android.tools.build:gradle:2.2.0'
         classpath 'com.google.gms:google-services:3.0.0'
         apply plugin: 'java'
         apply plugin: 'maven'