From b3c39a9def78d2e179c6ab9692f57b655393d099 Mon Sep 17 00:00:00 2001
From: Andrew Chen <achen.code@gmail.com>
Date: Wed, 9 Jan 2013 13:26:42 -0800
Subject: [PATCH] IntelliJ IDEA: Project updates to drag in ckChangeLog.

---
 ckChangeLog.iml | 59 +++++++++++++++++++++++++++++++++++++++++++++++++
 k9mail.iml      |  1 +
 k9mail.ipr      | 48 +++++++++++++++++++++++++++++++---------
 3 files changed, 97 insertions(+), 11 deletions(-)
 create mode 100644 ckChangeLog.iml

diff --git a/ckChangeLog.iml b/ckChangeLog.iml
new file mode 100644
index 000000000..cc4fda75c
--- /dev/null
+++ b/ckChangeLog.iml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="android" name="Android">
+      <configuration>
+        <option name="GEN_FOLDER_RELATIVE_PATH_APT" value="/plugins/ckChangeLog/library/target/generated-sources/r" />
+        <option name="GEN_FOLDER_RELATIVE_PATH_AIDL" value="/plugins/ckChangeLog/library/target/generated-sources/aidl" />
+        <option name="MANIFEST_FILE_RELATIVE_PATH" value="/plugins/ckChangeLog/library/AndroidManifest.xml" />
+        <option name="RES_FOLDER_RELATIVE_PATH" value="/plugins/ckChangeLog/library/res" />
+        <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/plugins/ckChangeLog/library/assets" />
+        <option name="LIBS_FOLDER_RELATIVE_PATH" value="/plugins/ckChangeLog/library/ignored" />
+        <option name="USE_CUSTOM_APK_RESOURCE_FOLDER" value="false" />
+        <option name="CUSTOM_APK_RESOURCE_FOLDER" value="/plugins/ckChangeLog/library/target/generated-sources/combined-resources/res" />
+        <option name="USE_CUSTOM_COMPILER_MANIFEST" value="false" />
+        <option name="CUSTOM_COMPILER_MANIFEST" value="" />
+        <option name="APK_PATH" value="/plugins/ckChangeLog/library/target/library.apk" />
+        <option name="LIBRARY_PROJECT" value="true" />
+        <option name="RUN_PROCESS_RESOURCES_MAVEN_TASK" value="false" />
+        <option name="GENERATE_UNSIGNED_APK" value="false" />
+        <option name="CUSTOM_DEBUG_KEYSTORE_PATH" value="" />
+        <option name="PACK_TEST_CODE" value="false" />
+        <option name="RUN_PROGUARD" value="false" />
+        <option name="PROGUARD_CFG_PATH" value="/proguard-project.txt" />
+        <resOverlayFolders>
+          <path>/plugins/ckChangeLog/library/res-overlay</path>
+        </resOverlayFolders>
+        <includeSystemProguardFile>true</includeSystemProguardFile>
+        <includeAssetsFromLibraries>true</includeAssetsFromLibraries>
+        <additionalNativeLibs />
+      </configuration>
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
+    <output url="file://$MODULE_DIR$/plugins/ckChangeLog/library/target/classes" />
+    <output-test url="file://$MODULE_DIR$/plugins/ckChangeLog/library/target/test-classes" />
+    <content url="file://$MODULE_DIR$/plugins/ckChangeLog/library">
+      <sourceFolder url="file://$MODULE_DIR$/plugins/ckChangeLog/library/target/generated-sources/r" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/plugins/ckChangeLog/library/gen" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/plugins/ckChangeLog/library/src" isTestSource="false" />
+      <excludeFolder url="file://$MODULE_DIR$/plugins/ckChangeLog/library/target/classes" />
+      <excludeFolder url="file://$MODULE_DIR$/plugins/ckChangeLog/library/target/generated-sources/combined-assets" />
+      <excludeFolder url="file://$MODULE_DIR$/plugins/ckChangeLog/library/target/generated-sources/combined-resources" />
+      <excludeFolder url="file://$MODULE_DIR$/plugins/ckChangeLog/library/target/generated-sources/extracted-dependencies" />
+      <excludeFolder url="file://$MODULE_DIR$/plugins/ckChangeLog/library/target/maven-archiver" />
+    </content>
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.android:android:4.1.1.4" level="project" />
+    <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="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="inheritedJdk" />
+  </component>
+</module>
+
diff --git a/k9mail.iml b/k9mail.iml
index 46fb4dd08..0ef93abec 100644
--- a/k9mail.iml
+++ b/k9mail.iml
@@ -44,6 +44,7 @@
     <orderEntry type="library" scope="PROVIDED" name="compile-only-libs" level="project" />
     <orderEntry type="module" module-name="ActionBarSherlock" />
     <orderEntry type="module" module-name="Android-PullToRefresh" />
+    <orderEntry type="module" module-name="ckChangeLog" />
     <orderEntry type="inheritedJdk" />
   </component>
 </module>
diff --git a/k9mail.ipr b/k9mail.ipr
index 16a2193a1..596eb4003 100644
--- a/k9mail.ipr
+++ b/k9mail.ipr
@@ -116,6 +116,16 @@
       <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" />
