Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Upgrading baseline ruby to 3.0.2
  • Loading branch information
kigster committed Sep 27, 2021
commit b8cbf3825260e02473a98d3ac0bf90a500853b81
2 changes: 1 addition & 1 deletion .circleci/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#
# rules_ruby circleci Docker file.
#
FROM ruby:3.0.1
FROM ruby:3.0.2

# make Apt non-interactive
RUN echo 'APT::Get::Assume-Yes "true";' > /etc/apt/apt.conf.d/90circleci \
Expand Down
4 changes: 2 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ jobs:
working_directory: /home/circleci/repo
resource_class: medium
docker:
- image: bazelruby/ruby-3.0.1
- image: bazelruby/ruby-3.0.2
environment:
PATH: "/usr/local/bin:/usr/bin:/sbin:/opt/bin:/home/circleci/repo/bin:/bin:/sbin:/usr/sbin"
BUNDLE_PATH: /home/circleci/.bundle_cache
Expand All @@ -24,7 +24,7 @@ jobs:
- run:
name: Install Bundler
command: |
gem install bundler:2.0.2 --no-doc
gem install bundler:2.2.28 --no-doc
bundle install --jobs=4 --retry=3 --path ${BUNDLE_PATH}

- run:
Expand Down
9 changes: 0 additions & 9 deletions .envrc
Original file line number Diff line number Diff line change
@@ -1,15 +1,6 @@
# vi: ft=sh

PATH_add bin

[[ -n $(command -V brew) ]] && {
completion="$(brew --prefix)/etc/bash_completion"
[[ -f "${completion}" ]] && {
echo "Loading bash completion"
source "${completion}"
}
}

eval "$(rbenv init -)"
rbenv local $(cat .ruby-version)
echo "Ruby Version is $(ruby --version)"
1 change: 1 addition & 0 deletions .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ AllCops:
- '**/*.ru'
- '**/Gemfile'
- '**/Rakefile'
NewCops: enable

Layout/HashAlignment:
Enabled: true
Expand Down
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.0.1
3.0.2
10 changes: 5 additions & 5 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ GEM
remote: https://rubygems.org/
specs:
ast (2.4.2)
parallel (1.20.1)
parser (3.0.1.1)
parallel (1.21.0)
parser (3.0.2.0)
ast (~> 2.4.1)
rainbow (3.0.0)
regexp_parser (2.1.1)
Expand All @@ -17,10 +17,10 @@ GEM
rubocop-ast (>= 0.6.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 1.4.0, < 2.0)
rubocop-ast (1.7.0)
rubocop-ast (1.11.0)
parser (>= 3.0.1.1)
ruby-progressbar (1.11.0)
unicode-display_width (1.7.0)
unicode-display_width (1.8.0)

PLATFORMS
ruby
Expand All @@ -30,4 +30,4 @@ DEPENDENCIES
rubocop (~> 0.88)

BUNDLED WITH
2.1.4
2.2.24
2 changes: 1 addition & 1 deletion README.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ rules_ruby_dependencies()
load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace")
bazel_skylib_workspace()

rules_ruby_select_sdk(version = "3.0.1")
rules_ruby_select_sdk(version = "3.0.2")

#———————————————————————————————————————————————————————————————————————
# Now, load the ruby_bundle rule & install gems specified in the Gemfile
Expand Down
2 changes: 1 addition & 1 deletion WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ load("@bazel_skylib//lib:versions.bzl", "versions")

versions.check("3.4.1")

rules_ruby_select_sdk("3.0.1")
rules_ruby_select_sdk("3.0.2")

