Skip to content

Commit 1696ade

Browse files
authored
Merge pull request #32 from purcell/gem-updates-oct-2024
Gem updates for project env
2 parents ef6dda8 + ece6674 commit 1696ade

File tree

7 files changed

+77
-92
lines changed

7 files changed

+77
-92
lines changed

.github/workflows/ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
matrix:
88
os: [ubuntu-latest]
99
# Due to https://github.com/actions/runner/issues/849, we have to use quotes for '3.0'
10-
ruby: ['2.7', '3.0', '3.1', '3.2']
10+
ruby: ['3.0', '3.1', '3.2', '3.3']
1111
runs-on: ${{ matrix.os }}
1212
steps:
1313
- uses: actions/checkout@v4

Gemfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ruby ">= 2.7"
1+
ruby ">= 3.0"
22

33
source "https://rubygems.org"
44

Gemfile.lock

+22-16
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,27 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
diff-lcs (1.5.0)
5-
google-protobuf (3.25.0)
6-
pg_query (4.2.3)
4+
bigdecimal (3.1.8)
5+
diff-lcs (1.5.1)
6+
google-protobuf (4.28.3)
7+
bigdecimal
8+
rake (>= 13)
9+
pg_query (5.1.0)
710
google-protobuf (>= 3.22.3)
8-
rake (13.1.0)
9-
rspec (3.12.0)
10-
rspec-core (~> 3.12.0)
11-
rspec-expectations (~> 3.12.0)
12-
rspec-mocks (~> 3.12.0)
13-
rspec-core (3.12.2)
14-
rspec-support (~> 3.12.0)
15-
rspec-expectations (3.12.3)
11+
rake (13.2.1)
12+
rspec (3.13.0)
13+
rspec-core (~> 3.13.0)
14+
rspec-expectations (~> 3.13.0)
15+
rspec-mocks (~> 3.13.0)
16+
rspec-core (3.13.2)
17+
rspec-support (~> 3.13.0)
18+
rspec-expectations (3.13.3)
1619
diff-lcs (>= 1.2.0, < 2.0)
17-
rspec-support (~> 3.12.0)
18-
rspec-mocks (3.12.6)
20+
rspec-support (~> 3.13.0)
21+
rspec-mocks (3.13.2)
1922
diff-lcs (>= 1.2.0, < 2.0)
20-
rspec-support (~> 3.12.0)
21-
rspec-support (3.12.1)
23+
rspec-support (~> 3.13.0)
24+
rspec-support (3.13.1)
2225

2326
PLATFORMS
2427
ruby
@@ -28,5 +31,8 @@ DEPENDENCIES
2831
rake
2932
rspec
3033

34+
RUBY VERSION
35+
ruby 3.3.5p100
36+
3137
BUNDLED WITH
32-
2.4.2
38+
2.5.16

flake.lock

+3-37
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

+20-18
Original file line numberDiff line numberDiff line change
@@ -3,29 +3,31 @@
33

44
inputs = {
55
nixpkgs.url = "nixpkgs/nixpkgs-unstable";
6-
flake-utils.url = "github:numtide/flake-utils";
76
};
87

9-
outputs = { self, nixpkgs, flake-utils }@inputs:
10-
flake-utils.lib.eachDefaultSystem (system:
11-
let
12-
pkgs = import nixpkgs { inherit system; };
13-
env = pkgs.bundlerEnv {
14-
name = "sqlint";
15-
gemdir = ./.;
16-
groups = [ "default" "development" "test" ];
8+
outputs = { self, nixpkgs }@inputs:
9+
let
10+
forAllSystems = nixpkgs.lib.genAttrs nixpkgs.lib.platforms.all;
11+
in
12+
{
13+
devShell =forAllSystems (system:
14+
let
15+
pkgs = import nixpkgs { inherit system; };
16+
env = pkgs.bundlerEnv {
17+
name = "sqlint";
18+
gemdir = ./.;
19+
groups = [ "default" "development" "test" ];
1720

18-
meta = with pkgs.lib;
21+
meta = with pkgs.lib;
1922
{
2023
description = "sqlint";
2124
platforms = platforms.unix;
2225
};
23-
};
24-
in
25-
{
26-
devShell = pkgs.mkShell {
27-
buildInputs = [ env pkgs.bundix ];
28-
};
29-
}
30-
);
26+
};
27+
in
28+
pkgs.mkShell {
29+
buildInputs = [ env pkgs.bundix ];
30+
}
31+
);
32+
};
3133
}

gemset.nix

