diff options
| author | Thomas Van Lenten <thomasvl@google.com> | 2016-05-19 10:08:51 -0400 |
|---|---|---|
| committer | Bo Yang <teboring@google.com> | 2016-06-13 13:52:50 -0700 |
| commit | 9e91571bb91b86ea8e8f83e92ebfbb0b90736353 (patch) | |
| tree | c1d83e11f989cd5fe81dc2c0fcccf013f0c16505 | |
| parent | 7e4fb76ac0cca62c97bc6c21505b757ea9b99130 (diff) | |
| download | protobuf-9e91571bb91b86ea8e8f83e92ebfbb0b90736353.tar.gz protobuf-9e91571bb91b86ea8e8f83e92ebfbb0b90736353.tar.bz2 protobuf-9e91571bb91b86ea8e8f83e92ebfbb0b90736353.zip | |
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.
| -rw-r--r-- | .gitignore | 12 | ||||
| -rw-r--r-- | objectivec/.gitignore | 23 |
2 files changed, 28 insertions, 7 deletions
@@ -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/ diff --git a/objectivec/.gitignore b/objectivec/.gitignore new file mode 100644 index 00000000..f786ffce --- /dev/null +++ b/objectivec/.gitignore @@ -0,0 +1,23 @@ +## Build generated +build/ +DerivedData/ + +## Various settings +*.pbxuser +!default.pbxuser +*.mode1v3 +!default.mode1v3 +*.mode2v3 +!default.mode2v3 +*.perspectivev3 +!default.perspectivev3 +xcuserdata/ + +## Other +*.moved-aside +*.xccheckout +*.xcscmblueprint + +## Obj-C/Swift specific +*.hmap +*.ipa |