local_repository(
name = "bazelruby_rules_ruby_ruby_tests_testdata_another_workspace",
Expand Down
1 change: 0 additions & 1 deletion bin/deps
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@

# shellcheck disable=SC1090
source "${BASHMATIC_HOME}/init.sh" 1>/dev/null 2>&1

command -v rbenv >/dev/null && eval "$(rbenv init -)"

__version.detect() {
Expand Down
2 changes: 1 addition & 1 deletion examples/example_gem/WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ load(

rules_ruby_dependencies()

rules_ruby_select_sdk("3.0.1")
rules_ruby_select_sdk("3.0.2")

load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace")

Expand Down
128 changes: 64 additions & 64 deletions examples/simple_rails_api/Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,124 +1,124 @@
GEM
remote: https://rubygems.org/
specs:
actioncable (6.0.4)
actionpack (= 6.0.4)
actioncable (6.0.4.1)
actionpack (= 6.0.4.1)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
actionmailbox (6.0.4)
actionpack (= 6.0.4)
activejob (= 6.0.4)
activerecord (= 6.0.4)
activestorage (= 6.0.4)
activesupport (= 6.0.4)
actionmailbox (6.0.4.1)
actionpack (= 6.0.4.1)
activejob (= 6.0.4.1)
activerecord (= 6.0.4.1)
activestorage (= 6.0.4.1)
activesupport (= 6.0.4.1)
mail (>= 2.7.1)
actionmailer (6.0.4)
actionpack (= 6.0.4)
actionview (= 6.0.4)
activejob (= 6.0.4)
actionmailer (6.0.4.1)
actionpack (= 6.0.4.1)
actionview (= 6.0.4.1)
activejob (= 6.0.4.1)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
actionpack (6.0.4)
actionview (= 6.0.4)
activesupport (= 6.0.4)
actionpack (6.0.4.1)
actionview (= 6.0.4.1)
activesupport (= 6.0.4.1)
rack (~> 2.0, >= 2.0.8)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.2.0)
actiontext (6.0.4)
actionpack (= 6.0.4)
activerecord (= 6.0.4)
activestorage (= 6.0.4)
activesupport (= 6.0.4)
actiontext (6.0.4.1)
actionpack (= 6.0.4.1)
activerecord (= 6.0.4.1)
activestorage (= 6.0.4.1)
activesupport (= 6.0.4.1)
nokogiri (>= 1.8.5)
actionview (6.0.4)
activesupport (= 6.0.4)
actionview (6.0.4.1)
activesupport (= 6.0.4.1)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.1, >= 1.2.0)
activejob (6.0.4)
activesupport (= 6.0.4)
activejob (6.0.4.1)
activesupport (= 6.0.4.1)
globalid (>= 0.3.6)
activemodel (6.0.4)
activesupport (= 6.0.4)
activerecord (6.0.4)
activemodel (= 6.0.4)
activesupport (= 6.0.4)
activestorage (6.0.4)
actionpack (= 6.0.4)
activejob (= 6.0.4)
activerecord (= 6.0.4)
activemodel (6.0.4.1)
activesupport (= 6.0.4.1)
activerecord (6.0.4.1)
activemodel (= 6.0.4.1)
activesupport (= 6.0.4.1)
activestorage (6.0.4.1)
actionpack (= 6.0.4.1)
activejob (= 6.0.4.1)
activerecord (= 6.0.4.1)
marcel (~> 1.0.0)
activesupport (6.0.4)
activesupport (6.0.4.1)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
tzinfo (~> 1.1)
zeitwerk (~> 2.2, >= 2.2.2)
bootsnap (1.7.5)
bootsnap (1.9.1)
msgpack (~> 1.0)
builder (3.2.4)
byebug (11.1.3)
concurrent-ruby (1.1.9)
crass (1.0.6)
erubi (1.10.0)
ffi (1.15.3)
globalid (0.4.2)
activesupport (>= 4.2.0)
ffi (1.15.4)
globalid (0.5.2)
activesupport (>= 5.0)
i18n (1.8.10)
concurrent-ruby (~> 1.0)
listen (3.0.8)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
loofah (2.10.0)
loofah (2.12.0)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
mail (2.7.1)
mini_mime (>= 0.1.1)
marcel (1.0.1)
marcel (1.0.2)
method_source (1.0.0)
mini_mime (1.1.0)
mini_portile2 (2.5.3)
mini_mime (1.1.1)
mini_portile2 (2.6.1)
minitest (5.14.4)
msgpack (1.4.2)
nio4r (2.5.7)
nokogiri (1.11.7)
mini_portile2 (~> 2.5.0)
nio4r (2.5.8)
nokogiri (1.12.4)
mini_portile2 (~> 2.6.1)
racc (~> 1.4)
puma (4.3.8)
nio4r (~> 2.0)
racc (1.5.2)
rack (2.2.3)
rack-test (1.1.0)
rack (>= 1.0, < 3)
rails (6.0.4)
actioncable (= 6.0.4)
actionmailbox (= 6.0.4)
actionmailer (= 6.0.4)
actionpack (= 6.0.4)
actiontext (= 6.0.4)
actionview (= 6.0.4)
activejob (= 6.0.4)
activemodel (= 6.0.4)
activerecord (= 6.0.4)
activestorage (= 6.0.4)
activesupport (= 6.0.4)
rails (6.0.4.1)
actioncable (= 6.0.4.1)
actionmailbox (= 6.0.4.1)
actionmailer (= 6.0.4.1)
actionpack (= 6.0.4.1)
actiontext (= 6.0.4.1)
actionview (= 6.0.4.1)
activejob (= 6.0.4.1)
activemodel (= 6.0.4.1)
activerecord (= 6.0.4.1)
activestorage (= 6.0.4.1)
activesupport (= 6.0.4.1)
bundler (>= 1.3.0)
railties (= 6.0.4)
railties (= 6.0.4.1)
sprockets-rails (>= 2.0.0)
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
rails-html-sanitizer (1.3.0)
rails-html-sanitizer (1.4.2)
loofah (~> 2.3)
railties (6.0.4)
actionpack (= 6.0.4)
activesupport (= 6.0.4)
railties (6.0.4.1)
actionpack (= 6.0.4.1)
activesupport (= 6.0.4.1)
method_source
rake (>= 0.8.7)
thor (>= 0.20.3, < 2.0)
rake (13.0.4)
rake (13.0.6)
rb-fsevent (0.11.0)
rb-inotify (0.10.1)
ffi (~> 1.0)
Expand Down Expand Up @@ -158,4 +158,4 @@ DEPENDENCIES
tzinfo-data

BUNDLED WITH
2.1.4
2.2.24
2 changes: 1 addition & 1 deletion examples/simple_rails_api/WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ load(

rules_ruby_dependencies()

rules_ruby_select_sdk(version = "3.0.1")
rules_ruby_select_sdk(version = "3.0.2")

load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace")

Expand Down
1 change: 1 addition & 0 deletions examples/simple_script/.ruby-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
3.0.2
14 changes: 7 additions & 7 deletions examples/simple_script/Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ GEM
awesome_print (1.9.2)
colored2 (3.1.2)
diff-lcs (1.4.4)
parallel (1.20.1)
parser (3.0.1.1)
parallel (1.21.0)
parser (3.0.2.0)
ast (~> 2.4.1)
rainbow (3.0.0)
regexp_parser (2.1.1)
Expand All @@ -27,19 +27,19 @@ GEM
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.7.0)
rspec-support (3.7.1)
rubocop (1.18.3)
rubocop (1.21.0)
parallel (~> 1.10)
parser (>= 3.0.0.0)
rainbow (>= 2.2.2, < 4.0)
regexp_parser (>= 1.8, < 3.0)
rexml
rubocop-ast (>= 1.7.0, < 2.0)
rubocop-ast (>= 1.9.1, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 1.4.0, < 3.0)
rubocop-ast (1.7.0)
rubocop-ast (1.11.0)
parser (>= 3.0.1.1)
ruby-progressbar (1.11.0)
unicode-display_width (2.0.0)
unicode-display_width (2.1.0)

PLATFORMS
ruby
Expand All @@ -52,4 +52,4 @@ DEPENDENCIES
rubocop

BUNDLED WITH
2.1.4
2.2.24
2 changes: 1 addition & 1 deletion examples/simple_script/WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ load(

rules_ruby_dependencies()

rules_ruby_select_sdk(version = "3.0.1")
rules_ruby_select_sdk(version = "3.0.2")

load("@bazelruby_rules_ruby//ruby:defs.bzl", "ruby_bundle")

Expand Down
3 changes: 2 additions & 1 deletion examples/simple_script/spec/script_spec.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
# frozen_string_literal: true

require 'spec_helper'
require 'script'

require_relative '../script'

describe 'oss_rand' do
it 'generates a String' do
Expand Down
Loading