summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--lib/bundler/lockfile_parser.rb8
-rw-r--r--lib/bundler/man/bundle-config.14
-rw-r--r--lib/bundler/man/bundle-config.1.ronn4
-rw-r--r--lib/bundler/man/bundle-inject.12
-rw-r--r--lib/bundler/man/bundle-inject.1.ronn2
-rw-r--r--spec/bundler/bundler/lockfile_parser_spec.rb8
-rw-r--r--spec/bundler/cache/git_spec.rb2
7 files changed, 15 insertions, 15 deletions
diff --git a/lib/bundler/lockfile_parser.rb b/lib/bundler/lockfile_parser.rb
index d00ba4cc10..9ab9d73ae2 100644
--- a/lib/bundler/lockfile_parser.rb
+++ b/lib/bundler/lockfile_parser.rb
@@ -145,13 +145,13 @@ module Bundler
if @platforms.include?(Gem::Platform::X64_MINGW)
@platforms.delete(Gem::Platform::X64_MINGW_LEGACY)
SharedHelpers.major_deprecation(2,
- "Found x64-mingw32 in lockfile, which is deprecated. Removing it. Support for x64-mingw32 will be removed in Bundler 3.0.",
- removed_message: "Found x64-mingw32 in lockfile, which is no longer supported as of Bundler 3.0.")
+ "Found x64-mingw32 in lockfile, which is deprecated. Removing it. Support for x64-mingw32 will be removed in Bundler 4.0.",
+ removed_message: "Found x64-mingw32 in lockfile, which is no longer supported as of Bundler 4.0.")
else
@platforms[@platforms.index(Gem::Platform::X64_MINGW_LEGACY)] = Gem::Platform::X64_MINGW
SharedHelpers.major_deprecation(2,
- "Found x64-mingw32 in lockfile, which is deprecated. Using x64-mingw-ucrt, the replacement for x64-mingw32 in modern rubies, instead. Support for x64-mingw32 will be removed in Bundler 3.0.",
- removed_message: "Found x64-mingw32 in lockfile, which is no longer supported as of Bundler 3.0.")
+ "Found x64-mingw32 in lockfile, which is deprecated. Using x64-mingw-ucrt, the replacement for x64-mingw32 in modern rubies, instead. Support for x64-mingw32 will be removed in Bundler 4.0.",
+ removed_message: "Found x64-mingw32 in lockfile, which is no longer supported as of Bundler 4.0.")
end
end
diff --git a/lib/bundler/man/bundle-config.1 b/lib/bundler/man/bundle-config.1
index 0c1a8a7609..80b1be904e 100644
--- a/lib/bundler/man/bundle-config.1
+++ b/lib/bundler/man/bundle-config.1
@@ -66,7 +66,7 @@ Automatically run \fBbundle install\fR when gems are missing\.
Install executables from gems in the bundle to the specified directory\. Defaults to \fBfalse\fR\.
.TP
\fBcache_all\fR (\fBBUNDLE_CACHE_ALL\fR)
-Cache all gems, including path and git gems\. This needs to be explicitly configured on bundler 1 and bundler 2, but will be the default on bundler 3\.
+Cache all gems, including path and git gems\. This needs to be explicitly before bundler 4, but will be the default on bundler 4\.
.TP
\fBcache_all_platforms\fR (\fBBUNDLE_CACHE_ALL_PLATFORMS\fR)
Cache gems for all platforms\.
@@ -214,7 +214,7 @@ A space\-separated or \fB:\fR\-separated list of groups whose gems bundler shoul
.SH "REMEMBERING OPTIONS"
Flags passed to \fBbundle install\fR or the Bundler runtime, such as \fB\-\-path foo\fR or \fB\-\-without production\fR, are remembered between commands and saved to your local application's configuration (normally, \fB\./\.bundle/config\fR)\.
.P
-However, this will be changed in bundler 3, so it's better not to rely on this behavior\. If these options must be remembered, it's better to set them using \fBbundle config\fR (e\.g\., \fBbundle config set \-\-local path foo\fR)\.
+However, this will be changed in bundler 4, so it's better not to rely on this behavior\. If these options must be remembered, it's better to set them using \fBbundle config\fR (e\.g\., \fBbundle config set \-\-local path foo\fR)\.
.P
The flags that can be configured are:
.TP
diff --git a/lib/bundler/man/bundle-config.1.ronn b/lib/bundler/man/bundle-config.1.ronn
index 9750a5ae4c..b36288c23b 100644
--- a/lib/bundler/man/bundle-config.1.ronn
+++ b/lib/bundler/man/bundle-config.1.ronn
@@ -89,7 +89,7 @@ learn more about their operation in [bundle install(1)](bundle-install.1.html).
Defaults to `false`.
* `cache_all` (`BUNDLE_CACHE_ALL`):
Cache all gems, including path and git gems. This needs to be explicitly
- configured on bundler 1 and bundler 2, but will be the default on bundler 3.
+ before bundler 4, but will be the default on bundler 4.
* `cache_all_platforms` (`BUNDLE_CACHE_ALL_PLATFORMS`):
Cache gems for all platforms.
* `cache_path` (`BUNDLE_CACHE_PATH`):
@@ -229,7 +229,7 @@ Flags passed to `bundle install` or the Bundler runtime, such as `--path foo` or
`--without production`, are remembered between commands and saved to your local
application's configuration (normally, `./.bundle/config`).
-However, this will be changed in bundler 3, so it's better not to rely on this
+However, this will be changed in bundler 4, so it's better not to rely on this
behavior. If these options must be remembered, it's better to set them using
`bundle config` (e.g., `bundle config set --local path foo`).
diff --git a/lib/bundler/man/bundle-inject.1 b/lib/bundler/man/bundle-inject.1
index acdf22a909..7a1ddcf27e 100644
--- a/lib/bundler/man/bundle-inject.1
+++ b/lib/bundler/man/bundle-inject.1
@@ -20,7 +20,7 @@ bundle inject 'rack' '> 0'
.P
This will inject the 'rack' gem with a version greater than 0 in your [\fBGemfile(5)\fR][Gemfile(5)] and Gemfile\.lock\.
.P
-The \fBbundle inject\fR command was deprecated in Bundler 2\.1 and will be removed in Bundler 3\.0\.
+The \fBbundle inject\fR command was deprecated in Bundler 2\.1 and will be removed in Bundler 4\.0\.
.SH "OPTIONS"
.TP
\fB\-\-source=SOURCE\fR
diff --git a/lib/bundler/man/bundle-inject.1.ronn b/lib/bundler/man/bundle-inject.1.ronn
index e2a911b6d8..7f6f0fb5b6 100644
--- a/lib/bundler/man/bundle-inject.1.ronn
+++ b/lib/bundler/man/bundle-inject.1.ronn
@@ -21,7 +21,7 @@ Example:
This will inject the 'rack' gem with a version greater than 0 in your
[`Gemfile(5)`][Gemfile(5)] and Gemfile.lock.
-The `bundle inject` command was deprecated in Bundler 2.1 and will be removed in Bundler 3.0.
+The `bundle inject` command was deprecated in Bundler 2.1 and will be removed in Bundler 4.0.
## OPTIONS
diff --git a/spec/bundler/bundler/lockfile_parser_spec.rb b/spec/bundler/bundler/lockfile_parser_spec.rb
index cee00dfad6..54aa6a0bfe 100644
--- a/spec/bundler/bundler/lockfile_parser_spec.rb
+++ b/spec/bundler/bundler/lockfile_parser_spec.rb
@@ -129,8 +129,8 @@ RSpec.describe Bundler::LockfileParser do
it "shows deprecation warning for replacement" do
expect(Bundler::SharedHelpers).to receive(:major_deprecation).with(
2,
- "Found x64-mingw32 in lockfile, which is deprecated. Using x64-mingw-ucrt, the replacement for x64-mingw32 in modern rubies, instead. Support for x64-mingw32 will be removed in Bundler 3.0.",
- removed_message: "Found x64-mingw32 in lockfile, which is no longer supported as of Bundler 3.0."
+ "Found x64-mingw32 in lockfile, which is deprecated. Using x64-mingw-ucrt, the replacement for x64-mingw32 in modern rubies, instead. Support for x64-mingw32 will be removed in Bundler 4.0.",
+ removed_message: "Found x64-mingw32 in lockfile, which is no longer supported as of Bundler 4.0."
)
subject
end
@@ -183,8 +183,8 @@ RSpec.describe Bundler::LockfileParser do
it "shows deprecation warning for removing legacy platform" do
expect(Bundler::SharedHelpers).to receive(:major_deprecation).with(
2,
- "Found x64-mingw32 in lockfile, which is deprecated. Removing it. Support for x64-mingw32 will be removed in Bundler 3.0.",
- removed_message: "Found x64-mingw32 in lockfile, which is no longer supported as of Bundler 3.0."
+ "Found x64-mingw32 in lockfile, which is deprecated. Removing it. Support for x64-mingw32 will be removed in Bundler 4.0.",
+ removed_message: "Found x64-mingw32 in lockfile, which is no longer supported as of Bundler 4.0."
)
subject
end
diff --git a/spec/bundler/cache/git_spec.rb b/spec/bundler/cache/git_spec.rb
index b337882a6e..e9dee60a98 100644
--- a/spec/bundler/cache/git_spec.rb
+++ b/spec/bundler/cache/git_spec.rb
@@ -452,7 +452,7 @@ RSpec.describe "bundle cache with git" do
bundle :cache, "all-platforms" => true, :install => false
# it did _NOT_ actually install the gem - neither in $GEM_HOME (bundler 2 mode),
- # nor in .bundle (bundler 3 mode)
+ # nor in .bundle (bundler 4 mode)
expect(Pathname.new(File.join(default_bundle_path, "gems/foo-1.0-#{ref}"))).to_not exist
# it _did_ cache the gem in vendor/
expect(bundled_app("vendor/cache/foo-1.0-#{ref}")).to exist
generated by cgit v1.2.3 (git 2.25.1) at 2026-01-21 19:17:24 +0000