Skip to content

Commit 4e015c6

Browse files
cipolleschiRiccardo Cipolleschi
and
Riccardo Cipolleschi
authored
chore: Remove ruby-version from 0.69 (#36433)
Co-authored-by: Riccardo Cipolleschi <[email protected]>
1 parent 124bb11 commit 4e015c6

File tree

7 files changed

+7
-132
lines changed

7 files changed

+7
-132
lines changed

.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,8 @@ package-lock.json
9797
# Ruby Gems (Bundler)
9898
/vendor
9999
/template/vendor
100+
.ruby-version
101+
/**/.ruby-version
100102

101103
# iOS / CocoaPods
102104
/template/ios/build/

.ruby-version

-1
This file was deleted.

Gemfile

+2-2
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 '2.7.5'
4+
ruby '>= 2.6.10'
55

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

Gemfile.lock

-100
This file was deleted.

scripts/update-ruby.sh

+1-26
Original file line numberDiff line numberDiff line change
@@ -32,26 +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
52-
53-
sed_i -e "s/^\(ruby '\)[^']*\('.*\)$/\1$VERSION\2/" Gemfile
54-
sed_i -e "s/^\(ruby '\)[^']*\('.*\)$/\1$VERSION\2/" template/Gemfile
5535

5636
rm -f Gemfile.lock
5737

@@ -60,9 +40,4 @@ cp "$BUNDLE_APP_CONFIG/"* template/_bundle # sync!
6040

6141
bundle lock
6242

63-
git add \
64-
.ruby-version \
65-
Gemfile \
66-
Gemfile.lock \
67-
template/_ruby-version \
68-
template/Gemfile
43+
git add Gemfile.lock

template/Gemfile

+2-2
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 '2.7.5'
4+
ruby '>= 2.6.10'
55

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

template/_ruby-version

-1
This file was deleted.

0 commit comments

Comments
 (0)