Skip to content

Commit 1d22e29

Browse files
cipolleschiRiccardo Cipolleschi
andauthored
chore: Remove ruby-version from 0.71 (#36423)
* chore: Remove ruby-version from 0.71 * Update Gemfile * Update Gemfile --------- Co-authored-by: Riccardo Cipolleschi <[email protected]>
1 parent e0d92c6 commit 1d22e29

File tree

7 files changed

+9
-29
lines changed

7 files changed

+9
-29
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,8 @@ package-lock.json
9999
# Ruby Gems (Bundler)
100100
/vendor
101101
/template/vendor
102+
.ruby-version
103+
/**/.ruby-version
102104

103105
# iOS / CocoaPods
104106
/template/ios/build/

.ruby-version

Lines changed: 0 additions & 1 deletion
This file was deleted.

Gemfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
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 File.read(File.join(__dir__, '.ruby-version')).strip
4+
ruby '>= 2.6.10'
55

6-
gem 'cocoapods', '~> 1.11', '>= 1.11.3'
6+
gem 'cocoapods', '>= 1.11.3'

Gemfile.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,10 +89,10 @@ PLATFORMS
8989
ruby
9090

9191
DEPENDENCIES
92-
cocoapods (~> 1.11, >= 1.11.3)
92+
cocoapods (~> 1.12)
9393

9494
RUBY VERSION
9595
ruby 2.7.6p219
9696

9797
BUNDLED WITH
98-
2.3.22
98+
2.1.4

scripts/update-ruby.sh

Lines changed: 1 addition & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -32,23 +32,6 @@ fi
3232
if [ -z "$VERSION" ]; then
3333
die "Please provide an installed/usable Ruby version"
3434
fi
35-
echo "Setting Ruby version to: $VERSION"
36-
37-
cd "$ROOT" || die "Failed to change to $ROOT"
38-
39-
# do this first, so rbenv/rvm will automatically pick the desired version
40-
echo "$VERSION" > .ruby-version
41-
42-
# make sure we're using it
43-
CURRENT_VERSION=$(ruby --version | cut -d' ' -f2 | cut -dp -f1)
44-
if [ -z "$CURRENT_VERSION" ]; then
45-
# rbenv/rvm uses shims, the commands do exist, but do not return a version if misconfigured
46-
die "Missing usable ruby, check your installation"
47-
elif [ "$VERSION" != "$CURRENT_VERSION" ]; then
48-
die "Plese use the ruby version you are trying to set: $VERSION ('$CURRENT_VERSION' in use)"
49-
fi
50-
51-
echo "$VERSION" > template/_ruby-version
5235

5336
rm -f Gemfile.lock
5437

@@ -62,10 +45,7 @@ export GIT_DISCOVERY_ACROSS_FILESYSTEM=1;
6245
IS_GIT_REPO=$(git rev-parse --is-inside-work-tree 2> /dev/null || true)
6346
export GIT_DISCOVERY_ACROSS_FILESYSTEM=0;
6447
if [ "$IS_GIT_REPO" = "true" ]; then
65-
git add \
66-
.ruby-version \
67-
Gemfile.lock \
68-
template/_ruby-version
48+
git add Gemfile.lock
6949
else
7050
echo "Detected that you're not in Git. If on another SCM, don't forget to commit the edited files."
7151
fi

template/Gemfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
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 File.read(File.join(__dir__, '.ruby-version')).strip
4+
ruby '>= 2.6.10'
55

6-
gem 'cocoapods', '~> 1.11', '>= 1.11.3'
6+
gem 'cocoapods', '>= 1.11.3'

template/_ruby-version

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)