aboutsummaryrefslogtreecommitdiffstats
path: root/Global
diff options
context:
space:
mode:
authorBrendan Forster <brendan@github.com>2018-11-23 13:28:52 -0400
committerGitHub <noreply@github.com>2018-11-23 13:28:52 -0400
commit79d9eb9d63d7fc36e0abd7753c47ea149572768f (patch)
tree44ba55b8042e25b6a80853f4b4b2c5554d2861b5 /Global
parent6615b2687b99752459b5acb466da0e32d3ca6fed (diff)
parent0a23ed588dd0d59dbc2b356133fe87364265b45a (diff)
downloadgitignore-79d9eb9d63d7fc36e0abd7753c47ea149572768f.tar.gz
gitignore-79d9eb9d63d7fc36e0abd7753c47ea149572768f.zip
Merge pull request #2861 from Coeur/revert-2752-patch-2
Revert "Update Xcode.gitignore"
Diffstat (limited to 'Global')
-rw-r--r--Global/Xcode.gitignore74
1 files changed, 9 insertions, 65 deletions
diff --git a/Global/Xcode.gitignore b/Global/Xcode.gitignore
index b01314d3..cd0c7d3e 100644
--- a/Global/Xcode.gitignore
+++ b/Global/Xcode.gitignore
@@ -2,11 +2,17 @@
#
# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
-## Build generated
+## User settings
+xcuserdata/
+
+## compatibility with Xcode 8 and earlier (ignoring not required starting Xcode 9)
+*.xcscmblueprint
+*.xccheckout
+
+## compatibility with Xcode 3 and earlier (ignoring not required starting Xcode 4)
build/
DerivedData/
-
-## Various settings
+*.moved-aside
*.pbxuser
!default.pbxuser
*.mode1v3
@@ -15,65 +21,3 @@ DerivedData/
!default.mode2v3
*.perspectivev3
!default.perspectivev3
-xcuserdata/
-
-## Other
-*.moved-aside
-*.xccheckout
-*.xcscmblueprint
-
-## Obj-C/Swift specific
-*.hmap
-*.ipa
-*.dSYM.zip
-*.dSYM
-
-## Playgrounds
-timeline.xctimeline
-playground.xcworkspace
-
-# Swift Package Manager
-#
-# Add this line if you want to avoid checking in source code from Swift Package Manager dependencies.
-# Packages/
-# Package.pins
-# Package.resolved
-.build/
-
-# CocoaPods
-#
-# We recommend against adding the Pods directory to your .gitignore. However
-# you should judge for yourself, the pros and cons are mentioned at:
-# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
-#
-# Pods/
-#
-# Add this line if you want to avoid checking in source code from the Xcode workspace
-# *.xcworkspace
-
-# Carthage
-#
-# Add this line if you want to avoid checking in source code from Carthage dependencies.
-# Carthage/Checkouts
-
-Carthage/Build
-
-# fastlane
-#
-# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the
-# screenshots whenever they are needed.
-# For more information about the recommended setup visit:
-# https://docs.fastlane.tools/best-practices/source-control/#source-control
-
-fastlane/report.xml
-fastlane/Preview.html
-fastlane/screenshots/**/*.png
-fastlane/test_output
-
-# Code Injection
-#
-# After new code Injection tools there's a generated folder /iOSInjectionProject
-# https://github.com/johnno1962/injectionforxcode
-
-iOSInjectionProject/
-