aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKyle Horimoto <khorimoto@gmail.com>2015-09-04 14:23:01 -0700
committerKyle Horimoto <khorimoto@gmail.com>2015-09-04 14:53:44 -0700
commit6c4bf865ed5beba56e08718973bf05b03e38f009 (patch)
tree97821f7e1f4a60c777bab88ef0ddd6ee0d338b33
parent44c7bcfa9f7ae69fa481b100bcfba5e1387eee9c (diff)
downloadconnectbot-6c4bf865ed5beba56e08718973bf05b03e38f009.tar.gz
connectbot-6c4bf865ed5beba56e08718973bf05b03e38f009.tar.bz2
connectbot-6c4bf865ed5beba56e08718973bf05b03e38f009.zip
Add .idea/gradle.xml and app/app.iml to .gitignore files.
These files change according to the individual user's machine each time the project is edited by Android Studio.
-rw-r--r--.idea/.gitignore1
-rw-r--r--.idea/gradle.xml2
-rw-r--r--app/app.iml47
3 files changed, 24 insertions, 26 deletions
diff --git a/.idea/.gitignore b/.idea/.gitignore
index 8e587e7..ff07e6f 100644
--- a/.idea/.gitignore
+++ b/.idea/.gitignore
@@ -4,7 +4,6 @@
!/copyright/*.xml
!/fileColors.xml
!/encodings.xml
-!/gradle.xml
!/runConfigurations/*.xml
!/inspectionProfiles/*.xml
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 8d2df47..1bbc21d 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -5,7 +5,7 @@
<GradleProjectSettings>
<option name="distributionType" value="DEFAULT_WRAPPED" />
<option name="externalProjectPath" value="$PROJECT_DIR$" />
- <option name="gradleJvm" value="1.8" />
+ <option name="gradleJvm" value="1.7" />
<option name="modules">
<set>
<option value="$PROJECT_DIR$" />
diff --git a/app/app.iml b/app/app.iml
index e6fba85..fb1f329 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -75,7 +75,8 @@
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.0.0/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/design/23.0.0/jars" />
- <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/23.0.0/jars" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/recyclerview-v7/23.0.1/jars" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/23.0.1/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
@@ -88,43 +89,41 @@
<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/jacoco" />
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
- <excludeFolder url="file://$MODULE_DIR$/build/reports" />
- <excludeFolder url="file://$MODULE_DIR$/build/test-results" />
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
</content>
<orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
<orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="library" exported="" scope="TEST" name="asm-5.0.1" level="project" />
+ <orderEntry type="library" exported="" scope="TEST" name="robolectric-utils-3.0" level="project" />
+ <orderEntry type="library" exported="" name="support-v4-23.0.1" level="project" />
<orderEntry type="library" exported="" name="jzlib-1.1.3" level="project" />
- <orderEntry type="library" exported="" scope="TEST" name="maven-ant-tasks-2.1.3" level="project" />
+ <orderEntry type="library" exported="" scope="TEST" name="objenesis-2.1" level="project" />
+ <orderEntry type="library" exported="" name="design-23.0.0" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="ant-1.8.0" level="project" />
- <orderEntry type="library" exported="" scope="TEST" name="assertj-core-1.7.0" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="accessibility-test-framework-1.0" level="project" />
- <orderEntry type="library" exported="" scope="TEST" name="asm-commons-5.0.1" level="project" />
- <orderEntry type="library" exported="" scope="TEST" name="ant-launcher-1.8.0" level="project" />
- <orderEntry type="library" exported="" scope="TEST" name="asm-5.0.1" level="project" />
- <orderEntry type="library" exported="" scope="TEST" name="shadows-core-3.0" level="project" />
- <orderEntry type="library" exported="" name="appcompat-v7-23.0.0" level="project" />
- <orderEntry type="library" exported="" scope="TEST" name="asm-util-5.0.1" level="project" />
- <orderEntry type="library" exported="" scope="TEST" name="bcprov-jdk16-1.46" level="project" />
- <orderEntry type="library" exported="" name="support-v4-23.0.0" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="mockito-core-1.10.19" level="project" />
- <orderEntry type="library" exported="" name="jsocks-1.0.0" level="project" />
- <orderEntry type="library" exported="" scope="TEST" name="objenesis-2.1" level="project" />
- <orderEntry type="library" exported="" name="support-annotations-23.0.0" level="project" />
- <orderEntry type="library" exported="" scope="TEST" name="icu4j-53.1" level="project" />
+ <orderEntry type="library" exported="" scope="TEST" name="bcprov-jdk16-1.46" level="project" />
+ <orderEntry type="library" exported="" scope="TEST" name="maven-ant-tasks-2.1.3" level="project" />
+ <orderEntry type="library" exported="" scope="TEST" name="sqlite4java-0.282" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="robolectric-resources-3.0" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="robolectric-annotations-3.0" level="project" />
- <orderEntry type="library" exported="" name="design-23.0.0" level="project" />
- <orderEntry type="library" exported="" scope="TEST" name="sqlite4java-0.282" level="project" />
- <orderEntry type="library" exported="" scope="TEST" name="asm-tree-5.0.1" level="project" />
- <orderEntry type="library" exported="" scope="TEST" name="robolectric-utils-3.0" level="project" />
- <orderEntry type="library" exported="" scope="TEST" name="asm-analysis-5.0.1" level="project" />
<orderEntry type="library" exported="" name="sshlib-2.2.0" level="project" />
- <orderEntry type="library" exported="" scope="TEST" name="hamcrest-core-1.3" level="project" />
+ <orderEntry type="library" exported="" scope="TEST" name="shadows-core-3.0" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="vtd-xml-2.11" level="project" />
+ <orderEntry type="library" exported="" scope="TEST" name="asm-commons-5.0.1" level="project" />
+ <orderEntry type="library" exported="" scope="TEST" name="hamcrest-core-1.3" level="project" />
+ <orderEntry type="library" exported="" scope="TEST" name="asm-tree-5.0.1" level="project" />
+ <orderEntry type="library" exported="" scope="TEST" name="asm-analysis-5.0.1" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="junit-4.12" level="project" />
+ <orderEntry type="library" exported="" scope="TEST" name="icu4j-53.1" level="project" />
+ <orderEntry type="library" exported="" scope="TEST" name="ant-launcher-1.8.0" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="robolectric-3.0" level="project" />
+ <orderEntry type="library" exported="" scope="TEST" name="asm-util-5.0.1" level="project" />
+ <orderEntry type="library" exported="" name="appcompat-v7-23.0.0" level="project" />
+ <orderEntry type="library" exported="" scope="TEST" name="assertj-core-1.7.0" level="project" />
+ <orderEntry type="library" exported="" name="recyclerview-v7-23.0.1" level="project" />
+ <orderEntry type="library" exported="" name="jsocks-1.0.0" level="project" />
+ <orderEntry type="library" exported="" name="support-annotations-23.0.1" level="project" />
</component>
</module> \ No newline at end of file