summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornagachika <nagachika@ruby-lang.org>2022-02-12 16:52:38 +0900
committernagachika <nagachika@ruby-lang.org>2022-02-12 16:52:38 +0900
commit034872d6a66916fb2859f41d380ce503c84a65e8 (patch)
tree5a740887f8c64aa5701fb2371f5eb40be147a942
parent545d6820715a48a17d6182128c0db4198dfa76c1 (diff)
merge revision(s) 342e7a094a70d6f90b96262c88177dae32976c85:
[rubygems/rubygems] Fix spec to not touch the network And not depend on the state of rack's master branch, in particular, on their Ruby support range. https://github.com/rubygems/rubygems/commit/9ea4baffac --- spec/bundler/commands/remove_spec.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
-rw-r--r--spec/bundler/commands/remove_spec.rb4
-rw-r--r--version.h8
2 files changed, 7 insertions, 5 deletions
diff --git a/spec/bundler/commands/remove_spec.rb b/spec/bundler/commands/remove_spec.rb
index 70dc09c9b6..95d6e75e9f 100644
--- a/spec/bundler/commands/remove_spec.rb
+++ b/spec/bundler/commands/remove_spec.rb
@@ -48,12 +48,14 @@ RSpec.describe "bundle remove" do
context "when gem is specified in multiple lines" do
it "shows success for removed gem" do
+ build_git "rack"
+
gemfile <<-G
source '#{file_uri_for(gem_repo1)}'
gem 'git'
gem 'rack',
- git: 'https://github.com/rack/rack',
+ git: "#{lib_path("rack-1.0")}",
branch: 'master'
gem 'nokogiri'
G
diff --git a/version.h b/version.h
index 3223f4b72f..f74699f971 100644
--- a/version.h
+++ b/version.h
@@ -12,11 +12,11 @@
# define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR
#define RUBY_VERSION_TEENY 4
#define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
-#define RUBY_PATCHLEVEL 164
+#define RUBY_PATCHLEVEL 165
-#define RUBY_RELEASE_YEAR 2021
-#define RUBY_RELEASE_MONTH 12
-#define RUBY_RELEASE_DAY 24
+#define RUBY_RELEASE_YEAR 2022
+#define RUBY_RELEASE_MONTH 2
+#define RUBY_RELEASE_DAY 12
#include "ruby/version.h"