Skip to content

Commit 04aecfd

Browse files
authored
Merge pull request #164 from SherlockGougou/master
升级sdk版本为28,添加gitignore,解决jitpack编译失败
2 parents 6d1c490 + 8f34d46 commit 04aecfd

23 files changed

+504
-308
lines changed

.gitignore

Lines changed: 243 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,243 @@
1+
2+
# Created by https://www.gitignore.io/api/java,macos,android,androidstudio
3+
# Edit at https://www.gitignore.io/?templates=java,macos,android,androidstudio
4+
5+
### Android ###
6+
# Built application files
7+
*.apk
8+
*.ap_
9+
*.aab
10+
11+
# Files for the ART/Dalvik VM
12+
*.dex
13+
14+
# Java class files
15+
*.class
16+
17+
# Generated files
18+
bin/
19+
gen/
20+
out/
21+
22+
# Gradle files
23+
.gradle/
24+
build/
25+
26+
# Local configuration file (sdk path, etc)
27+
local.properties
28+
29+
# Proguard folder generated by Eclipse
30+
proguard/
31+
32+
# Log Files
33+
*.log
34+
35+
# Android Studio Navigation editor temp files
36+
.navigation/
37+
38+
# Android Studio captures folder
39+
captures/
40+
41+
# IntelliJ
42+
*.iml
43+
.idea/*
44+
.idea/workspace.xml
45+
.idea/tasks.xml
46+
.idea/gradle.xml
47+
.idea/assetWizardSettings.xml
48+
.idea/dictionaries
49+
.idea/libraries
50+
.idea/caches
51+
# Android Studio 3 in .gitignore file.
52+
.idea/caches/build_file_checksums.ser
53+
.idea/modules.xml
54+
55+
# Keystore files
56+
# Uncomment the following lines if you do not want to check your keystore files in.
57+
#*.jks
58+
#*.keystore
59+
60+
# External native build folder generated in Android Studio 2.2 and later
61+
.externalNativeBuild
62+
63+
# Google Services (e.g. APIs or Firebase)
64+
# google-services.json
65+
66+
# Freeline
67+
freeline.py
68+
freeline/
69+
freeline_project_description.json
70+
71+
# fastlane
72+
fastlane/report.xml
73+
fastlane/Preview.html
74+
fastlane/screenshots
75+
fastlane/test_output
76+
fastlane/readme.md
77+
78+
# Version control
79+
vcs.xml
80+
81+
# lint
82+
lint/intermediates/
83+
lint/generated/
84+
lint/outputs/
85+
lint/tmp/
86+
# lint/reports/
87+
88+
### Android Patch ###
89+
gen-external-apklibs
90+
output.json
91+
92+
### AndroidStudio ###
93+
# Covers files to be ignored for android development using Android Studio.
94+
95+
# Built application files
96+
97+
# Files for the ART/Dalvik VM
98+
99+
# Java class files
100+
101+
# Generated files
102+
103+
# Gradle files
104+
.gradle
105+
106+
# Signing files
107+
.signing/
108+
109+
# Local configuration file (sdk path, etc)
110+
111+
# Proguard folder generated by Eclipse
112+
113+
# Log Files
114+
115+
# Android Studio
116+
/*/build/
117+
/*/local.properties
118+
/*/out
119+
/*/*/build
120+
/*/*/production
121+
*.ipr
122+
*~
123+
*.swp
124+
125+
# Android Patch
126+
127+
# External native build folder generated in Android Studio 2.2 and later
128+
129+
# NDK
130+
obj/
131+
132+
# IntelliJ IDEA
133+
*.iws
134+
/out/
135+
136+
# User-specific configurations
137+
.idea/caches/
138+
.idea/libraries/
139+
.idea/shelf/
140+
.idea/.name
141+
.idea/compiler.xml
142+
.idea/copyright/profiles_settings.xml
143+
.idea/encodings.xml
144+
.idea/misc.xml
145+
.idea/scopes/scope_settings.xml
146+
.idea/vcs.xml
147+
.idea/jsLibraryMappings.xml
148+
.idea/datasources.xml
149+
.idea/dataSources.ids
150+
.idea/sqlDataSources.xml
151+
.idea/dynamic.xml
152+
.idea/uiDesigner.xml
153+
154+
# OS-specific files
155+
.DS_Store
156+
.DS_Store?
157+
._*
158+
.Spotlight-V100
159+
.Trashes
160+
ehthumbs.db
161+
Thumbs.db
162+
163+
# Legacy Eclipse project files
164+
.classpath
165+
.project
166+
.cproject
167+
.settings/
168+
169+
# Mobile Tools for Java (J2ME)
170+
.mtj.tmp/
171+
172+
# Package Files #
173+
*.war
174+
*.ear
175+
176+
# virtual machine crash logs (Reference: http://www.java.com/en/download/help/error_hotspot.xml)
177+
hs_err_pid*
178+
179+
## Plugin-specific files:
180+
181+
# mpeltonen/sbt-idea plugin
182+
.idea_modules/
183+
184+
# JIRA plugin
185+
atlassian-ide-plugin.xml
186+
187+
# Mongo Explorer plugin
188+
.idea/mongoSettings.xml
189+
190+
# Crashlytics plugin (for Android Studio and IntelliJ)
191+
com_crashlytics_export_strings.xml
192+
crashlytics.properties
193+
crashlytics-build.properties
194+
fabric.properties
195+
196+
### AndroidStudio Patch ###
197+
198+
!/gradle/wrapper/gradle-wrapper.jar
199+
200+
### Java ###
201+
# Compiled class file
202+
203+
# Log file
204+
205+
# BlueJ files
206+
*.ctxt
207+
208+
# Mobile Tools for Java (J2ME)
209+
210+
# Package Files #
211+
*.jar
212+
*.nar
213+
*.zip
214+
*.tar.gz
215+
*.rar
216+
217+
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
218+
219+
### macOS ###
220+
# General
221+
.AppleDouble
222+
.LSOverride
223+
224+
# Icon must end with two \r
225+
Icon
226+
227+
# Thumbnails
228+
229+
# Files that might appear in the root of a volume
230+
.DocumentRevisions-V100
231+
.fseventsd
232+
.TemporaryItems
233+
.VolumeIcon.icns
234+
.com.apple.timemachine.donotpresent
235+
236+
# Directories potentially created on remote AFP share
237+
.AppleDB
238+
.AppleDesktop
239+
Network Trash Folder
240+
Temporary Items
241+
.apdisk
242+
243+
# End of https://www.gitignore.io/api/java,macos,android,androidstudio

.idea/MagicIndicator.iml

Lines changed: 0 additions & 9 deletions
This file was deleted.

.idea/compiler.xml

Lines changed: 0 additions & 22 deletions
This file was deleted.

.idea/copyright/profiles_settings.xml

Lines changed: 0 additions & 3 deletions
This file was deleted.

.idea/encodings.xml

Lines changed: 0 additions & 6 deletions
This file was deleted.

.idea/gradle.xml

Lines changed: 4 additions & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/libraries/animated_vector_drawable_23_4_0.xml

Lines changed: 0 additions & 13 deletions
This file was deleted.

.idea/libraries/appcompat_v7_23_4_0.xml

Lines changed: 0 additions & 17 deletions
This file was deleted.

.idea/libraries/hamcrest_core_1_3.xml

Lines changed: 0 additions & 11 deletions
This file was deleted.

.idea/libraries/junit_4_12.xml

Lines changed: 0 additions & 11 deletions
This file was deleted.

.idea/libraries/support_annotations_23_4_0.xml

Lines changed: 0 additions & 11 deletions
This file was deleted.

0 commit comments

Comments
 (0)