mirror/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2026-01-27 04:24:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed conflict of vendor_gems.rb

Browse Source
This commit is contained in:
Hiroshi SHIBATA 2025-11-18 18:47:32 +09:00
parent 85abc59c32
commit a1c76c7e3a
No known key found for this signature in database
GPG Key ID: F9CF13417264FAC2
2 changed files with 17 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tool/bundler/vendor_gems.rb
View File

@ -2,27 +2,16 @@
source "https://rubygems.org"
<<<<<<< HEAD
gem "fileutils", "1.7.3"
gem "molinillo", github: "cocoapods/molinillo"
<<<<<<< HEAD
gem "net-http", github: "ruby/net-http", ref: "d8fd39c589279b1aaec85a7c8de9b3e199c72efe"
gem "net-http-persistent", github: "hsbt/net-http-persistent", ref: "9b6fbd733cf35596dfe7f80c0c154f9f3d17dbdb"
=======
gem "net-http", "0.8.0"
=======
gem "fileutils", "1.8.0"
gem "molinillo", github: "cocoapods/molinillo", ref: "1d62d7d5f448e79418716dc779a4909509ccda2a"
gem "net-http", "0.7.0" # net-http-0.8.0 is broken with JRuby
>>>>>>> 198b10c12d6 (Downgrade net-http 0.7.0 because JRuby is not working)
gem "net-http-persistent", "4.0.6"
>>>>>>> 7e6ce7be57a (Use released version of net-http-0.8.0)
gem "net-protocol", "0.2.2"
gem "optparse", "0.6.0"
gem "optparse", "0.8.0"
gem "pub_grub", github: "jhawthorn/pub_grub", ref: "df6add45d1b4d122daff2f959c9bd1ca93d14261"
gem "resolv", "0.6.2"
gem "securerandom", "0.4.1"
gem "timeout", "0.4.3"
gem "timeout", "0.4.4"
gem "thor", "1.4.0"
gem "tsort", "0.2.0"
gem "uri", "1.0.4"
gem "uri", "1.1.1"

63
tool/bundler/vendor_gems.rb.lock
View File

