diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index ef9841e..02c71f6 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -16,8 +16,8 @@ jobs: strategy: fail-fast: false matrix: - ruby: ['3.0', 3.1, 3.2, 3.3] - gemfile: [6.1, '7.0', 7.1] + ruby: [3.1, 3.2, 3.3] + gemfile: [6.1, '7.0', 7.1, 7.2] env: # $BUNDLE_GEMFILE must be set at the job level, so it is set for all steps BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/actionpack-${{ matrix.gemfile }}.gemfile CC_TEST_REPORTER_ID: 0d09e6611c01dedd75511b1c60f62329d01729289e06375cfe67cefe67013d9f diff --git a/Gemfile.lock b/Gemfile.lock index 03a3ca0..7b9ce49 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,75 +1,76 @@ PATH remote: . specs: - country_select (8.0.3) - countries (> 5.0, < 7.0) + country_select (9.0.0) + countries (> 5.0, < 8.0) GEM remote: https://rubygems.org/ specs: - actionpack (7.1.3) - actionview (= 7.1.3) - activesupport (= 7.1.3) + actionpack (7.2.1) + actionview (= 7.2.1) + activesupport (= 7.2.1) nokogiri (>= 1.8.5) racc - rack (>= 2.2.4) + rack (>= 2.2.4, < 3.2) rack-session (>= 1.0.1) rack-test (>= 0.6.3) rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) - actionview (7.1.3) - activesupport (= 7.1.3) + useragent (~> 0.16) + actionview (7.2.1) + activesupport (= 7.2.1) builder (~> 3.1) erubi (~> 1.11) rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) - activesupport (7.1.3) + activesupport (7.2.1) base64 bigdecimal - concurrent-ruby (~> 1.0, >= 1.0.2) + concurrent-ruby (~> 1.0, >= 1.3.1) connection_pool (>= 2.2.5) drb i18n (>= 1.6, < 2) + logger (>= 1.4.2) minitest (>= 5.1) - mutex_m - tzinfo (~> 2.0) + securerandom (>= 0.3) + tzinfo (~> 2.0, >= 2.0.5) base64 (0.2.0) - bigdecimal (3.1.6) - builder (3.2.4) + bigdecimal (3.1.8) + builder (3.3.0) coderay (1.1.3) - concurrent-ruby (1.2.3) + concurrent-ruby (1.3.4) connection_pool (2.4.1) - countries (6.0.0) + countries (7.0.0) unaccent (~> 0.3) crass (1.0.6) diff-lcs (1.5.1) - docile (1.4.0) - drb (2.2.0) - ruby2_keywords - erubi (1.12.0) - i18n (1.14.1) + docile (1.4.1) + drb (2.2.1) + erubi (1.13.0) + i18n (1.14.6) concurrent-ruby (~> 1.0) + logger (1.6.1) loofah (2.22.0) crass (~> 1.0.2) nokogiri (>= 1.12.0) - method_source (1.0.0) - mini_portile2 (2.8.5) - minitest (5.22.2) - mutex_m (0.2.0) - nokogiri (1.16.2) + method_source (1.1.0) + mini_portile2 (2.8.7) + minitest (5.25.1) + nokogiri (1.16.7) mini_portile2 (~> 2.8.2) racc (~> 1.4) - nokogiri (1.16.2-arm64-darwin) + nokogiri (1.16.7-arm64-darwin) racc (~> 1.4) - nokogiri (1.16.2-x86_64-darwin) + nokogiri (1.16.7-x86_64-darwin) racc (~> 1.4) - nokogiri (1.16.2-x86_64-linux) + nokogiri (1.16.7-x86_64-linux) racc (~> 1.4) pry (0.14.2) coderay (~> 1.1) method_source (~> 1.0) - racc (1.7.3) - rack (3.0.9) + racc (1.8.1) + rack (3.1.7) rack-session (2.0.0) rack (>= 3.0.0) rack-test (2.1.0) @@ -81,30 +82,31 @@ GEM rails-html-sanitizer (1.6.0) loofah (~> 2.21) nokogiri (~> 1.14) - rake (13.1.0) + rake (13.2.1) rspec (3.13.0) rspec-core (~> 3.13.0) rspec-expectations (~> 3.13.0) rspec-mocks (~> 3.13.0) - rspec-core (3.13.0) + rspec-core (3.13.1) rspec-support (~> 3.13.0) - rspec-expectations (3.13.0) + rspec-expectations (3.13.3) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.13.0) - rspec-mocks (3.13.0) + rspec-mocks (3.13.1) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.13.0) - rspec-support (3.13.0) - ruby2_keywords (0.0.5) + rspec-support (3.13.1) + securerandom (0.3.1) simplecov (0.22.0) docile (~> 1.1) simplecov-html (~> 0.11) simplecov_json_formatter (~> 0.1) - simplecov-html (0.12.3) + simplecov-html (0.13.1) simplecov_json_formatter (0.1.4) tzinfo (2.0.6) concurrent-ruby (~> 1.0) unaccent (0.4.0) + useragent (0.16.10) PLATFORMS arm64-darwin-22 @@ -121,4 +123,4 @@ DEPENDENCIES simplecov (~> 0.22) BUNDLED WITH - 2.4.19 + 2.5.11 diff --git a/country_select.gemspec b/country_select.gemspec index ab91734..f9f0b24 100644 --- a/country_select.gemspec +++ b/country_select.gemspec @@ -24,7 +24,7 @@ Gem::Specification.new do |s| s.executables = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) } s.require_paths = ['lib'] - s.required_ruby_version = '>= 3.0' + s.required_ruby_version = '>= 3.1' s.add_development_dependency 'actionpack', '~> 7.0' s.add_development_dependency 'pry', '~> 0' @@ -32,5 +32,5 @@ Gem::Specification.new do |s| s.add_development_dependency 'rspec', '~> 3' s.add_development_dependency 'simplecov', '~> 0.22' - s.add_dependency 'countries', '> 5.0', '< 7.0' + s.add_dependency 'countries', '> 5.0', '< 8.0' end diff --git a/gemfiles/actionpack-7.0.gemfile.lock b/gemfiles/actionpack-7.0.gemfile.lock index 1be550e..06c2398 100644 --- a/gemfiles/actionpack-7.0.gemfile.lock +++ b/gemfiles/actionpack-7.0.gemfile.lock @@ -2,56 +2,56 @@ PATH remote: .. specs: country_select (9.0.0) - countries (> 5.0, < 7.0) + countries (> 5.0, < 8.0) GEM remote: https://rubygems.org/ specs: - actionpack (7.0.8) - actionview (= 7.0.8) - activesupport (= 7.0.8) + actionpack (7.0.8.4) + actionview (= 7.0.8.4) + activesupport (= 7.0.8.4) rack (~> 2.0, >= 2.2.4) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actionview (7.0.8) - activesupport (= 7.0.8) + actionview (7.0.8.4) + activesupport (= 7.0.8.4) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activesupport (7.0.8) + activesupport (7.0.8.4) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) tzinfo (~> 2.0) - builder (3.2.4) + builder (3.3.0) coderay (1.1.3) - concurrent-ruby (1.2.3) - countries (6.0.0) + concurrent-ruby (1.3.4) + countries (7.0.0) unaccent (~> 0.3) crass (1.0.6) diff-lcs (1.5.1) - docile (1.4.0) - erubi (1.12.0) - i18n (1.14.1) + docile (1.4.1) + erubi (1.13.0) + i18n (1.14.6) concurrent-ruby (~> 1.0) loofah (2.22.0) crass (~> 1.0.2) nokogiri (>= 1.12.0) - method_source (1.0.0) - minitest (5.22.2) - nokogiri (1.16.2-arm64-darwin) + method_source (1.1.0) + minitest (5.25.1) + nokogiri (1.16.7-arm64-darwin) racc (~> 1.4) - nokogiri (1.16.2-x86_64-darwin) + nokogiri (1.16.7-x86_64-darwin) racc (~> 1.4) - nokogiri (1.16.2-x86_64-linux) + nokogiri (1.16.7-x86_64-linux) racc (~> 1.4) pry (0.14.2) coderay (~> 1.1) method_source (~> 1.0) - racc (1.7.3) - rack (2.2.8) + racc (1.8.1) + rack (2.2.9) rack-test (2.1.0) rack (>= 1.3) rails-dom-testing (2.2.0) @@ -61,38 +61,38 @@ GEM rails-html-sanitizer (1.6.0) loofah (~> 2.21) nokogiri (~> 1.14) - railties (7.0.8) - actionpack (= 7.0.8) - activesupport (= 7.0.8) + railties (7.0.8.4) + actionpack (= 7.0.8.4) + activesupport (= 7.0.8.4) method_source rake (>= 12.2) thor (~> 1.0) zeitwerk (~> 2.5) - rake (13.1.0) + rake (13.2.1) rspec (3.13.0) rspec-core (~> 3.13.0) rspec-expectations (~> 3.13.0) rspec-mocks (~> 3.13.0) - rspec-core (3.13.0) + rspec-core (3.13.1) rspec-support (~> 3.13.0) - rspec-expectations (3.13.0) + rspec-expectations (3.13.3) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.13.0) - rspec-mocks (3.13.0) + rspec-mocks (3.13.1) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.13.0) - rspec-support (3.13.0) + rspec-support (3.13.1) simplecov (0.22.0) docile (~> 1.1) simplecov-html (~> 0.11) simplecov_json_formatter (~> 0.1) - simplecov-html (0.12.3) + simplecov-html (0.13.1) simplecov_json_formatter (0.1.4) - thor (1.3.0) + thor (1.3.2) tzinfo (2.0.6) concurrent-ruby (~> 1.0) unaccent (0.4.0) - zeitwerk (2.6.13) + zeitwerk (2.6.18) PLATFORMS arm64-darwin-22 @@ -111,4 +111,4 @@ DEPENDENCIES simplecov (~> 0.22) BUNDLED WITH - 2.4.19 + 2.5.18 diff --git a/gemfiles/actionpack-7.1.gemfile.lock b/gemfiles/actionpack-7.1.gemfile.lock index 750d49e..0f792f8 100644 --- a/gemfiles/actionpack-7.1.gemfile.lock +++ b/gemfiles/actionpack-7.1.gemfile.lock @@ -2,14 +2,14 @@ PATH remote: .. specs: country_select (9.0.0) - countries (> 5.0, < 7.0) + countries (> 5.0, < 8.0) GEM remote: https://rubygems.org/ specs: - actionpack (7.1.3) - actionview (= 7.1.3) - activesupport (= 7.1.3) + actionpack (7.1.4) + actionview (= 7.1.4) + activesupport (= 7.1.4) nokogiri (>= 1.8.5) racc rack (>= 2.2.4) @@ -17,13 +17,13 @@ GEM rack-test (>= 0.6.3) rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) - actionview (7.1.3) - activesupport (= 7.1.3) + actionview (7.1.4) + activesupport (= 7.1.4) builder (~> 3.1) erubi (~> 1.11) rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) - activesupport (7.1.3) + activesupport (7.1.4) base64 bigdecimal concurrent-ruby (~> 1.0, >= 1.0.2) @@ -34,44 +34,43 @@ GEM mutex_m tzinfo (~> 2.0) base64 (0.2.0) - bigdecimal (3.1.6) - builder (3.2.4) + bigdecimal (3.1.8) + builder (3.3.0) coderay (1.1.3) - concurrent-ruby (1.2.3) + concurrent-ruby (1.3.4) connection_pool (2.4.1) - countries (6.0.0) + countries (7.0.0) unaccent (~> 0.3) crass (1.0.6) diff-lcs (1.5.1) - docile (1.4.0) - drb (2.2.0) - ruby2_keywords - erubi (1.12.0) - i18n (1.14.1) + docile (1.4.1) + drb (2.2.1) + erubi (1.13.0) + i18n (1.14.6) concurrent-ruby (~> 1.0) io-console (0.7.2) - irb (1.11.2) - rdoc + irb (1.14.1) + rdoc (>= 4.0.0) reline (>= 0.4.2) loofah (2.22.0) crass (~> 1.0.2) nokogiri (>= 1.12.0) - method_source (1.0.0) - minitest (5.22.2) + method_source (1.1.0) + minitest (5.25.1) mutex_m (0.2.0) - nokogiri (1.16.2-arm64-darwin) + nokogiri (1.16.7-arm64-darwin) racc (~> 1.4) - nokogiri (1.16.2-x86_64-darwin) + nokogiri (1.16.7-x86_64-darwin) racc (~> 1.4) - nokogiri (1.16.2-x86_64-linux) + nokogiri (1.16.7-x86_64-linux) racc (~> 1.4) pry (0.14.2) coderay (~> 1.1) method_source (~> 1.0) psych (5.1.2) stringio - racc (1.7.3) - rack (3.0.9) + racc (1.8.1) + rack (3.1.7) rack-session (2.0.0) rack (>= 3.0.0) rack-test (2.1.0) @@ -86,46 +85,45 @@ GEM rails-html-sanitizer (1.6.0) loofah (~> 2.21) nokogiri (~> 1.14) - railties (7.1.3) - actionpack (= 7.1.3) - activesupport (= 7.1.3) + railties (7.1.4) + actionpack (= 7.1.4) + activesupport (= 7.1.4) irb rackup (>= 1.0.0) rake (>= 12.2) thor (~> 1.0, >= 1.2.2) zeitwerk (~> 2.6) - rake (13.1.0) - rdoc (6.6.2) + rake (13.2.1) + rdoc (6.7.0) psych (>= 4.0.0) - reline (0.4.2) + reline (0.5.10) io-console (~> 0.5) rspec (3.13.0) rspec-core (~> 3.13.0) rspec-expectations (~> 3.13.0) rspec-mocks (~> 3.13.0) - rspec-core (3.13.0) + rspec-core (3.13.1) rspec-support (~> 3.13.0) - rspec-expectations (3.13.0) + rspec-expectations (3.13.3) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.13.0) - rspec-mocks (3.13.0) + rspec-mocks (3.13.1) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.13.0) - rspec-support (3.13.0) - ruby2_keywords (0.0.5) + rspec-support (3.13.1) simplecov (0.22.0) docile (~> 1.1) simplecov-html (~> 0.11) simplecov_json_formatter (~> 0.1) - simplecov-html (0.12.3) + simplecov-html (0.13.1) simplecov_json_formatter (0.1.4) - stringio (3.1.0) - thor (1.3.0) + stringio (3.1.1) + thor (1.3.2) tzinfo (2.0.6) concurrent-ruby (~> 1.0) unaccent (0.4.0) - webrick (1.8.1) - zeitwerk (2.6.13) + webrick (1.8.2) + zeitwerk (2.6.18) PLATFORMS arm64-darwin-22 @@ -144,4 +142,4 @@ DEPENDENCIES simplecov (~> 0.22) BUNDLED WITH - 2.4.19 + 2.5.18 diff --git a/gemfiles/actionpack-7.2.gemfile b/gemfiles/actionpack-7.2.gemfile new file mode 100644 index 0000000..640e481 --- /dev/null +++ b/gemfiles/actionpack-7.2.gemfile @@ -0,0 +1,9 @@ +# frozen_string_literal: true + +source 'https://rubygems.org' + +gemspec path: '../' + +gem 'railties', '~> 7.2.0' +gem 'actionpack', '~> 7.2.0' +gem 'nokogiri', '~> 1.16' diff --git a/gemfiles/actionpack-7.2.gemfile.lock b/gemfiles/actionpack-7.2.gemfile.lock new file mode 100644 index 0000000..8cdf879 --- /dev/null +++ b/gemfiles/actionpack-7.2.gemfile.lock @@ -0,0 +1,157 @@ +PATH + remote: .. + specs: + country_select (9.0.0) + countries (> 5.0, < 8.0) + +GEM + remote: https://rubygems.org/ + specs: + actionpack (7.2.1) + actionview (= 7.2.1) + activesupport (= 7.2.1) + nokogiri (>= 1.8.5) + racc + rack (>= 2.2.4, < 3.2) + rack-session (>= 1.0.1) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.2) + rails-html-sanitizer (~> 1.6) + useragent (~> 0.16) + actionview (7.2.1) + activesupport (= 7.2.1) + builder (~> 3.1) + erubi (~> 1.11) + rails-dom-testing (~> 2.2) + rails-html-sanitizer (~> 1.6) + activesupport (7.2.1) + base64 + 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) + securerandom (>= 0.3) + tzinfo (~> 2.0, >= 2.0.5) + base64 (0.2.0) + bigdecimal (3.1.8) + builder (3.3.0) + coderay (1.1.3) + concurrent-ruby (1.3.4) + connection_pool (2.4.1) + countries (7.0.0) + unaccent (~> 0.3) + crass (1.0.6) + diff-lcs (1.5.1) + docile (1.4.1) + drb (2.2.1) + erubi (1.13.0) + i18n (1.14.6) + concurrent-ruby (~> 1.0) + io-console (0.7.2) + irb (1.14.1) + rdoc (>= 4.0.0) + reline (>= 0.4.2) + logger (1.6.1) + loofah (2.22.0) + crass (~> 1.0.2) + nokogiri (>= 1.12.0) + method_source (1.1.0) + minitest (5.25.1) + nokogiri (1.16.7-aarch64-linux) + racc (~> 1.4) + nokogiri (1.16.7-arm-linux) + racc (~> 1.4) + nokogiri (1.16.7-arm64-darwin) + racc (~> 1.4) + nokogiri (1.16.7-x86-linux) + racc (~> 1.4) + nokogiri (1.16.7-x86_64-darwin) + racc (~> 1.4) + nokogiri (1.16.7-x86_64-linux) + racc (~> 1.4) + pry (0.14.2) + coderay (~> 1.1) + method_source (~> 1.0) + psych (5.1.2) + stringio + racc (1.8.1) + rack (3.1.7) + rack-session (2.0.0) + rack (>= 3.0.0) + rack-test (2.1.0) + rack (>= 1.3) + rackup (2.1.0) + rack (>= 3) + webrick (~> 1.8) + rails-dom-testing (2.2.0) + activesupport (>= 5.0.0) + minitest + nokogiri (>= 1.6) + rails-html-sanitizer (1.6.0) + loofah (~> 2.21) + nokogiri (~> 1.14) + railties (7.2.1) + actionpack (= 7.2.1) + activesupport (= 7.2.1) + irb (~> 1.13) + rackup (>= 1.0.0) + rake (>= 12.2) + thor (~> 1.0, >= 1.2.2) + zeitwerk (~> 2.6) + rake (13.2.1) + rdoc (6.7.0) + psych (>= 4.0.0) + reline (0.5.10) + io-console (~> 0.5) + rspec (3.13.0) + rspec-core (~> 3.13.0) + rspec-expectations (~> 3.13.0) + rspec-mocks (~> 3.13.0) + rspec-core (3.13.1) + rspec-support (~> 3.13.0) + rspec-expectations (3.13.3) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.13.0) + rspec-mocks (3.13.1) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.13.0) + rspec-support (3.13.1) + securerandom (0.3.1) + simplecov (0.22.0) + docile (~> 1.1) + simplecov-html (~> 0.11) + simplecov_json_formatter (~> 0.1) + simplecov-html (0.13.1) + simplecov_json_formatter (0.1.4) + stringio (3.1.1) + thor (1.3.2) + tzinfo (2.0.6) + concurrent-ruby (~> 1.0) + unaccent (0.4.0) + useragent (0.16.10) + webrick (1.8.2) + zeitwerk (2.6.18) + +PLATFORMS + aarch64-linux + arm-linux + arm64-darwin + x86-linux + x86_64-darwin + x86_64-linux + +DEPENDENCIES + actionpack (~> 7.2.0) + country_select! + nokogiri (~> 1.16) + pry (~> 0) + railties (~> 7.2.0) + rake (~> 13) + rspec (~> 3) + simplecov (~> 0.22) + +BUNDLED WITH + 2.5.18