diff options
author | David RodrÃguez <deivid.rodriguez@riseup.net> | 2019-03-12 11:37:42 +0100 |
---|---|---|
committer | David RodrÃguez <deivid.rodriguez@riseup.net> | 2019-03-12 11:37:42 +0100 |
commit | 22db310f67c717a972cd5437cf6dcfc4bfc76b26 (patch) | |
tree | 7d442bf959a374f765c57c5dcb2f60da0e4721d6 | |
parent | 33c55e748b3ecea5ab8ee86b826a4d58de743996 (diff) | |
download | bundler-22db310f67c717a972cd5437cf6dcfc4bfc76b26.tar.gz |
Don't commit to a deprecation horizon
Bundler 3.0 was incorrect according to the new plan of migrating to
https sources first, and then removing custom sources.
-rw-r--r-- | lib/bundler/dsl.rb | 2 | ||||
-rw-r--r-- | spec/other/major_deprecation_spec.rb | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/bundler/dsl.rb b/lib/bundler/dsl.rb index 977a50d5c0..d16a50cb7e 100644 --- a/lib/bundler/dsl.rb +++ b/lib/bundler/dsl.rb @@ -480,7 +480,7 @@ repo_name ||= user_name end Bundler::SharedHelpers.major_deprecation 3, <<-EOS -The :#{name} git source is deprecated, and will be removed in Bundler 3.0.#{additional_message} Add this code to the top of your Gemfile to ensure it continues to work: +The :#{name} git source is deprecated, and will be removed in the future.#{additional_message} Add this code to the top of your Gemfile to ensure it continues to work: git_source(:#{name}) #{replacement} diff --git a/spec/other/major_deprecation_spec.rb b/spec/other/major_deprecation_spec.rb index 05ef9b7570..5175e8d4c8 100644 --- a/spec/other/major_deprecation_spec.rb +++ b/spec/other/major_deprecation_spec.rb @@ -172,7 +172,7 @@ RSpec.describe "major deprecations" do describe Bundler::Dsl do let(:msg) do <<-EOS -The :github git source is deprecated, and will be removed in Bundler 3.0. Change any "reponame" :github sources to "username/reponame". Add this code to the top of your Gemfile to ensure it continues to work: +The :github git source is deprecated, and will be removed in the future. Change any "reponame" :github sources to "username/reponame". Add this code to the top of your Gemfile to ensure it continues to work: git_source(:github) {|repo_name| "https://github.com/\#{repo_name}.git" } @@ -212,7 +212,7 @@ The :github git source is deprecated, and will be removed in Bundler 3.0. Change it "warns about removal" do allow(Bundler.ui).to receive(:deprecate) msg = <<-EOS -The :bitbucket git source is deprecated, and will be removed in Bundler 3.0. Add this code to the top of your Gemfile to ensure it continues to work: +The :bitbucket git source is deprecated, and will be removed in the future. Add this code to the top of your Gemfile to ensure it continues to work: git_source(:bitbucket) do |repo_name| user_name, repo_name = repo_name.split("/") @@ -230,7 +230,7 @@ The :bitbucket git source is deprecated, and will be removed in Bundler 3.0. Add it "warns about removal" do allow(Bundler.ui).to receive(:deprecate) msg = <<-EOS -The :gist git source is deprecated, and will be removed in Bundler 3.0. Add this code to the top of your Gemfile to ensure it continues to work: +The :gist git source is deprecated, and will be removed in the future. Add this code to the top of your Gemfile to ensure it continues to work: git_source(:gist) {|repo_name| "https://gist.github.com/\#{repo_name}.git" } |