Merge pull request #934 from mnin/main

Fix compatibility with bundler 4.x

Author: MikeMcQuaid

.github/workflows/test.yml

@@ -31,7 +31,7 @@ jobs:
     needs: core
     strategy:
       matrix:
-        bundler: ["2.1", "2.2", "2.3", "2.4"]
+        bundler: ["2.4", "2.5", "2.6", "4.0"]
     steps:
       - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
       - name: Set up Ruby
@@ -138,7 +138,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby: ["3.1", "3.2", "3.3", "3.4"]
+        ruby: ["3.2", "3.3", "3.4", "4.0"]
     steps:
       - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
       - name: Set up Ruby

.licensed.yml

@@ -15,6 +15,7 @@ reviewed:
     - csv
     - logger
     - net-http
+    - ostruct
     - racc
     - uri
 

.licenses/bundler/nokogiri.dep.yml

@@ -1,6 +1,6 @@
 ---
 name: nokogiri
-version: 1.18.10
+version: 1.19.0
 type: bundler
 summary: Nokogiri (鋸) makes it easy and painless to work with XML and HTML from Ruby.
 homepage: https://nokogiri.org

.licenses/bundler/ostruct.dep.yml

@@ -0,0 +1,69 @@
+---
+name: ostruct
+version: 0.6.3
+type: bundler
+summary: Class to build custom data structures, similar to a Hash.
+homepage: https://github.com/ruby/ostruct
+license: other
+licenses:
+- sources: COPYING
+  text: |
+    Ruby is copyrighted free software by Yukihiro Matsumoto <matz@netlab.jp>.
+    You can redistribute it and/or modify it under either the terms of the
+    2-clause BSDL (see the file BSDL), or the conditions below:
+
+    1. You may make and give away verbatim copies of the source form of the
+       software without restriction, provided that you duplicate all of the
+       original copyright notices and associated disclaimers.
+
+    2. You may modify your copy of the software in any way, provided that
+       you do at least ONE of the following:
+
+       a. place your modifications in the Public Domain or otherwise
+          make them Freely Available, such as by posting said
+          modifications to Usenet or an equivalent medium, or by allowing
+          the author to include your modifications in the software.
+
+       b. use the modified software only within your corporation or
+          organization.
+
+       c. give non-standard binaries non-standard names, with
+          instructions on where to get the original software distribution.
+
+       d. make other distribution arrangements with the author.
+
+    3. You may distribute the software in object code or binary form,
+       provided that you do at least ONE of the following:
+
+       a. distribute the binaries and library files of the software,
+          together with instructions (in the manual page or equivalent)
+          on where to get the original distribution.
+
+       b. accompany the distribution with the machine-readable source of
+          the software.
+
+       c. give non-standard binaries non-standard names, with
+          instructions on where to get the original software distribution.
+
+       d. make other distribution arrangements with the author.
+
+    4. You may modify and include the part of the software into any other
+       software (possibly commercial).  But some files in the distribution
+       are not written by the author, so that they are not under these terms.
+
+       For the list of those files and their copying conditions, see the
+       file LEGAL.
+
+    5. The scripts and library files supplied as input to or produced as
+       output from the software do not automatically fall under the
+       copyright of the software, but belong to whomever generated them,
+       and may be sold commercially, and may be aggregated with this
+       software.
+
+    6. THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
+       IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+       WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+       PURPOSE.
+- sources: README.md
+  text: The gem is available as open source under the terms of the [2-Clause BSD License](https://opensource.org/licenses/BSD-2-Clause).
+notices: []

.ruby-version

@@ -1 +1 @@
-3.1.7
+4.0.1

Gemfile.lock

@@ -5,6 +5,7 @@ PATH
       csv (~> 3.3)
       json (~> 2.6)
       licensee (~> 9.16)
+      ostruct (~> 0.6.3)
       parallel (~> 1.22)
       pathname-common_prefix (~> 0.0.1)
       reverse_markdown (>= 2.1, < 4.0)
@@ -65,12 +66,13 @@ GEM
       ruby2_keywords (>= 0.0.5)
     net-http (0.9.1)
       uri (>= 0.11.1)
-    nokogiri (1.18.10)
+    nokogiri (1.19.0)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     octokit (9.2.0)
       faraday (>= 1, < 3)
       sawyer (~> 0.9)
+    ostruct (0.6.3)
     parallel (1.27.0)
     parser (3.3.10.1)
       ast (~> 2.4.1)

docs/migrations/v3.md

@@ -45,7 +45,7 @@ jobs:
       - uses: actions/checkout@v1
 
       # install ruby
-      - uses: ruby/setup-ruby@a2bbe5b1b236842c1cb7dd11e8e3b51e0a616acc
+      - uses: ruby/setup-ruby@80740b3b13bf9857e28854481ca95a84e78a2bdf
         with:
           ruby-version: "3.0"
 
@@ -71,7 +71,7 @@ jobs:
       - uses: actions/checkout@v1
 
       # install ruby and bundler
-      - uses: ruby/setup-ruby@a2bbe5b1b236842c1cb7dd11e8e3b51e0a616acc
+      - uses: ruby/setup-ruby@80740b3b13bf9857e28854481ca95a84e78a2bdf
         with:
           ruby-version: "3.0"
 
@@ -95,7 +95,7 @@ jobs:
       - uses: actions/checkout@v1
 
       # install ruby and bundler
-      - uses: ruby/setup-ruby@a2bbe5b1b236842c1cb7dd11e8e3b51e0a616acc
+      - uses: ruby/setup-ruby@80740b3b13bf9857e28854481ca95a84e78a2bdf
         with:
           ruby-version: "3.0"
 

lib/licensed/sources/bundler/missing_specification.rb

@@ -59,6 +59,8 @@ def __materialize__(*args, **kwargs)
 
 module Bundler
   class LazySpecification
-    prepend ::Licensed::Bundler::LazySpecification
+    if Gem::Version.new(::Bundler::VERSION) < Gem::Version.new("4.0.0")
+      prepend ::Licensed::Bundler::LazySpecification
+    end
   end
 end

licensed.gemspec

@@ -32,6 +32,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "parallel", "~> 1.22"
   spec.add_dependency "reverse_markdown", ">= 2.1", "< 4.0"
   spec.add_dependency "json", "~> 2.6"
+  spec.add_dependency "ostruct", "~> 0.6.3"
 
   spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "minitest", "~> 5.17"

test/fixtures/cocoapods/Gemfile.lock

@@ -1,26 +1,35 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    CFPropertyList (3.0.6)
-      rexml
-    activesupport (7.0.4.3)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
+    CFPropertyList (3.0.8)
+    activesupport (7.2.3)
+      base64
+      benchmark (>= 0.3)
+      bigdecimal
+      concurrent-ruby (~> 1.0, >= 1.3.1)
+      connection_pool (>= 2.2.5)
+      drb
       i18n (>= 1.6, < 2)
+      logger (>= 1.4.2)
       minitest (>= 5.1)
-      tzinfo (~> 2.0)
-    addressable (2.8.1)
-      public_suffix (>= 2.0.2, < 6.0)
+      securerandom (>= 0.3)
+      tzinfo (~> 2.0, >= 2.0.5)
+    addressable (2.8.8)
+      public_suffix (>= 2.0.2, < 8.0)
     algoliasearch (1.27.5)
       httpclient (~> 2.8, >= 2.8.3)
       json (>= 1.5.1)
     atomos (0.1.3)
+    base64 (0.3.0)
+    benchmark (0.5.0)
+    bigdecimal (4.0.1)
     claide (1.1.0)
-    cocoapods (1.12.0)
+    cocoapods (1.16.2)
       addressable (~> 2.8)
       claide (>= 1.0.2, < 2.0)
-      cocoapods-core (= 1.12.0)
+      cocoapods-core (= 1.16.2)
       cocoapods-deintegrate (>= 1.0.3, < 2.0)
-      cocoapods-downloader (>= 1.6.0, < 2.0)
+      cocoapods-downloader (>= 2.1, < 3.0)
       cocoapods-plugins (>= 1.0.0, < 2.0)
       cocoapods-search (>= 1.0.0, < 2.0)
       cocoapods-trunk (>= 1.6.0, < 2.0)
@@ -32,8 +41,8 @@ GEM
       molinillo (~> 0.8.0)
       nap (~> 1.0)
       ruby-macho (>= 2.3.0, < 3.0)
-      xcodeproj (>= 1.21.0, < 2.0)
-    cocoapods-core (1.12.0)
+      xcodeproj (>= 1.27.0, < 2.0)
+    cocoapods-core (1.16.2)
       activesupport (>= 5.0, < 8)
       addressable (~> 2.8)
       algoliasearch (~> 1.0)
@@ -45,7 +54,7 @@ GEM
       typhoeus (~> 1.0)
     cocoapods-deintegrate (1.0.5)
     cocoapods-dependencies-list (1.0.0)
-    cocoapods-downloader (1.6.3)
+    cocoapods-downloader (2.1)
     cocoapods-plugins (1.0.0)
       nap
     cocoapods-search (1.0.1)
@@ -54,40 +63,49 @@ GEM
       netrc (~> 0.11)
     cocoapods-try (1.2.0)
     colored2 (3.1.2)
-    concurrent-ruby (1.2.2)
+    concurrent-ruby (1.3.6)
+    connection_pool (3.0.2)
+    drb (2.2.3)
     escape (0.0.4)
-    ethon (0.16.0)
+    ethon (0.18.0)
       ffi (>= 1.15.0)
-    ffi (1.15.5)
+      logger
+    ffi (1.17.3-x86_64-linux-gnu)
     fourflusher (2.3.1)
     fuzzy_match (2.0.4)
     gh_inspector (1.1.3)
-    httpclient (2.8.3)
-    i18n (1.12.0)
+    httpclient (2.9.0)
+      mutex_m
+    i18n (1.14.8)
       concurrent-ruby (~> 1.0)
-    json (2.6.3)
-    minitest (5.18.0)
+    json (2.18.0)
+    logger (1.7.0)
+    minitest (6.0.1)
+      prism (~> 1.5)
     molinillo (0.8.0)
-    nanaimo (0.3.0)
+    mutex_m (0.3.0)
+    nanaimo (0.4.0)
     nap (1.1.0)
     netrc (0.11.0)
+    prism (1.8.0)
     public_suffix (4.0.7)
-    rexml (3.2.5)
+    rexml (3.4.4)
     ruby-macho (2.5.1)
-    typhoeus (1.4.0)
+    securerandom (0.4.1)
+    typhoeus (1.4.1)
       ethon (>= 0.9.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    xcodeproj (1.22.0)
+    xcodeproj (1.27.0)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.3)
       claide (>= 1.0.2, < 2.0)
       colored2 (~> 3.1)
-      nanaimo (~> 0.3.0)
-      rexml (~> 3.2.4)
+      nanaimo (~> 0.4.0)
+      rexml (>= 3.3.6, < 4.0)
 
 PLATFORMS
-  ruby
+  x86_64-linux
 
 DEPENDENCIES
   cocoapods