Skip to content

Commit

Permalink
Merge branch 'main' of github.com:pay-rails/pay
Browse files Browse the repository at this point in the history
  • Loading branch information
excid3 committed Oct 4, 2024
2 parents c3f8e5d + b604d05 commit b85b088
Show file tree
Hide file tree
Showing 34 changed files with 276 additions and 250 deletions.
4 changes: 4 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,7 @@ updates:
- dependency-name: actionpack
versions:
- 6.1.2.1
- package-ecosystem: github-actions
directory: "/"
schedule:
interval: monthly
12 changes: 6 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
ruby: ['3.1', '3.2', '3.3']
ruby: ['3.2', '3.3']
gemfile:
- rails_6_1
- rails_7
Expand All @@ -29,7 +29,7 @@ jobs:
steps:
- name: SQLite3 version
run: sqlite3 --version
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
Expand All @@ -51,7 +51,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
ruby: ['3.1', '3.2', '3.3']
ruby: ['3.2', '3.3']
gemfile:
- rails_6_1
- rails_7
Expand All @@ -72,7 +72,7 @@ jobs:
ports: ['5432:5432']

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
Expand All @@ -94,7 +94,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
ruby: ['3.1', '3.2', '3.3']
ruby: ['3.2', '3.3']
gemfile:
- rails_6_1
- rails_7
Expand All @@ -115,7 +115,7 @@ jobs:
options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
Expand Down
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@

### Unreleased

### 8.1.0

* Stripe v13
* Remove OpenStruct dependency

### 8.0.0

* [Breaking] Remove `pay_customer.payment_method_token` virtual attribute. Use `@pay_customer.update_payment_method(token)` instead.
Expand Down
4 changes: 2 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ gem "webmock"

gem "braintree", ">= 2.92.0"
gem "lemonsqueezy", "~> 1.0"
gem "paddle", "~> 2.4"
gem "stripe", "~> 12.0"
gem "paddle", "~> 2.6"
gem "stripe", "~> 13.0"

gem "prawn"
gem "receipts"
Expand Down
49 changes: 25 additions & 24 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
GIT
remote: https://github.com/thoughtbot/appraisal.git
revision: c83f8376d8f1024d999433010cf81948d56b937e
revision: 24feeea4c5c1d2e7a5f95d053da61858c6bfb2b1
specs:
appraisal (2.5.0)
bundler
Expand All @@ -10,7 +10,7 @@ GIT
PATH
remote: .
specs:
pay (8.0.0)
pay (8.1.0)
rails (>= 6.0.0)

GEM
Expand Down Expand Up @@ -92,7 +92,7 @@ GEM
base64 (0.2.0)
bigdecimal (3.1.8)
bindex (0.8.1)
braintree (4.21.0)
braintree (4.22.0)
builder (>= 3.2.4)
rexml (>= 3.1.9)
builder (3.3.0)
Expand All @@ -113,14 +113,14 @@ GEM
globalid (1.2.1)
activesupport (>= 6.1)
hashdiff (1.1.1)
i18n (1.14.5)
i18n (1.14.6)
concurrent-ruby (~> 1.0)
importmap-rails (2.0.1)
actionpack (>= 6.0.0)
activesupport (>= 6.0.0)
railties (>= 6.0.0)
io-console (0.7.2)
irb (1.14.0)
irb (1.14.1)
rdoc (>= 4.0.0)
reline (>= 0.4.2)
json (2.7.2)
Expand All @@ -147,7 +147,7 @@ GEM
mysql2 (0.5.6)
net-http (0.4.1)
uri
net-imap (0.4.15)
net-imap (0.4.16)
date
net-protocol
net-pop (0.1.2)
Expand All @@ -164,14 +164,16 @@ GEM
racc (~> 1.4)
nokogiri (1.16.7-x86_64-linux)
racc (~> 1.4)
paddle (2.5.1)
faraday (~> 2.0)
ostruct (0.6.0)
paddle (2.6.0)
faraday (~> 2.11.0)
ostruct (~> 0.6.0)
parallel (1.26.3)
parser (3.3.5.0)
ast (~> 2.4.1)
racc
pdf-core (0.10.0)
pg (1.5.7)
pg (1.5.8)
prawn (2.5.0)
matrix (~> 0.4)
pdf-core (~> 0.10.0)
Expand All @@ -181,7 +183,7 @@ GEM
psych (5.1.2)
stringio
public_suffix (6.0.1)
puma (6.4.2)
puma (6.4.3)
nio4r (~> 2.0)
racc (1.8.1)
rack (3.1.7)
Expand Down Expand Up @@ -229,9 +231,9 @@ GEM
prawn (>= 1.3.0, < 3.0.0)
prawn-table (~> 0.2.1)
regexp_parser (2.9.2)
reline (0.5.9)
reline (0.5.10)
io-console (~> 0.5)
rexml (3.3.7)
rexml (3.3.8)
rubocop (1.65.1)
json (~> 2.3)
language_server-protocol (>= 3.17.0)
Expand All @@ -243,7 +245,7 @@ GEM
rubocop-ast (>= 1.31.1, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 2.4.0, < 3.0)
rubocop-ast (1.32.2)
rubocop-ast (1.32.3)
parser (>= 3.3.1.0)
rubocop-performance (1.21.1)
rubocop (>= 1.48.1, < 2.0)
Expand All @@ -258,10 +260,10 @@ GEM
actionpack (>= 6.1)
activesupport (>= 6.1)
sprockets (>= 3.0.0)
sqlite3 (2.0.4)
sqlite3 (2.1.0)
mini_portile2 (~> 2.8.0)
sqlite3 (2.0.4-x86_64-darwin)
sqlite3 (2.0.4-x86_64-linux-gnu)
sqlite3 (2.1.0-x86_64-darwin)
sqlite3 (2.1.0-x86_64-linux-gnu)
standard (1.40.0)
language_server-protocol (~> 3.17.0.2)
lint_roller (~> 1.0)
Expand All @@ -277,18 +279,17 @@ GEM
stimulus-rails (1.3.4)
railties (>= 6.0.0)
stringio (3.1.1)
stripe (12.5.0)
stripe (13.0.0)
thor (1.3.2)
timeout (0.4.1)
ttfunk (1.8.0)
bigdecimal (~> 3.1)
turbo-rails (2.0.6)
turbo-rails (2.0.10)
actionpack (>= 6.0.0)
activejob (>= 6.0.0)
railties (>= 6.0.0)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
unicode-display_width (2.5.0)
unicode-display_width (2.6.0)
uri (0.13.1)
useragent (0.16.10)
vcr (6.3.1)
Expand All @@ -298,11 +299,11 @@ GEM
activemodel (>= 6.0.0)
bindex (>= 0.4.0)
railties (>= 6.0.0)
webmock (3.23.1)
webmock (3.24.0)
addressable (>= 2.8.0)
crack (>= 0.3.2)
hashdiff (>= 0.4.0, < 2.0.0)
webrick (1.8.1)
webrick (1.8.2)
websocket-driver (0.7.6)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.5)
Expand All @@ -323,7 +324,7 @@ DEPENDENCIES
net-imap
net-pop
net-smtp
paddle (~> 2.4)
paddle (~> 2.6)
pay!
pg
prawn
Expand All @@ -333,7 +334,7 @@ DEPENDENCIES
sqlite3
standard
stimulus-rails
stripe (~> 12.0)
stripe (~> 13.0)
turbo-rails
vcr
web-console
Expand Down
Loading

0 comments on commit b85b088

Please sign in to comment.