+      <directory url="file://$PROJECT_DIR$/plugins/ckChangeLog/library/target/generated-sources/r" includeSubdirectories="true" />
+      <directory url="file://$PROJECT_DIR$/plugins/Android-PullToRefresh/library/target/generated-sources/aidl" includeSubdirectories="true" />
+      <directory url="file://$PROJECT_DIR$/target/generated-sources/r" includeSubdirectories="true" />
+      <directory url="file://$PROJECT_DIR$/plugins/ckChangeLog/library/target/generated-sources/aidl" includeSubdirectories="true" />
+      <directory url="file://$PROJECT_DIR$/plugins/Android-PullToRefresh/library/target/generated-sources/annotations" includeSubdirectories="true" />
+      <directory url="file://$PROJECT_DIR$/plugins/Android-PullToRefresh/library/target/generated-test-sources/test-annotations" includeSubdirectories="true" />
+      <directory url="file://$PROJECT_DIR$/plugins/ckChangeLog/library/target/generated-sources/annotations" includeSubdirectories="true" />
+      <directory url="file://$PROJECT_DIR$/plugins/ckChangeLog/library/target/generated-test-sources/test-annotations" includeSubdirectories="true" />
+      <directory url="file://$PROJECT_DIR$/plugins/ActionBarSherlock/library/target/generated-sources/annotations" includeSubdirectories="true" />
+      <directory url="file://$PROJECT_DIR$/plugins/ActionBarSherlock/library/target/generated-test-sources/test-annotations" includeSubdirectories="true" />
     </excludeFromCompile>
     <resourceExtensions>
       <entry name=".+\.(properties|xml|html|dtd|tld)" />
@@ -137,7 +147,24 @@
       <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" />
+        <module name="ActionBarSherlock" />
+        <module name="Android-PullToRefresh" />
+        <module name="ckChangeLog" />
+        <module name="library" />
+      </profile>
     </annotationProcessing>
+    <bytecodeTargetLevel>
+      <module name="ActionBarSherlock" target="1.6" />
+      <module name="Android-PullToRefresh" target="1.6" />
+      <module name="ckChangeLog" target="1.6" />
+      <module name="k9mail" target="1.6" />
+      <module name="library" target="1.6" />
+    </bytecodeTargetLevel>
   </component>
   <component name="CopyrightManager" default="">
     <module2copyright />
@@ -149,6 +176,7 @@
     <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" />
+    <file url="file://$PROJECT_DIR$/plugins/ckChangeLog/library" charset="UTF-8" />
   </component>
   <component name="EntryPointsManager">
     <entry_points version="2.0" />
@@ -173,6 +201,9 @@
     <version value="1.0" />
   </component>
   <component name="IvyIDEA.ProjectSettings">
+    <option name="artifactTypeSettings">
+      <ArtifactTypeSettings />
+    </option>
     <option name="propertiesSettings">
       <PropertiesSettings />
     </option>
@@ -180,9 +211,6 @@
   <component name="IvyProjectSettings">
     <dependencies />
   </component>
-  <component name="JavacSettings">
-    <option name="ADDITIONAL_OPTIONS_STRING" value="-target 1.6" />
-  </component>
   <component name="JavadocGenerationManager">
     <option name="OUTPUT_DIRECTORY" />
     <option name="OPTION_SCOPE" value="protected" />
@@ -205,6 +233,7 @@
       <list>
         <option value="$PROJECT_DIR$/plugins/ActionBarSherlock/library/pom.xml" />
         <option value="$PROJECT_DIR$/plugins/Android-PullToRefresh/library/pom.xml" />
+        <option value="$PROJECT_DIR$/plugins/ckChangeLog/library/pom.xml" />
       </list>
     </option>
   </component>
@@ -375,6 +404,7 @@
     <modules>
       <module fileurl="file://$PROJECT_DIR$/ActionBarSherlock.iml" filepath="$PROJECT_DIR$/ActionBarSherlock.iml" />
       <module fileurl="file://$PROJECT_DIR$/Android-PullToRefresh.iml" filepath="$PROJECT_DIR$/Android-PullToRefresh.iml" />
+      <module fileurl="file://$PROJECT_DIR$/ckChangeLog.iml" filepath="$PROJECT_DIR$/ckChangeLog.iml" />
       <module fileurl="file://$PROJECT_DIR$/k9mail.iml" filepath="$PROJECT_DIR$/k9mail.iml" />
     </modules>
   </component>
@@ -491,16 +521,12 @@
         <root url="jar://$MAVEN_REPOSITORY$/com/google/android/android/4.1.1.4/android-4.1.1.4-sources.jar!/" />
       </SOURCES>
     </library>
-    <library name="Maven: com.google.android:support-v4:r7">
+    <library name="Maven: com.google.android:support-v4:r99">
       <CLASSES>
-        <root url="jar://$MAVEN_REPOSITORY$/com/google/android/support-v4/r7/support-v4-r7.jar!/" />
+        <root url="jar://$PROJECT_DIR$/plugins/ActionBarSherlock/library/libs/android-support-v4.jar!/" />
       </CLASSES>
-      <JAVADOC>
-        <root url="jar://$MAVEN_REPOSITORY$/com/google/android/support-v4/r7/support-v4-r7-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://$MAVEN_REPOSITORY$/com/google/android/support-v4/r7/support-v4-r7-sources.jar!/" />
-      </SOURCES>
+      <JAVADOC />
+      <SOURCES />
     </library>
     <library name="Maven: commons-codec:commons-codec:1.3">
       <CLASSES>