Skip to content

Commit ebcc502

Browse files
Merge pull request #8 from modular-ftc/feature/update-to-4.3
Feature/update to 4.3
2 parents fd5dee4 + 7da9b20 commit ebcc502

15 files changed

+684
-24
lines changed

.gitignore

+238-10
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,256 @@
1-
# built application files
1+
# Created by .ignore support plugin (hsz.mobi)
2+
### Windows template
3+
# Windows thumbnail cache files
4+
Thumbs.db
5+
ehthumbs.db
6+
ehthumbs_vista.db
7+
8+
# Dump file
9+
*.stackdump
10+
11+
# Folder config file
12+
[Dd]esktop.ini
13+
14+
# Recycle Bin used on file shares
15+
$RECYCLE.BIN/
16+
17+
# Windows Installer files
18+
*.cab
19+
*.msi
20+
*.msix
21+
*.msm
22+
*.msp
23+
24+
# Windows shortcuts
25+
*.lnk
26+
### Java template
27+
# Compiled class file
28+
*.class
29+
30+
# Log file
31+
*.log
32+
33+
# BlueJ files
34+
*.ctxt
35+
36+
# Mobile Tools for Java (J2ME)
37+
.mtj.tmp/
38+
39+
# Package Files #
40+
*.jar
41+
*.war
42+
*.nar
43+
*.ear
44+
*.zip
45+
*.tar.gz
46+
*.rar
47+
48+
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
49+
hs_err_pid*
50+
### JetBrains template
51+
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and WebStorm
52+
# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
53+
54+
# User-specific stuff
55+
.idea/**/workspace.xml
56+
.idea/**/tasks.xml
57+
.idea/**/usage.statistics.xml
58+
.idea/**/dictionaries
59+
.idea/**/shelf
60+
61+
# Sensitive or high-churn files
62+
.idea/**/dataSources/
63+
.idea/**/dataSources.ids
64+
.idea/**/dataSources.local.xml
65+
.idea/**/sqlDataSources.xml
66+
.idea/**/dynamic.xml
67+
.idea/**/uiDesigner.xml
68+
.idea/**/dbnavigator.xml
69+
70+
# Gradle
71+
.idea/**/gradle.xml
72+
.idea/**/libraries
73+
74+
# Gradle and Maven with auto-import
75+
# When using Gradle or Maven with auto-import, you should exclude module files,
76+
# since they will be recreated, and may cause churn. Uncomment if using
77+
# auto-import.
78+
# .idea/modules.xml
79+
# .idea/*.iml
80+
# .idea/modules
81+
82+
# CMake
83+
cmake-build-*/
84+
85+
# Mongo Explorer plugin
86+
.idea/**/mongoSettings.xml
87+
88+
# File-based project format
89+
*.iws
90+
91+
# IntelliJ
92+
out/
93+
94+
# mpeltonen/sbt-idea plugin
95+
.idea_modules/
96+
97+
# JIRA plugin
98+
atlassian-ide-plugin.xml
99+
100+
# Cursive Clojure plugin
101+
.idea/replstate.xml
102+
103+
# Crashlytics plugin (for Android Studio and IntelliJ)
104+
com_crashlytics_export_strings.xml
105+
crashlytics.properties
106+
crashlytics-build.properties
107+
fabric.properties
108+
109+
# Editor-based Rest Client
110+
.idea/httpRequests
111+
### macOS template
112+
# General
113+
.DS_Store
114+
.AppleDouble
115+
.LSOverride
116+
117+
# Icon must end with two \r
118+
Icon
119+
120+
# Thumbnails
121+
._*
122+
123+
# Files that might appear in the root of a volume
124+
.DocumentRevisions-V100
125+
.fseventsd
126+
.Spotlight-V100
127+
.TemporaryItems
128+
.Trashes
129+
.VolumeIcon.icns
130+
.com.apple.timemachine.donotpresent
131+
132+
# Directories potentially created on remote AFP share
133+
.AppleDB
134+
.AppleDesktop
135+
Network Trash Folder
136+
Temporary Items
137+
.apdisk
138+
### Kotlin template
139+
# Compiled class file
140+
*.class
141+
142+
# Log file
143+
*.log
144+
145+
# BlueJ files
146+
*.ctxt
147+
148+
# Mobile Tools for Java (J2ME)
149+
.mtj.tmp/
150+
151+
# Package Files #
152+
*.jar
153+
*.war
154+
*.nar
155+
*.ear
156+
*.zip
157+
*.tar.gz
158+
*.rar
159+
160+
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
161+
hs_err_pid*
162+
### Android template
163+
# Built application files
2164
*.apk
3165
*.ap_
4166

167+
# Files for the ART/Dalvik VM
168+
*.dex
169+
5170
# Java class files
6171
*.class
7172

8-
# generated files
173+
# Generated files
9174
bin/
10175
gen/
176+
out/
177+
178+
# Gradle files
179+
.gradle/
180+
build/
11181

12182
# Local configuration file (sdk path, etc)
13183
local.properties
14184

15-
# Windows thumbnail db
16-
Thumbs.db
185+
# Proguard folder generated by Eclipse
186+
proguard/
17187

18-
# OSX files
19-
.DS_Store
188+
# Log Files
189+
*.log
190+
191+
# Android Studio Navigation editor temp files
192+
.navigation/
20193

21-
# Android Studio
194+
# Android Studio captures folder
195+
captures/
196+
197+
# IntelliJ
22198
*.iml
23-
.idea
199+
.idea/workspace.xml
200+
.idea/tasks.xml
201+
.idea/gradle.xml
202+
.idea/assetWizardSettings.xml
203+
.idea/dictionaries
204+
.idea/libraries
205+
.idea/caches
206+
207+
# Keystore files
208+
# Uncomment the following line if you do not want to check your keystore files in.
209+
#*.jks
210+
211+
# External native build folder generated in Android Studio 2.2 and later
212+
.externalNativeBuild
213+
214+
# Google Services (e.g. APIs or Firebase)
215+
google-services.json
216+
217+
# Freeline
218+
freeline.py
219+
freeline/
220+
freeline_project_description.json
221+
222+
# fastlane
223+
fastlane/report.xml
224+
fastlane/Preview.html
225+
fastlane/screenshots
226+
fastlane/test_output
227+
fastlane/readme.md
228+
### Linux template
229+
*~
230+
231+
# temporary files which can be created if a process still has a handle open of a deleted file
232+
.fuse_hidden*
233+
234+
# KDE directory preferences
235+
.directory
236+
237+
# Linux trash folder which might appear on any partition or disk
238+
.Trash-*
239+
240+
# .nfs files are created when an open file is removed but is still being accessed
241+
.nfs*
242+
### Gradle template
24243
.gradle
25-
build/
244+
/build/
245+
246+
# Ignore Gradle GUI config
247+
gradle-app.setting
248+
249+
# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
250+
!gradle-wrapper.jar
26251

27-
*ASUS_PC_01*
252+
# Cache of project
253+
.gradletasknamecache
28254

255+
# # Work around https://youtrack.jetbrains.com/issue/IDEA-116898
256+
# gradle/wrapper/gradle-wrapper.properties

.idea/codeStyles/Project.xml

+32
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/codeStyles/codeStyleConfig.xml

+5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/encodings.xml

+6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)