From 507c3949bea442a308cc04fdbbf6560754c9f5ee Mon Sep 17 00:00:00 2001 From: Ben Bodenmiller Date: Sun, 10 May 2015 05:21:36 -0700 Subject: [PATCH] sync up xcode related gitignore files some details based on #1221 --- Global/Xcode.gitignore | 11 ++++++++++- Objective-C.gitignore | 20 ++++++++++++++++++-- Swift.gitignore | 13 +++++++++++-- 3 files changed, 39 insertions(+), 5 deletions(-) diff --git a/Global/Xcode.gitignore b/Global/Xcode.gitignore index 1b81d249..d07b7894 100644 --- a/Global/Xcode.gitignore +++ b/Global/Xcode.gitignore @@ -1,4 +1,12 @@ +# Xcode +# +# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore + +## Build generated build/ +DerivedData + +## Various settings *.pbxuser !default.pbxuser *.mode1v3 @@ -8,7 +16,8 @@ build/ *.perspectivev3 !default.perspectivev3 xcuserdata + +## Other *.xccheckout *.moved-aside -DerivedData *.xcuserstate diff --git a/Objective-C.gitignore b/Objective-C.gitignore index fffb5ed0..7f24b4de 100644 --- a/Objective-C.gitignore +++ b/Objective-C.gitignore @@ -1,6 +1,12 @@ # Xcode # +# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore + +## Build generated build/ +DerivedData + +## Various settings *.pbxuser !default.pbxuser *.mode1v3 @@ -10,12 +16,15 @@ build/ *.perspectivev3 !default.perspectivev3 xcuserdata + +## Other *.xccheckout *.moved-aside -DerivedData +*.xcuserstate + +## Obj-C/Swift specific *.hmap *.ipa -*.xcuserstate # CocoaPods # @@ -24,3 +33,10 @@ DerivedData # http://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control # #Pods/ + +# Carthage +# +# Add this line if you want to avoid checking in source code from Carthage dependencies. +# Carthage/Checkouts + +Carthage/Build diff --git a/Swift.gitignore b/Swift.gitignore index 8615121b..583de456 100644 --- a/Swift.gitignore +++ b/Swift.gitignore @@ -1,6 +1,12 @@ # Xcode # +# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore + +## Build generated build/ +DerivedData + +## Various settings *.pbxuser !default.pbxuser *.mode1v3 @@ -10,12 +16,15 @@ build/ *.perspectivev3 !default.perspectivev3 xcuserdata + +## Other *.xccheckout *.moved-aside -DerivedData +*.xcuserstate + +## Obj-C/Swift specific *.hmap *.ipa -*.xcuserstate # CocoaPods #