From 7971b9e6931a54bf43359fb9f4729c48ffbe9f1e Mon Sep 17 00:00:00 2001
From: Ahmet Inan <xdsopl@googlemail.com>
Date: Mon, 9 Feb 2015 22:12:11 +0100
Subject: [PATCH] android studio updates

---
 Robot36.iml      | 2 +-
 app/app.iml      | 2 ++
 app/build.gradle | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Robot36.iml b/Robot36.iml
index 5550340..42f4ed5 100644
--- a/Robot36.iml
+++ b/Robot36.iml
@@ -7,7 +7,7 @@
       </configuration>
     </facet>
   </component>
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
     <output url="file://$MODULE_DIR$/build/classes/main" />
     <output-test url="file://$MODULE_DIR$/build/classes/test" />
     <exclude-output />
diff --git a/app/app.iml b/app/app.iml
index 7cd5b07..8459066 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -9,6 +9,7 @@
     <facet type="android" name="Android">
       <configuration>
         <option name="SELECTED_BUILD_VARIANT" value="debug" />
+        <option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
         <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
         <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
         <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugTest" />
@@ -24,6 +25,7 @@
   </component>
   <component name="NewModuleRootManager" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
+    <output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
diff --git a/app/build.gradle b/app/build.gradle
index afbd793..27783d8 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 21
-    buildToolsVersion "21.1.1"
+    buildToolsVersion "21.1.2"
 
     defaultConfig {
         applicationId "xdsopl.robot36"