Skip to content

Commit 4b2d3c7

Browse files
author
Axier Fernandez
committed
United all different projects and updated libraries
1 parent ebfa600 commit 4b2d3c7

File tree

186 files changed

+722
-5063
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

186 files changed

+722
-5063
lines changed

.gitignore

Lines changed: 119 additions & 176 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11

2-
# Created by https://www.gitignore.io/api/android,androidstudio,macos
2+
# Created by https://www.gitignore.io/api/java,linux,macos,windows,android,intellij,androidstudio
3+
# Edit at https://www.gitignore.io/?templates=java,linux,macos,windows,android,intellij,androidstudio
34

45
### Android ###
56
# Built application files
67
*.apk
78
*.ap_
9+
*.aab
810

911
# Files for the ART/Dalvik VM
1012
*.dex
@@ -36,16 +38,20 @@ proguard/
3638
# Android Studio captures folder
3739
captures/
3840

39-
# Intellijvoy
41+
# IntelliJ
4042
*.iml
4143
.idea/workspace.xml
4244
.idea/tasks.xml
4345
.idea/gradle.xml
46+
.idea/assetWizardSettings.xml
4447
.idea/dictionaries
4548
.idea/libraries
49+
.idea/caches
4650

4751
# Keystore files
48-
*.jks
52+
# Uncomment the following lines if you do not want to check your keystore files in.
53+
#*.jks
54+
#*.keystore
4955

5056
# External native build folder generated in Android Studio 2.2 and later
5157
.externalNativeBuild
@@ -58,6 +64,13 @@ freeline.py
5864
freeline/
5965
freeline_project_description.json
6066

67+
# fastlane
68+
fastlane/report.xml
69+
fastlane/Preview.html
70+
fastlane/screenshots
71+
fastlane/test_output
72+
fastlane/readme.md
73+
6174
### Android Patch ###
6275
gen-external-apklibs
6376

@@ -106,7 +119,9 @@ obj/
106119
/out/
107120

108121
# User-specific configurations
122+
.idea/caches/
109123
.idea/libraries/
124+
.idea/shelf/
110125
.idea/.name
111126
.idea/compiler.xml
112127
.idea/copyright/profiles_settings.xml
@@ -122,8 +137,6 @@ obj/
122137
.idea/dynamic.xml
123138
.idea/uiDesigner.xml
124139

125-
# Keystore files
126-
127140
# OS-specific files
128141
.DS_Store
129142
.DS_Store?
@@ -136,12 +149,13 @@ Thumbs.db
136149
# Legacy Eclipse project files
137150
.classpath
138151
.project
152+
.cproject
153+
.settings/
139154

140155
# Mobile Tools for Java (J2ME)
141156
.mtj.tmp/
142157

143158
# Package Files #
144-
*.jar
145159
*.war
146160
*.ear
147161

@@ -166,209 +180,115 @@ crashlytics-build.properties
166180
fabric.properties
167181

168182
### AndroidStudio Patch ###
169-
# Google Services plugin
170183

171184
!/gradle/wrapper/gradle-wrapper.jar
172185

173-
### macOS ###
174-
*.DS_Store
175-
.AppleDouble
176-
.LSOverride
177-
178-
# Icon must end with two \r
179-
Icon
180-
181-
# Thumbnails
182-
183-
# Files that might appear in the root of a volume
184-
.DocumentRevisions-V100
185-
.fseventsd
186-
.TemporaryItems
187-
.VolumeIcon.icns
188-
.com.apple.timemachine.donotpresent
189-
190-
# Directories potentially created on remote AFP share
191-
.AppleDB
192-
.AppleDesktop
193-
Network Trash Folder
194-
Temporary Items
195-
.apdisk
196-
197-
# End of https://www.gitignore.io/api/android,androidstudio,macos
198-
199-
# Created by https://www.gitignore.io/api/android,androidstudio,macos
200-
201-
### Android ###
202-
# Built application files
203-
*.apk
204-
*.ap_
205-
206-
# Files for the ART/Dalvik VM
207-
*.dex
186+
### Intellij ###
187+
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and WebStorm
188+
# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
208189

