mirror of https://github.com/moparisthebest/k-9
IntellIJ IDEA: Project fixes for submodule removal, add android support jar as compile time dependency, and various other IntelliJ-specific build fixes.
This commit is contained in:
Andrew Chen
parent
38e8fc182c
commit
dbd9d9944a
|
|
@ -8,7 +8,7 @@
|
|||
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/plugins/ActionBarSherlock/library/AndroidManifest.xml" />
|
||||
<option name="RES_FOLDER_RELATIVE_PATH" value="/plugins/ActionBarSherlock/library/res" />
|
||||
<option name="ASSETS_FOLDER_RELATIVE_PATH" value="/plugins/ActionBarSherlock/library/assets" />
|
||||
<option name="LIBS_FOLDER_RELATIVE_PATH" value="/plugins/ActionBarSherlock/library/libs" />
|
||||
<option name="LIBS_FOLDER_RELATIVE_PATH" value="/plugins/ActionBarSherlock/library/ignored" />
|
||||
<option name="REGENERATE_R_JAVA" value="true" />
|
||||
<option name="REGENERATE_JAVA_BY_AIDL" value="true" />
|
||||
<option name="USE_CUSTOM_APK_RESOURCE_FOLDER" value="false" />
|
||||
|
|
@ -51,16 +51,12 @@
|
|||
<orderEntry type="library" scope="PROVIDED" name="Maven: commons-logging:commons-logging:1.1.1" level="project" />
|
||||
<orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.httpcomponents:httpclient:4.0.1" level="project" />
|
||||
<orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.httpcomponents:httpcore:4.0.1" level="project" />
|
||||
<orderEntry type="library" scope="TEST" name="Maven: commons-codec:commons-codec:1.3" level="project" />
|
||||
<orderEntry type="library" scope="PROVIDED" name="Maven: commons-codec:commons-codec:1.3" level="project" />
|
||||
<orderEntry type="library" scope="PROVIDED" name="Maven: org.khronos:opengl-api:gl1.1-android-2.1_r1" level="project" />
|
||||
<orderEntry type="library" scope="PROVIDED" name="Maven: xerces:xmlParserAPIs:2.6.2" level="project" />
|
||||
<orderEntry type="library" scope="PROVIDED" name="Maven: xpp3:xpp3:1.1.4c" level="project" />
|
||||
<orderEntry type="library" scope="PROVIDED" name="Maven: org.json:json:20080701" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.google.android:support-v4:r7" level="project" />
|
||||
<orderEntry type="library" scope="TEST" name="Maven: com.pivotallabs:robolectric:1.1" level="project" />
|
||||
<orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:1.0" level="project" />
|
||||
<orderEntry type="library" scope="TEST" name="Maven: org.xerial:sqlite-jdbc:3.7.2" level="project" />
|
||||
<orderEntry type="library" scope="TEST" name="Maven: org.javassist:javassist:3.14.0-GA" level="project" />
|
||||
<orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.10" level="project" />
|
||||
<orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.1" level="project" />
|
||||
<orderEntry type="inheritedJdk" />
|
||||
|
|
|
|||
Binary file not shown.
Binary file not shown.
|
|
@ -8,7 +8,7 @@
|
|||
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/AndroidManifest.xml" />
|
||||
<option name="RES_FOLDER_RELATIVE_PATH" value="/res" />
|
||||
<option name="ASSETS_FOLDER_RELATIVE_PATH" value="/assets" />
|
||||
<option name="LIBS_FOLDER_RELATIVE_PATH" value="/libs" />
|
||||
<option name="LIBS_FOLDER_RELATIVE_PATH" value="/ignored" />
|
||||
<option name="REGENERATE_R_JAVA" value="true" />
|
||||
<option name="REGENERATE_JAVA_BY_AIDL" value="true" />
|
||||
<option name="USE_CUSTOM_APK_RESOURCE_FOLDER" value="false" />
|
||||
|
|
@ -31,12 +31,15 @@
|
|||
</facet>
|
||||
</component>
|
||||
<component name="NewModuleRootManager" inherit-compiler-output="false">
|
||||
<output url="file://$MODULE_DIR$/bin" />
|
||||
<exclude-output />
|
||||
<output url="file://$MODULE_DIR$/target/classes" />
|
||||
<output-test url="file://$MODULE_DIR$/target/test-classes" />
|
||||
<content url="file://$MODULE_DIR$">
|
||||
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/gen" isTestSource="false" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/tests/src" isTestSource="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/target/generated-sources/r" isTestSource="false" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/target/classes" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/target/test-classes" />
|
||||
</content>
|
||||
<orderEntry type="sourceFolder" forTests="false" />
|
||||
<orderEntry type="library" name="libs" level="project" />
|
||||
|
|
|
|||
62
k9mail.ipr
62
k9mail.ipr
|
|
@ -111,11 +111,11 @@
|
|||
<component name="CompilerConfiguration">
|
||||
<option name="DEFAULT_COMPILER" value="Javac" />
|
||||
<excludeFromCompile>
|
||||
<directory url="file://$PROJECT_DIR$/gen" includeSubdirectories="true" />
|
||||
<directory url="file://$PROJECT_DIR$/plugins/ActionBarSherlock/library/gen" includeSubdirectories="true" />
|
||||
<directory url="file://$PROJECT_DIR$/plugins/ActionBarSherlock/library/target/generated-sources/r" includeSubdirectories="true" />
|
||||
<directory url="file://$PROJECT_DIR$/plugins/Android-PullToRefresh/library/gen" includeSubdirectories="true" />
|
||||
<directory url="file://$PROJECT_DIR$/plugins/Android-PullToRefresh/library/target/generated-sources/r" includeSubdirectories="true" />
|
||||
<directory url="file://$PROJECT_DIR$/gen" includeSubdirectories="true" />
|
||||
</excludeFromCompile>
|
||||
<resourceExtensions>
|
||||
<entry name=".+\.(properties|xml|html|dtd|tld)" />
|
||||
|
|
@ -142,6 +142,7 @@
|
|||
<option name="SKIP_IMPORT_STATEMENTS" value="false" />
|
||||
</component>
|
||||
<component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false">
|
||||
<file url="file://$PROJECT_DIR$" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/plugins/ActionBarSherlock/library" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/plugins/Android-PullToRefresh/library" charset="UTF-8" />
|
||||
</component>
|
||||
|
|
@ -149,8 +150,7 @@
|
|||
<entry_points version="2.0" />
|
||||
</component>
|
||||
<component name="FrameworkDetectionExcludesConfiguration">
|
||||
<file type="android" url="file://$PROJECT_DIR$/plugins/ActionBarSherlock/library" />
|
||||
<file type="android" url="file://$PROJECT_DIR$/plugins/Android-PullToRefresh/library" />
|
||||
<file type="android" url="file://$PROJECT_DIR$" />
|
||||
</component>
|
||||
<component name="IdProvider" IDEtalkID="71055AFE08650FC251AC52E23DE3F795" />
|
||||
<component name="InspectionProjectProfileManager">
|
||||
|
|
@ -421,8 +421,6 @@
|
|||
</component>
|
||||
<component name="VcsDirectoryMappings">
|
||||
<mapping directory="" vcs="Git" />
|
||||
<mapping directory="$PROJECT_DIR$/plugins/ActionBarSherlock" vcs="Git" />
|
||||
<mapping directory="$PROJECT_DIR$/plugins/Android-PullToRefresh" vcs="Git" />
|
||||
</component>
|
||||
<component name="VssConfiguration">
|
||||
<option name="CLIENT_PATH" value="" />
|
||||
|
|
@ -464,10 +462,20 @@
|
|||
<CLASSES>
|
||||
<root url="jar://$PROJECT_DIR$/compile-only-libs/junit-4.8.2.jar!/" />
|
||||
<root url="jar://$PROJECT_DIR$/compile-only-libs/mockito-all-1.8.5.jar!/" />
|
||||
<root url="jar://$PROJECT_DIR$/compile-only-libs/android-support-v4.jar!/" />
|
||||
</CLASSES>
|
||||
<JAVADOC />
|
||||
<SOURCES>
|
||||
<root url="jar://$PROJECT_DIR$/compile-only-libs/mockito-all-1.8.5.jar!/" />
|
||||
<root url="jar://$PROJECT_DIR$/compile-only-libs/android-support-v4-src.zip!/ics" />
|
||||
<root url="jar://$PROJECT_DIR$/compile-only-libs/android-support-v4-src.zip!/eclair" />
|
||||
<root url="jar://$PROJECT_DIR$/compile-only-libs/android-support-v4-src.zip!/ics-mr1" />
|
||||
<root url="jar://$PROJECT_DIR$/compile-only-libs/android-support-v4-src.zip!/java" />
|
||||
<root url="jar://$PROJECT_DIR$/compile-only-libs/android-support-v4-src.zip!/jellybean" />
|
||||
<root url="jar://$PROJECT_DIR$/compile-only-libs/android-support-v4-src.zip!/honeycomb_mr2" />
|
||||
<root url="jar://$PROJECT_DIR$/compile-only-libs/android-support-v4-src.zip!/gingerbread" />
|
||||
<root url="jar://$PROJECT_DIR$/compile-only-libs/android-support-v4-src.zip!/froyo" />
|
||||
<root url="jar://$PROJECT_DIR$/compile-only-libs/android-support-v4-src.zip!/honeycomb" />
|
||||
</SOURCES>
|
||||
</library>
|
||||
<library name="libs">
|
||||
|
|
@ -518,17 +526,6 @@
|
|||
<root url="jar://$MAVEN_REPOSITORY$/com/google/android/support-v4/r7/support-v4-r7-sources.jar!/" />
|
||||
</SOURCES>
|
||||
</library>
|
||||
<library name="Maven: com.pivotallabs:robolectric:1.1">
|
||||
<CLASSES>
|
||||
<root url="jar://$MAVEN_REPOSITORY$/com/pivotallabs/robolectric/1.1/robolectric-1.1.jar!/" />
|
||||
</CLASSES>
|
||||
<JAVADOC>
|
||||
<root url="jar://$MAVEN_REPOSITORY$/com/pivotallabs/robolectric/1.1/robolectric-1.1-javadoc.jar!/" />
|
||||
</JAVADOC>
|
||||
<SOURCES>
|
||||
<root url="jar://$MAVEN_REPOSITORY$/com/pivotallabs/robolectric/1.1/robolectric-1.1-sources.jar!/" />
|
||||
</SOURCES>
|
||||
</library>
|
||||
<library name="Maven: commons-codec:commons-codec:1.3">
|
||||
<CLASSES>
|
||||
<root url="jar://$MAVEN_REPOSITORY$/commons-codec/commons-codec/1.3/commons-codec-1.3.jar!/" />
|
||||
|
|
@ -595,17 +592,6 @@
|
|||
<root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1-sources.jar!/" />
|
||||
</SOURCES>
|
||||
</library>
|
||||
<library name="Maven: org.javassist:javassist:3.14.0-GA">
|
||||
<CLASSES>
|
||||
<root url="jar://$MAVEN_REPOSITORY$/org/javassist/javassist/3.14.0-GA/javassist-3.14.0-GA.jar!/" />
|
||||
</CLASSES>
|
||||
<JAVADOC>
|
||||
<root url="jar://$MAVEN_REPOSITORY$/org/javassist/javassist/3.14.0-GA/javassist-3.14.0-GA-javadoc.jar!/" />
|
||||
</JAVADOC>
|
||||
<SOURCES>
|
||||
<root url="jar://$MAVEN_REPOSITORY$/org/javassist/javassist/3.14.0-GA/javassist-3.14.0-GA-sources.jar!/" />
|
||||
</SOURCES>
|
||||
</library>
|
||||
<library name="Maven: org.json:json:20080701">
|
||||
<CLASSES>
|
||||
<root url="jar://$MAVEN_REPOSITORY$/org/json/json/20080701/json-20080701.jar!/" />
|
||||
|
|
@ -628,28 +614,6 @@
|
|||
<root url="jar://$MAVEN_REPOSITORY$/org/khronos/opengl-api/gl1.1-android-2.1_r1/opengl-api-gl1.1-android-2.1_r1-sources.jar!/" />
|
||||
</SOURCES>
|
||||
</library>
|
||||
<library name="Maven: org.objenesis:objenesis:1.0">
|
||||
<CLASSES>
|
||||
<root url="jar://$MAVEN_REPOSITORY$/org/objenesis/objenesis/1.0/objenesis-1.0.jar!/" />
|
||||
</CLASSES>
|
||||
<JAVADOC>
|
||||
<root url="jar://$MAVEN_REPOSITORY$/org/objenesis/objenesis/1.0/objenesis-1.0-javadoc.jar!/" />
|
||||
</JAVADOC>
|
||||
<SOURCES>
|
||||
<root url="jar://$MAVEN_REPOSITORY$/org/objenesis/objenesis/1.0/objenesis-1.0-sources.jar!/" />
|
||||
</SOURCES>
|
||||
</library>
|
||||
<library name="Maven: org.xerial:sqlite-jdbc:3.7.2">
|
||||
<CLASSES>
|
||||
<root url="jar://$MAVEN_REPOSITORY$/org/xerial/sqlite-jdbc/3.7.2/sqlite-jdbc-3.7.2.jar!/" />
|
||||
</CLASSES>
|
||||
<JAVADOC>
|
||||
<root url="jar://$MAVEN_REPOSITORY$/org/xerial/sqlite-jdbc/3.7.2/sqlite-jdbc-3.7.2-javadoc.jar!/" />
|
||||
</JAVADOC>
|
||||
<SOURCES>
|
||||
<root url="jar://$MAVEN_REPOSITORY$/org/xerial/sqlite-jdbc/3.7.2/sqlite-jdbc-3.7.2-sources.jar!/" />
|
||||
</SOURCES>
|
||||
</library>
|
||||
<library name="Maven: xerces:xmlParserAPIs:2.6.2">
|
||||
<CLASSES>
|
||||
<root url="jar://$MAVEN_REPOSITORY$/xerces/xmlParserAPIs/2.6.2/xmlParserAPIs-2.6.2.jar!/" />
|
||||
|
|
|
|||
Loading…
Reference in New Issue