diff options
| author | Samuel Tardieu <sam@rfc1149.net> | 2014-03-04 09:11:31 +0100 |
|---|---|---|
| committer | Samuel Tardieu <sam@rfc1149.net> | 2014-03-04 09:11:31 +0100 |
| commit | 9ad7c604ed390155201f097b50b3e169f7089f5f (patch) | |
| tree | a165094c7cac58205fd087c7cab705b7bcd1aa2a | |
| parent | 3441a80ec644110873cfff40ed662099fee7b0e5 (diff) | |
| download | cgeo-9ad7c604ed390155201f097b50b3e169f7089f5f.zip cgeo-9ad7c604ed390155201f097b50b3e169f7089f5f.tar.gz cgeo-9ad7c604ed390155201f097b50b3e169f7089f5f.tar.bz2 | |
#3636: update project files
| -rw-r--r-- | .idea/libraries/libs.xml | 10 | ||||
| -rw-r--r-- | cgeo-calendar/project.properties | 2 | ||||
| -rw-r--r-- | main/cgeo.iml | 23 | ||||
| -rw-r--r-- | tests/tests.iml | 2 |
4 files changed, 24 insertions, 13 deletions
diff --git a/.idea/libraries/libs.xml b/.idea/libraries/libs.xml deleted file mode 100644 index 1a24e71..0000000 --- a/.idea/libraries/libs.xml +++ /dev/null @@ -1,10 +0,0 @@ -<component name="libraryTable"> - <library name="libs"> - <CLASSES> - <root url="file://$PROJECT_DIR$/main/libs" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - <jarDirectory url="file://$PROJECT_DIR$/main/libs" recursive="false" /> - </library> -</component>
\ No newline at end of file diff --git a/cgeo-calendar/project.properties b/cgeo-calendar/project.properties index 705eae9..bdd4f48 100644 --- a/cgeo-calendar/project.properties +++ b/cgeo-calendar/project.properties @@ -11,4 +11,4 @@ proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt # Project target. -target=Google Inc.:Google APIs:8 +target=android-18 diff --git a/main/cgeo.iml b/main/cgeo.iml index 1096900..aa2b244 100644 --- a/main/cgeo.iml +++ b/main/cgeo.iml @@ -14,7 +14,18 @@ <sourceFolder url="file://$MODULE_DIR$/gen" isTestSource="false" generated="true" /> <sourceFolder url="file://$MODULE_DIR$/thirdparty" isTestSource="false" /> </content> - <orderEntry type="library" exported="" name="libs" level="project" /> + <orderEntry type="module-library" exported=""> + <library name="libs"> + <CLASSES> + <root url="file://$MODULE_DIR$/libs" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + <jarDirectory url="file://$MODULE_DIR$/libs" recursive="false" /> + <jarDirectory url="file://$MODULE_DIR$/libs" recursive="false" /> + <jarDirectory url="file://$MODULE_DIR$/libs/src" recursive="false" type="SOURCES" /> + </library> + </orderEntry> <orderEntry type="jdk" jdkName="Android 4.4.2 Google APIs" jdkType="Android SDK" /> <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="module-library" exported="" scope="PROVIDED"> @@ -30,6 +41,16 @@ <jarDirectory url="file://$MODULE_DIR$/compile-libs" recursive="false" type="SOURCES" /> </library> </orderEntry> + <orderEntry type="module-library" exported="" scope="PROVIDED"> + <library> + <CLASSES> + <root url="file://$MODULE_DIR$/libs" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + <jarDirectory url="file://$MODULE_DIR$/libs" recursive="false" /> + </library> + </orderEntry> </component> </module> diff --git a/tests/tests.iml b/tests/tests.iml index 507d269..f544166 100644 --- a/tests/tests.iml +++ b/tests/tests.iml @@ -15,6 +15,7 @@ <sourceFolder url="file://$MODULE_DIR$/gen" isTestSource="false" generated="true" /> </content> <orderEntry type="sourceFolder" forTests="false" /> + <orderEntry type="module" module-name="cgeo" exported="" scope="TEST" /> <orderEntry type="module-library"> <library> <CLASSES> @@ -33,7 +34,6 @@ <SOURCES /> </library> </orderEntry> - <orderEntry type="module" module-name="cgeo" exported="" scope="TEST" /> <orderEntry type="jdk" jdkName="Android 2.2 Google APIs" jdkType="Android SDK" /> <orderEntry type="module-library" scope="PROVIDED"> <library> |