209-
# Java class files
210-
*.class
190+
# User-specific stuff
191+
.idea/**/workspace.xml
192+
.idea/**/tasks.xml
193+
.idea/**/usage.statistics.xml
194+
.idea/**/dictionaries
195+
.idea/**/shelf
211196

212197
# Generated files
213-
bin/
214-
gen/
215-
out/
216-
217-
# Gradle files
218-
.gradle/
219-
build/
220-
221-
# Local configuration file (sdk path, etc)
222-
local.properties
223-
224-
# Proguard folder generated by Eclipse
225-
proguard/
226-
227-
# Log Files
228-
*.log
229-
230-
# Android Studio Navigation editor temp files
231-
.navigation/
232-
233-
# Android Studio captures folder
234-
captures/
235-
236-
# Intellij
237-
*.iml
238-
.idea/workspace.xml
239-
.idea/tasks.xml
240-
.idea/gradle.xml
241-
.idea/dictionaries
242-
.idea/libraries
243-
244-
# Keystore files
245-
*.jks
246-
247-
# External native build folder generated in Android Studio 2.2 and later
248-
.externalNativeBuild
249-
250-
# Google Services (e.g. APIs or Firebase)
251-
google-services.json
252-
253-
# Freeline
254-
freeline.py
255-
freeline/
256-
freeline_project_description.json
257-
258-
### Android Patch ###
259-
gen-external-apklibs
260-
261-
### AndroidStudio ###
262-
# Covers files to be ignored for android development using Android Studio.
263-
264-
# Built application files
198+
.idea/**/contentModel.xml
199+
200+
# Sensitive or high-churn files
201+
.idea/**/dataSources/
202+
.idea/**/dataSources.ids
203+
.idea/**/dataSources.local.xml
204+
.idea/**/sqlDataSources.xml
205+
.idea/**/dynamic.xml
206+
.idea/**/uiDesigner.xml
207+
.idea/**/dbnavigator.xml
208+
209+
# Gradle
210+
.idea/**/gradle.xml
211+
.idea/**/libraries
212+
213+
# Gradle and Maven with auto-import
214+
# When using Gradle or Maven with auto-import, you should exclude module files,
215+
# since they will be recreated, and may cause churn. Uncomment if using
216+
# auto-import.
217+
# .idea/modules.xml
218+
# .idea/*.iml
219+
# .idea/modules
220+
221+
# CMake
222+
cmake-build-*/
265223

266-
# Files for the ART/Dalvik VM
224+
# Mongo Explorer plugin
225+
.idea/**/mongoSettings.xml
267226

268-
# Java class files
227+
# File-based project format
269228

270-
# Generated files
229+
# IntelliJ
271230

272-
# Gradle files
273-
.gradle
231+
# mpeltonen/sbt-idea plugin
274232

275-
# Signing files
276-
.signing/
233+
# JIRA plugin
277234

278-
# Local configuration file (sdk path, etc)
235+
# Cursive Clojure plugin
236+
.idea/replstate.xml
279237

280-
# Proguard folder generated by Eclipse
238+
# Crashlytics plugin (for Android Studio and IntelliJ)
281239

282-
# Log Files
240+
# Editor-based Rest Client
241+
.idea/httpRequests
283242

284-
# Android Studio
285-
/*/build/
286-
/*/local.properties
287-
/*/out
288-
/*/*/build
289-
/*/*/production
290-
*.ipr
291-
*~
292-
*.swp
243+
# Android studio 3.1+ serialized cache file
244+
.idea/caches/build_file_checksums.ser
293245

294-
# Android Patch
246+
### Intellij Patch ###
247+
# Comment Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-215987721
295248

