From daec44fa5276171cada21e889111c600dadfd1ff Mon Sep 17 00:00:00 2001 From: Thomas Van Lenten Date: Thu, 19 May 2016 10:08:51 -0400 Subject: Expand the OS X/Xcode gitignores - Add the folder CocoaPods will add to the root folder. - Move and expand the entries in the objectivec directory. --- .gitignore | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to '.gitignore') diff --git a/.gitignore b/.gitignore index 27eeb9c2..5cb8cba9 100644 --- a/.gitignore +++ b/.gitignore @@ -88,16 +88,14 @@ build_msvc # packages themselves. /csharp/src/packages/*/ -# Directories created by opening the Objective C Xcode projects. -objectivec/ProtocolBuffers_OSX.xcodeproj/project.xcworkspace/xcuserdata/ -objectivec/ProtocolBuffers_OSX.xcodeproj/project.xcworkspace/xcshareddata/ProtocolBuffers_OSX.xccheckout -objectivec/ProtocolBuffers_OSX.xcodeproj/xcuserdata/ -objectivec/ProtocolBuffers_iOS.xcodeproj/project.xcworkspace/xcuserdata/ -objectivec/ProtocolBuffers_iOS.xcodeproj/project.xcworkspace/xcshareddata/ProtocolBuffers_iOS.xccheckout -objectivec/ProtocolBuffers_iOS.xcodeproj/xcuserdata/ # OS X's Finder creates these for state about opened windows/etc. **/.DS_Store +# Cocoapods artifacts +# Podfile.lock and the workspace file are tracked, to ease deleting them. That's +# needed to trigger "pod install" to rerun the preinstall commands. +Pods/ + # Comformance test output conformance/.libs/ conformance/com/ -- cgit v1.2.3