+29-18
Original file line numberDiff line numberDiff line change
@@ -1,97 +1,108 @@
11
{
2+
bigdecimal = {
3+
groups = ["default"];
4+
platforms = [];
5+
source = {
6+
remotes = ["https://rubygems.org"];
7+
sha256 = "1gi7zqgmqwi5lizggs1jhc3zlwaqayy9rx2ah80sxy24bbnng558";
8+
type = "gem";
9+
};
10+
version = "3.1.8";
11+
};
212
diff-lcs = {
313
groups = ["default" "development"];
414
platforms = [];
515
source = {
616
remotes = ["https://rubygems.org"];
7-
sha256 = "0rwvjahnp7cpmracd8x732rjgnilqv2sx7d1gfrysslc3h039fa9";
17+
sha256 = "1znxccz83m4xgpd239nyqxlifdb7m8rlfayk6s259186nkgj6ci7";
818
type = "gem";
919
};
10-
version = "1.5.0";
20+
version = "1.5.1";
1121
};
1222
google-protobuf = {
23+
dependencies = ["bigdecimal" "rake"];
1324
groups = ["default"];
1425
platforms = [];
1526
source = {
1627
remotes = ["https://rubygems.org"];
17-
sha256 = "18d1w5j7vjaza3v1ig9j7zyis04kxqdkb1272vbgncxn03ck45mm";
28+
sha256 = "1d99vyhmyp2n5zd0qmfymzwbcn71dbnwwvc0m4z14msjb7b8dvf0";
1829
type = "gem";
1930
};
20-
version = "3.25.0";
31+
version = "4.28.3";
2132
};
2233
pg_query = {
2334
dependencies = ["google-protobuf"];
2435
groups = ["default"];
2536
platforms = [];
2637
source = {
2738
remotes = ["https://rubygems.org"];
28-
sha256 = "15ynrzqsmmbmxib8ri8n9k6z3l6rwd91j7y1mghm33nfgdf9bj8w";
39+
sha256 = "0p8ljf694qvrf5875ljg6kp7gvmndy8490kasjzcq22ghryg9xxp";
2940
type = "gem";
3041
};
31-
version = "4.2.3";
42+
version = "5.1.0";
3243
};
3344
rake = {
3445
groups = ["development"];
3546
platforms = [];
3647
source = {
3748
remotes = ["https://rubygems.org"];
38-
sha256 = "1ilr853hawi09626axx0mps4rkkmxcs54mapz9jnqvpnlwd3wsmy";
49+
sha256 = "17850wcwkgi30p7yqh60960ypn7yibacjjha0av78zaxwvd3ijs6";
3950
type = "gem";
4051
};
41-
version = "13.1.0";
52+
version = "13.2.1";
4253
};
4354
rspec = {
4455
dependencies = ["rspec-core" "rspec-expectations" "rspec-mocks"];
4556
groups = ["development"];
4657
platforms = [];
4758
source = {
4859
remotes = ["https://rubygems.org"];
49-
sha256 = "171rc90vcgjl8p1bdrqa92ymrj8a87qf6w20x05xq29mljcigi6c";
60+
sha256 = "14xrp8vq6i9zx37vh0yp4h9m0anx9paw200l1r5ad9fmq559346l";
5061
type = "gem";
5162
};
52-
version = "3.12.0";
63+
version = "3.13.0";
5364
};
5465
rspec-core = {
5566
dependencies = ["rspec-support"];
5667
groups = ["default" "development"];
5768
platforms = [];
5869
source = {
5970
remotes = ["https://rubygems.org"];
60-
sha256 = "0l95bnjxdabrn79hwdhn2q1n7mn26pj7y1w5660v5qi81x458nqm";
71+
sha256 = "001kazj244cb6fbkmh7ap74csbr78717qaskqzqpir1q8xpdmywl";
6172
type = "gem";
6273
};
63-
version = "3.12.2";
74+
version = "3.13.2";
6475
};
6576
rspec-expectations = {
6677
dependencies = ["diff-lcs" "rspec-support"];
6778
groups = ["default" "development"];
6879
platforms = [];
6980
source = {
7081
remotes = ["https://rubygems.org"];
71-
sha256 = "05j44jfqlv7j2rpxb5vqzf9hfv7w8ba46wwgxwcwd8p0wzi1hg89";
82+
sha256 = "0n3cyrhsa75x5wwvskrrqk56jbjgdi2q1zx0irllf0chkgsmlsqf";
7283
type = "gem";
7384
};
74-
version = "3.12.3";
85+
version = "3.13.3";
7586
};
7687
rspec-mocks = {
7788
dependencies = ["diff-lcs" "rspec-support"];
7889
groups = ["default" "development"];
7990
platforms = [];
8091
source = {
8192
remotes = ["https://rubygems.org"];
82-
sha256 = "1gq7gviwpck7fhp4y5ibljljvxgjklza18j62qf6zkm2icaa8lfy";
93+
sha256 = "1vxxkb2sf2b36d8ca2nq84kjf85fz4x7wqcvb8r6a5hfxxfk69r3";
8394
type = "gem";
8495
};
85-
version = "3.12.6";
96+
version = "3.13.2";
8697
};
8798
rspec-support = {
8899
groups = ["default" "development"];
89100
platforms = [];
90101
source = {
91102
remotes = ["https://rubygems.org"];
92-
sha256 = "1ky86j3ksi26ng9ybd7j0qsdf1lpr8mzrmn98yy9gzv801fvhsgr";
103+
sha256 = "03z7gpqz5xkw9rf53835pa8a9vgj4lic54rnix9vfwmp2m7pv1s8";
93104
type = "gem";
94105
};
95-
version = "3.12.1";
106+
version = "3.13.1";
96107
};
97108
}

sqlint.gemspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Gem::Specification.new do |s|
88
s.name = 'sqlint'
99
s.version = SQLint::VERSION
1010
s.platform = Gem::Platform::RUBY
11-
s.required_ruby_version = '>= 2.7'
11+
s.required_ruby_version = '>= 3.0'
1212
s.authors = ['Steve Purcell', 'Kieran Trezona-le Comte']
1313
s.description = <<-EOF
1414
Simple SQL linter.

0 commit comments

Comments
 (0)