@ -1,17 +1,10 @@
GIT
remote: https://github.com/cocoapods/molinillo.git
revision: 1d62d7d5f448e79418716dc779a4909509ccda2a
ref: 1d62d7d5f448e79418716dc779a4909509ccda2a
specs:
molinillo (0.8.0)
GIT
remote: https://github.com/hsbt/net-http-persistent.git
revision: 9b6fbd733cf35596dfe7f80c0c154f9f3d17dbdb
ref: 9b6fbd733cf35596dfe7f80c0c154f9f3d17dbdb
specs:
net-http-persistent (4.0.6)
connection_pool (~> 2.2, >= 2.2.4)
GIT
remote: https://github.com/jhawthorn/pub_grub.git
revision: df6add45d1b4d122daff2f959c9bd1ca93d14261
@ -22,31 +15,21 @@ GIT
GEM
remote: https://rubygems.org/
specs:
<<<<<<< HEAD
connection_pool (2.4.1)
fileutils (1.7.3)
<<<<<<< HEAD
=======
net-http (0.8.0)
uri (>= 0.11.1)
=======
connection_pool (2.5.4)
fileutils (1.8.0)
net-http (0.7.0)
uri
>>>>>>> 198b10c12d6 (Downgrade net-http 0.7.0 because JRuby is not working)
net-http-persistent (4.0.6)
connection_pool (~> 2.2, >= 2.2.4)
>>>>>>> 7e6ce7be57a (Use released version of net-http-0.8.0)
net-protocol (0.2.2)
timeout
optparse (0.6.0)
optparse (0.8.0)
resolv (0.6.2)
securerandom (0.4.1)
thor (1.4.0)
timeout (0.4.3)
timeout (0.4.4)
tsort (0.2.0)
uri (1.0.4)
uri (1.1.1)
PLATFORMS
java
@ -58,53 +41,35 @@ PLATFORMS
x86_64-linux
DEPENDENCIES
fileutils (= 1.7.3)
fileutils (= 1.8.0)
molinillo!
<<<<<<< HEAD
<<<<<<< HEAD
net-http!
net-http-persistent!
=======
net-http (= 0.8.0)
=======
net-http (= 0.7.0)
>>>>>>> 198b10c12d6 (Downgrade net-http 0.7.0 because JRuby is not working)
net-http-persistent (= 4.0.6)
>>>>>>> 7e6ce7be57a (Use released version of net-http-0.8.0)
net-protocol (= 0.2.2)
optparse (= 0.6.0)
optparse (= 0.8.0)
pub_grub!
resolv (= 0.6.2)
securerandom (= 0.4.1)
thor (= 1.4.0)
timeout (= 0.4.3)
timeout (= 0.4.4)
tsort (= 0.2.0)
uri (= 1.0.4)
uri (= 1.1.1)
CHECKSUMS
connection_pool (2.4.1) sha256=0f40cf997091f1f04ff66da67eabd61a9fe0d4928b9a3645228532512fab62f4
fileutils (1.7.3) sha256=57271e854b694a87755d76f836f5c57b2c9538ebbaf4b2154bb66addf15eb5da
connection_pool (2.5.4) sha256=e9e1922327416091f3f6542f5f4446c2a20745276b9aa796dd0bb2fd0ea1e70a
fileutils (1.8.0) sha256=8c6b1df54e2540bdb2f39258f08af78853aa70bad52b4d394bbc6424593c6e02
molinillo (0.8.0)
<<<<<<< HEAD
<<<<<<< HEAD
net-http (0.6.0)
net-http-persistent (4.0.6)
=======
net-http (0.8.0) sha256=df42c47ce9f9e95ad32a317c97c12f945bc1af365288837ea4ff259876ecb46d
=======
net-http (0.7.0) sha256=4db7d9f558f8ffd4dcf832d0aefd02320c569c7d4f857def49e585069673a425
>>>>>>> 198b10c12d6 (Downgrade net-http 0.7.0 because JRuby is not working)
net-http-persistent (4.0.6) sha256=2abb3a04438edf6cb9e0e7e505969605f709eda3e3c5211beadd621a2c84dd5d
>>>>>>> 7e6ce7be57a (Use released version of net-http-0.8.0)
net-protocol (0.2.2) sha256=aa73e0cba6a125369de9837b8d8ef82a61849360eba0521900e2c3713aa162a8
optparse (0.6.0) sha256=25e90469c1cd44048a89dc01c1dde9d5f0bdf717851055fb18237780779b068c
optparse (0.8.0) sha256=ef6b7fbaf7ec331474f325bc08dd5622e6e1e651007a5341330ee4b08ce734f0
pub_grub (0.5.0)
resolv (0.6.2) sha256=61efe545cedddeb1b14f77e51f85c85ca66af5098fdbf567fadf32c34590fb14
securerandom (0.4.1) sha256=cc5193d414a4341b6e225f0cb4446aceca8e50d5e1888743fac16987638ea0b1
thor (1.4.0) sha256=8763e822ccb0f1d7bee88cde131b19a65606657b847cc7b7b4b82e772bcd8a3d
timeout (0.4.3) sha256=9509f079b2b55fe4236d79633bd75e34c1c1e7e3fb4b56cb5fda61f80a0fe30e
timeout (0.4.4) sha256=f0f6f970104b82427cd990680f539b6bbb8b1e55efa913a55c6492935e4e0edb
tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f
uri (1.0.4) sha256=34485d137c079f8753a0ca1d883841a7ba2e5fae556e3c30c2aab0dde616344b
uri (1.1.1) sha256=379fa58d27ffb1387eaada68c749d1426738bd0f654d812fcc07e7568f5c57c6
BUNDLED WITH
4.0.0.dev
4.0.0.dev