aboutsummaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorScott Jackson <daneren2005@gmail.com>2015-05-01 18:00:31 -0700
committerScott Jackson <daneren2005@gmail.com>2015-05-01 18:00:31 -0700
commitdcf952e2677259e093947a3fa5ab926b302e7f5d (patch)
tree87a3eee49753f00f163d5bd1f541c41384152ee2 /app
parent552c168128f7da9d3c90a8516a18812d7ae6c474 (diff)
downloaddsub-dcf952e2677259e093947a3fa5ab926b302e7f5d.tar.gz
dsub-dcf952e2677259e093947a3fa5ab926b302e7f5d.tar.bz2
dsub-dcf952e2677259e093947a3fa5ab926b302e7f5d.zip
Update to Studio's 1.2
Diffstat (limited to 'app')
-rw-r--r--app/app.iml8
1 files changed, 4 insertions, 4 deletions
diff --git a/app/app.iml b/app/app.iml
index 573f65e3..6d0eca89 100644
--- a/app/app.iml
+++ b/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" external.system.module.group="DSub" external.system.module.version="unspecified" 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="DSub" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="android-gradle" name="Android-Gradle">
<configuration>
@@ -12,8 +12,9 @@
<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="assembleDebugAndroidTest" />
<option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
+ <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugAndroidTest" />
+ <option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugAndroidTestSources" />
<option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugAndroidTestSources" />
<option name="ALLOW_USER_CONFIGURATION" value="false" />
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
@@ -112,5 +113,4 @@
<orderEntry type="module" module-name="DragSort ListView" exported="" />
<orderEntry type="module" module-name="Server Proxy" exported="" />
</component>
-</module>
-
+</module> \ No newline at end of file