Modernize Stage I

- Drop legacy Ruby and AM versions
- Bump version to 2.0.0
- Add gemspec metadata

.github/workflows/ruby.yml

@@ -16,8 +16,8 @@ jobs:
 
     strategy:
       matrix:
-        ruby-version: ['2.6', '2.7', '3.0', '3.1', '3.2', '3.3']
-        gemfile: [am_6.0, am_6.1, am_7.0, am_7.1]
+        ruby-version: ['3.0', '3.1', '3.2', '3.3']
+        gemfile: [am_7.0, am_7.1]
         channel: [stable]
 
         include:
@@ -43,30 +43,8 @@ jobs:
             gemfile: am_edge
             channel: experimental
 
-        exclude:
-          - ruby-version: '2.6'
-            gemfile: am_7.0
-          - ruby-version: '2.6'
-            gemfile: am_7.1
-
-          - ruby-version: '3.1'
-            gemfile: am_6.0
-          - ruby-version: '3.1'
-            gemfile: am_6.1
-
-          - ruby-version: '3.2'
-            gemfile: am_6.0
-          - ruby-version: '3.2'
-            gemfile: am_6.1
-
-          - ruby-version: '3.3'
-            gemfile: am_6.0
-          - ruby-version: '3.3'
-            gemfile: am_6.1
-
     env:
       BUNDLE_GEMFILE: gemfiles/${{ matrix.gemfile }}.gemfile
-      TEST_CONFIG: ./spec/config.github.yml
 
     continue-on-error: ${{ matrix.channel != 'stable' }}
 

Appraisals

@@ -1,63 +1,9 @@
-appraise 'am-3.2' do
-  gem 'activemodel', "~> 3.2.0"
-  gem 'activesupport', "~> 3.2.0"
-  gem 'dalli', '< 3'
-end
-
-appraise 'am-4.0' do
-  gem 'activemodel', "~> 4.0.0"
-  gem 'activesupport', "~> 4.0.0"
-  gem 'dalli', '< 3'
-end
-
-appraise 'am-4.1' do
-  gem 'activemodel', "~> 4.1.0"
-  gem 'activesupport', "~> 4.1.0"
-  gem 'dalli', '< 3'
-end
-
-appraise 'am-4.2' do
-  gem 'activemodel', "~> 4.2.0"
-  gem 'activesupport', "~> 4.2.0"
-  gem 'dalli', '< 3'
-end
-
-appraise 'am-5.0' do
-  gem 'activemodel', "~> 5.0.0"
-  gem 'activesupport', "~> 5.0.0"
-  gem 'dalli', '< 3'
-end
-
-appraise 'am-5.1' do
-  gem 'activemodel', "~> 5.1.0"
-  gem 'activesupport', "~> 5.1.0"
-  gem 'dalli', '< 3'
-end
-
-appraise 'am-5.2' do
-  gem 'activemodel', "~> 5.2.0"
-  gem 'activesupport', "~> 5.2.0"
-  gem 'dalli', '< 3'
-end
-
-appraise 'am-6.0' do
-  gem 'activemodel', "~> 6.0.0"
-  gem 'activesupport', "~> 6.0.0"
-end
-
-appraise 'am-6.1' do
-  gem 'activemodel', "~> 6.1.0"
-  gem 'activesupport', "~> 6.1.0"
-end
-
 appraise 'am-7.0' do
   gem 'activemodel', "~> 7.0.0"
-  gem 'activesupport', "~> 7.0.0"
 end
 
 appraise 'am-7.1' do
   gem 'activemodel', "~> 7.1.0"
-  gem 'activesupport', "~> 7.1.0"
 end
 
 appraise 'am-edge' do

Gemfile

@@ -2,3 +2,13 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in hawk.gemspec
 gemspec
+
+gem 'appraisal'
+gem 'bundler'
+gem 'byebug'
+gem 'pry'
+gem 'rake'
+gem 'rspec'
+gem 'simplecov'
+gem 'webmock'
+gem 'yard'

README.md

@@ -1,7 +1,6 @@
 # Hawk
 
 [![Build Status](https://github.com/ifad/hawk/actions/workflows/ruby.yml/badge.svg)](https://github.com/ifad/hawk/actions)
-[![Legacy Build Status](https://github.com/ifad/hawk/actions/workflows/legacy_ruby.yml/badge.svg)](https://github.com/ifad/hawk/actions)
 
 Hawk is an API Client framework. It is used as a base to then build your API
 clients. It consumes JSON and produces Ruby objects without any Hash magic.

gemfiles/am_7.0.gemfile

@@ -2,7 +2,15 @@
 
 source "https://rubygems.org"
 
+gem "appraisal"
+gem "bundler"
+gem "byebug"
+gem "pry"
+gem "rake"
+gem "rspec"
+gem "simplecov"
+gem "webmock"
+gem "yard"
 gem "activemodel", "~> 7.0.0"
-gem "activesupport", "~> 7.0.0"
 
 gemspec path: "../"

gemfiles/am_7.1.gemfile

@@ -2,7 +2,15 @@
 
 source "https://rubygems.org"
 
+gem "appraisal"
+gem "bundler"
+gem "byebug"
+gem "pry"
+gem "rake"
+gem "rspec"
+gem "simplecov"
+gem "webmock"
+gem "yard"
 gem "activemodel", "~> 7.1.0"
-gem "activesupport", "~> 7.1.0"
 
 gemspec path: "../"

gemfiles/am_edge.gemfile

@@ -2,6 +2,15 @@
 
 source "https://rubygems.org"
 
+gem "appraisal"
+gem "bundler"
+gem "byebug"
+gem "pry"
+gem "rake"
+gem "rspec"
+gem "simplecov"
+gem "webmock"
+gem "yard"
 gem "activemodel", git: "https://github.com/rails/rails.git"
 gem "activesupport", git: "https://github.com/rails/rails.git"
 

hawk.gemspec

@@ -19,20 +19,18 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
+  spec.metadata = {
+    'bug_tracker_uri' => 'https://github.com/ifad/hawk/issues',
+    'homepage_uri' => 'https://github.com/ifad/hawk',
+    'source_code_uri' => 'https://github.com/ifad/hawk',
+    'rubygems_mfa_required' => 'true'
+  }
+
+  spec.required_ruby_version = '>= 3.0'
+
   spec.add_dependency 'typhoeus'
-  spec.add_dependency 'ethon', '>= 0.7.4'
+  spec.add_dependency 'ethon', '>= 0.16.0'
   spec.add_dependency 'multi_json'
   spec.add_dependency 'dalli'
-  spec.add_dependency 'activesupport', '>= 3.0.0'
-  spec.add_dependency 'activemodel', '>= 3.0.0'
-
-  spec.add_development_dependency 'bundler'
-  spec.add_development_dependency 'rake'
-  spec.add_development_dependency 'pry'
-  spec.add_development_dependency 'byebug'
-  spec.add_development_dependency 'rspec'
-  spec.add_development_dependency 'webmock'
-  spec.add_development_dependency 'simplecov'
-  spec.add_development_dependency 'appraisal'
-  spec.add_development_dependency 'yard'
+  spec.add_dependency 'activemodel', '>= 7.0'
 end

lib/hawk/version.rb

@@ -1,3 +1,3 @@
 module Hawk
-  VERSION = "1.0.0"
+  VERSION = "2.0.0"
 end