Skip to content

Commit c01629a

Browse files
authored
Merge pull request #70 from ShimmerEngineering/AA-279
AA-279
2 parents 458eaa8 + 1fbcab4 commit c01629a

File tree

181 files changed

+8246
-696
lines changed

Some content is hidden

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

181 files changed

+8246
-696
lines changed

.gitignore

Lines changed: 96 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,100 @@
11
ShimmerAndroidInstrumentDriver/build/generated/mockable-android-19.jar
22
ShimmerAndroidInstrumentDriver/build/generated/mockable-android-21.jar
33
ShimmerAndroidInstrumentDriver/gradle.properties
4+
5+
# Built application files
6+
*.apk
7+
*.aar
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+
# Uncomment the following line in case you need and you don't have the release build type files in your app
22+
# release/
23+
24+
# Gradle files
25+
.gradle/
26+
build/
27+
28+
# Local configuration file (sdk path, etc)
29+
local.properties
30+
31+
# Proguard folder generated by Eclipse
32+
proguard/
33+
34+
# Log Files
35+
*.log
36+
37+
# Android Studio Navigation editor temp files
38+
.navigation/
39+
40+
# Android Studio captures folder
41+
captures/
42+
43+
# IntelliJ
44+
*.iml
45+
.idea/
46+
misc.xml
47+
deploymentTargetDropDown.xml
48+
render.experimental.xml
49+
.idea/workspace.xml
50+
.idea/tasks.xml
51+
.idea/gradle.xml
52+
.idea/assetWizardSettings.xml
53+
.idea/dictionaries
54+
.idea/libraries
55+
.idea/jarRepositories.xml
56+
# Android Studio 3 in .gitignore file.
57+
.idea/caches
58+
.idea/modules.xml
59+
# Comment next line if keeping position of elements in Navigation Editor is relevant for you
60+
.idea/navEditor.xml
61+
62+
# Keystore files
63+
# Uncomment the following lines if you do not want to check your keystore files in.
64+
#*.jks
65+
#*.keystore
66+
67+
# External native build folder generated in Android Studio 2.2 and later
68+
.externalNativeBuild
69+
.cxx/
70+
71+
# Google Services (e.g. APIs or Firebase)
72+
# google-services.json
73+
74+
# Freeline
75+
freeline.py
76+
freeline/
77+
freeline_project_description.json
78+
79+
# fastlane
80+
fastlane/report.xml
81+
fastlane/Preview.html
82+
fastlane/screenshots
83+
fastlane/test_output
84+
fastlane/readme.md
85+
86+
# Version control
87+
vcs.xml
88+
89+
# lint
90+
lint/intermediates/
91+
lint/generated/
92+
lint/outputs/
93+
lint/tmp/
94+
# lint/reports/
95+
96+
# Android Profiling
97+
*.hprof
498
gradle.properties
99+
ShimmerAndroidInstrumentDriver/.idea/jarRepositories.xml
100+
ShimmerAndroidInstrumentDriver/.idea/gradle.xml
Lines changed: 81 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,93 @@
11
# Built application files
2-
/**/build/
2+
*.apk
3+
*.aar
4+
*.ap_
5+
*.aab
36

4-
# Crashlytics configuations
5-
com_crashlytics_export_strings.xml
7+
# Files for the ART/Dalvik VM
8+
*.dex
9+
10+
# Java class files
11+
*.class
12+
13+
# Generated files
14+
bin/
15+
gen/
16+
out/
17+
# Uncomment the following line in case you need and you don't have the release build type files in your app
18+
# release/
19+
20+
# Gradle files
21+
.gradle/
22+
build/
623

724
# Local configuration file (sdk path, etc)
825
local.properties
926

10-
# Gradle generated files
11-
.gradle/
27+
# Proguard folder generated by Eclipse
28+
proguard/
29+
30+
# Log Files
31+
*.log
1232

13-
# Signing files
14-
.signing/
33+
# Android Studio Navigation editor temp files
34+
.navigation/
1535

16-
# User-specific configurations
17-
.idea/libraries/
36+
# Android Studio captures folder
37+
captures/
38+
39+
# IntelliJ
40+
*.iml
41+
.idea/
42+
misc.xml
43+
deploymentTargetDropDown.xml
44+
render.experimental.xml
1845
.idea/workspace.xml
1946
.idea/tasks.xml
20-
.idea/.name
21-
.idea/compiler.xml
22-
.idea/copyright/profiles_settings.xml
23-
.idea/encodings.xml
24-
.idea/misc.xml
47+
.idea/gradle.xml
48+
.idea/assetWizardSettings.xml
49+
.idea/dictionaries
50+
.idea/libraries
51+
.idea/jarRepositories.xml
52+
# Android Studio 3 in .gitignore file.
53+
.idea/caches
2554
.idea/modules.xml
26-
.idea/scopes/scope_settings.xml
27-
.idea/vcs.xml
28-
*.iml
55+
# Comment next line if keeping position of elements in Navigation Editor is relevant for you
56+
.idea/navEditor.xml
57+
58+
# Keystore files
59+
# Uncomment the following lines if you do not want to check your keystore files in.
60+
#*.jks
61+
#*.keystore
62+
63+
# External native build folder generated in Android Studio 2.2 and later
64+
.externalNativeBuild
65+
.cxx/
66+
67+
# Google Services (e.g. APIs or Firebase)
68+
# google-services.json
69+
70+
# Freeline
71+
freeline.py
72+
freeline/
73+
freeline_project_description.json
74+
75+
# fastlane
76+
fastlane/report.xml
77+
fastlane/Preview.html
78+
fastlane/screenshots
79+
fastlane/test_output
80+
fastlane/readme.md
81+
82+
# Version control
83+
vcs.xml
84+
85+
# lint
86+
lint/intermediates/
87+
lint/generated/
88+
lint/outputs/
89+
lint/tmp/
90+
# lint/reports/
2991

30-
# OS-specific files
31-
.DS_Store
32-
.DS_Store?
33-
._*
34-
.Spotlight-V100
35-
.Trashes
36-
ehthumbs.db
37-
Thumbs.db
38-
/ShimmerAndroidInstrumentDriver/gradle.properties
92+
# Android Profiling
93+
*.hprof

ShimmerAndroidInstrumentDriver/.idea/codeStyles/Project.xml

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

ShimmerAndroidInstrumentDriver/.idea/gradle.xml

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

ShimmerAndroidInstrumentDriver/.idea/runConfigurations.xml

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

0 commit comments

Comments
 (0)