From 41a568172c66f1b22850b4e5e6b27895d39bcfe8 Mon Sep 17 00:00:00 2001 From: Luke Hill Date: Thu, 24 Oct 2024 10:00:56 +0100 Subject: [PATCH 1/6] Release using 3.3 --- .github/workflows/release-rubygem.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-rubygem.yml b/.github/workflows/release-rubygem.yml index 0314b2b2d..4399b4e84 100644 --- a/.github/workflows/release-rubygem.yml +++ b/.github/workflows/release-rubygem.yml @@ -13,7 +13,7 @@ jobs: - uses: actions/checkout@v4 - uses: ruby/setup-ruby@v1 with: - ruby-version: '3.2' + ruby-version: '3.3' bundler-cache: true - uses: cucumber/action-publish-rubygem@v1.0.0 with: From e3652246c0fe76af81bbc1a680a8db888b4ab04f Mon Sep 17 00:00:00 2001 From: Luke Hill Date: Thu, 24 Oct 2024 10:01:27 +0100 Subject: [PATCH 2/6] Test on 3.3 also --- .github/workflows/test-ruby.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test-ruby.yml b/.github/workflows/test-ruby.yml index f89f37369..b512907cb 100644 --- a/.github/workflows/test-ruby.yml +++ b/.github/workflows/test-ruby.yml @@ -17,12 +17,12 @@ jobs: matrix: os: - ubuntu-latest - ruby: ['2.7', '3.0', '3.1', '3.2'] + ruby: ['2.7', '3.0', '3.1', '3.2', '3.3'] include: - os: windows-latest - ruby: '3.2' + ruby: '3.3' - os: macos-latest - ruby: '3.2' + ruby: '3.3' steps: - uses: actions/checkout@v4 From 7b1d644075325b7cc3963b2f041fe80e39affca8 Mon Sep 17 00:00:00 2001 From: Luke Hill Date: Thu, 24 Oct 2024 10:04:21 +0100 Subject: [PATCH 3/6] Fix license issue --- dotnet/LICENSE | 21 +++++++++++++++++++++ go/LICENSE | 21 +++++++++++++++++++++ java/LICENSE | 21 +++++++++++++++++++++ javascript/LICENSE | 21 +++++++++++++++++++++ python/LICENSE | 21 +++++++++++++++++++++ ruby/LICENSE | 21 +++++++++++++++++++++ 6 files changed, 126 insertions(+) create mode 100644 dotnet/LICENSE create mode 100644 go/LICENSE create mode 100644 java/LICENSE create mode 100644 javascript/LICENSE create mode 100644 python/LICENSE create mode 100644 ruby/LICENSE diff --git a/dotnet/LICENSE b/dotnet/LICENSE new file mode 100644 index 000000000..a5e1512d0 --- /dev/null +++ b/dotnet/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2016 Cucumber Ltd and contributors + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/go/LICENSE b/go/LICENSE new file mode 100644 index 000000000..a5e1512d0 --- /dev/null +++ b/go/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2016 Cucumber Ltd and contributors + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/java/LICENSE b/java/LICENSE new file mode 100644 index 000000000..a5e1512d0 --- /dev/null +++ b/java/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2016 Cucumber Ltd and contributors + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/javascript/LICENSE b/javascript/LICENSE new file mode 100644 index 000000000..a5e1512d0 --- /dev/null +++ b/javascript/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2016 Cucumber Ltd and contributors + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/python/LICENSE b/python/LICENSE new file mode 100644 index 000000000..a5e1512d0 --- /dev/null +++ b/python/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2016 Cucumber Ltd and contributors + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/ruby/LICENSE b/ruby/LICENSE new file mode 100644 index 000000000..a5e1512d0 --- /dev/null +++ b/ruby/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2016 Cucumber Ltd and contributors + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. From 8c643e428c69ab4b64178f68d67f276042f5cc50 Mon Sep 17 00:00:00 2001 From: Luke Hill Date: Thu, 24 Oct 2024 10:06:07 +0100 Subject: [PATCH 4/6] update minimum ruby to 2.7 and update dev deps aside from rubocop --- ruby/cucumber-cucumber-expressions.gemspec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ruby/cucumber-cucumber-expressions.gemspec b/ruby/cucumber-cucumber-expressions.gemspec index dc05ddf08..50d33ef7b 100644 --- a/ruby/cucumber-cucumber-expressions.gemspec +++ b/ruby/cucumber-cucumber-expressions.gemspec @@ -13,7 +13,7 @@ Gem::Specification.new do |s| s.homepage = 'https://github.com/cucumber/cucumber-expressions' s.platform = Gem::Platform::RUBY s.license = 'MIT' - s.required_ruby_version = '>= 2.5' + s.required_ruby_version = '>= 2.7' s.metadata = { 'bug_tracker_uri' => 'https://github.com/cucumber/cucumber/issues', @@ -25,8 +25,8 @@ Gem::Specification.new do |s| s.add_runtime_dependency 'bigdecimal' - s.add_development_dependency 'rake', '~> 13.0', '>= 13.0.6' - s.add_development_dependency 'rspec', '~> 3.11', '>= 3.11.0' + s.add_development_dependency 'rake', '~> 13.1' + s.add_development_dependency 'rspec', '~> 3.13' s.add_development_dependency 'rubocop', '~> 1.27.0' s.add_development_dependency 'rubocop-performance', '~> 1.7.0' s.add_development_dependency 'rubocop-rake', '~> 0.5.0' From 41e75b48d1dce3fd2923bfeecf3df8092bee43d3 Mon Sep 17 00:00:00 2001 From: Luke Hill Date: Thu, 24 Oct 2024 10:11:47 +0100 Subject: [PATCH 5/6] Add changelog entry2 --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4a784da41..a107703e0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/). ## [Unreleased] +### Changed +- [Ruby] Minimum supported ruby is now 2.7+ ([#308](https://github.com/cucumber/cucumber-expressions/pull/308)) ## [17.1.0] - 2024-03-21 ### Added From d7045ddee19d6c80fd5b07a3ad5c4de4821efe41 Mon Sep 17 00:00:00 2001 From: Luke Hill Date: Thu, 24 Oct 2024 10:13:30 +0100 Subject: [PATCH 6/6] Update package files --- ruby/cucumber-cucumber-expressions.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ruby/cucumber-cucumber-expressions.gemspec b/ruby/cucumber-cucumber-expressions.gemspec index 50d33ef7b..e7abd0700 100644 --- a/ruby/cucumber-cucumber-expressions.gemspec +++ b/ruby/cucumber-cucumber-expressions.gemspec @@ -32,7 +32,7 @@ Gem::Specification.new do |s| s.add_development_dependency 'rubocop-rake', '~> 0.5.0' s.add_development_dependency 'rubocop-rspec', '~> 2.0.0' - s.files = `git ls-files`.split("\n").reject { |path| path =~ /\.gitignore$/ } + s.files = Dir['lib/**/*', 'CHANGELOG.md', 'CONTRIBUTING.md', 'LICENSE', 'README.md'] s.rdoc_options = ['--charset=UTF-8'] s.require_path = 'lib' end