Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
a01d9c3a8c
@ -62,125 +62,153 @@
|
|||||||
</indentOptions>
|
</indentOptions>
|
||||||
<arrangement>
|
<arrangement>
|
||||||
<rules>
|
<rules>
|
||||||
<rule>
|
<section>
|
||||||
<match>
|
<rule>
|
||||||
<AND>
|
<match>
|
||||||
<NAME>xmlns:android</NAME>
|
<AND>
|
||||||
<XML_NAMESPACE>Namespace:</XML_NAMESPACE>
|
<NAME>xmlns:android</NAME>
|
||||||
</AND>
|
<XML_NAMESPACE>Namespace:</XML_NAMESPACE>
|
||||||
</match>
|
</AND>
|
||||||
</rule>
|
</match>
|
||||||
<rule>
|
</rule>
|
||||||
<match>
|
</section>
|
||||||
<AND>
|
<section>
|
||||||
<NAME>xmlns:.*</NAME>
|
<rule>
|
||||||
<XML_NAMESPACE>Namespace:</XML_NAMESPACE>
|
<match>
|
||||||
</AND>
|
<AND>
|
||||||
</match>
|
<NAME>xmlns:.*</NAME>
|
||||||
<order>BY_NAME</order>
|
<XML_NAMESPACE>Namespace:</XML_NAMESPACE>
|
||||||
</rule>
|
</AND>
|
||||||
<rule>
|
</match>
|
||||||
<match>
|
<order>BY_NAME</order>
|
||||||
<AND>
|
</rule>
|
||||||
<NAME>.*:id</NAME>
|
</section>
|
||||||
<XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
|
<section>
|
||||||
</AND>
|
<rule>
|
||||||
</match>
|
<match>
|
||||||
</rule>
|
<AND>
|
||||||
<rule>
|
<NAME>.*:id</NAME>
|
||||||
<match>
|
<XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
|
||||||
<AND>
|
</AND>
|
||||||
<NAME>.*:name</NAME>
|
</match>
|
||||||
<XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
|
</rule>
|
||||||
</AND>
|
</section>
|
||||||
</match>
|
<section>
|
||||||
</rule>
|
<rule>
|
||||||
<rule>
|
<match>
|
||||||
<match>
|
<AND>
|
||||||
<AND>
|
<NAME>.*:name</NAME>
|
||||||
<NAME>name</NAME>
|
<XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
|
||||||
<XML_NAMESPACE>^$</XML_NAMESPACE>
|
</AND>
|
||||||
</AND>
|
</match>
|
||||||
</match>
|
</rule>
|
||||||
</rule>
|
</section>
|
||||||
<rule>
|
<section>
|
||||||
<match>
|
<rule>
|
||||||
<AND>
|
<match>
|
||||||
<NAME>style</NAME>
|
<AND>
|
||||||
<XML_NAMESPACE>^$</XML_NAMESPACE>
|
<NAME>name</NAME>
|
||||||
</AND>
|
<XML_NAMESPACE>^$</XML_NAMESPACE>
|
||||||
</match>
|
</AND>
|
||||||
</rule>
|
</match>
|
||||||
<rule>
|
</rule>
|
||||||
<match>
|
</section>
|
||||||
<AND>
|
<section>
|
||||||
<NAME>.*</NAME>
|
<rule>
|
||||||
<XML_NAMESPACE>^$</XML_NAMESPACE>
|
<match>
|
||||||
</AND>
|
<AND>
|
||||||
</match>
|
<NAME>style</NAME>
|
||||||
<order>BY_NAME</order>
|
<XML_NAMESPACE>^$</XML_NAMESPACE>
|
||||||
</rule>
|
</AND>
|
||||||
<rule>
|
</match>
|
||||||
<match>
|
</rule>
|
||||||
<AND>
|
</section>
|
||||||
<NAME>.*:layout_width</NAME>
|
<section>
|
||||||
<XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
|
<rule>
|
||||||
</AND>
|
<match>
|
||||||
</match>
|
<AND>
|
||||||
</rule>
|
<NAME>.*</NAME>
|
||||||
<rule>
|
<XML_NAMESPACE>^$</XML_NAMESPACE>
|
||||||
<match>
|
</AND>
|
||||||
<AND>
|
</match>
|
||||||
<NAME>.*:layout_height</NAME>
|
<order>BY_NAME</order>
|
||||||
<XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
|
</rule>
|
||||||
</AND>
|
</section>
|
||||||
</match>
|
<section>
|
||||||
</rule>
|
<rule>
|
||||||
<rule>
|
<match>
|
||||||
<match>
|
<AND>
|
||||||
<AND>
|
<NAME>.*:layout_width</NAME>
|
||||||
<NAME>.*:layout_.*</NAME>
|
<XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
|
||||||
<XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
|
</AND>
|
||||||
</AND>
|
</match>
|
||||||
</match>
|
</rule>
|
||||||
<order>BY_NAME</order>
|
</section>
|
||||||
</rule>
|
<section>
|
||||||
<rule>
|
<rule>
|
||||||
<match>
|
<match>
|
||||||
<AND>
|
<AND>
|
||||||
<NAME>.*:width</NAME>
|
<NAME>.*:layout_height</NAME>
|
||||||
<XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
|
<XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
|
||||||
</AND>
|
</AND>
|
||||||
</match>
|
</match>
|
||||||
<order>BY_NAME</order>
|
</rule>
|
||||||
</rule>
|
</section>
|
||||||
<rule>
|
<section>
|
||||||
<match>
|
<rule>
|
||||||
<AND>
|
<match>
|
||||||
<NAME>.*:height</NAME>
|
<AND>
|
||||||
<XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
|
<NAME>.*:layout_.*</NAME>
|
||||||
</AND>
|
<XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
|
||||||
</match>
|
</AND>
|
||||||
<order>BY_NAME</order>
|
</match>
|
||||||
</rule>
|
<order>BY_NAME</order>
|
||||||
<rule>
|
</rule>
|
||||||
<match>
|
</section>
|
||||||
<AND>
|
<section>
|
||||||
<NAME>.*</NAME>
|
<rule>
|
||||||
<XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
|
<match>
|
||||||
</AND>
|
<AND>
|
||||||
</match>
|
<NAME>.*:width</NAME>
|
||||||
<order>BY_NAME</order>
|
<XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
|
||||||
</rule>
|
</AND>
|
||||||
<rule>
|
</match>
|
||||||
<match>
|
<order>BY_NAME</order>
|
||||||
<AND>
|
</rule>
|
||||||
<NAME>.*</NAME>
|
</section>
|
||||||
<XML_NAMESPACE>.*</XML_NAMESPACE>
|
<section>
|
||||||
</AND>
|
<rule>
|
||||||
</match>
|
<match>
|
||||||
<order>BY_NAME</order>
|
<AND>
|
||||||
</rule>
|
<NAME>.*:height</NAME>
|
||||||
|
<XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
|
||||||
|
</AND>
|
||||||
|
</match>
|
||||||
|
<order>BY_NAME</order>
|
||||||
|
</rule>
|
||||||
|
</section>
|
||||||
|
<section>
|
||||||
|
<rule>
|
||||||
|
<match>
|
||||||
|
<AND>
|
||||||
|
<NAME>.*</NAME>
|
||||||
|
<XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
|
||||||
|
</AND>
|
||||||
|
</match>
|
||||||
|
<order>BY_NAME</order>
|
||||||
|
</rule>
|
||||||
|
</section>
|
||||||
|
<section>
|
||||||
|
<rule>
|
||||||
|
<match>
|
||||||
|
<AND>
|
||||||
|
<NAME>.*</NAME>
|
||||||
|
<XML_NAMESPACE>.*</XML_NAMESPACE>
|
||||||
|
</AND>
|
||||||
|
</match>
|
||||||
|
<order>BY_NAME</order>
|
||||||
|
</rule>
|
||||||
|
</section>
|
||||||
</rules>
|
</rules>
|
||||||
</arrangement>
|
</arrangement>
|
||||||
</codeStyleSettings>
|
</codeStyleSettings>
|
||||||
@ -188,5 +216,4 @@
|
|||||||
</option>
|
</option>
|
||||||
<option name="USE_PER_PROJECT_SETTINGS" value="true" />
|
<option name="USE_PER_PROJECT_SETTINGS" value="true" />
|
||||||
</component>
|
</component>
|
||||||
</project>
|
</project>
|
||||||
|
|
@ -7,6 +7,7 @@
|
|||||||
<option name="distributionType" value="DEFAULT_WRAPPED" />
|
<option name="distributionType" value="DEFAULT_WRAPPED" />
|
||||||
<option name="externalProjectPath" value="$PROJECT_DIR$" />
|
<option name="externalProjectPath" value="$PROJECT_DIR$" />
|
||||||
<option name="gradleHome" value="/opt/gradle" />
|
<option name="gradleHome" value="/opt/gradle" />
|
||||||
|
<option name="gradleJvm" value="1.7" />
|
||||||
<option name="modules">
|
<option name="modules">
|
||||||
<set>
|
<set>
|
||||||
<option value="$PROJECT_DIR$" />
|
<option value="$PROJECT_DIR$" />
|
||||||
@ -18,5 +19,4 @@
|
|||||||
</GradleProjectSettings>
|
</GradleProjectSettings>
|
||||||
</option>
|
</option>
|
||||||
</component>
|
</component>
|
||||||
</project>
|
</project>
|
||||||
|
|
104
.idea/misc.xml
104
.idea/misc.xml
@ -1,8 +1,5 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<project version="4">
|
<project version="4">
|
||||||
<component name="DaemonCodeAnalyzer">
|
|
||||||
<disable_hints />
|
|
||||||
</component>
|
|
||||||
<component name="EntryPointsManager">
|
<component name="EntryPointsManager">
|
||||||
<entry_points version="2.0" />
|
<entry_points version="2.0" />
|
||||||
</component>
|
</component>
|
||||||
@ -43,104 +40,6 @@
|
|||||||
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" assert-keyword="true" jdk-15="true" project-jdk-name="1.7" project-jdk-type="JavaSDK">
|
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" assert-keyword="true" jdk-15="true" project-jdk-name="1.7" project-jdk-type="JavaSDK">
|
||||||
<output url="file://$PROJECT_DIR$/build/classes" />
|
<output url="file://$PROJECT_DIR$/build/classes" />
|
||||||
</component>
|
</component>
|
||||||
<component name="RunManager">
|
|
||||||
<configuration default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
|
|
||||||
<module name="" />
|
|
||||||
<option name="VM_PARAMETERS" value="-Xmx512m -Xms256m -XX:MaxPermSize=250m -ea" />
|
|
||||||
<option name="PROGRAM_PARAMETERS" />
|
|
||||||
<method />
|
|
||||||
</configuration>
|
|
||||||
<configuration default="true" type="Remote" factoryName="Remote">
|
|
||||||
<option name="USE_SOCKET_TRANSPORT" value="true" />
|
|
||||||
<option name="SERVER_MODE" value="false" />
|
|
||||||
<option name="SHMEM_ADDRESS" value="javadebug" />
|
|
||||||
<option name="HOST" value="localhost" />
|
|
||||||
<option name="PORT" value="5005" />
|
|
||||||
<method />
|
|
||||||
</configuration>
|
|
||||||
<configuration default="true" type="Applet" factoryName="Applet">
|
|
||||||
<module name="" />
|
|
||||||
<option name="MAIN_CLASS_NAME" />
|
|
||||||
<option name="HTML_FILE_NAME" />
|
|
||||||
<option name="HTML_USED" value="false" />
|
|
||||||
<option name="WIDTH" value="400" />
|
|
||||||
<option name="HEIGHT" value="300" />
|
|
||||||
<option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
|
|
||||||
<option name="VM_PARAMETERS" />
|
|
||||||
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
|
|
||||||
<option name="ALTERNATIVE_JRE_PATH" />
|
|
||||||
<method />
|
|
||||||
</configuration>
|
|
||||||
<configuration default="true" type="TestNG" factoryName="TestNG">
|
|
||||||
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
|
|
||||||
<module name="" />
|
|
||||||
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
|
|
||||||
<option name="ALTERNATIVE_JRE_PATH" />
|
|
||||||
<option name="SUITE_NAME" />
|
|
||||||
<option name="PACKAGE_NAME" />
|
|
||||||
<option name="MAIN_CLASS_NAME" />
|
|
||||||
<option name="METHOD_NAME" />
|
|
||||||
<option name="GROUP_NAME" />
|
|
||||||
<option name="TEST_OBJECT" value="CLASS" />
|
|
||||||
<option name="VM_PARAMETERS" value="-ea" />
|
|
||||||
<option name="PARAMETERS" />
|
|
||||||
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
|
|
||||||
<option name="OUTPUT_DIRECTORY" />
|
|
||||||
<option name="ANNOTATION_TYPE" />
|
|
||||||
<option name="ENV_VARIABLES" />
|
|
||||||
<option name="PASS_PARENT_ENVS" value="true" />
|
|
||||||
<option name="TEST_SEARCH_SCOPE">
|
|
||||||
<value defaultName="moduleWithDependencies" />
|
|
||||||
</option>
|
|
||||||
<option name="USE_DEFAULT_REPORTERS" value="false" />
|
|
||||||
<option name="PROPERTIES_FILE" />
|
|
||||||
<envs />
|
|
||||||
<properties />
|
|
||||||
<listeners />
|
|
||||||
<method />
|
|
||||||
</configuration>
|
|
||||||
<configuration default="true" type="Application" factoryName="Application">
|
|
||||||
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
|
|
||||||
<option name="MAIN_CLASS_NAME" />
|
|
||||||
<option name="VM_PARAMETERS" />
|
|
||||||
<option name="PROGRAM_PARAMETERS" />
|
|
||||||
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
|
|
||||||
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
|
|
||||||
<option name="ALTERNATIVE_JRE_PATH" />
|
|
||||||
<option name="ENABLE_SWING_INSPECTOR" value="false" />
|
|
||||||
<option name="ENV_VARIABLES" />
|
|
||||||
<option name="PASS_PARENT_ENVS" value="true" />
|
|
||||||
<module name="" />
|
|
||||||
<envs />
|
|
||||||
<method />
|
|
||||||
</configuration>
|
|
||||||
<configuration default="true" type="JUnit" factoryName="JUnit">
|
|
||||||
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
|
|
||||||
<module name="" />
|
|
||||||
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
|
|
||||||
<option name="ALTERNATIVE_JRE_PATH" />
|
|
||||||
<option name="PACKAGE_NAME" />
|
|
||||||
<option name="MAIN_CLASS_NAME" />
|
|
||||||
<option name="METHOD_NAME" />
|
|
||||||
<option name="TEST_OBJECT" value="class" />
|
|
||||||
<option name="VM_PARAMETERS" value="-ea" />
|
|
||||||
<option name="PARAMETERS" />
|
|
||||||
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
|
|
||||||
<option name="ENV_VARIABLES" />
|
|
||||||
<option name="PASS_PARENT_ENVS" value="true" />
|
|
||||||
<option name="TEST_SEARCH_SCOPE">
|
|
||||||
<value defaultName="moduleWithDependencies" />
|
|
||||||
</option>
|
|
||||||
<envs />
|
|
||||||
<patterns />
|
|
||||||
<method />
|
|
||||||
</configuration>
|
|
||||||
<list size="0" />
|
|
||||||
<configuration name="<template>" type="WebApp" default="true" selected="false">
|
|
||||||
<Host>localhost</Host>
|
|
||||||
<Port>5050</Port>
|
|
||||||
</configuration>
|
|
||||||
</component>
|
|
||||||
<component name="masterDetails">
|
<component name="masterDetails">
|
||||||
<states>
|
<states>
|
||||||
<state key="ProjectJDKs.UI">
|
<state key="ProjectJDKs.UI">
|
||||||
@ -157,5 +56,4 @@
|
|||||||
</state>
|
</state>
|
||||||
</states>
|
</states>
|
||||||
</component>
|
</component>
|
||||||
</project>
|
</project>
|
||||||
|
|
@ -17,6 +17,10 @@
|
|||||||
<option name="CLEAR_LOGCAT" value="false" />
|
<option name="CLEAR_LOGCAT" value="false" />
|
||||||
<option name="SHOW_LOGCAT_AUTOMATICALLY" value="true" />
|
<option name="SHOW_LOGCAT_AUTOMATICALLY" value="true" />
|
||||||
<option name="FILTER_LOGCAT_AUTOMATICALLY" value="true" />
|
<option name="FILTER_LOGCAT_AUTOMATICALLY" value="true" />
|
||||||
|
<option name="SELECTED_MATRIX_CONFIGURATION_ID" value="0" />
|
||||||
|
<option name="SELECTED_CLOUD_PROJECT_ID" value="" />
|
||||||
|
<option name="IS_VALID_CLOUD_SELECTION" value="false" />
|
||||||
|
<option name="INVALID_CLOUD_SELECTION_ERROR" value="" />
|
||||||
<RunnerSettings RunnerId="AndroidDebugRunner" />
|
<RunnerSettings RunnerId="AndroidDebugRunner" />
|
||||||
<ConfigurationWrapper RunnerId="AndroidDebugRunner" />
|
<ConfigurationWrapper RunnerId="AndroidDebugRunner" />
|
||||||
<method />
|
<method />
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?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="calculatorpp" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
|
<module external.linked.project.id=":android-app-tests" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="calculatorpp" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
|
||||||
<component name="FacetManager">
|
<component name="FacetManager">
|
||||||
<facet type="android-gradle" name="Android-Gradle">
|
<facet type="android-gradle" name="Android-Gradle">
|
||||||
<configuration>
|
<configuration>
|
||||||
@ -8,7 +8,8 @@
|
|||||||
</facet>
|
</facet>
|
||||||
<facet type="java-gradle" name="Java-Gradle">
|
<facet type="java-gradle" name="Java-Gradle">
|
||||||
<configuration>
|
<configuration>
|
||||||
<option name="BUILD_FOLDER_PATH" />
|
<option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/build" />
|
||||||
|
<option name="BUILDABLE" value="true" />
|
||||||
</configuration>
|
</configuration>
|
||||||
</facet>
|
</facet>
|
||||||
</component>
|
</component>
|
||||||
@ -31,8 +32,8 @@
|
|||||||
<orderEntry type="library" exported="" scope="TEST" name="robolectric-2.3" level="project" />
|
<orderEntry type="library" exported="" scope="TEST" name="robolectric-2.3" level="project" />
|
||||||
<orderEntry type="library" exported="" scope="TEST" name="mockito-all-1.9.5" level="project" />
|
<orderEntry type="library" exported="" scope="TEST" name="mockito-all-1.9.5" level="project" />
|
||||||
<orderEntry type="library" exported="" scope="TEST" name="jsonassert-1.2.3" level="project" />
|
<orderEntry type="library" exported="" scope="TEST" name="jsonassert-1.2.3" level="project" />
|
||||||
<orderEntry type="library" exported="" scope="TEST" name="support-v4-21.0.3" level="project" />
|
<orderEntry type="library" exported="" scope="TEST" name="support-v4-22.1.1" level="project" />
|
||||||
<orderEntry type="library" exported="" scope="TEST" name="appcompat-v7-21.0.3" level="project" />
|
<orderEntry type="library" exported="" scope="TEST" name="appcompat-v7-22.1.1" level="project" />
|
||||||
<orderEntry type="library" exported="" scope="TEST" name="hamcrest-core-1.3" level="project" />
|
<orderEntry type="library" exported="" scope="TEST" name="hamcrest-core-1.3" level="project" />
|
||||||
<orderEntry type="library" exported="" scope="TEST" name="objenesis-1.3" level="project" />
|
<orderEntry type="library" exported="" scope="TEST" name="objenesis-1.3" level="project" />
|
||||||
<orderEntry type="library" exported="" scope="TEST" name="sqlite4java-0.282" level="project" />
|
<orderEntry type="library" exported="" scope="TEST" name="sqlite4java-0.282" level="project" />
|
||||||
@ -72,40 +73,44 @@
|
|||||||
<orderEntry type="library" exported="" scope="TEST" name="wagon-http-shared-1.0-beta-6" level="project" />
|
<orderEntry type="library" exported="" scope="TEST" name="wagon-http-shared-1.0-beta-6" level="project" />
|
||||||
<orderEntry type="library" exported="" scope="TEST" name="xercesMinimal-1.9.6.2" level="project" />
|
<orderEntry type="library" exported="" scope="TEST" name="xercesMinimal-1.9.6.2" level="project" />
|
||||||
<orderEntry type="library" exported="" scope="TEST" name="nekohtml-1.9.6.2" level="project" />
|
<orderEntry type="library" exported="" scope="TEST" name="nekohtml-1.9.6.2" level="project" />
|
||||||
<orderEntry type="library" exported="" scope="TEST" name="support-annotations-21.0.3" level="project" />
|
<orderEntry type="library" exported="" scope="TEST" name="support-annotations-22.1.1" level="project" />
|
||||||
<orderEntry type="library" exported="" scope="TEST" name="jscl-1.0.11" level="project" />
|
|
||||||
<orderEntry type="library" exported="" scope="TEST" name="simple-xml-2.6.1" level="project" />
|
<orderEntry type="library" exported="" scope="TEST" name="simple-xml-2.6.1" level="project" />
|
||||||
<orderEntry type="library" exported="" scope="TEST" name="classes" level="project" />
|
<orderEntry type="library" exported="" scope="TEST" name="classes" level="project" />
|
||||||
|
<orderEntry type="library" exported="" scope="TEST" name="support-annotations-22.1.1" level="project" />
|
||||||
|
<orderEntry type="library" exported="" scope="TEST" name="classes" level="project" />
|
||||||
|
<orderEntry type="library" exported="" scope="TEST" name="core" level="project" />
|
||||||
<orderEntry type="library" exported="" scope="TEST" name="commons-cli-1.2" level="project" />
|
<orderEntry type="library" exported="" scope="TEST" name="commons-cli-1.2" level="project" />
|
||||||
<orderEntry type="library" exported="" scope="TEST" name="annotations-2.0.1" level="project" />
|
<orderEntry type="library" exported="" scope="TEST" name="annotations-2.0.1" level="project" />
|
||||||
<orderEntry type="library" exported="" scope="TEST" name="classes" level="project" />
|
<orderEntry type="library" exported="" scope="TEST" name="classes" level="project" />
|
||||||
<orderEntry type="library" exported="" scope="TEST" name="core" level="project" />
|
|
||||||
<orderEntry type="library" exported="" scope="TEST" name="internal_impl-21.0.3" level="project" />
|
|
||||||
<orderEntry type="library" exported="" scope="TEST" name="classes" level="project" />
|
|
||||||
<orderEntry type="library" exported="" scope="TEST" name="classes" level="project" />
|
<orderEntry type="library" exported="" scope="TEST" name="classes" level="project" />
|
||||||
|
<orderEntry type="library" exported="" scope="TEST" name="internal_impl-22.1.1" level="project" />
|
||||||
<orderEntry type="library" exported="" scope="TEST" name="stax-1.2.0" level="project" />
|
<orderEntry type="library" exported="" scope="TEST" name="stax-1.2.0" level="project" />
|
||||||
|
<orderEntry type="library" exported="" scope="TEST" name="classes" level="project" />
|
||||||
|
<orderEntry type="library" exported="" scope="TEST" name="leakcanary-watcher-1.3" level="project" />
|
||||||
|
<orderEntry type="library" exported="" scope="TEST" name="classes" level="project" />
|
||||||
|
<orderEntry type="library" exported="" scope="TEST" name="classes" level="project" />
|
||||||
<orderEntry type="library" exported="" scope="TEST" name="common-msg-1.0.5" level="project" />
|
<orderEntry type="library" exported="" scope="TEST" name="common-msg-1.0.5" level="project" />
|
||||||
<orderEntry type="library" exported="" scope="TEST" name="support-annotations-21.0.3" level="project" />
|
|
||||||
<orderEntry type="library" exported="" scope="TEST" name="common-listeners-1.0.7" level="project" />
|
<orderEntry type="library" exported="" scope="TEST" name="common-listeners-1.0.7" level="project" />
|
||||||
|
<orderEntry type="library" exported="" scope="TEST" name="classes" level="project" />
|
||||||
|
<orderEntry type="library" exported="" scope="TEST" name="classes" level="project" />
|
||||||
<orderEntry type="library" exported="" scope="TEST" name="guava-11.0.2" level="project" />
|
<orderEntry type="library" exported="" scope="TEST" name="guava-11.0.2" level="project" />
|
||||||
<orderEntry type="library" exported="" scope="TEST" name="library-2.4.0" level="project" />
|
<orderEntry type="library" exported="" scope="TEST" name="classes" level="project" />
|
||||||
<orderEntry type="library" exported="" scope="TEST" name="common-text-1.0.7" level="project" />
|
<orderEntry type="library" exported="" scope="TEST" name="common-text-1.0.7" level="project" />
|
||||||
|
<orderEntry type="library" exported="" scope="TEST" name="library-2.4.0" level="project" />
|
||||||
|
<orderEntry type="library" exported="" scope="TEST" name="classes" level="project" />
|
||||||
<orderEntry type="library" exported="" scope="TEST" name="acra-4.5.0" level="project" />
|
<orderEntry type="library" exported="" scope="TEST" name="acra-4.5.0" level="project" />
|
||||||
<orderEntry type="library" exported="" scope="TEST" name="classes" level="project" />
|
<orderEntry type="library" exported="" scope="TEST" name="classes" level="project" />
|
||||||
|
<orderEntry type="library" exported="" scope="TEST" name="classes" level="project" />
|
||||||
<orderEntry type="library" exported="" scope="TEST" name="common-core-1.0.7" level="project" />
|
<orderEntry type="library" exported="" scope="TEST" name="common-core-1.0.7" level="project" />
|
||||||
<orderEntry type="library" exported="" scope="TEST" name="classes" level="project" />
|
<orderEntry type="library" exported="" scope="TEST" name="classes" level="project" />
|
||||||
<orderEntry type="library" exported="" scope="TEST" name="classes" level="project" />
|
<orderEntry type="library" exported="" scope="TEST" name="haha-1.1" level="project" />
|
||||||
<orderEntry type="library" exported="" scope="TEST" name="classes" level="project" />
|
|
||||||
<orderEntry type="library" exported="" scope="TEST" name="classes" level="project" />
|
|
||||||
<orderEntry type="library" exported="" scope="TEST" name="common-security-1.0.7" level="project" />
|
<orderEntry type="library" exported="" scope="TEST" name="common-security-1.0.7" level="project" />
|
||||||
|
<orderEntry type="library" exported="" scope="TEST" name="jscl-1.0.11" level="project" />
|
||||||
|
<orderEntry type="library" exported="" scope="TEST" name="leakcanary-analyzer-1.3" level="project" />
|
||||||
<orderEntry type="library" exported="" scope="TEST" name="classes" level="project" />
|
<orderEntry type="library" exported="" scope="TEST" name="classes" level="project" />
|
||||||
<orderEntry type="library" exported="" scope="TEST" name="classes" level="project" />
|
<orderEntry type="library" exported="" scope="TEST" name="classes" level="project" />
|
||||||
<orderEntry type="library" exported="" scope="TEST" name="classes" level="project" />
|
<orderEntry type="library" exported="" scope="TEST" name="_home_serso_projects_java_serso_android_calculatorpp_android_app_build_intermediates_classes_debug" level="project" />
|
||||||
<orderEntry type="library" exported="" scope="TEST" name="classes" level="project" />
|
<orderEntry type="library" exported="" scope="TEST" name="_home_serso_projects_java_serso_android_calculatorpp_android_app_build_intermediates_dependency_cache_debug" level="project" />
|
||||||
<orderEntry type="library" exported="" scope="TEST" name="classes" level="project" />
|
|
||||||
<orderEntry type="library" exported="" scope="TEST" name="_home_serso_projects_java_android_calculatorpp_android_app_build_intermediates_classes_debug" level="project" />
|
|
||||||
<orderEntry type="library" exported="" scope="TEST" name="_home_serso_projects_java_android_calculatorpp_android_app_build_intermediates_dependency_cache_debug" level="project" />
|
|
||||||
<orderEntry type="library" exported="" scope="TEST" name="android" level="project" />
|
<orderEntry type="library" exported="" scope="TEST" name="android" level="project" />
|
||||||
</component>
|
</component>
|
||||||
</module>
|
</module>
|
||||||
|
|
@ -23,19 +23,19 @@
|
|||||||
apply plugin: 'java'
|
apply plugin: 'java'
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
def androidModule = project(':android-app')
|
def app = project(':android-app')
|
||||||
compile androidModule
|
compile app
|
||||||
|
|
||||||
testCompile androidModule.android.applicationVariants.toList().first().javaCompile.classpath
|
testCompile app.android.applicationVariants.toList().first().javaCompile.classpath
|
||||||
testCompile androidModule.android.applicationVariants.toList().first().javaCompile.outputs.files
|
testCompile app.android.applicationVariants.toList().first().javaCompile.outputs.files
|
||||||
testCompile files(androidModule.plugins.findPlugin("com.android.application").getBootClasspath())
|
testCompile files(app.android.bootClasspath)
|
||||||
|
|
||||||
testCompile 'junit:junit:4.11'
|
testCompile 'junit:junit:4.11'
|
||||||
testCompile 'org.robolectric:robolectric:2.3'
|
testCompile 'org.robolectric:robolectric:2.3'
|
||||||
testCompile 'org.mockito:mockito-all:1.9.5'
|
testCompile 'org.mockito:mockito-all:1.9.5'
|
||||||
testCompile 'org.skyscreamer:jsonassert:1.2.3'
|
testCompile 'org.skyscreamer:jsonassert:1.2.3'
|
||||||
testCompile 'com.android.support:support-v4:21.0.3'
|
testCompile 'com.android.support:support-v4:22.1.1'
|
||||||
testCompile 'com.android.support:appcompat-v7:21.0.3'
|
testCompile 'com.android.support:appcompat-v7:22.1.1'
|
||||||
}
|
}
|
||||||
|
|
||||||
tasks.withType(Test) {
|
tasks.withType(Test) {
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?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="org.solovyev.android" external.system.module.version="2.1.3" type="JAVA_MODULE" version="4">
|
<module external.linked.project.id=":android-app" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="org.solovyev.android" external.system.module.version="2.1.3" type="JAVA_MODULE" version="4">
|
||||||
<component name="FacetManager">
|
<component name="FacetManager">
|
||||||
<facet type="android-gradle" name="Android-Gradle">
|
<facet type="android-gradle" name="Android-Gradle">
|
||||||
<configuration>
|
<configuration>
|
||||||
@ -12,9 +12,10 @@
|
|||||||
<option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
|
<option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
|
||||||
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
|
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
|
||||||
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
|
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
|
||||||
<option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugTest" />
|
|
||||||
<option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
|
<option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
|
||||||
<option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugTestSources" />
|
<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="ALLOW_USER_CONFIGURATION" value="false" />
|
||||||
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
|
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
|
||||||
<option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
|
<option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
|
||||||
@ -25,7 +26,7 @@
|
|||||||
</component>
|
</component>
|
||||||
<component name="NewModuleRootManager" inherit-compiler-output="false">
|
<component name="NewModuleRootManager" inherit-compiler-output="false">
|
||||||
<output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
|
<output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
|
||||||
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
|
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/androidTest/debug" />
|
||||||
<exclude-output />
|
<exclude-output />
|
||||||
<content url="file://$MODULE_DIR$">
|
<content url="file://$MODULE_DIR$">
|
||||||
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
|
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
|
||||||
@ -34,12 +35,12 @@
|
|||||||
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
|
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
|
||||||
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
|
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
|
||||||
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/debug" type="java-resource" />
|
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/debug" type="java-resource" />
|
||||||
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/test/debug" isTestSource="true" generated="true" />
|
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
|
||||||
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/test/debug" isTestSource="true" generated="true" />
|
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
|
||||||
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/test/debug" isTestSource="true" generated="true" />
|
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
|
||||||
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/test/debug" isTestSource="true" generated="true" />
|
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
|
||||||
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/test/debug" type="java-test-resource" />
|
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
|
||||||
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/test/debug" type="java-test-resource" />
|
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/androidTest/debug" type="java-test-resource" />
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
|
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
|
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
|
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
|
||||||
@ -68,6 +69,22 @@
|
|||||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
|
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
|
||||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
|
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
|
||||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
|
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
|
||||||
|
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/22.1.1/jars" />
|
||||||
|
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/recyclerview-v7/21.0.0/jars" />
|
||||||
|
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/22.1.1/jars" />
|
||||||
|
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-ads/7.3.0/jars" />
|
||||||
|
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-analytics/7.3.0/jars" />
|
||||||
|
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-base/7.3.0/jars" />
|
||||||
|
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.melnykov/floatingactionbutton/1.1.0/jars" />
|
||||||
|
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.squareup.leakcanary/leakcanary-android/1.3/jars" />
|
||||||
|
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/org.solovyev.android/android-common-core/1.1.18/jars" />
|
||||||
|
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/org.solovyev.android/android-common-lists/1.1.18/jars" />
|
||||||
|
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/org.solovyev.android/android-common-menus/1.1.18/jars" />
|
||||||
|
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/org.solovyev.android/android-common-other/1.1.18/jars" />
|
||||||
|
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/org.solovyev.android/android-common-preferences/1.1.18/jars" />
|
||||||
|
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/org.solovyev.android/android-common-views/1.1.18/jars" />
|
||||||
|
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/org.solovyev.android/checkout/0.7.2/jars" />
|
||||||
|
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/org.solovyev.android/material/0.1.2/jars" />
|
||||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
|
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
|
||||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
|
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
|
||||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
|
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
|
||||||
@ -80,42 +97,44 @@
|
|||||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
|
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
|
||||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
|
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
|
||||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
|
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
|
||||||
<excludeFolder url="file://$MODULE_DIR$/build/libs" />
|
|
||||||
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
|
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
|
||||||
<excludeFolder url="file://$MODULE_DIR$/build/poms" />
|
|
||||||
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
|
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
|
||||||
</content>
|
</content>
|
||||||
<orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
|
<orderEntry type="jdk" jdkName="Android API 22 Platform" jdkType="Android SDK" />
|
||||||
<orderEntry type="sourceFolder" forTests="false" />
|
<orderEntry type="sourceFolder" forTests="false" />
|
||||||
<orderEntry type="library" exported="" name="support-v4-21.0.3" level="project" />
|
<orderEntry type="library" exported="" name="leakcanary-watcher-1.3" level="project" />
|
||||||
<orderEntry type="library" exported="" name="play-services-ads-6.5.87" level="project" />
|
|
||||||
<orderEntry type="library" exported="" name="acra-4.5.0" level="project" />
|
<orderEntry type="library" exported="" name="acra-4.5.0" level="project" />
|
||||||
<orderEntry type="library" exported="" name="annotations-2.0.1" level="project" />
|
<orderEntry type="library" exported="" name="annotations-2.0.1" level="project" />
|
||||||
|
<orderEntry type="library" exported="" name="play-services-ads-7.3.0" level="project" />
|
||||||
<orderEntry type="library" exported="" name="common-core-1.0.7" level="project" />
|
<orderEntry type="library" exported="" name="common-core-1.0.7" level="project" />
|
||||||
<orderEntry type="library" exported="" name="common-listeners-1.0.7" level="project" />
|
<orderEntry type="library" exported="" name="common-listeners-1.0.7" level="project" />
|
||||||
<orderEntry type="library" exported="" name="appcompat-v7-21.0.3" level="project" />
|
|
||||||
<orderEntry type="library" exported="" name="common-text-1.0.7" level="project" />
|
<orderEntry type="library" exported="" name="common-text-1.0.7" level="project" />
|
||||||
<orderEntry type="library" exported="" name="android-common-views-1.1.18" level="project" />
|
<orderEntry type="library" exported="" name="android-common-views-1.1.18" level="project" />
|
||||||
<orderEntry type="library" exported="" name="stax-1.2.0" level="project" />
|
<orderEntry type="library" exported="" name="stax-1.2.0" level="project" />
|
||||||
<orderEntry type="library" exported="" name="jscl-1.0.11" level="project" />
|
<orderEntry type="library" exported="" name="jscl-1.0.11" level="project" />
|
||||||
<orderEntry type="library" exported="" name="library-2.4.0" level="project" />
|
<orderEntry type="library" exported="" name="library-2.4.0" level="project" />
|
||||||
|
<orderEntry type="library" exported="" name="leakcanary-analyzer-1.3" level="project" />
|
||||||
|
<orderEntry type="library" exported="" name="play-services-base-7.3.0" level="project" />
|
||||||
<orderEntry type="library" exported="" name="material-0.1.2" level="project" />
|
<orderEntry type="library" exported="" name="material-0.1.2" level="project" />
|
||||||
<orderEntry type="library" exported="" name="android-common-menus-1.1.18" level="project" />
|
<orderEntry type="library" exported="" name="android-common-menus-1.1.18" level="project" />
|
||||||
<orderEntry type="library" exported="" name="recyclerview-v7-21.0.0" level="project" />
|
<orderEntry type="library" exported="" name="recyclerview-v7-21.0.0" level="project" />
|
||||||
|
<orderEntry type="library" exported="" name="leakcanary-android-1.3" level="project" />
|
||||||
<orderEntry type="library" exported="" name="common-security-1.0.7" level="project" />
|
<orderEntry type="library" exported="" name="common-security-1.0.7" level="project" />
|
||||||
<orderEntry type="library" exported="" name="play-services-base-6.5.87" level="project" />
|
<orderEntry type="library" exported="" name="play-services-analytics-7.3.0" level="project" />
|
||||||
|
<orderEntry type="library" exported="" name="support-annotations-22.1.1" level="project" />
|
||||||
|
<orderEntry type="library" exported="" name="haha-1.1" level="project" />
|
||||||
<orderEntry type="library" exported="" name="android-common-core-1.1.18" level="project" />
|
<orderEntry type="library" exported="" name="android-common-core-1.1.18" level="project" />
|
||||||
|
<orderEntry type="library" exported="" name="appcompat-v7-22.1.1" level="project" />
|
||||||
<orderEntry type="library" exported="" name="common-msg-1.0.5" level="project" />
|
<orderEntry type="library" exported="" name="common-msg-1.0.5" level="project" />
|
||||||
<orderEntry type="library" exported="" name="android-common-other-1.1.18" level="project" />
|
<orderEntry type="library" exported="" name="android-common-other-1.1.18" level="project" />
|
||||||
<orderEntry type="library" exported="" name="floatingactionbutton-1.1.0" level="project" />
|
<orderEntry type="library" exported="" name="floatingactionbutton-1.1.0" level="project" />
|
||||||
<orderEntry type="library" exported="" name="android-common-preferences-1.1.18" level="project" />
|
|
||||||
<orderEntry type="library" exported="" name="checkout-0.7.2" level="project" />
|
<orderEntry type="library" exported="" name="checkout-0.7.2" level="project" />
|
||||||
<orderEntry type="library" exported="" name="support-annotations-21.0.3" level="project" />
|
<orderEntry type="library" exported="" name="android-common-preferences-1.1.18" level="project" />
|
||||||
<orderEntry type="library" exported="" name="android-common-lists-1.1.18" level="project" />
|
<orderEntry type="library" exported="" name="android-common-lists-1.1.18" level="project" />
|
||||||
<orderEntry type="library" exported="" name="guava-11.0.2" level="project" />
|
<orderEntry type="library" exported="" name="guava-11.0.2" level="project" />
|
||||||
<orderEntry type="library" exported="" name="commons-cli-1.2" level="project" />
|
<orderEntry type="library" exported="" name="commons-cli-1.2" level="project" />
|
||||||
<orderEntry type="library" exported="" name="simple-xml-2.6.1" level="project" />
|
<orderEntry type="library" exported="" name="simple-xml-2.6.1" level="project" />
|
||||||
|
<orderEntry type="library" exported="" name="support-v4-22.1.1" level="project" />
|
||||||
<orderEntry type="module" module-name="core" exported="" />
|
<orderEntry type="module" module-name="core" exported="" />
|
||||||
</component>
|
</component>
|
||||||
</module>
|
</module>
|
||||||
|
|
@ -56,8 +56,8 @@ dependencies {
|
|||||||
compile 'org.solovyev:common-core:1.0.7'
|
compile 'org.solovyev:common-core:1.0.7'
|
||||||
compile 'org.solovyev:common-text:1.0.7'
|
compile 'org.solovyev:common-text:1.0.7'
|
||||||
compile 'org.solovyev:common-security:1.0.7'
|
compile 'org.solovyev:common-security:1.0.7'
|
||||||
compile 'com.android.support:support-v4:21.0.3'
|
compile 'com.android.support:support-v4:22.1.1'
|
||||||
compile 'com.android.support:appcompat-v7:21.0.3'
|
compile 'com.android.support:appcompat-v7:22.1.1'
|
||||||
compile('ch.acra:acra:4.5.0') {
|
compile('ch.acra:acra:4.5.0') {
|
||||||
exclude group: 'org.json'
|
exclude group: 'org.json'
|
||||||
}
|
}
|
||||||
@ -72,14 +72,18 @@ dependencies {
|
|||||||
}
|
}
|
||||||
compile 'org.solovyev.android:checkout:0.7.2@aar'
|
compile 'org.solovyev.android:checkout:0.7.2@aar'
|
||||||
compile 'org.solovyev.android:material:0.1.2@aar'
|
compile 'org.solovyev.android:material:0.1.2@aar'
|
||||||
compile 'com.google.android.gms:play-services-ads:6.5.87@aar'
|
compile 'com.google.android.gms:play-services-ads:7.3.0@aar'
|
||||||
compile 'com.google.android.gms:play-services-base:6.5.87@aar'
|
compile 'com.google.android.gms:play-services-base:7.3.0@aar'
|
||||||
|
compile 'com.google.android.gms:play-services-analytics:7.3.0@aar'
|
||||||
compile 'com.melnykov:floatingactionbutton:1.1.0'
|
compile 'com.melnykov:floatingactionbutton:1.1.0'
|
||||||
|
|
||||||
|
debugCompile 'com.squareup.leakcanary:leakcanary-android:1.3'
|
||||||
|
releaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.3'
|
||||||
}
|
}
|
||||||
|
|
||||||
task androidJavadocs(type: Javadoc) {
|
task androidJavadocs(type: Javadoc) {
|
||||||
source = android.sourceSets.main.java.srcDirs
|
source = android.sourceSets.main.java.srcDirs
|
||||||
classpath += project.files(android.plugin.getBootClasspath().join(File.pathSeparator))
|
classpath += project.files(android.bootClasspath.join(File.pathSeparator))
|
||||||
configurations.compile.each { File file -> classpath += project.files(file.path) }
|
configurations.compile.each { File file -> classpath += project.files(file.path) }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -29,6 +29,9 @@ import android.graphics.Typeface;
|
|||||||
import android.os.Handler;
|
import android.os.Handler;
|
||||||
import android.preference.PreferenceManager;
|
import android.preference.PreferenceManager;
|
||||||
import android.util.Log;
|
import android.util.Log;
|
||||||
|
|
||||||
|
import com.squareup.leakcanary.LeakCanary;
|
||||||
|
|
||||||
import org.acra.ACRA;
|
import org.acra.ACRA;
|
||||||
import org.acra.ReportingInteractionMode;
|
import org.acra.ReportingInteractionMode;
|
||||||
import org.acra.annotation.ReportsCrashes;
|
import org.acra.annotation.ReportsCrashes;
|
||||||
@ -43,11 +46,12 @@ import org.solovyev.android.calculator.wizard.CalculatorWizards;
|
|||||||
import org.solovyev.android.wizard.Wizards;
|
import org.solovyev.android.wizard.Wizards;
|
||||||
import org.solovyev.common.msg.MessageType;
|
import org.solovyev.common.msg.MessageType;
|
||||||
|
|
||||||
import javax.annotation.Nonnull;
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.concurrent.TimeUnit;
|
import java.util.concurrent.TimeUnit;
|
||||||
|
|
||||||
|
import javax.annotation.Nonnull;
|
||||||
|
|
||||||
@ReportsCrashes(formKey = "",
|
@ReportsCrashes(formKey = "",
|
||||||
formUri = "https://serso.cloudant.com/acra-cpp/_design/acra-storage/_update/report",
|
formUri = "https://serso.cloudant.com/acra-cpp/_design/acra-storage/_update/report",
|
||||||
reportType = org.acra.sender.HttpSender.Type.JSON,
|
reportType = org.acra.sender.HttpSender.Type.JSON,
|
||||||
@ -121,6 +125,8 @@ public class CalculatorApplication extends android.app.Application implements Sh
|
|||||||
public void onCreate() {
|
public void onCreate() {
|
||||||
if (!BuildConfig.DEBUG) {
|
if (!BuildConfig.DEBUG) {
|
||||||
ACRA.init(this);
|
ACRA.init(this);
|
||||||
|
} else {
|
||||||
|
LeakCanary.install(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!App.isInitialized()) {
|
if (!App.isInitialized()) {
|
||||||
|
@ -7,11 +7,11 @@ public String version_name() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public int android_sdk_version() {
|
public int android_sdk_version() {
|
||||||
return 21
|
return 22
|
||||||
}
|
}
|
||||||
|
|
||||||
public String android_build_tools_version() {
|
public String android_build_tools_version() {
|
||||||
return '21.1.2'
|
return '22.0.1'
|
||||||
}
|
}
|
||||||
|
|
||||||
public String android_min_sdk_version() {
|
public String android_min_sdk_version() {
|
||||||
@ -24,7 +24,7 @@ buildscript {
|
|||||||
mavenCentral()
|
mavenCentral()
|
||||||
}
|
}
|
||||||
dependencies {
|
dependencies {
|
||||||
classpath 'com.android.tools.build:gradle:1.0.0'
|
classpath 'com.android.tools.build:gradle:1.2.2'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1,9 +1,10 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?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="calculatorpp" 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">
|
<component name="FacetManager">
|
||||||
<facet type="java-gradle" name="Java-Gradle">
|
<facet type="java-gradle" name="Java-Gradle">
|
||||||
<configuration>
|
<configuration>
|
||||||
<option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/build" />
|
<option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/build" />
|
||||||
|
<option name="BUILDABLE" value="false" />
|
||||||
</configuration>
|
</configuration>
|
||||||
</facet>
|
</facet>
|
||||||
</component>
|
</component>
|
||||||
@ -15,5 +16,4 @@
|
|||||||
<orderEntry type="inheritedJdk" />
|
<orderEntry type="inheritedJdk" />
|
||||||
<orderEntry type="sourceFolder" forTests="false" />
|
<orderEntry type="sourceFolder" forTests="false" />
|
||||||
</component>
|
</component>
|
||||||
</module>
|
</module>
|
||||||
|
|
@ -1,5 +1,5 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?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="calculatorpp" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
|
<module external.linked.project.id=":core" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="calculatorpp" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
|
||||||
<component name="FacetManager">
|
<component name="FacetManager">
|
||||||
<facet type="android-gradle" name="Android-Gradle">
|
<facet type="android-gradle" name="Android-Gradle">
|
||||||
<configuration>
|
<configuration>
|
||||||
@ -8,7 +8,8 @@
|
|||||||
</facet>
|
</facet>
|
||||||
<facet type="java-gradle" name="Java-Gradle">
|
<facet type="java-gradle" name="Java-Gradle">
|
||||||
<configuration>
|
<configuration>
|
||||||
<option name="BUILD_FOLDER_PATH" />
|
<option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/build" />
|
||||||
|
<option name="BUILDABLE" value="true" />
|
||||||
</configuration>
|
</configuration>
|
||||||
</facet>
|
</facet>
|
||||||
</component>
|
</component>
|
||||||
@ -41,6 +42,6 @@
|
|||||||
<orderEntry type="library" exported="" scope="TEST" name="mockito-core-1.9.0" level="project" />
|
<orderEntry type="library" exported="" scope="TEST" name="mockito-core-1.9.0" level="project" />
|
||||||
<orderEntry type="library" exported="" scope="TEST" name="hamcrest-core-1.3" level="project" />
|
<orderEntry type="library" exported="" scope="TEST" name="hamcrest-core-1.3" level="project" />
|
||||||
<orderEntry type="library" exported="" scope="TEST" name="objenesis-1.0" level="project" />
|
<orderEntry type="library" exported="" scope="TEST" name="objenesis-1.0" level="project" />
|
||||||
|
<orderEntry type="library" exported="" name="core.core" level="project" />
|
||||||
</component>
|
</component>
|
||||||
</module>
|
</module>
|
||||||
|
|
Loading…
Reference in New Issue
Block a user