xcodeproj 1.5.0 → 1.5.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/xcodeproj/gem_version.rb +1 -1
- data/lib/xcodeproj/plist.rb +9 -2
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 9084e7a80a61cbf7fe8fef7da730e4d3c9ff90b1
|
|
4
|
+
data.tar.gz: 3dbcdcd622aa7c288d92c570e0a882ac24fd28cb
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 56453fae972dbbc49bda896460fd976a9028e0a5fab6e801195435eea2aa85e834ef12f113651c2ee9e41045dc6c2944b43e6bfe9709a746bfc821f0cdfd5267
|
|
7
|
+
data.tar.gz: b5b0a96286a6364d1061c8e1838bc66c8c979594cd50c3059d04ef5ac269b10b6f91dcbe2a288cf42e8a1e6a1c70a4bf0c1e03eef54dd1b9793a25ba1870ab2b
|
data/lib/xcodeproj/plist.rb
CHANGED
|
@@ -77,11 +77,18 @@ module Xcodeproj
|
|
|
77
77
|
|
|
78
78
|
# @return [Bool] Checks whether there are merge conflicts in the file.
|
|
79
79
|
#
|
|
80
|
-
# @param [#to_s]
|
|
80
|
+
# @param [#to_s] contents
|
|
81
81
|
# The contents of the file.
|
|
82
82
|
#
|
|
83
83
|
def self.file_in_conflict?(contents)
|
|
84
|
-
|
|
84
|
+
conflict_regex = /
|
|
85
|
+
^<{7}(?!<) # Exactly 7 left arrows at the beginning of the line
|
|
86
|
+
[\w\W]* # Anything
|
|
87
|
+
^={7}(?!=) # Exactly 7 equality symbols at the beginning of the line
|
|
88
|
+
[\w\W]* # Anything
|
|
89
|
+
^>{7}(?!>) # Exactly 7 right arrows at the beginning of the line
|
|
90
|
+
/xm
|
|
91
|
+
contents.match(conflict_regex)
|
|
85
92
|
end
|
|
86
93
|
end
|
|
87
94
|
end
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: xcodeproj
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 1.5.
|
|
4
|
+
version: 1.5.1
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Eloy Duran
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2017-
|
|
11
|
+
date: 2017-07-19 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: CFPropertyList
|