diff options
| author | Kazuki Yamaguchi <k@rhe.jp> | 2015-09-04 01:48:51 +0900 |
|---|---|---|
| committer | Kazuki Yamaguchi <k@rhe.jp> | 2015-09-04 01:48:51 +0900 |
| commit | cca0c014f0f8a777226e737e0ed6a8cc25505c41 (patch) | |
| tree | 960e805f251f53ca145bdc51b251e304d0c993af /app | |
| parent | 3cb3ad1f0668f0cca948ec1e8e5aee5c69bb1838 (diff) | |
| parent | aafa11394cae85c0ba3aabc2a678638a8bed4296 (diff) | |
| download | SmileEssence-cca0c014f0f8a777226e737e0ed6a8cc25505c41.tar.gz | |
Merge branch 'master' of https://github.com/laco0416/SmileEssence
Diffstat (limited to 'app')
| -rw-r--r-- | app/app.iml | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/app/app.iml b/app/app.iml index 6171d07a..58bb3ec1 100644 --- a/app/app.iml +++ b/app/app.iml @@ -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" /> @@ -97,4 +98,4 @@ <orderEntry type="library" exported="" name="twitter4j-core-4.0.4" level="project" /> <orderEntry type="library" exported="" name="support-annotations-23.0.0" level="project" /> </component> -</module>
\ No newline at end of file +</module> |