Skip to content

Commit 55aa4f3

Browse files
authored
Merge pull request #495 from crowdbotics/qa
Deploy to Master
2 parents 0bae9e4 + fd12846 commit 55aa4f3

File tree

8 files changed

+297
-185
lines changed

8 files changed

+297
-185
lines changed

Gemfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@ source 'https://rubygems.org'
33
# You may use http://rbenv.org/ or https://rvm.io/ to install and use this version
44
ruby '>= 2.6.10'
55

6-
gem 'cocoapods', '>= 1.11.3'
6+
gem 'cocoapods', '~> 1.13', '!= 1.15.0', '!= 1.15.1'
7+
gem 'activesupport', '>= 6.1.7.5', '< 7.1.0'

Gemfile.lock

Lines changed: 21 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,29 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
CFPropertyList (3.0.6)
4+
CFPropertyList (3.0.7)
5+
base64
6+
nkf
57
rexml
68
activesupport (7.0.4.3)
79
concurrent-ruby (~> 1.0, >= 1.0.2)
810
i18n (>= 1.6, < 2)
911
minitest (>= 5.1)
1012
tzinfo (~> 2.0)
11-
addressable (2.8.4)
12-
public_suffix (>= 2.0.2, < 6.0)
13+
addressable (2.8.7)
14+
public_suffix (>= 2.0.2, < 7.0)
1315
algoliasearch (1.27.5)
1416
httpclient (~> 2.8, >= 2.8.3)
1517
json (>= 1.5.1)
1618
atomos (0.1.3)
19+
base64 (0.2.0)
1720
claide (1.1.0)
18-
cocoapods (1.12.1)
21+
cocoapods (1.15.2)
1922
addressable (~> 2.8)
2023
claide (>= 1.0.2, < 2.0)
21-
cocoapods-core (= 1.12.1)
24+
cocoapods-core (= 1.15.2)
2225
cocoapods-deintegrate (>= 1.0.3, < 2.0)
23-
cocoapods-downloader (>= 1.6.0, < 2.0)
26+
cocoapods-downloader (>= 2.1, < 3.0)
2427
cocoapods-plugins (>= 1.0.0, < 2.0)
2528
cocoapods-search (>= 1.0.0, < 2.0)
2629
cocoapods-trunk (>= 1.6.0, < 2.0)
@@ -32,8 +35,8 @@ GEM
3235
molinillo (~> 0.8.0)
3336
nap (~> 1.0)
3437
ruby-macho (>= 2.3.0, < 3.0)
35-
xcodeproj (>= 1.21.0, < 2.0)
36-
cocoapods-core (1.12.1)
38+
xcodeproj (>= 1.23.0, < 2.0)
39+
cocoapods-core (1.15.2)
3740
activesupport (>= 5.0, < 8)
3841
addressable (~> 2.8)
3942
algoliasearch (~> 1.0)
@@ -44,7 +47,7 @@ GEM
4447
public_suffix (~> 4.0)
4548
typhoeus (~> 1.0)
4649
cocoapods-deintegrate (1.0.5)
47-
cocoapods-downloader (1.6.3)
50+
cocoapods-downloader (2.1)
4851
cocoapods-plugins (1.0.0)
4952
nap
5053
cocoapods-search (1.0.1)
@@ -57,39 +60,41 @@ GEM
5760
escape (0.0.4)
5861
ethon (0.16.0)
5962
ffi (>= 1.15.0)
60-
ffi (1.15.5)
63+
ffi (1.17.0)
6164
fourflusher (2.3.1)
6265
fuzzy_match (2.0.4)
6366
gh_inspector (1.1.3)
6467
httpclient (2.8.3)
6568
i18n (1.13.0)
6669
concurrent-ruby (~> 1.0)
67-
json (2.6.3)
70+
json (2.7.2)
6871
minitest (5.18.0)
6972
molinillo (0.8.0)
7073
nanaimo (0.3.0)
7174
nap (1.1.0)
7275
netrc (0.11.0)
76+
nkf (0.2.0)
7377
public_suffix (4.0.7)
74-
rexml (3.2.5)
78+
rexml (3.3.7)
7579
ruby-macho (2.5.1)
76-
typhoeus (1.4.0)
80+
typhoeus (1.4.1)
7781
ethon (>= 0.9.0)
7882
tzinfo (2.0.6)
7983
concurrent-ruby (~> 1.0)
80-
xcodeproj (1.22.0)
84+
xcodeproj (1.25.0)
8185
CFPropertyList (>= 2.3.3, < 4.0)
8286
atomos (~> 0.1.3)
8387
claide (>= 1.0.2, < 2.0)
8488
colored2 (~> 3.1)
8589
nanaimo (~> 0.3.0)
86-
rexml (~> 3.2.4)
90+
rexml (>= 3.3.2, < 4.0)
8791

8892
PLATFORMS
8993
ruby
9094

9195
DEPENDENCIES
92-
cocoapods (>= 1.11.3)
96+
activesupport (>= 6.1.7.5, < 7.1.0)
97+
cocoapods (~> 1.13, != 1.15.1, != 1.15.0)
9398

9499
RUBY VERSION
95100
ruby 2.7.4p191

dist/cookie/{{cookiecutter.project_slug}}/.crowdbotics.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"scaffold": {
33
"type": "react-native",
4-
"version": "2.7.2",
4+
"version": "2.7.3",
55
"cookiecutter_context": {
66
"project_name": "{{cookiecutter.project_name}}",
77
"project_slug": "{{cookiecutter.project_slug}}",

0 commit comments

Comments
 (0)