Skip to content

Commit b3c39a9

Browse files
andrewachenandrewachen
committed
IntelliJ IDEA: Project updates to drag in ckChangeLog.
1 parent ec6e6e1 commit b3c39a9

File tree

3 files changed

+97
-11
lines changed

3 files changed

+97
-11
lines changed

Diff for: ‎ckChangeLog.iml

+59
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
3+
<component name="FacetManager">
4+
<facet type="android" name="Android">
5+
<configuration>
6+
<option name="GEN_FOLDER_RELATIVE_PATH_APT" value="/plugins/ckChangeLog/library/target/generated-sources/r" />
7+
<option name="GEN_FOLDER_RELATIVE_PATH_AIDL" value="/plugins/ckChangeLog/library/target/generated-sources/aidl" />
8+
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/plugins/ckChangeLog/library/AndroidManifest.xml" />
9+
<option name="RES_FOLDER_RELATIVE_PATH" value="/plugins/ckChangeLog/library/res" />
10+
<option name="ASSETS_FOLDER_RELATIVE_PATH" value="/plugins/ckChangeLog/library/assets" />
11+
<option name="LIBS_FOLDER_RELATIVE_PATH" value="/plugins/ckChangeLog/library/ignored" />
12+
<option name="USE_CUSTOM_APK_RESOURCE_FOLDER" value="false" />
13+
<option name="CUSTOM_APK_RESOURCE_FOLDER" value="/plugins/ckChangeLog/library/target/generated-sources/combined-resources/res" />
14+
<option name="USE_CUSTOM_COMPILER_MANIFEST" value="false" />
15+
<option name="CUSTOM_COMPILER_MANIFEST" value="" />
16+
<option name="APK_PATH" value="/plugins/ckChangeLog/library/target/library.apk" />
17+
<option name="LIBRARY_PROJECT" value="true" />
18+
<option name="RUN_PROCESS_RESOURCES_MAVEN_TASK" value="false" />
19+
<option name="GENERATE_UNSIGNED_APK" value="false" />
20+
<option name="CUSTOM_DEBUG_KEYSTORE_PATH" value="" />
21+
<option name="PACK_TEST_CODE" value="false" />
22+
<option name="RUN_PROGUARD" value="false" />
23+
<option name="PROGUARD_CFG_PATH" value="/proguard-project.txt" />
24+
<resOverlayFolders>
25+
<path>/plugins/ckChangeLog/library/res-overlay</path>
26+
</resOverlayFolders>
27+
<includeSystemProguardFile>true</includeSystemProguardFile>
28+
<includeAssetsFromLibraries>true</includeAssetsFromLibraries>
29+
<additionalNativeLibs />
30+
</configuration>
31+
</facet>
32+
</component>
33+
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
34+
<output url="file://$MODULE_DIR$/plugins/ckChangeLog/library/target/classes" />
35+
<output-test url="file://$MODULE_DIR$/plugins/ckChangeLog/library/target/test-classes" />
36+
<content url="file://$MODULE_DIR$/plugins/ckChangeLog/library">
37+
<sourceFolder url="file://$MODULE_DIR$/plugins/ckChangeLog/library/target/generated-sources/r" isTestSource="false" />
38+
<sourceFolder url="file://$MODULE_DIR$/plugins/ckChangeLog/library/gen" isTestSource="false" />
39+
<sourceFolder url="file://$MODULE_DIR$/plugins/ckChangeLog/library/src" isTestSource="false" />
40+
<excludeFolder url="file://$MODULE_DIR$/plugins/ckChangeLog/library/target/classes" />
41+
<excludeFolder url="file://$MODULE_DIR$/plugins/ckChangeLog/library/target/generated-sources/combined-assets" />
42+
<excludeFolder url="file://$MODULE_DIR$/plugins/ckChangeLog/library/target/generated-sources/combined-resources" />
43+
<excludeFolder url="file://$MODULE_DIR$/plugins/ckChangeLog/library/target/generated-sources/extracted-dependencies" />
44+
<excludeFolder url="file://$MODULE_DIR$/plugins/ckChangeLog/library/target/maven-archiver" />
45+
</content>
46+
<orderEntry type="sourceFolder" forTests="false" />
47+
<orderEntry type="library" scope="PROVIDED" name="Maven: com.google.android:android:4.1.1.4" level="project" />
48+
<orderEntry type="library" scope="PROVIDED" name="Maven: commons-logging:commons-logging:1.1.1" level="project" />
49+
<orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.httpcomponents:httpclient:4.0.1" level="project" />
50+
<orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.httpcomponents:httpcore:4.0.1" level="project" />
51+
<orderEntry type="library" scope="PROVIDED" name="Maven: commons-codec:commons-codec:1.3" level="project" />
52+
<orderEntry type="library" scope="PROVIDED" name="Maven: org.khronos:opengl-api:gl1.1-android-2.1_r1" level="project" />
53+
<orderEntry type="library" scope="PROVIDED" name="Maven: xerces:xmlParserAPIs:2.6.2" level="project" />
54+
<orderEntry type="library" scope="PROVIDED" name="Maven: xpp3:xpp3:1.1.4c" level="project" />
55+
<orderEntry type="library" scope="PROVIDED" name="Maven: org.json:json:20080701" level="project" />
56+
<orderEntry type="inheritedJdk" />
57+
</component>
58+
</module>
59+

