[iOS] Make .pbxproj file a non-binary

[bbarthec]

Why

https://exponent-internal.slack.com/archives/C1QLJDKDZ/p1590273938117300

Check the change here: https://github.com/expo/expo/pull/8508/files

[sjchmiela]

Is this something we would like to try?

https://github.com/lavajeff/react-native-apollo-starter/blob/825a3c7c61b0c357a5fd75dc48209f6b856a5f6d/.gitattributes#L2

[tsapeta]

I think James mentioned that we might want to keep Pods' pbxproj as it was (because it's generated) and change git attributes only for this one under ios/Exponent.xcodeproj

[tsapeta]

Hmm, still, what about other project.pbxproj? Especially from Pods folder, in the client and bare-expo as well.

[bbarthec]

These lines result in being able to see diff for only two specified .pbxproj files (every else .pbxproj is treated as binary (-diff -text):

diff --git a/apps/bare-expo/ios/BareExpo.xcodeproj/project.pbxproj b/apps/bare-expo/ios/BareExpo.xcodeproj/project.pbxproj
index af29fdbeed..664369f871 100644
--- a/apps/bare-expo/ios/BareExpo.xcodeproj/project.pbxproj
+++ b/apps/bare-expo/ios/BareExpo.xcodeproj/project.pbxproj
@@ -6,8 +6,6 @@
        objectVersion = 46;
        objects = {
-
-
 /* Begin PBXBuildFile section */
                00E356F31AD99517003FC87E /* BareExpoTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 00E356F21AD99517003FC87E /* BareExpoTests.m */; };
                13B07FBC1A68108700A75B9A /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB01A68108700A75B9A /* AppDelegate.m */; };

diff --git a/apps/bare-expo/ios/Pods/Pods.xcodeproj/project.pbxproj b/apps/bare-expo/ios/Pods/Pods.xcodeproj/project.pbxproj
index 85e3e54d20..1d3bbf20b5 100644
Binary files a/apps/bare-expo/ios/Pods/Pods.xcodeproj/project.pbxproj and b/apps/bare-expo/ios/Pods/Pods.xcodeproj/project.pbxproj differ

diff --git a/ios/Exponent.xcodeproj/project.pbxproj b/ios/Exponent.xcodeproj/project.pbxproj
index 5b42fb5434..bc57b61db4 100644
--- a/ios/Exponent.xcodeproj/project.pbxproj
+++ b/ios/Exponent.xcodeproj/project.pbxproj
@@ -1,6 +1,8 @@
 // !$*UTF8*$!
 {
        archiveVersion = 1;
+
+
        classes = {
        };
        objectVersion = 46;

[sjchmiela]

Thanks for applying my suggestion! I've inspected the mergepbx library and started to wonder if… this will work automatically? The setup on https://github.com/simonwagner/mergepbx#using-mergepbx-as-a-merge-driver suggests to also edit ~/.gitconfig — I don't suppose we'd want to make all the contributors have to modify it manually? Or is it somehow automatically taken care of?

[bbarthec]

Yeah, after a second thought I think I'm going to remove it.
Why?

1. You have to have it installed to be available
2. Even though it probably might come in handy (I believe every pod install modifies whole .pbxproj file and especially UUIDs are generated from scratch) and union merge would possibly fail miserably in almost every case, I don't think we need sth like this and I haven't tested it so ¯_(ツ)_/¯

[sjchmiela]

Does making pbxproj a binary also hide it from the diff? Is it still possible to expand the diff to see the changes?

IMHO we would like to hide it from the diff 👍, but I would also like to see the changes if I want to. What do you think?

[bbarthec]

@sjchmiela, yeap, marking file as binary disables diff and CRLF conversion, but from what I've experienced only in git tool. That means neither git show nor git diff would show file content. I believed that this would cause github to show this kind of files (with binary attribute) to be shown as binary file in PRs and previews as well, but it turned out that github is not working like this 🤔 So, if you navigate to https://github.com/expo/expo/pull/8508/files you'll see that all .pbxproj files contents are perfectly visible if you expand the diff 🤔 Maybe I'm missing sth somewhere, but I dunno where and what 🤷

[sjchmiela]

That sounds great! 🥇

[sjchmiela]

Thank you for thinking it over! 🧠

[sjchmiela]

That sounds great! 🥇