Skip to content
This repository has been archived by the owner on Apr 14, 2021. It is now read-only.

Bump rake version to 12.0 on gemspec template #6924

Merged
3 commits merged into from
Jan 24, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
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
2 changes: 1 addition & 1 deletion lib/bundler/templates/newgem/newgem.gemspec.tt
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ Gem::Specification.new do |spec|
<%- end -%>

spec.add_development_dependency "bundler", "~> <%= config[:bundler_version] %>"
spec.add_development_dependency "rake", "~> 10.0"
spec.add_development_dependency "rake", "~> 12.0"
<%- if config[:ext] -%>
spec.add_development_dependency "rake-compiler"
<%- end -%>
Expand Down
6 changes: 3 additions & 3 deletions spec/commands/lock_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ def read_lockfile(file = "Gemfile.lock")
actionpack (= 2.3.2)
activerecord (= 2.3.2)
activeresource (= 2.3.2)
rake (= 10.0.2)
rake (10.0.2)
rake (= 12.3.2)
rake (12.3.2)
with_license (1.0)

PLATFORMS
Expand Down Expand Up @@ -133,7 +133,7 @@ def read_lockfile(file = "Gemfile.lock")
end

it "update specific gems using --update" do
lockfile @lockfile.gsub("2.3.2", "2.3.1").gsub("10.0.2", "10.0.1")
lockfile @lockfile.gsub("2.3.2", "2.3.1").gsub("12.3.2", "10.0.1")

bundle "lock --update rails rake"

Expand Down
6 changes: 3 additions & 3 deletions spec/commands/newgem_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ def gem_skeleton_assertions(gem_name)
end

Dir.chdir(bundled_app("newgem")) do
gems = ["rake-10.0.2", :bundler]
gems = ["rake-12.3.2", :bundler]
# for Ruby core repository, Ruby 2.6+ has bundler as standard library.
gems.delete(:bundler) if ruby_core?
system_gems gems, :path => :bundle_path
Expand Down Expand Up @@ -303,7 +303,7 @@ def create_temporary_dir(dir)
end

it "runs rake without problems" do
system_gems ["rake-10.0.2"]
system_gems ["rake-12.3.2"]

rakefile = strip_whitespace <<-RAKEFILE
task :default do
Expand Down Expand Up @@ -585,7 +585,7 @@ def create_temporary_dir(dir)
end

it "runs rake without problems" do
system_gems ["rake-10.0.2"]
system_gems ["rake-12.3.2"]

rakefile = strip_whitespace <<-RAKEFILE
task :default do
Expand Down
4 changes: 2 additions & 2 deletions spec/commands/show_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@
it "prints path of all gems in bundle sorted by name", :bundler => "< 2" do
bundle "show --paths"

expect(out).to include(default_bundle_path("gems", "rake-10.0.2").to_s)
expect(out).to include(default_bundle_path("gems", "rake-12.3.2").to_s)
expect(out).to include(default_bundle_path("gems", "rails-2.3.2").to_s)

# Gem names are the last component of their path.
Expand All @@ -92,7 +92,7 @@
it "prints path of all gems in bundle sorted by name", :bundler => "2" do
bundle "show --paths"

expect(out).to include(default_bundle_path("gems", "rake-10.0.2").to_s)
expect(out).to include(default_bundle_path("gems", "rake-12.3.2").to_s)
expect(out).to include(default_bundle_path("gems", "rails-2.3.2").to_s)

out_lines = out.split("\n")
Expand Down
2 changes: 1 addition & 1 deletion spec/install/gemfile/gemspec_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@
build_lib("foo", :path => tmp.join("foo")) do |s|
s.write("Gemfile", "source 'file://#{gem_repo1}'\ngemspec")
s.add_dependency "actionpack", "=2.3.2"
s.add_development_dependency "rake", "=10.0.2"
s.add_development_dependency "rake", "=12.3.2"
end

Dir.chdir(tmp.join("foo")) do
Expand Down
2 changes: 1 addition & 1 deletion spec/install/gems/compact_index_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -915,7 +915,7 @@ def start
source "#{source_uri}"
gem "rails"
G
deps = [Gem::Dependency.new("rake", "= 10.0.2"),
deps = [Gem::Dependency.new("rake", "= 12.3.2"),
Gem::Dependency.new("actionpack", "= 2.3.2"),
Gem::Dependency.new("activerecord", "= 2.3.2"),
Gem::Dependency.new("actionmailer", "= 2.3.2"),
Expand Down
4 changes: 2 additions & 2 deletions spec/lock/lockfile_bundler_1_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -737,8 +737,8 @@
actionpack (= 2.3.2)
activerecord (= 2.3.2)
activeresource (= 2.3.2)
rake (= 10.0.2)
rake (10.0.2)
rake (= 12.3.2)
rake (12.3.2)

PLATFORMS
#{generic_local_platform}
Expand Down
4 changes: 2 additions & 2 deletions spec/lock/lockfile_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -772,8 +772,8 @@
actionpack (= 2.3.2)
activerecord (= 2.3.2)
activeresource (= 2.3.2)
rake (= 10.0.2)
rake (10.0.2)
rake (= 12.3.2)
rake (12.3.2)

PLATFORMS
#{lockfile_platforms}
Expand Down
2 changes: 1 addition & 1 deletion spec/runtime/setup_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ def clean_load_path(lp)
"/gems/actionpack-2.3.2/lib",
"/gems/actionmailer-2.3.2/lib",
"/gems/activesupport-2.3.2/lib",
"/gems/rake-10.0.2/lib"
"/gems/rake-12.3.2/lib"
)
end

Expand Down
2 changes: 1 addition & 1 deletion spec/support/builders.rb
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ def build_repo1

build_gem "rails", "2.3.2" do |s|
s.executables = "rails"
s.add_dependency "rake", "10.0.2"
s.add_dependency "rake", "12.3.2"
s.add_dependency "actionpack", "2.3.2"
s.add_dependency "activerecord", "2.3.2"
s.add_dependency "actionmailer", "2.3.2"
Expand Down
2 changes: 1 addition & 1 deletion spec/support/rubygems_ext.rb
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ module Rubygems
"compact_index" => "~> 0.11.0",
"sinatra" => "~> 1.4.7",
# Rake version has to be consistent for tests to pass
"rake" => "10.0.2",
"rake" => "12.3.2",
# 3.0.0 breaks 1.9.2 specs
"builder" => "2.1.2",
}
Expand Down