296-
# External native build folder generated in Android Studio 2.2 and later
249+
# *.iml
250+
# modules.xml
251+
# .idea/misc.xml
252+
# *.ipr
297253

298-
# NDK
299-
obj/
254+
# Sonarlint plugin
255+
.idea/sonarlint
300256

301-
# IntelliJ IDEA
302-
*.iws
303-
/out/
257+
### Java ###
258+
# Compiled class file
304259

305-
# User-specific configurations
306-
.idea/libraries/
307-
.idea/.name
308-
.idea/compiler.xml
309-
.idea/copyright/profiles_settings.xml
310-
.idea/encodings.xml
311-
.idea/misc.xml
312-
.idea/modules.xml
313-
.idea/scopes/scope_settings.xml
314-
.idea/vcs.xml
315-
.idea/jsLibraryMappings.xml
316-
.idea/datasources.xml
317-
.idea/dataSources.ids
318-
.idea/sqlDataSources.xml
319-
.idea/dynamic.xml
320-
.idea/uiDesigner.xml
321-
322-
# Keystore files
323-
324-
# OS-specific files
325-
.DS_Store
326-
.DS_Store?
327-
._*
328-
.Spotlight-V100
329-
.Trashes
330-
ehthumbs.db
331-
Thumbs.db
260+
# Log file
332261

333-
# Legacy Eclipse project files
334-
.classpath
335-
.project
262+
# BlueJ files
263+
*.ctxt
336264

337265
# Mobile Tools for Java (J2ME)
338-
.mtj.tmp/
339266

340267
# Package Files #
341268
*.jar
342-
*.war
343-
*.ear
269+
*.nar
270+
*.zip
271+
*.tar.gz
272+
*.rar
344273

345-
# virtual machine crash logs (Reference: http://www.java.com/en/download/help/error_hotspot.xml)
346-
hs_err_pid*
274+
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
347275

348-
## Plugin-specific files:
276+
### Linux ###
349277

350-
# mpeltonen/sbt-idea plugin
351-
.idea_modules/
278+
# temporary files which can be created if a process still has a handle open of a deleted file
279+
.fuse_hidden*
352280

353-
# JIRA plugin
354-
atlassian-ide-plugin.xml
281+
# KDE directory preferences
282+
.directory
355283

356-
# Mongo Explorer plugin
357-
.idea/mongoSettings.xml
284+
# Linux trash folder which might appear on any partition or disk
285+
.Trash-*
358286

359-
# Crashlytics plugin (for Android Studio and IntelliJ)
360-
com_crashlytics_export_strings.xml
361-
crashlytics.properties
362-
crashlytics-build.properties
363-
fabric.properties
364-
365-
### AndroidStudio Patch ###
366-
# Google Services plugin
367-
368-
!/gradle/wrapper/gradle-wrapper.jar
287+
# .nfs files are created when an open file is removed but is still being accessed
288+
.nfs*
369289

370290
### macOS ###
371-
*.DS_Store
291+
# General
372292
.AppleDouble
373293
.LSOverride
374294

@@ -391,4 +311,27 @@ Network Trash Folder
391311
Temporary Items
392312
.apdisk
393313

394-
# End of https://www.gitignore.io/api/android,androidstudio,macos
314+
### Windows ###
315+
# Windows thumbnail cache files
316+
ehthumbs_vista.db
317+
318+
# Dump file
319+
*.stackdump
320+
321+
# Folder config file
322+
[Dd]esktop.ini
323+
324+
# Recycle Bin used on file shares
325+
$RECYCLE.BIN/
326+
327+
# Windows Installer files
328+
*.cab
329+
*.msi
330+
*.msix
331+
*.msm
332+
*.msp
333+
334+
# Windows shortcuts
335+
*.lnk
336+
337+
# End of https://www.gitignore.io/api/java,linux,macos,windows,android,intellij,androidstudio

0 commit comments

Comments
 (0)