Skip to content

Commit a75d5b2

Browse files
okwasniewskiokwasniewski
authored
fix: update gemfile for newer ruby versions (#184)
1 parent 5b86b2b commit a75d5b2

File tree

4 files changed

+28
-36
lines changed

4 files changed

+28
-36
lines changed

‎apps/RNApp/Gemfile‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11
source 'https://rubygems.org'
22

33
# You may use http://rbenv.org/ or https://rvm.io/ to install and use this version
4-
ruby ">= 2.6.10"
4+
ruby '>= 2.6.10'
55

66
# Exclude problematic versions of cocoapods and activesupport that causes build failures.
7-
gem 'cocoapods', '>= 1.13', '!= 1.15.0', '!= 1.15.1'
87
gem 'activesupport', '>= 6.1.7.5', '!= 7.1.0'
9-
gem 'xcodeproj', '< 1.26.0'
8+
gem 'cocoapods', '>= 1.13', '!= 1.15.0', '!= 1.15.1'
109
gem 'concurrent-ruby', '< 1.3.4'
10+
gem 'xcodeproj', '< 1.26.0'
1111

1212
# Ruby 3.4.0 has removed some libraries from the standard library.
13+
gem 'benchmark'
1314
gem 'bigdecimal'
1415
gem 'logger'
15-
gem 'benchmark'
1616
gem 'mutex_m'
17+
gem 'nkf'

‎apps/RNApp/Gemfile.lock‎

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,19 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
CFPropertyList (3.0.9)
5-
activesupport (7.1.6)
4+
CFPropertyList (3.0.8)
5+
activesupport (7.2.3)
66
base64
77
benchmark (>= 0.3)
88
bigdecimal
9-
concurrent-ruby (~> 1.0, >= 1.0.2)
9+
concurrent-ruby (~> 1.0, >= 1.3.1)
1010
connection_pool (>= 2.2.5)
1111
drb
1212
i18n (>= 1.6, < 2)
1313
logger (>= 1.4.2)
1414
minitest (>= 5.1)
15-
mutex_m
1615
securerandom (>= 0.3)
17-
tzinfo (~> 2.0)
16+
tzinfo (~> 2.0, >= 2.0.5)
1817
addressable (2.8.8)
1918
public_suffix (>= 2.0.2, < 8.0)
2019
algoliasearch (1.27.5)
@@ -23,7 +22,7 @@ GEM
2322
atomos (0.1.3)
2423
base64 (0.3.0)
2524
benchmark (0.5.0)
26-
bigdecimal (3.3.1)
25+
bigdecimal (4.0.1)
2726
claide (1.1.0)
2827
cocoapods (1.15.2)
2928
addressable (~> 2.8)
@@ -64,31 +63,34 @@ GEM
6463
cocoapods-try (1.2.0)
6564
colored2 (3.1.2)
6665
concurrent-ruby (1.3.3)
67-
connection_pool (2.5.5)
66+
connection_pool (3.0.2)
6867
drb (2.2.3)
6968
escape (0.0.4)
7069
ethon (0.15.0)
7170
ffi (>= 1.15.0)
72-
ffi (1.17.2)
71+
ffi (1.17.3)
7372
fourflusher (2.3.1)
7473
fuzzy_match (2.0.4)
7574
gh_inspector (1.1.3)
7675
httpclient (2.9.0)
7776
mutex_m
78-
i18n (1.14.7)
77+
i18n (1.14.8)
7978
concurrent-ruby (~> 1.0)
8079
json (2.18.0)
8180
logger (1.7.0)
82-
minitest (5.26.1)
81+
minitest (6.0.1)
82+
prism (~> 1.5)
8383
molinillo (0.8.0)
8484
mutex_m (0.3.0)
8585
nanaimo (0.3.0)
8686
nap (1.1.0)
8787
netrc (0.11.0)
88+
nkf (0.2.0)
89+
prism (1.8.0)
8890
public_suffix (4.0.7)
8991
rexml (3.4.4)
9092
ruby-macho (2.5.1)
91-
securerandom (0.3.2)
93+
securerandom (0.4.1)
9294
typhoeus (1.5.0)
9395
ethon (>= 0.9.0, < 0.16.0)
9496
tzinfo (2.0.6)
@@ -112,6 +114,7 @@ DEPENDENCIES
112114
concurrent-ruby (< 1.3.4)
113115
logger
114116
mutex_m
117+
nkf
115118
xcodeproj (< 1.26.0)
116119

117120
RUBY VERSION

‎apps/RNApp/ios/Podfile.lock‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2816,7 +2816,7 @@ SPEC CHECKSUMS:
28162816
ReactCommon: 801eff8cb9c940c04d3a89ce399c343ee3eff654
28172817
RNScreens: d6413aeb1878cdafd3c721e2c5218faf5d5d3b13
28182818
SocketRocket: d4aabe649be1e368d1318fdf28a022d714d65748
2819-
Yoga: 46ff53afcbeda2bae19c85b65e17487c3e3984dd
2819+
Yoga: 526f25666395d30c297d53154398ffd249eaf9e1
28202820

28212821
PODFILE CHECKSUM: 7c116a16dd0744063c8c6293dbfc638c9d447c19
28222822

‎apps/RNApp/ios/RNApp.xcodeproj/project.pbxproj‎

Lines changed: 8 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10+
0AF1414240CE2891676C3CF5 /* Pods_RNApp_BrownfieldLib.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5847633C6FB221FD423653AE /* Pods_RNApp_BrownfieldLib.framework */; };
1011
13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; };
11-
6DB1205BF3704AD01AC6F51D /* Pods_RNApp_BrownfieldLib.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6FC6D7B8BAED9C6AA485CD47 /* Pods_RNApp_BrownfieldLib.framework */; };
12-
72684BA2F8ACEA7D12847DDE /* Pods_RNApp.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4F1F9468A0054691518CD7F2 /* Pods_RNApp.framework */; };
12+
6858E2980480F2D1CDE55629 /* Pods_RNApp.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C9D6297085667BA7D6ADD88C /* Pods_RNApp.framework */; };
1313
761780ED2CA45674006654EE /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 761780EC2CA45674006654EE /* AppDelegate.swift */; };
1414
79BD1EE92EEBFB76003AA29F /* BrownfieldLib.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 79BD1EE32EEBFB76003AA29F /* BrownfieldLib.framework */; };
1515
79BD1EEA2EEBFB76003AA29F /* BrownfieldLib.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 79BD1EE32EEBFB76003AA29F /* BrownfieldLib.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
@@ -48,14 +48,14 @@
4848
13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = RNApp/Info.plist; sourceTree = "<group>"; };
4949
13B07FB81A68108700A75B9A /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = PrivacyInfo.xcprivacy; path = RNApp/PrivacyInfo.xcprivacy; sourceTree = "<group>"; };
5050
3B4392A12AC88292D35C810B /* Pods-RNApp.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RNApp.debug.xcconfig"; path = "Target Support Files/Pods-RNApp/Pods-RNApp.debug.xcconfig"; sourceTree = "<group>"; };
51-
4F1F9468A0054691518CD7F2 /* Pods_RNApp.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RNApp.framework; sourceTree = BUILT_PRODUCTS_DIR; };
5251
5709B34CF0A7D63546082F79 /* Pods-RNApp.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RNApp.release.xcconfig"; path = "Target Support Files/Pods-RNApp/Pods-RNApp.release.xcconfig"; sourceTree = "<group>"; };
53-
6FC6D7B8BAED9C6AA485CD47 /* Pods_RNApp_BrownfieldLib.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RNApp_BrownfieldLib.framework; sourceTree = BUILT_PRODUCTS_DIR; };
52+
5847633C6FB221FD423653AE /* Pods_RNApp_BrownfieldLib.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RNApp_BrownfieldLib.framework; sourceTree = BUILT_PRODUCTS_DIR; };
5453
761780EC2CA45674006654EE /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = AppDelegate.swift; path = RNApp/AppDelegate.swift; sourceTree = "<group>"; };
5554
79BD1EE32EEBFB76003AA29F /* BrownfieldLib.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = BrownfieldLib.framework; sourceTree = BUILT_PRODUCTS_DIR; };
5655
79F35E8A2EEC1D4500E64860 /* BrownfieldLib.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BrownfieldLib.swift; sourceTree = "<group>"; };
5756
81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = LaunchScreen.storyboard; path = RNApp/LaunchScreen.storyboard; sourceTree = "<group>"; };
5857
8A02E03D9F74B585B0A8F7F7 /* Pods-RNApp-BrownfieldLib.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RNApp-BrownfieldLib.debug.xcconfig"; path = "Target Support Files/Pods-RNApp-BrownfieldLib/Pods-RNApp-BrownfieldLib.debug.xcconfig"; sourceTree = "<group>"; };
58+
C9D6297085667BA7D6ADD88C /* Pods_RNApp.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RNApp.framework; sourceTree = BUILT_PRODUCTS_DIR; };
5959
D8C030F60E402FD6CFBB3904 /* Pods-RNApp-BrownfieldLib.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RNApp-BrownfieldLib.release.xcconfig"; path = "Target Support Files/Pods-RNApp-BrownfieldLib/Pods-RNApp-BrownfieldLib.release.xcconfig"; sourceTree = "<group>"; };
6060
ED297162215061F000B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; };
6161
/* End PBXFileReference section */
@@ -66,15 +66,15 @@
6666
buildActionMask = 2147483647;
6767
files = (
6868
79BD1EE92EEBFB76003AA29F /* BrownfieldLib.framework in Frameworks */,
69-
72684BA2F8ACEA7D12847DDE /* Pods_RNApp.framework in Frameworks */,
69+
6858E2980480F2D1CDE55629 /* Pods_RNApp.framework in Frameworks */,
7070
);
7171
runOnlyForDeploymentPostprocessing = 0;
7272
};
7373
79BD1EE02EEBFB76003AA29F /* Frameworks */ = {
7474
isa = PBXFrameworksBuildPhase;
7575
buildActionMask = 2147483647;
7676
files = (
77-
6DB1205BF3704AD01AC6F51D /* Pods_RNApp_BrownfieldLib.framework in Frameworks */,
77+
0AF1414240CE2891676C3CF5 /* Pods_RNApp_BrownfieldLib.framework in Frameworks */,
7878
);
7979
runOnlyForDeploymentPostprocessing = 0;
8080
};
@@ -97,8 +97,8 @@
9797
isa = PBXGroup;
9898
children = (
9999
ED297162215061F000B7C4FE /* JavaScriptCore.framework */,
100-
4F1F9468A0054691518CD7F2 /* Pods_RNApp.framework */,
101-
6FC6D7B8BAED9C6AA485CD47 /* Pods_RNApp_BrownfieldLib.framework */,
100+
C9D6297085667BA7D6ADD88C /* Pods_RNApp.framework */,
101+
5847633C6FB221FD423653AE /* Pods_RNApp_BrownfieldLib.framework */,
102102
);
103103
name = Frameworks;
104104
sourceTree = "<group>";
@@ -291,14 +291,10 @@
291291
inputFileListPaths = (
292292
"${PODS_ROOT}/Target Support Files/Pods-RNApp/Pods-RNApp-frameworks-${CONFIGURATION}-input-files.xcfilelist",
293293
);
294-
inputPaths = (
295-
);
296294
name = "[CP] Embed Pods Frameworks";
297295
outputFileListPaths = (
298296
"${PODS_ROOT}/Target Support Files/Pods-RNApp/Pods-RNApp-frameworks-${CONFIGURATION}-output-files.xcfilelist",
299297
);
300-
outputPaths = (
301-
);
302298
runOnlyForDeploymentPostprocessing = 0;
303299
shellPath = /bin/sh;
304300
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-RNApp/Pods-RNApp-frameworks.sh\"\n";
@@ -334,14 +330,10 @@
334330
inputFileListPaths = (
335331
"${PODS_ROOT}/Target Support Files/Pods-RNApp-BrownfieldLib/Pods-RNApp-BrownfieldLib-resources-${CONFIGURATION}-input-files.xcfilelist",
336332
);
337-
inputPaths = (
338-
);
339333
name = "[CP] Copy Pods Resources";
340334
outputFileListPaths = (
341335
"${PODS_ROOT}/Target Support Files/Pods-RNApp-BrownfieldLib/Pods-RNApp-BrownfieldLib-resources-${CONFIGURATION}-output-files.xcfilelist",
342336
);
343-
outputPaths = (
344-
);
345337
runOnlyForDeploymentPostprocessing = 0;
346338
shellPath = /bin/sh;
347339
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-RNApp-BrownfieldLib/Pods-RNApp-BrownfieldLib-resources.sh\"\n";
@@ -397,14 +389,10 @@
397389
inputFileListPaths = (
398390
"${PODS_ROOT}/Target Support Files/Pods-RNApp/Pods-RNApp-resources-${CONFIGURATION}-input-files.xcfilelist",
399391
);
400-
inputPaths = (
401-
);
402392
name = "[CP] Copy Pods Resources";
403393
outputFileListPaths = (
404394
"${PODS_ROOT}/Target Support Files/Pods-RNApp/Pods-RNApp-resources-${CONFIGURATION}-output-files.xcfilelist",
405395
);
406-
outputPaths = (
407-
);
408396
runOnlyForDeploymentPostprocessing = 0;
409397
shellPath = /bin/sh;
410398
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-RNApp/Pods-RNApp-resources.sh\"\n";

0 commit comments

Comments
 (0)