Skip to content

Commit

Permalink
Merge pull request Expensify#48233 from Expensify/Rory-BumpRuby
Browse files Browse the repository at this point in the history
Bump ruby version
  • Loading branch information
lakchote authored Sep 4, 2024
2 parents ec8a5d9 + 921af38 commit 562d7b4
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 12 deletions.
3 changes: 1 addition & 2 deletions .github/actions/composite/buildAndroidE2EAPK/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,8 @@ runs:
distribution: "oracle"
java-version: "17"

- uses: ruby/setup-ruby@v1.187.0
- uses: ruby/setup-ruby@v1.190.0
with:
ruby-version: "2.7"
bundler-cache: true

- uses: gradle/gradle-build-action@3fbe033aaae657f011f88f29be9e65ed26bd29ef
Expand Down
6 changes: 2 additions & 4 deletions .github/workflows/platformDeploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,8 @@ jobs:
java-version: '17'

- name: Setup Ruby
uses: ruby/setup-ruby@v1.187.0
uses: ruby/setup-ruby@v1.190.0
with:
ruby-version: '2.7'
bundler-cache: true

- name: Decrypt keystore
Expand Down Expand Up @@ -186,9 +185,8 @@ jobs:
uses: ./.github/actions/composite/setupNode

- name: Setup Ruby
uses: ruby/setup-ruby@v1.187.0
uses: ruby/setup-ruby@v1.190.0
with:
ruby-version: '2.7'
bundler-cache: true

- name: Cache Pod dependencies
Expand Down
6 changes: 2 additions & 4 deletions .github/workflows/testBuild.yml
Original file line number Diff line number Diff line change
Expand Up @@ -87,9 +87,8 @@ jobs:
java-version: '17'

- name: Setup Ruby
uses: ruby/setup-ruby@v1.187.0
uses: ruby/setup-ruby@v1.190.0
with:
ruby-version: '2.7'
bundler-cache: true

- name: Decrypt keystore
Expand Down Expand Up @@ -161,9 +160,8 @@ jobs:
run: sudo xcode-select -switch /Applications/Xcode_15.2.0.app

- name: Setup Ruby
uses: ruby/setup-ruby@v1.187.0
uses: ruby/setup-ruby@v1.190.0
with:
ruby-version: '2.7'
bundler-cache: true

- name: Cache Pod dependencies
Expand Down
1 change: 1 addition & 0 deletions .ruby-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
3.3.4
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
source "https://rubygems.org"

# You may use http://rbenv.org/ or https://rvm.io/ to install and use this version
ruby ">= 2.6.10"
ruby ">= 3.3.4"

gem "cocoapods", "= 1.15.2"
gem 'activesupport', '>= 6.1.7.5', '!= 7.1.0'
Expand Down
2 changes: 1 addition & 1 deletion Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@ DEPENDENCIES
xcpretty (~> 0)

RUBY VERSION
ruby 2.6.10p210
ruby 3.3.4p94

BUNDLED WITH
2.4.19

0 comments on commit 562d7b4

Please sign in to comment.