Skip to content

Commit 3287f20

Browse files
authored
Merge pull request #11599 from github-maccloud/macos-ruby-changes
[macOS] Removing Ruby 3.0 and making 3.3 as a default version.
2 parents c84c47c + 30c1bfe commit 3287f20

File tree

3 files changed

+4
-8
lines changed

3 files changed

+4
-8
lines changed

images/macos/scripts/build/install-rubygems.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ source ~/utils/utils.sh
99
echo "Updating RubyGems..."
1010
gem update --system
1111

12-
# Temporarily install activesupport 7.1.5.1 due to compatibility issues with cocoapods https://github.com/CocoaPods/CocoaPods/issues/12081
13-
gem install activesupport -v 7.1.5.1
12+
# Temporarily install activesupport 7.2.2.1 due to compatibility issues with cocoapods https://github.com/CocoaPods/CocoaPods/issues/12081
13+
gem install activesupport -v 7.2.2.1
1414

1515
gemsToInstall=$(get_toolset_value '.ruby.rubygems | .[]')
1616
if [[ -n $gemsToInstall ]]; then

images/macos/toolsets/toolset-13.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@
116116
}
117117
},
118118
"ruby": {
119-
"default": "3.0",
119+
"default": "3.3",
120120
"rubygems": [
121121
"cocoapods",
122122
"bundler",
@@ -212,7 +212,6 @@
212212
"arch": {
213213
"x64": {
214214
"versions": [
215-
"3.0.*",
216215
"3.1.*",
217216
"3.2.*",
218217
"3.3.*",
@@ -221,7 +220,6 @@
221220
},
222221
"arm64": {
223222
"versions": [
224-
"3.0.*",
225223
"3.1.*",
226224
"3.2.*",
227225
"3.3.*",

images/macos/toolsets/toolset-14.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@
120120
}
121121
},
122122
"ruby": {
123-
"default": "3.0",
123+
"default": "3.3",
124124
"rubygems": [
125125
"cocoapods",
126126
"bundler",
@@ -200,7 +200,6 @@
200200
"arch": {
201201
"x64": {
202202
"versions": [
203-
"3.0.*",
204203
"3.1.*",
205204
"3.2.*",
206205
"3.3.*",
@@ -209,7 +208,6 @@
209208
},
210209
"arm64": {
211210
"versions": [
212-
"3.0.*",
213211
"3.1.*",
214212
"3.2.*",
215213
"3.3.*",

0 commit comments

Comments
 (0)