diff options
| author | Kenny Root <kenny@the-b.org> | 2015-09-04 15:21:39 -0700 |
|---|---|---|
| committer | Kenny Root <kenny@the-b.org> | 2015-09-04 15:21:39 -0700 |
| commit | 50c40dc18bd156be4cb8a1cd70a16de06fe61310 (patch) | |
| tree | 0a9410020922aa1be137af5fb004f0c97681eb90 /app | |
| parent | fb57d4914a56a7bbe8606761958a4f51946f0d9c (diff) | |
| parent | 5c32181adf15e6ce400fc91f6883edc90f0c23e2 (diff) | |
| download | connectbot-50c40dc18bd156be4cb8a1cd70a16de06fe61310.tar.gz connectbot-50c40dc18bd156be4cb8a1cd70a16de06fe61310.tar.bz2 connectbot-50c40dc18bd156be4cb8a1cd70a16de06fe61310.zip | |
Merge pull request #187 from khorimoto/change-gitignore
Add .idea/gradle.xml to .gitignore files and add app/app.iml changes.
Diffstat (limited to 'app')
| -rw-r--r-- | app/app.iml | 47 |
1 files changed, 23 insertions, 24 deletions
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 |