Diff for: ‎k9mail.iml

+1
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444
<orderEntry type="library" scope="PROVIDED" name="compile-only-libs" level="project" />
4545
<orderEntry type="module" module-name="ActionBarSherlock" />
4646
<orderEntry type="module" module-name="Android-PullToRefresh" />
47+
<orderEntry type="module" module-name="ckChangeLog" />
4748
<orderEntry type="inheritedJdk" />
4849
</component>
4950
</module>

Diff for: ‎k9mail.ipr

+37-11
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,16 @@
116116
<directory url="file://$PROJECT_DIR$/plugins/Android-PullToRefresh/library/gen" includeSubdirectories="true" />
117117
<directory url="file://$PROJECT_DIR$/plugins/Android-PullToRefresh/library/target/generated-sources/r" includeSubdirectories="true" />
118118
<directory url="file://$PROJECT_DIR$/gen" includeSubdirectories="true" />
119+
<directory url="file://$PROJECT_DIR$/plugins/ckChangeLog/library/target/generated-sources/r" includeSubdirectories="true" />
120+
<directory url="file://$PROJECT_DIR$/plugins/Android-PullToRefresh/library/target/generated-sources/aidl" includeSubdirectories="true" />
121+
<directory url="file://$PROJECT_DIR$/target/generated-sources/r" includeSubdirectories="true" />
122+
<directory url="file://$PROJECT_DIR$/plugins/ckChangeLog/library/target/generated-sources/aidl" includeSubdirectories="true" />
123+
<directory url="file://$PROJECT_DIR$/plugins/Android-PullToRefresh/library/target/generated-sources/annotations" includeSubdirectories="true" />
124+
<directory url="file://$PROJECT_DIR$/plugins/Android-PullToRefresh/library/target/generated-test-sources/test-annotations" includeSubdirectories="true" />
125+
<directory url="file://$PROJECT_DIR$/plugins/ckChangeLog/library/target/generated-sources/annotations" includeSubdirectories="true" />
126+
<directory url="file://$PROJECT_DIR$/plugins/ckChangeLog/library/target/generated-test-sources/test-annotations" includeSubdirectories="true" />
127+
<directory url="file://$PROJECT_DIR$/plugins/ActionBarSherlock/library/target/generated-sources/annotations" includeSubdirectories="true" />
128+
<directory url="file://$PROJECT_DIR$/plugins/ActionBarSherlock/library/target/generated-test-sources/test-annotations" includeSubdirectories="true" />
119129
</excludeFromCompile>
120130
<resourceExtensions>
121131
<entry name=".+\.(properties|xml|html|dtd|tld)" />
@@ -137,7 +147,24 @@
137147
<profile default="true" name="Default" enabled="false">
138148
<processorPath useClasspath="true" />
139149
</profile>
150+
<profile default="false" name="Maven default annotation processors profile" enabled="true">
151+
<sourceOutputDir name="target/generated-sources/annotations" />
152+
<sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
153+
<outputRelativeToContentRoot value="true" />
154+
<processorPath useClasspath="true" />
155+
<module name="ActionBarSherlock" />
156+
<module name="Android-PullToRefresh" />
157+
<module name="ckChangeLog" />
158+
<module name="library" />
159+
</profile>
140160
</annotationProcessing>
161+
<bytecodeTargetLevel>
162+
<module name="ActionBarSherlock" target="1.6" />
163+
<module name="Android-PullToRefresh" target="1.6" />
164+
<module name="ckChangeLog" target="1.6" />
165+
<module name="k9mail" target="1.6" />
166+
<module name="library" target="1.6" />
167+
</bytecodeTargetLevel>
141168
</component>
142169
<component name="CopyrightManager" default="">
143170
<module2copyright />
@@ -149,6 +176,7 @@
149176
<file url="file://$PROJECT_DIR$" charset="UTF-8" />
150177
<file url="file://$PROJECT_DIR$/plugins/ActionBarSherlock/library" charset="UTF-8" />
151178
<file url="file://$PROJECT_DIR$/plugins/Android-PullToRefresh/library" charset="UTF-8" />
179+
<file url="file://$PROJECT_DIR$/plugins/ckChangeLog/library" charset="UTF-8" />
152180
</component>
153181
<component name="EntryPointsManager">
154182
<entry_points version="2.0" />
@@ -173,16 +201,16 @@
173201
<version value="1.0" />
174202
</component>
175203
<component name="IvyIDEA.ProjectSettings">
204+
<option name="artifactTypeSettings">
205+
<ArtifactTypeSettings />
206+
</option>
176207
<option name="propertiesSettings">
177208
<PropertiesSettings />
178209
</option>
179210
</component>
180211
<component name="IvyProjectSettings">
181212
<dependencies />
182213
</component>
183-
<component name="JavacSettings">
184-
<option name="ADDITIONAL_OPTIONS_STRING" value="-target 1.6" />
185-
</component>
186214
<component name="JavadocGenerationManager">
187215
<option name="OUTPUT_DIRECTORY" />
188216
<option name="OPTION_SCOPE" value="protected" />
@@ -205,6 +233,7 @@
205233
<list>
206234
<option value="$PROJECT_DIR$/plugins/ActionBarSherlock/library/pom.xml" />
207235
<option value="$PROJECT_DIR$/plugins/Android-PullToRefresh/library/pom.xml" />
236+
<option value="$PROJECT_DIR$/plugins/ckChangeLog/library/pom.xml" />
208237
</list>
209238
</option>
210239
</component>
@@ -375,6 +404,7 @@
375404
<modules>
376405
<module fileurl="file://$PROJECT_DIR$/ActionBarSherlock.iml" filepath="$PROJECT_DIR$/ActionBarSherlock.iml" />
377406
<module fileurl="file://$PROJECT_DIR$/Android-PullToRefresh.iml" filepath="$PROJECT_DIR$/Android-PullToRefresh.iml" />
407+
<module fileurl="file://$PROJECT_DIR$/ckChangeLog.iml" filepath="$PROJECT_DIR$/ckChangeLog.iml" />
378408
<module fileurl="file://$PROJECT_DIR$/k9mail.iml" filepath="$PROJECT_DIR$/k9mail.iml" />
379409
</modules>
380410
</component>
@@ -491,16 +521,12 @@
491521
<root url="jar://$MAVEN_REPOSITORY$/com/google/android/android/4.1.1.4/android-4.1.1.4-sources.jar!/" />
492522
</SOURCES>
493523
</library>
494-
<library name="Maven: com.google.android:support-v4:r7">
524+
<library name="Maven: com.google.android:support-v4:r99">
495525
<CLASSES>
496-
<root url="jar://$MAVEN_REPOSITORY$/com/google/android/support-v4/r7/support-v4-r7.jar!/" />
526+
<root url="jar://$PROJECT_DIR$/plugins/ActionBarSherlock/library/libs/android-support-v4.jar!/" />
497527
</CLASSES>
498-
<JAVADOC>
499-
<root url="jar://$MAVEN_REPOSITORY$/com/google/android/support-v4/r7/support-v4-r7-javadoc.jar!/" />
500-
</JAVADOC>
501-
<SOURCES>
502-
<root url="jar://$MAVEN_REPOSITORY$/com/google/android/support-v4/r7/support-v4-r7-sources.jar!/" />
503-
</SOURCES>
528+
<JAVADOC />
529+
<SOURCES />
504530
</library>
505531
<library name="Maven: commons-codec:commons-codec:1.3">
506532
<CLASSES>

0 commit comments

Comments
 (0)