kintsugi 0.6.0 → 0.6.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
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: b1bb4d750b89e3f7648a84bb65fefe78abcba67a04f4c92bde7a636a3af0e5b0
|
|
4
|
+
data.tar.gz: eec2d98b161b7079af42c8fbfb1da27960d4557bb1a1fcda1473c82873fc6c62
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: '09aaa8afe8d45faa843182e86d883e60996782967ce3d6f03fac9310a5197659c4c3f218293d71752d3feabd3aa44b8f9f36ddeae6a78ec1da2317ed48fcb1be'
|
|
7
|
+
data.tar.gz: 9eb2ebc3653c1d6ecf3467b9d0a125902313c3221ef53599e5a5b343bc6eda346f31306651a8ec8014086f695abd68b9283983b6f10136c1e854e1975d66eae7
|
|
@@ -35,6 +35,8 @@ module Kintsugi
|
|
|
35
35
|
#
|
|
36
36
|
# @return [void]
|
|
37
37
|
def apply_change_to_project(project, change)
|
|
38
|
+
return unless change&.key?("rootObject")
|
|
39
|
+
|
|
38
40
|
# We iterate over the main group and project references first because they might create file
|
|
39
41
|
# or project references that are referenced in other parts.
|
|
40
42
|
unless change["rootObject"]["mainGroup"].nil?
|
data/lib/kintsugi/version.rb
CHANGED
|
@@ -27,6 +27,13 @@ describe Kintsugi, :apply_change_to_project do
|
|
|
27
27
|
end
|
|
28
28
|
end
|
|
29
29
|
|
|
30
|
+
it "not raises when change is nil or doesn't have root object" do
|
|
31
|
+
expect {
|
|
32
|
+
described_class.apply_change_to_project(base_project, nil)
|
|
33
|
+
described_class.apply_change_to_project(base_project, {})
|
|
34
|
+
}.not_to raise_error
|
|
35
|
+
end
|
|
36
|
+
|
|
30
37
|
it "adds new target" do
|
|
31
38
|
theirs_project = create_copy_of_project(base_project.path, "theirs")
|
|
32
39
|
theirs_project.new_target("com.apple.product-type.library.static", "foo", :ios)
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: kintsugi
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.6.
|
|
4
|
+
version: 0.6.1
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Ben Yohay
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2022-08-
|
|
11
|
+
date: 2022-08-29 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: xcodeproj
|
|
@@ -168,7 +168,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
|
168
168
|
- !ruby/object:Gem::Version
|
|
169
169
|
version: '0'
|
|
170
170
|
requirements: []
|
|
171
|
-
rubygems_version: 3.3.
|
|
171
|
+
rubygems_version: 3.3.21
|
|
172
172
|
signing_key:
|
|
173
173
|
specification_version: 4
|
|
174
174
|
summary: pbxproj files git conflicts solver
|