Further fixes for Android Studio
This commit is contained in:
Joshua Bahnsen
parent
753bf35fa9
commit
e60085f398
|
|
@ -2,6 +2,14 @@
|
|||
<project version="4">
|
||||
<component name="CompilerConfiguration">
|
||||
<option name="DEFAULT_COMPILER" value="Javac" />
|
||||
<excludeFromCompile>
|
||||
<directory url="file://$PROJECT_DIR$/gen" includeSubdirectories="true" />
|
||||
<directory url="file://$PROJECT_DIR$/menudrawer/library/target/generated-sources/r" includeSubdirectories="true" />
|
||||
<directory url="file://$PROJECT_DIR$/menudrawer/samples/target/generated-sources/r" includeSubdirectories="true" />
|
||||
<directory url="file://$PROJECT_DIR$/menudrawer/samples/gen-external-apklibs/com.actionbarsherlock_actionbarsherlock_4.3.1/gen" includeSubdirectories="true" />
|
||||
<directory url="file://$PROJECT_DIR$/menudrawer/library/gen" includeSubdirectories="true" />
|
||||
<directory url="file://$PROJECT_DIR$/pulltorefresh/library/gen" includeSubdirectories="true" />
|
||||
</excludeFromCompile>
|
||||
<resourceExtensions />
|
||||
<wildcardResourcePatterns>
|
||||
<entry name="!?*.java" />
|
||||
|
|
@ -17,7 +25,18 @@
|
|||
<profile default="true" name="Default" enabled="false">
|
||||
<processorPath useClasspath="true" />
|
||||
</profile>
|
||||
<profile default="false" name="Maven default annotation processors profile" enabled="true">
|
||||
<sourceOutputDir name="target/generated-sources/annotations" />
|
||||
<sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
|
||||
<outputRelativeToContentRoot value="true" />
|
||||
<processorPath useClasspath="true" />
|
||||
</profile>
|
||||
</annotationProcessing>
|
||||
<bytecodeTargetLevel>
|
||||
<module name="menudrawer" target="1.6" />
|
||||
<module name="menudrawer-parent" target="1.6" />
|
||||
<module name="samples" target="1.6" />
|
||||
</bytecodeTargetLevel>
|
||||
</component>
|
||||
</project>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,9 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false" />
|
||||
<component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false">
|
||||
<file url="file://$PROJECT_DIR$/menudrawer" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/menudrawer/library" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/menudrawer/samples" charset="UTF-8" />
|
||||
</component>
|
||||
</project>
|
||||
|
||||
|
|
|
|||
|
|
@ -3,8 +3,8 @@
|
|||
<component name="ProjectModuleManager">
|
||||
<modules>
|
||||
<module fileurl="file://$PROJECT_DIR$/Subsonic-Android.iml" filepath="$PROJECT_DIR$/Subsonic-Android.iml" />
|
||||
<module fileurl="file://$PROJECT_DIR$/Android-PullToRefresh/library/library.iml" filepath="$PROJECT_DIR$/Android-PullToRefresh/library/library.iml" />
|
||||
<module fileurl="file://$PROJECT_DIR$/android-menudrawer-master/library/library1.iml" filepath="$PROJECT_DIR$/android-menudrawer-master/library/library1.iml" />
|
||||
<module fileurl="file://$PROJECT_DIR$/menudrawer.iml" filepath="$PROJECT_DIR$/menudrawer.iml" />
|
||||
<module fileurl="file://$PROJECT_DIR$/pulltorefresh.iml" filepath="$PROJECT_DIR$/pulltorefresh.iml" />
|
||||
</modules>
|
||||
</component>
|
||||
</project>
|
||||
|
|
|
|||
|
|
@ -19,10 +19,10 @@
|
|||
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/gen" isTestSource="false" />
|
||||
</content>
|
||||
<orderEntry type="inheritedJdk" />
|
||||
<orderEntry type="jdk" jdkName="Android 4.2.2" jdkType="Android SDK" />
|
||||
<orderEntry type="sourceFolder" forTests="false" />
|
||||
<orderEntry type="module" module-name="library1" />
|
||||
<orderEntry type="module" module-name="library" />
|
||||
<orderEntry type="module" module-name="menudrawer" />
|
||||
<orderEntry type="module" module-name="pulltorefresh" />
|
||||
</component>
|
||||
</module>
|
||||
|
||||
|
|
|
|||
|
|
@ -3,15 +3,19 @@
|
|||
<component name="FacetManager">
|
||||
<facet type="android" name="Android">
|
||||
<configuration>
|
||||
<option name="GEN_FOLDER_RELATIVE_PATH_APT" value="/menudrawer/library/gen" />
|
||||
<option name="GEN_FOLDER_RELATIVE_PATH_AIDL" value="/menudrawer/library/gen" />
|
||||
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/menudrawer/library/AndroidManifest.xml" />
|
||||
<option name="RES_FOLDER_RELATIVE_PATH" value="/menudrawer/library/res" />
|
||||
<option name="LIBRARY_PROJECT" value="true" />
|
||||
</configuration>
|
||||
</facet>
|
||||
</component>
|
||||
<component name="NewModuleRootManager" inherit-compiler-output="true">
|
||||
<exclude-output />
|
||||
<content url="file://$MODULE_DIR$">
|
||||
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/gen" isTestSource="false" />
|
||||
<content url="file://$MODULE_DIR$/menudrawer">
|
||||
<sourceFolder url="file://$MODULE_DIR$/menudrawer/library/src" isTestSource="false" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/menudrawer/library/gen" isTestSource="false" />
|
||||
</content>
|
||||
<orderEntry type="inheritedJdk" />
|
||||
<orderEntry type="sourceFolder" forTests="false" />
|
||||
|
|
|
|||
|
|
@ -10,6 +10,7 @@
|
|||
# Project target.
|
||||
target=android-17
|
||||
android.library=false
|
||||
android.library.reference.1=menudrawer
|
||||
android.library.reference.2=pulltorefresh
|
||||
|
||||
|
||||
android.library.reference.1=pulltorefresh/library
|
||||
android.library.reference.2=menudrawer/library
|
||||
|
|
|
|||
|
|
@ -3,15 +3,19 @@
|
|||
<component name="FacetManager">
|
||||
<facet type="android" name="Android">
|
||||
<configuration>
|
||||
<option name="GEN_FOLDER_RELATIVE_PATH_APT" value="/pulltorefresh/library/gen" />
|
||||
<option name="GEN_FOLDER_RELATIVE_PATH_AIDL" value="/pulltorefresh/library/gen" />
|
||||
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/pulltorefresh/library/AndroidManifest.xml" />
|
||||
<option name="RES_FOLDER_RELATIVE_PATH" value="/pulltorefresh/library/res" />
|
||||
<option name="LIBRARY_PROJECT" value="true" />
|
||||
</configuration>
|
||||
</facet>
|
||||
</component>
|
||||
<component name="NewModuleRootManager" inherit-compiler-output="true">
|
||||
<exclude-output />
|
||||
<content url="file://$MODULE_DIR$">
|
||||
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/gen" isTestSource="false" />
|
||||
<content url="file://$MODULE_DIR$/pulltorefresh">
|
||||
<sourceFolder url="file://$MODULE_DIR$/pulltorefresh/library/src" isTestSource="false" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/pulltorefresh/library/gen" isTestSource="false" />
|
||||
</content>
|
||||
<orderEntry type="inheritedJdk" />
|
||||
<orderEntry type="sourceFolder" forTests="false" />
|
||||
|
|
|
|||
Loading…
Reference in New Issue