kintsugi 0.7.2 → 0.7.4
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/.github/workflows/release.yml +1 -1
- data/.github/workflows/tests.yml +4 -2
- data/kintsugi.gemspec +1 -1
- data/lib/kintsugi/version.rb +1 -1
- data/lib/kintsugi/xcodeproj_extensions.rb +11 -0
- metadata +5 -5
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 86f0ab39483b15695fb6566e271eb3149a61affb33ab68904ca752acca8f0ca9
|
4
|
+
data.tar.gz: f27079f1a0f316dc11af37acd25011e4897fbf74f4ca01c90b03ad8717a85c03
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 44a481b5256cc4b5ab7c04fde177eb15b13d3e8cd3ca6118314fc969a10bcf372f38736a345a9ff86ab478500823d065717c36bb02673fadd29e615800438320
|
7
|
+
data.tar.gz: d0903545a1ea63c26eb4c5e5346efb46742bd8095ae8f932cf4f2a674b2671aa99f23b2e9d10c7fb6059fdf3b79188d2108d2d407dc7b94bf93b434874f8a852
|
data/.github/workflows/tests.yml
CHANGED
@@ -10,6 +10,9 @@ jobs:
|
|
10
10
|
main-job:
|
11
11
|
name: Main
|
12
12
|
runs-on: ubuntu-latest
|
13
|
+
strategy:
|
14
|
+
matrix:
|
15
|
+
ruby-version: [2.6, 2.7, 3.2, 3.3]
|
13
16
|
|
14
17
|
steps:
|
15
18
|
- name: Checkout repo
|
@@ -18,8 +21,7 @@ jobs:
|
|
18
21
|
- name: Set up Ruby
|
19
22
|
uses: ruby/setup-ruby@v1
|
20
23
|
with:
|
21
|
-
ruby-version:
|
22
|
-
rubygems: latest
|
24
|
+
ruby-version: ${{ matrix.ruby-version }}
|
23
25
|
bundler-cache: true
|
24
26
|
|
25
27
|
- name: Run Rake
|
data/kintsugi.gemspec
CHANGED
@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
|
|
23
23
|
spec.require_paths = ["lib"]
|
24
24
|
|
25
25
|
spec.add_dependency "tty-prompt", "~> 0"
|
26
|
-
spec.add_dependency "xcodeproj", ">= 1.19.0", "<= 1.
|
26
|
+
spec.add_dependency "xcodeproj", ">= 1.19.0", "<= 1.23.0"
|
27
27
|
|
28
28
|
spec.add_development_dependency "git", "~> 1.11"
|
29
29
|
spec.add_development_dependency "rake", "~> 13.0"
|
data/lib/kintsugi/version.rb
CHANGED
@@ -125,6 +125,17 @@ module Xcodeproj
|
|
125
125
|
hash
|
126
126
|
end
|
127
127
|
end
|
128
|
+
|
129
|
+
# By default, for this type, the `display_name` is used when calling `ascii_plist_annotation` (which is used
|
130
|
+
# to serialize the project to disk). In the case where the `display_name` contains a "plugin:" prefix, which
|
131
|
+
# means that the package is a plugin, the prefix is ommitted so just the package name is used.
|
132
|
+
# This, of course can be implemented in a better way, like adding a field to this object as plugin, marking it
|
133
|
+
# as a plugin, but this is a very simple way to achieve the desired result.
|
134
|
+
class XCSwiftPackageProductDependency
|
135
|
+
def ascii_plist_annotation
|
136
|
+
" #{display_name.delete_prefix("plugin:")} "
|
137
|
+
end
|
138
|
+
end
|
128
139
|
end
|
129
140
|
end
|
130
141
|
|
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.7.
|
4
|
+
version: 0.7.4
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Ben Yohay
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2023-
|
11
|
+
date: 2023-12-31 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: tty-prompt
|
@@ -33,7 +33,7 @@ dependencies:
|
|
33
33
|
version: 1.19.0
|
34
34
|
- - "<="
|
35
35
|
- !ruby/object:Gem::Version
|
36
|
-
version: 1.
|
36
|
+
version: 1.23.0
|
37
37
|
type: :runtime
|
38
38
|
prerelease: false
|
39
39
|
version_requirements: !ruby/object:Gem::Requirement
|
@@ -43,7 +43,7 @@ dependencies:
|
|
43
43
|
version: 1.19.0
|
44
44
|
- - "<="
|
45
45
|
- !ruby/object:Gem::Version
|
46
|
-
version: 1.
|
46
|
+
version: 1.23.0
|
47
47
|
- !ruby/object:Gem::Dependency
|
48
48
|
name: git
|
49
49
|
requirement: !ruby/object:Gem::Requirement
|
@@ -184,7 +184,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
184
184
|
- !ruby/object:Gem::Version
|
185
185
|
version: '0'
|
186
186
|
requirements: []
|
187
|
-
rubygems_version: 3.
|
187
|
+
rubygems_version: 3.6.0.dev
|
188
188
|
signing_key:
|
189
189
|
specification_version: 4
|
190
190
|
summary: pbxproj files git conflicts solver
|