Nextrek
Diff Revisions
314
vs
366
for /Android/SmartCharging/SmartCharging/app/app.iml
|
@@ -12,10 +12,12 @@ |
12 |
12 |
|
<option name="SELECTED_TEST_ARTIFACT" value="_android_test_" /> |
13 |
13 |
|
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" /> |
14 |
14 |
|
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" /> |
15 |
|
- |
<option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" /> |
16 |
15 |
|
<option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugAndroidTest" /> |
17 |
16 |
|
<option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugAndroidTestSources" /> |
18 |
|
- |
<option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugAndroidTestSources" /> |
|
17 |
+ |
<afterSyncTasks> |
|
18 |
+ |
<task>generateDebugAndroidTestSources</task> |
|
19 |
+ |
<task>generateDebugSources</task> |
|
20 |
+ |
</afterSyncTasks> |
19 |
21 |
|
<option name="ALLOW_USER_CONFIGURATION" value="false" /> |
20 |
22 |
|
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" /> |
21 |
23 |
|
<option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" /> |
|
@@ -24,7 +26,7 @@ |
24 |
26 |
|
</configuration> |
25 |
27 |
|
</facet> |
26 |
28 |
|
</component> |
27 |
|
- |
<component name="NewModuleRootManager" inherit-compiler-output="false"> |
|
29 |
+ |
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false"> |
28 |
30 |
|
<output url="file://$MODULE_DIR$/build/intermediates/classes/debug" /> |
29 |
31 |
|
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/androidTest/debug" /> |
30 |
32 |
|
<exclude-output /> |
|
@@ -120,14 +122,13 @@ |
120 |
122 |
|
<orderEntry type="library" exported="" name="appcompat-v7-22.1.1" level="project" /> |
121 |
123 |
|
<orderEntry type="library" exported="" name="play-services-location-7.3.0" level="project" /> |
122 |
124 |
|
<orderEntry type="library" exported="" name="play-services-ads-7.3.0" level="project" /> |
|
125 |
+ |
<orderEntry type="library" exported="" name="httpclient-android-4.3.5.1" level="project" /> |
123 |
126 |
|
<orderEntry type="library" exported="" name="play-services-7.3.0" level="project" /> |
124 |
127 |
|
<orderEntry type="library" exported="" name="play-services-base-7.3.0" level="project" /> |
125 |
128 |
|
<orderEntry type="library" exported="" name="play-services-safetynet-7.3.0" level="project" /> |
126 |
129 |
|
<orderEntry type="library" exported="" name="play-services-appinvite-7.3.0" level="project" /> |
127 |
130 |
|
<orderEntry type="library" exported="" name="play-services-gcm-7.3.0" level="project" /> |
128 |
|
- |
<orderEntry type="library" exported="" name="httpmime-4.3.5" level="project" /> |
129 |
131 |
|
<orderEntry type="library" exported="" name="play-services-nearby-7.3.0" level="project" /> |
130 |
|
- |
<orderEntry type="library" exported="" name="httpclient-4.5" level="project" /> |
131 |
132 |
|
<orderEntry type="library" exported="" name="support-v4-22.1.1" level="project" /> |
132 |
133 |
|
<orderEntry type="library" exported="" name="play-services-fitness-7.3.0" level="project" /> |
133 |
134 |
|
<orderEntry type="library" exported="" name="play-services-plus-7.3.0" level="project" /> |
|
@@ -135,5 +136,6 @@ |
135 |
136 |
|
<orderEntry type="library" exported="" name="play-services-appstate-7.3.0" level="project" /> |
136 |
137 |
|
<orderEntry type="library" exported="" name="play-services-games-7.3.0" level="project" /> |
137 |
138 |
|
<orderEntry type="library" exported="" name="play-services-identity-7.3.0" level="project" /> |
|
139 |
+ |
<orderEntry type="library" exported="" name="httpmime-4.3.6" level="project" /> |
138 |
140 |
|
</component> |
139 |
141 |
|
</module> |