Merge pull request #101 from cosmo0920/upgrade-activesupport-to-6.1

Upgrade activesupport to 6.1

Author: ashie

.github/workflows/linux.yml

@@ -6,13 +6,36 @@ on:
 jobs:
   build:
     runs-on: ${{ matrix.os }}
+    continue-on-error: ${{ matrix.experimental }}
     strategy:
       fail-fast: false
       matrix:
-        ruby: [ '2.4', '2.5', '2.6', '2.7' ]
+        ruby: [ '2.5', '2.6', '2.7', '3.0' ]
         postgres: [ '9', '10', '11', '12', '13' ]
         os:
           - ubuntu-latest
+        experimental: [false]
+        include:
+          - ruby: head
+            postgres: '9'
+            os: ubuntu-latest
+            experimental: true
+          - ruby: head
+            postgres: '10'
+            os: ubuntu-latest
+            experimental: true
+          - ruby: head
+            postgres: '11'
+            os: ubuntu-latest
+            experimental: true
+          - ruby: head
+            postgres: '12'
+            os: ubuntu-latest
+            experimental: true
+          - ruby: head
+            postgres: '13'
+            os: ubuntu-latest
+            experimental: true
     services:
       postgres:
         image: postgres:${{ matrix.postgres }}

.travis.yml

@@ -5,7 +5,6 @@ addons:
   postgresql: "9.4"
 
 rvm:
-  - 2.4.10
   - 2.5.8
   - 2.6.6
   - 2.7.1

README.md

@@ -27,11 +27,6 @@ We recommend that mysql2 gem is higher than `0.3.12` and pg gem is higher than `
 
 If you use ruby 2.1, use pg gem 0.21.0 (< 1.0.0) because ActiveRecord 5.1.4 or earlier doesn't support Ruby 2.1.
 
-### Resolve tzinfo version conflict
-
-If you want to use fluent-plugin-sql with recent fluentd/td-agent, you need to downgrade tzinfo to v1.x manually.
-See also this comment: https://github.com/fluent/fluent-plugin-sql/issues/87#issuecomment-614552292
-
 ## Input: How It Works
 
 This plugin runs following SQL periodically:

fluent-plugin-sql.gemspec

@@ -17,8 +17,8 @@ Gem::Specification.new do |gem|
   gem.license = "Apache-2.0"
 
   gem.add_dependency "fluentd", [">= 0.12.17", "< 2"]
-  gem.add_dependency 'activerecord', "~> 5.1"
-  gem.add_dependency 'activerecord-import', "~> 0.7"
+  gem.add_dependency 'activerecord', "~> 6.1"
+  gem.add_dependency 'activerecord-import', "~> 1.0"
   gem.add_development_dependency "rake", ">= 0.9.2"
   gem.add_development_dependency "test-unit", "> 3.1.0"
   gem.add_development_dependency "test-unit-rr"