summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzeapo <mohamed@zenadi.com>2014-08-15 23:05:05 +0200
committerzeapo <mohamed@zenadi.com>2014-08-15 23:05:05 +0200
commit246f3c1a8c6d85829cbad2588efb9ff5232c6995 (patch)
treedb2a263e4c99936de25babe5dd16b151f063b730
parentdd045f57f1b36af29cbaba2c82312ee5ab1d360e (diff)
local configs update, have to add them to git ignore...
-rw-r--r--.idea/gradle.xml1
-rw-r--r--.idea/libraries/JavaEWAH_0_7_9.xml9
-rw-r--r--.idea/libraries/commons_io_1_3_2.xml9
-rw-r--r--.idea/libraries/jsch_0_1_50.xml9
-rw-r--r--.idea/libraries/org_eclipse_jgit_3_4_1_201406201815_r.xml9
-rw-r--r--.idea/misc.xml2
-rw-r--r--.idea/modules.xml2
-rw-r--r--Android-Password-Store.iml19
-rw-r--r--app/app.iml22
9 files changed, 78 insertions, 4 deletions
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 453f2fcf..6a2ce86f 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -15,7 +15,6 @@
</option>
</GradleProjectSettings>
</option>
- <option name="offlineWork" value="true" />
</component>
</project>
diff --git a/.idea/libraries/JavaEWAH_0_7_9.xml b/.idea/libraries/JavaEWAH_0_7_9.xml
new file mode 100644
index 00000000..62fd8dc5
--- /dev/null
+++ b/.idea/libraries/JavaEWAH_0_7_9.xml
@@ -0,0 +1,9 @@
+<component name="libraryTable">
+ <library name="JavaEWAH-0.7.9">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.googlecode.javaewah/JavaEWAH/0.7.9/eceaf316a8faf0e794296ebe158ae110c7d72a5a/JavaEWAH-0.7.9.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+</component> \ No newline at end of file
diff --git a/.idea/libraries/commons_io_1_3_2.xml b/.idea/libraries/commons_io_1_3_2.xml
new file mode 100644
index 00000000..a270c43e
--- /dev/null
+++ b/.idea/libraries/commons_io_1_3_2.xml
@@ -0,0 +1,9 @@
+<component name="libraryTable">
+ <library name="commons-io-1.3.2">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.commons/commons-io/1.3.2/b6dde38349ba9bb5e6ea6320531eae969985dae5/commons-io-1.3.2.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+</component> \ No newline at end of file
diff --git a/.idea/libraries/jsch_0_1_50.xml b/.idea/libraries/jsch_0_1_50.xml
new file mode 100644
index 00000000..17a3541d
--- /dev/null
+++ b/.idea/libraries/jsch_0_1_50.xml
@@ -0,0 +1,9 @@
+<component name="libraryTable">
+ <library name="jsch-0.1.50">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.jcraft/jsch/0.1.50/fae4a0b1f2a96cb8f58f38da2650814c991cea01/jsch-0.1.50.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+</component> \ No newline at end of file
diff --git a/.idea/libraries/org_eclipse_jgit_3_4_1_201406201815_r.xml b/.idea/libraries/org_eclipse_jgit_3_4_1_201406201815_r.xml
new file mode 100644
index 00000000..91fc555f
--- /dev/null
+++ b/.idea/libraries/org_eclipse_jgit_3_4_1_201406201815_r.xml
@@ -0,0 +1,9 @@
+<component name="libraryTable">
+ <library name="org.eclipse.jgit-3.4.1.201406201815-r">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.eclipse.jgit/org.eclipse.jgit/3.4.1.201406201815-r/7fe73a21f4a078abaaface4d2b03b5eb3d306f63/org.eclipse.jgit-3.4.1.201406201815-r.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+</component> \ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 66ef8269..b153e48a 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -3,7 +3,7 @@
<component name="EntryPointsManager">
<entry_points version="2.0" />
</component>
- <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="1.7 (2)" project-jdk-type="JavaSDK">
+ <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="JDK" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
</project>
diff --git a/.idea/modules.xml b/.idea/modules.xml
index c9aff059..2dfce2aa 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,9 +2,11 @@
<project version="4">
<component name="ProjectModuleManager">
<modules>
+ <module fileurl="file://$PROJECT_DIR$/Android-Password-Store.iml" filepath="$PROJECT_DIR$/Android-Password-Store.iml" />
<module fileurl="file://$PROJECT_DIR$/PwdStore.iml" filepath="$PROJECT_DIR$/PwdStore.iml" />
<module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
<module fileurl="file://$PROJECT_DIR$/libraries/openpgp-api-lib/openpgp-api-lib.iml" filepath="$PROJECT_DIR$/libraries/openpgp-api-lib/openpgp-api-lib.iml" />
+ <module fileurl="file://$PROJECT_DIR$/libraries/openpgp-api-lib/openpgp-api-lib.iml" filepath="$PROJECT_DIR$/libraries/openpgp-api-lib/openpgp-api-lib.iml" />
</modules>
</component>
</project>
diff --git a/Android-Password-Store.iml b/Android-Password-Store.iml
new file mode 100644
index 00000000..0bb6048a
--- /dev/null
+++ b/Android-Password-Store.iml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+ <component name="FacetManager">
+ <facet type="java-gradle" name="Java-Gradle">
+ <configuration>
+ <option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/build" />
+ </configuration>
+ </facet>
+ </component>
+ <component name="NewModuleRootManager" inherit-compiler-output="true">
+ <exclude-output />
+ <content url="file://$MODULE_DIR$">
+ <excludeFolder url="file://$MODULE_DIR$/.gradle" />
+ </content>
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ </component>
+</module>
+
diff --git a/app/app.iml b/app/app.iml
index 1defa8a4..f0f9d786 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="PwdStore" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="Android-Password-Store" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="android-gradle" name="Android-Gradle">
<configuration>
@@ -56,7 +56,25 @@
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
- <excludeFolder url="file://$MODULE_DIR$/build/intermediates" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/coverage-instrumented-classes" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/libs" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/ndk" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
</content>
<orderEntry type="jdk" jdkName="Android API 19 Platform" jdkType="Android SDK" />