diff options
| -rw-r--r-- | .idea/gradle.xml | 4 | ||||
| -rw-r--r-- | .idea/misc.xml | 3 | ||||
| -rw-r--r-- | SmileEssence.iml | 6 | ||||
| -rw-r--r-- | app/app.iml | 10 | ||||
| -rw-r--r-- | app/build.gradle | 1 |
5 files changed, 12 insertions, 12 deletions
diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 51364be0..6a64918c 100644 --- a/.idea/gradle.xml +++ b/.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.8" /> <option name="modules"> <set> <option value="$PROJECT_DIR$" /> @@ -16,5 +17,4 @@ </GradleProjectSettings> </option> </component> -</project> - +</project>
\ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 3e106f31..1b4e3c10 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -4,5 +4,4 @@ <entry_points version="2.0" /> </component> <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK" /> -</project> - +</project>
\ No newline at end of file diff --git a/SmileEssence.iml b/SmileEssence.iml index 6fa66712..49a2a293 100644 --- a/SmileEssence.iml +++ b/SmileEssence.iml @@ -1,9 +1,10 @@ <?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="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4"> +<module external.linked.project.id="SmileEssence" 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> @@ -14,5 +15,4 @@ <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> </component> -</module> - +</module>
\ No newline at end of file diff --git a/app/app.iml b/app/app.iml index 2df7a68a..8f98e9e2 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="SmileEssence" 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="SmileEssence" 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" /> @@ -94,10 +95,9 @@ <orderEntry type="library" exported="" name="ActiveAndroid-3.1" level="project" /> <orderEntry type="library" exported="" name="twitter4j-core-4.0.3" level="project" /> <orderEntry type="library" exported="" name="crouton-1.8.5" level="project" /> - <orderEntry type="library" exported="" name="snakeyaml-1.12" level="project" /> <orderEntry type="library" exported="" name="support-v13-18.0.0" level="project" /> + <orderEntry type="library" exported="" name="snakeyaml-1.12" level="project" /> <orderEntry type="library" exported="" name="guava-18.0" level="project" /> <orderEntry type="library" exported="" name="modules/volley-unspecified" level="project" /> </component> -</module> - +</module>
\ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index eae64197..412d1bd0 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -27,6 +27,7 @@ android { defaultConfig { applicationId "net.lacolaco.smileessence" minSdkVersion 17 + maxSdkVersion 19 targetSdkVersion 19 versionCode 25 versionName "1.0.11.1" |