Update Android Studio Project Files

This commit is contained in:
Negue 2015-06-20 20:02:18 +02:00
parent 92e4055b0c
commit 371436a3cd
8 changed files with 89 additions and 70 deletions

View file

@ -1 +1 @@
habitandrorpg habitrpg-android

View file

@ -1,23 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="CompilerConfiguration"> <component name="CompilerConfiguration">
<option name="DEFAULT_COMPILER" value="Javac" /> <resourceExtensions />
<resourceExtensions /> <wildcardResourcePatterns>
<wildcardResourcePatterns> <entry name="!?*.java" />
<entry name="!?*.java" /> <entry name="!?*.form" />
<entry name="!?*.form" /> <entry name="!?*.class" />
<entry name="!?*.class" /> <entry name="!?*.groovy" />
<entry name="!?*.groovy" /> <entry name="!?*.scala" />
<entry name="!?*.scala" /> <entry name="!?*.flex" />
<entry name="!?*.flex" /> <entry name="!?*.kt" />
<entry name="!?*.kt" /> <entry name="!?*.clj" />
<entry name="!?*.clj" /> <entry name="!?*.aj" />
</wildcardResourcePatterns> </wildcardResourcePatterns>
<annotationProcessing> <annotationProcessing>
<profile default="true" name="Default" enabled="false"> <profile default="true" name="Default" enabled="false">
<processorPath useClasspath="true" /> <processorPath useClasspath="true" />
</profile> </profile>
</annotationProcessing> </annotationProcessing>
</component> </component>
</project> </project>

View file

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false" /> <component name="Encoding">
</project> <file url="PROJECT" charset="UTF-8" />
</component>
</project>

View file

@ -1,19 +1,46 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="EntryPointsManager"> <component name="EntryPointsManager">
<entry_points version="2.0" /> <entry_points version="2.0" />
</component> </component>
<component name="ProjectLevelVcsManager" settingsEditedManually="false"> <component name="NullableNotNullManager">
<OptionsSetting value="true" id="Add" /> <option name="myDefaultNullable" value="android.support.annotation.Nullable" />
<OptionsSetting value="true" id="Remove" /> <option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
<OptionsSetting value="true" id="Checkout" /> <option name="myNullables">
<OptionsSetting value="true" id="Update" /> <value>
<OptionsSetting value="true" id="Status" /> <list size="4">
<OptionsSetting value="true" id="Edit" /> <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
<ConfirmationsSetting value="0" id="Add" /> <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
<ConfirmationsSetting value="0" id="Remove" /> <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
</component> <item index="3" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" assert-keyword="true" jdk-15="true" project-jdk-name="1.7" project-jdk-type="JavaSDK"> </list>
<output url="file://$PROJECT_DIR$/build/classes" /> </value>
</component> </option>
<option name="myNotNulls">
<value>
<list size="4">
<item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
<item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
<item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
<item index="3" class="java.lang.String" itemvalue="android.support.annotation.NonNull" />
</list>
</value>
</option>
</component>
<component name="ProjectLevelVcsManager" settingsEditedManually="false">
<OptionsSetting value="true" id="Add" />
<OptionsSetting value="true" id="Remove" />
<OptionsSetting value="true" id="Checkout" />
<OptionsSetting value="true" id="Update" />
<OptionsSetting value="true" id="Status" />
<OptionsSetting value="true" id="Edit" />
<ConfirmationsSetting value="0" id="Add" />
<ConfirmationsSetting value="0" id="Remove" />
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.7" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
<component name="ProjectType">
<option name="id" value="Android" />
</component>
</project> </project>

View file

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="ProjectModuleManager"> <component name="ProjectModuleManager">
<modules> <modules>
<module fileurl="file://$PROJECT_DIR$/Habitica/Habitica.iml" filepath="$PROJECT_DIR$/Habitica/Habitica.iml" /> <module fileurl="file://$PROJECT_DIR$/Habitica/Habitica.iml" filepath="$PROJECT_DIR$/Habitica/Habitica.iml" />
<module fileurl="file://$PROJECT_DIR$/habitrpg-android.iml" filepath="$PROJECT_DIR$/habitrpg-android.iml" /> <module fileurl="file://$PROJECT_DIR$/habitrpg-android.iml" filepath="$PROJECT_DIR$/habitrpg-android.iml" />
</modules> </modules>
</component> </component>
</project> </project>

View file

@ -1,5 +0,0 @@
<component name="DependencyValidationManager">
<state>
<option name="SKIP_IMPORT_STATEMENTS" value="false" />
</state>
</component>

View file

@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="VcsDirectoryMappings"> <component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$" vcs="Git" /> <mapping directory="$PROJECT_DIR$" vcs="Git" />
</component> </component>
</project> </project>

View file

@ -8,9 +8,7 @@
</configuration> </configuration>
</facet> </facet>
</component> </component>
<component name="NewModuleRootManager" inherit-compiler-output="true"> <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="true">
<output url="file://$MODULE_DIR$/build" />
<output-test url="file://$MODULE_DIR$/build" />
<exclude-output /> <exclude-output />
<content url="file://$MODULE_DIR$"> <content url="file://$MODULE_DIR$">
<excludeFolder url="file://$MODULE_DIR$/.gradle" /> <excludeFolder url="file://$MODULE_DIR$/.gradle" />