Skip to content

Commit 2a207c4

Browse files
author
tiansj
committed
ignore
1 parent 350a0f5 commit 2a207c4

File tree

3 files changed

+117
-5
lines changed

3 files changed

+117
-5
lines changed

.gitignore

Lines changed: 104 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,104 @@
1+
2+
.gradle/2.4/taskArtifacts/cache.properties
3+
4+
.gradle/2.4/taskArtifacts/cache.properties.lock
5+
6+
.gradle/2.4/taskArtifacts/fileHashes.bin
7+
8+
.gradle/2.4/taskArtifacts/fileSnapshots.bin
9+
10+
.gradle/2.4/taskArtifacts/outputFileStates.bin
11+
12+
.gradle/2.4/taskArtifacts/taskArtifacts.bin
13+
14+
.idea/.name
15+
16+
.idea/compiler.xml
17+
18+
.idea/copyright/profiles_settings.xml
19+
20+
.idea/gradle.xml
21+
22+
.idea/libraries/butterknife_7_0_1.xml
23+
24+
.idea/libraries/fastjson_1_1_34_android.xml
25+
26+
.idea/libraries/okhttp_2_4_0.xml
27+
28+
.idea/libraries/okio_1_4_0.xml
29+
30+
.idea/libraries/ormlite_android_4_48.xml
31+
32+
.idea/libraries/ormlite_core_4_48.xml
33+
34+
.idea/libraries/picasso_2_5_2.xml
35+
36+
.idea/libraries/support_annotations_22_2_1.xml
37+
38+
.idea/libraries/systembartint_1_0_3.xml
39+
40+
.idea/libraries/support_v4_22_2_1.xml
41+
42+
.idea/misc.xml
43+
44+
.idea/modules.xml
45+
46+
.idea/runConfigurations.xml
47+
48+
.idea/vcs.xml
49+
50+
.idea/workspace.xml
51+
52+
app/app.iml
53+
54+
build/intermediates/gradle_project_sync_data.bin
55+
56+
build/intermediates/dex-cache/cache.xml
57+
58+
app/app.iml
59+
60+
app/app.iml
61+
62+
local.properties
63+
64+
.idea/libraries/leakcanary_watcher_1_3.xml
65+
66+
.idea/libraries/leakcanary_android_1_3.xml
67+
68+
.idea/libraries/leakcanary_analyzer_1_3.xml
69+
70+
.idea/libraries/haha_1_1.xml
71+
72+
app/app.iml
73+
74+
local.properties
75+
76+
.gradle/2.2.1/taskArtifacts/fileSnapshots.bin
77+
78+
.gradle/2.2.1/taskArtifacts/outputFileStates.bin
79+
80+
.gradle/2.2.1/taskArtifacts/taskArtifacts.bin
81+
82+
.idea/libraries/ultra_ptr_1_0_10.xml
83+
84+
build/intermediates/lint-cache/api-versions-6-22.bin
85+
86+
build/intermediates/lint-cache/typos-en.txt-2.bin
87+
88+
local.properties
89+
90+
.gradle/2.2.1/taskArtifacts/cache.properties
91+
92+
.gradle/2.2.1/taskArtifacts/cache.properties.lock
93+
94+
.gradle/2.2.1/taskArtifacts/fileHashes.bin
95+
96+
app/app.iml
97+
98+
.idea/libraries/glide_3_6_1.xml
99+
100+
app/app.iml
101+
102+
app/app.iml
103+
104+
local.properties

app/app.iml

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,8 @@
7272
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
7373
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
7474
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/22.2.1/jars" />
75+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.squareup.leakcanary/leakcanary-android/1.3/jars" />
76+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/in.srain.cube/ultra-ptr/1.0.10/jars" />
7577
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
7678
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
7779
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
@@ -87,17 +89,23 @@
8789
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
8890
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
8991
</content>
90-
<orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
92+
<orderEntry type="jdk" jdkName="Android API 22 Platform" jdkType="Android SDK" />
9193
<orderEntry type="sourceFolder" forTests="false" />
9294
<orderEntry type="library" exported="" name="ormlite-android-4.48" level="project" />
93-
<orderEntry type="library" exported="" name="okhttp-2.4.0" level="project" />
95+
<orderEntry type="library" exported="" name="leakcanary-watcher-1.3" level="project" />
96+
<orderEntry type="library" exported="" name="ultra-ptr-1.0.10" level="project" />
9497
<orderEntry type="library" exported="" name="systembartint-1.0.3" level="project" />
95-
<orderEntry type="library" exported="" name="ormlite-core-4.48" level="project" />
98+
<orderEntry type="library" exported="" name="leakcanary-android-1.3" level="project" />
9699
<orderEntry type="library" exported="" name="fastjson-1.1.34.android" level="project" />
97100
<orderEntry type="library" exported="" name="butterknife-7.0.1" level="project" />
98-
<orderEntry type="library" exported="" name="support-v4-22.2.1" level="project" />
101+
<orderEntry type="library" exported="" name="glide-3.6.1" level="project" />
99102
<orderEntry type="library" exported="" name="picasso-2.5.2" level="project" />
100103
<orderEntry type="library" exported="" name="support-annotations-22.2.1" level="project" />
104+
<orderEntry type="library" exported="" name="haha-1.1" level="project" />
105+
<orderEntry type="library" exported="" name="okhttp-2.4.0" level="project" />
106+
<orderEntry type="library" exported="" name="ormlite-core-4.48" level="project" />
107+
<orderEntry type="library" exported="" name="support-v4-22.2.1" level="project" />
108+
<orderEntry type="library" exported="" name="leakcanary-analyzer-1.3" level="project" />
101109
<orderEntry type="library" exported="" name="okio-1.4.0" level="project" />
102110
</component>
103111
</module>

local.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@
77
# Location of the SDK. This is only used by Gradle.
88
# For customization when using a Version Control System, please read the
99
# header note.
10-
#Sun Aug 23 15:08:21 CST 2015
10+
#Mon Oct 26 10:14:22 CST 2015
1111
sdk.dir=/usr/local/android-sdk

0 commit comments

Comments
 (0)