From e8bb732c0b445347008e126fd0d495a62f68ca23 Mon Sep 17 00:00:00 2001
From: John Carlyle-Clarke <jcarlyleclarke@gocardless.com>
Date: Fri, 11 Oct 2024 14:46:42 +0100
Subject: [PATCH 1/2] Update dependencies of the pubsub gem

The upstream fork has had some updates but our fork has diverged quite a
lot. Update the Google Client gem and Prometheus gem.

We are seeing messages in the build of our FluentD setup like this:

```
Post-install message from google-gax:
*******************************************************************************
The google-gax gem is officially end-of-life and will not be updated further.

If your app uses the google-gax gem, it likely is using obsolete versions of
some Google Cloud client library (google-cloud-*) gem that depends on it. We
recommend updating any such libraries that depend on google-gax. Modern Google
Cloud client libraries will depend on the gapic-common gem instead.
*******************************************************************************
```
---
 .ruby-version                              | 2 +-
 fluent-plugin-gcloud-pubsub-custom.gemspec | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.ruby-version b/.ruby-version
index 57cf282..fa7adc7 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-2.6.5
+3.3.5
diff --git a/fluent-plugin-gcloud-pubsub-custom.gemspec b/fluent-plugin-gcloud-pubsub-custom.gemspec
index 3ac516d..c52acb2 100644
--- a/fluent-plugin-gcloud-pubsub-custom.gemspec
+++ b/fluent-plugin-gcloud-pubsub-custom.gemspec
@@ -17,7 +17,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
 
   gem.add_runtime_dependency "fluentd", [">= 0.14.15", "< 2"]
-  gem.add_runtime_dependency "google-cloud-pubsub", "~> 0.30.0"
+  gem.add_runtime_dependency "google-cloud-pubsub", "~> 2.19.0"
 
   # Use the same version constraint as fluent-plugin-prometheus currently specifies
   gem.add_runtime_dependency "prometheus-client", ">= 2.1.0"

From 5621ffac0a019670990a008a798dfd29dfb789b4 Mon Sep 17 00:00:00 2001
From: John Carlyle-Clarke <jcarlyleclarke@gocardless.com>
Date: Mon, 14 Oct 2024 10:13:53 +0100
Subject: [PATCH 2/2] Update Github Action config, remove Travis config

Bump Ruby version in the Github Actions config.
Remove the Travis config as we are not using it.
Update the target version in Rubocop.
---
 .github/workflows/test.yml |  2 +-
 .rubocop.yml               |  2 +-
 .travis.yml                | 26 --------------------------
 3 files changed, 2 insertions(+), 28 deletions(-)
 delete mode 100644 .travis.yml

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index d85fb79..1448226 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -18,7 +18,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby-version: [ '3.1' ]
+        ruby-version: [ '3.3.5' ]
 
     steps:
       - uses: actions/checkout@v2
diff --git a/.rubocop.yml b/.rubocop.yml
index 2371fde..11bc70a 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -3,7 +3,7 @@ inherit_from: .rubocop_todo.yml
 
 AllCops:
   # Matches the minimum version in .travis.yml
-  TargetRubyVersion: 2.4
+  TargetRubyVersion: 3.3
 
 Style/StringLiterals:
   EnforcedStyle: "double_quotes"
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index ffc87b8..0000000
--- a/.travis.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-language: ruby
-
-rvm:
-  - 2.5
-  - 2.6
-  - 2.7
-  - ruby-head
-
-gemfile:
-  - Gemfile
-
-branches:
-  only:
-    - master
-    - gocardless
-
-before_install: gem update bundler
-script:
-  - bundle exec rake test
-  - bundle exec rubocop
-
-sudo: false
-
-matrix:
-  allow_failures:
-    - rvm: ruby-head