xcodeproj 1.5.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f8046e57ba42d21845af2c95f063f5c51fd87625
-  data.tar.gz: 261b049b8d6d5dbc3884901e1bd6a6d184a6b0ed
+  metadata.gz: 9084e7a80a61cbf7fe8fef7da730e4d3c9ff90b1
+  data.tar.gz: 3dbcdcd622aa7c288d92c570e0a882ac24fd28cb
 SHA512:
-  metadata.gz: 4c6bdef5a2db8877086391a9ba5382ec220a58fa4cd212c432ddb2dd7659a964baf30f96566ec83c54a9de6ff427f7e4a27f161997670298ea898205390899b7
-  data.tar.gz: 31e7ec5eb73b9c36733b21d53997fc06e6ca986d8eb11438f611aeda9fbb7fad607e65438d9f11a452f590c538d5bc3e418b0f3f141d5a823dc99c5bae326b90
+  metadata.gz: 56453fae972dbbc49bda896460fd976a9028e0a5fab6e801195435eea2aa85e834ef12f113651c2ee9e41045dc6c2944b43e6bfe9709a746bfc821f0cdfd5267
+  data.tar.gz: b5b0a96286a6364d1061c8e1838bc66c8c979594cd50c3059d04ef5ac269b10b6f91dcbe2a288cf42e8a1e6a1c70a4bf0c1e03eef54dd1b9793a25ba1870ab2b

data/lib/xcodeproj/gem_version.rb

@@ -1,5 +1,5 @@
 module Xcodeproj
   # The version of the xcodeproj gem.
   #
-  VERSION = '1.5.0'.freeze unless defined? Xcodeproj::VERSION
+  VERSION = '1.5.1'.freeze unless defined? Xcodeproj::VERSION
 end

data/lib/xcodeproj/plist.rb

@@ -77,11 +77,18 @@ module Xcodeproj
 
     # @return [Bool] Checks whether there are merge conflicts in the file.
     #
-    # @param  [#to_s] path
+    # @param  [#to_s] contents
     #         The contents of the file.
     #
     def self.file_in_conflict?(contents)
-      contents.match(/^(<|=|>){7}/)
+      conflict_regex = /
+        ^<{7}(?!<) # Exactly 7 left arrows at the beginning of the line
+        [\w\W]* # Anything
+        ^={7}(?!=) # Exactly 7 equality symbols at the beginning of the line
+        [\w\W]* # Anything
+        ^>{7}(?!>) # Exactly 7 right arrows at the beginning of the line
+      /xm
+      contents.match(conflict_regex)
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xcodeproj
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.1
 platform: ruby
 authors:
 - Eloy Duran
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-06 00:00:00.000000000 Z
+date: 2017-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: CFPropertyList