diff options
| author | DJ Mountney <david@twkie.net> | 2017-03-09 02:16:47 +0300 |
|---|---|---|
| committer | DJ Mountney <david@twkie.net> | 2017-03-09 02:16:47 +0300 |
| commit | 65f6abffc4349131ebb75f8ded0f417933c4a50e (patch) | |
| tree | 24b702147ab9d37ef66eb5500a86370fe286de81 /vendor/gitignore/Global | |
| parent | 1110b2f18c1a5397df71979fcc3fc8fabe87576d (diff) | |
Update the gitignore and gitlab-ci templates for 9.0
Diffstat (limited to 'vendor/gitignore/Global')
| -rw-r--r-- | vendor/gitignore/Global/Eclipse.gitignore | 5 | ||||
| -rw-r--r-- | vendor/gitignore/Global/JetBrains.gitignore | 1 | ||||
| -rw-r--r-- | vendor/gitignore/Global/SBT.gitignore | 3 |
3 files changed, 9 insertions, 0 deletions
diff --git a/vendor/gitignore/Global/Eclipse.gitignore b/vendor/gitignore/Global/Eclipse.gitignore index 31c9fb31167..4f88399d2d8 100644 --- a/vendor/gitignore/Global/Eclipse.gitignore +++ b/vendor/gitignore/Global/Eclipse.gitignore @@ -49,3 +49,8 @@ local.properties # Code Recommenders .recommenders/ + +# Scala IDE specific (Scala & Java development for Eclipse) +.cache-main +.scala_dependencies +.worksheet diff --git a/vendor/gitignore/Global/JetBrains.gitignore b/vendor/gitignore/Global/JetBrains.gitignore index 401fee15748..ec7e95c6ab5 100644 --- a/vendor/gitignore/Global/JetBrains.gitignore +++ b/vendor/gitignore/Global/JetBrains.gitignore @@ -4,6 +4,7 @@ # User-specific stuff: .idea/**/workspace.xml .idea/**/tasks.xml +.idea/dictionaries # Sensitive or high-churn files: .idea/**/dataSources/ diff --git a/vendor/gitignore/Global/SBT.gitignore b/vendor/gitignore/Global/SBT.gitignore index 970d897c75c..5ed6acb6576 100644 --- a/vendor/gitignore/Global/SBT.gitignore +++ b/vendor/gitignore/Global/SBT.gitignore @@ -1,9 +1,12 @@ # Simple Build Tool # http://www.scala-sbt.org/release/docs/Getting-Started/Directories.html#configuring-version-control +dist/* target/ lib_managed/ src_managed/ project/boot/ +project/plugins/project/ .history .cache +.lib/ |