From da0b4c51cfb7b20e487a67d4a12064b6aaebc833 Mon Sep 17 00:00:00 2001
From: Aaron Culliney <devnull@deadc0de.org>
Date: Sat, 23 May 2015 22:49:03 -0700
Subject: [PATCH] Changes Android Studio made when upgraded

---
 Android/.idea/gradle.xml |  4 ++--
 Android/Android.iml      |  8 ++++----
 Android/app/app.iml      | 10 ++++++----
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/Android/.idea/gradle.xml b/Android/.idea/gradle.xml
index fe865d33..3ec59556 100644
--- a/Android/.idea/gradle.xml
+++ b/Android/.idea/gradle.xml
@@ -6,6 +6,7 @@
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="gradleHome" value="$APPLICATION_HOME_DIR$/gradle/gradle-2.2.1" />
+        <option name="gradleJvm" value="1.7" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
@@ -15,5 +16,4 @@
       </GradleProjectSettings>
     </option>
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/Android/Android.iml b/Android/Android.iml
index 7c38323e..e31e6386 100644
--- a/Android/Android.iml
+++ b/Android/Android.iml
@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="Android" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="java-gradle" name="Java-Gradle">
       <configuration>
         <option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/build" />
+        <option name="BUILDABLE" value="false" />
       </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 />
@@ -17,5 +18,4 @@
     <orderEntry type="jdk" jdkName="Android API 10 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
-</module>
-
+</module>
\ No newline at end of file
diff --git a/Android/app/app.iml b/Android/app/app.iml
index 31942747..13009d40 100644
--- a/Android/app/app.iml
+++ b/Android/app/app.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" type="JAVA_MODULE" version="4">
+<module external.linked.project.id=":app" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="Android" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="android-gradle" name="Android-Gradle">
       <configuration>
@@ -9,10 +9,12 @@
     <facet type="android" name="Android">
       <configuration>
         <option name="SELECTED_BUILD_VARIANT" value="demoDebug" />
+        <option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
         <option name="ASSEMBLE_TASK_NAME" value="assembleDemoDebug" />
         <option name="COMPILE_JAVA_TASK_NAME" value="compileDemoDebugSources" />
-        <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDemoDebugTest" />
         <option name="SOURCE_GEN_TASK_NAME" value="generateDemoDebugSources" />
+        <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDemoDebugTest" />
+        <option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDemoDebugTestSources" />
         <option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDemoDebugTestSources" />
         <option name="ALLOW_USER_CONFIGURATION" value="false" />
         <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
@@ -24,6 +26,7 @@
   </component>
   <component name="NewModuleRootManager" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/build/intermediates/classes/demo/debug" />
+    <output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/demo/debug" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/demo/debug" isTestSource="false" generated="true" />
@@ -108,5 +111,4 @@
     <orderEntry type="library" exported="" name="support-annotations-21.0.3" level="project" />
     <orderEntry type="library" exported="" name="support-v4-21.0.3" level="project" />
   </component>
-</module>
-
+</module>
\ No newline at end of file