Skip to content

Commit 5aae379

Browse files
authored
Remove connection dependencies and update stack files (#1)
* Try to not use connection, even for older GHCs * Only test stack for GHC >= 9.6 * Drop older stack files, update remainder. Prepare kubernetes-api-client-0.6.1.0 * ci: GHC 9.6.6 -> 9.6.7
1 parent 7b4c9c6 commit 5aae379

23 files changed

+156
-279
lines changed

.github/workflows/ci.yml

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ jobs:
3131
ghc:
3232
# - "8.10.7"
3333
# - "9.0.2"
34-
# - "9.2.8"
34+
- "9.2.8"
3535
- "9.4.8"
36-
- "9.6.6"
36+
- "9.6.7"
3737
- "9.8.4"
3838
steps:
3939
- uses: cachix/install-nix-action@v27
@@ -82,19 +82,13 @@ jobs:
8282
- "1.31"
8383
- "1.32"
8484
compiler:
85-
# - ghc: "8.10.7"
86-
# yaml: "stack-8.10.7.yaml"
87-
# - ghc: "9.0.2"
88-
# yaml: "stack-9.0.2-aeson1.yaml"
89-
# - ghc: "9.0.2"
90-
# yaml: "stack-9.0.2-aeson2.yaml"
91-
# - ghc: "9.2.8"
92-
# yaml: "stack-9.2.8.yaml"
93-
- ghc: "9.4.8"
94-
yaml: "stack-9.4.8.yaml"
95-
- ghc: "9.6.6"
96-
yaml: "stack-9.6.6.yaml"
85+
- ghc: "9.6.7"
86+
yaml: "stack-9.6.7.yaml"
9787
- ghc: "9.8.4"
88+
yaml: "stack-9.8.4.yaml"
89+
- ghc: "9.10.2"
90+
yaml: "stack-9.10.2.yaml"
91+
- ghc: "9.12.2"
9892
yaml: "stack.yaml"
9993
steps:
10094
- uses: cachix/install-nix-action@v27

kubernetes-api-client/CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
11

22
# Unreleased
33

4+
## 0.6.1.0
5+
6+
* Depend on `crypton-connection` instead of `connection` no matter what, even for older GHCs. This will break compatibility with Stackage snapshots from the pre-GHC 9.6 era, but this seems important to do since `connection` is unmaintained, and itself depends on older versions of `tls` which lack some modernization/security improvements (like dropping TLS 1.0 and 1.1 support in version 2.0.0).
7+
8+
## 0.6.0.1
9+
410
* Fix compatibility with `text-2.1.2`.

kubernetes-api-client/kubernetes-api-client.cabal

Lines changed: 16 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ cabal-version: 1.12
55
-- see: https://github.com/sol/hpack
66

77
name: kubernetes-api-client
8-
version: 0.6.0.1
8+
version: 0.6.1.0
99
synopsis: Client library for Kubernetes
1010
description: Client library for interacting with a Kubernetes cluster.
1111
.
@@ -54,6 +54,11 @@ library
5454
, base64-bytestring
5555
, bytestring >=0.10
5656
, containers >=0.5
57+
, crypton-connection
58+
, crypton-x509 >=1.7
59+
, crypton-x509-store >=1.6
60+
, crypton-x509-system >=1.6
61+
, crypton-x509-validation >=1.6
5762
, data-default-class >=0.1
5863
, either >=5.0
5964
, filepath >=1.4
@@ -79,20 +84,6 @@ library
7984
, uri-bytestring >=0.3
8085
, yaml >=0.8.32
8186
default-language: Haskell2010
82-
if impl(ghc >= 9.6)
83-
build-depends:
84-
crypton-connection
85-
, crypton-x509 >=1.7
86-
, crypton-x509-store >=1.6
87-
, crypton-x509-system >=1.6
88-
, crypton-x509-validation >=1.6
89-
else
90-
build-depends:
91-
connection
92-
, x509 >=1.7
93-
, x509-store >=1.6
94-
, x509-system >=1.6
95-
, x509-validation >=1.6
9687

9788
test-suite example
9889
type: exitcode-stdio-1.0
@@ -110,6 +101,11 @@ test-suite example
110101
, base64-bytestring
111102
, bytestring >=0.10
112103
, containers >=0.5
104+
, crypton-connection
105+
, crypton-x509 >=1.7
106+
, crypton-x509-store >=1.6
107+
, crypton-x509-system >=1.6
108+
, crypton-x509-validation >=1.6
113109
, data-default-class >=0.1
114110
, either >=5.0
115111
, filepath >=1.4
@@ -136,20 +132,6 @@ test-suite example
136132
, uri-bytestring >=0.3
137133
, yaml >=0.8.32
138134
default-language: Haskell2010
139-
if impl(ghc >= 9.6)
140-
build-depends:
141-
crypton-connection
142-
, crypton-x509 >=1.7
143-
, crypton-x509-store >=1.6
144-
, crypton-x509-system >=1.6
145-
, crypton-x509-validation >=1.6
146-
else
147-
build-depends:
148-
connection
149-
, x509 >=1.7
150-
, x509-store >=1.6
151-
, x509-system >=1.6
152-
, x509-validation >=1.6
153135

154136
test-suite spec
155137
type: exitcode-stdio-1.0
@@ -172,6 +154,11 @@ test-suite spec
172154
, base64-bytestring
173155
, bytestring >=0.10
174156
, containers >=0.5
157+
, crypton-connection
158+
, crypton-x509 >=1.7
159+
, crypton-x509-store >=1.6
160+
, crypton-x509-system >=1.6
161+
, crypton-x509-validation >=1.6
175162
, data-default-class >=0.1
176163
, either >=5.0
177164
, file-embed
@@ -202,17 +189,3 @@ test-suite spec
202189
, uri-bytestring >=0.3
203190
, yaml >=0.8.4
204191
default-language: Haskell2010
205-
if impl(ghc >= 9.6)
206-
build-depends:
207-
crypton-connection
208-
, crypton-x509 >=1.7
209-
, crypton-x509-store >=1.6
210-
, crypton-x509-system >=1.6
211-
, crypton-x509-validation >=1.6
212-
else
213-
build-depends:
214-
connection
215-
, x509 >=1.7
216-
, x509-store >=1.6
217-
, x509-system >=1.6
218-
, x509-validation >=1.6

kubernetes-api-client/package.yaml

Lines changed: 6 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: kubernetes-api-client
2-
version: 0.6.0.1
2+
version: 0.6.1.0
33
description: |
44
Client library for interacting with a Kubernetes cluster.
55
@@ -45,6 +45,11 @@ dependencies:
4545
- base64-bytestring
4646
- bytestring >=0.10
4747
- containers >= 0.5
48+
- crypton-connection
49+
- crypton-x509 >=1.7
50+
- crypton-x509-store >=1.6
51+
- crypton-x509-system >=1.6
52+
- crypton-x509-validation >=1.6
4853
- data-default-class >=0.1
4954
- either >=5.0
5055
- filepath >=1.4
@@ -69,19 +74,3 @@ dependencies:
6974
- typed-process >=0.2
7075
- uri-bytestring >=0.3
7176
- yaml >=0.8.32
72-
when:
73-
- condition: impl(ghc >= 9.6)
74-
then:
75-
dependencies:
76-
- crypton-connection
77-
- crypton-x509 >=1.7
78-
- crypton-x509-store >=1.6
79-
- crypton-x509-system >=1.6
80-
- crypton-x509-validation >=1.6
81-
else:
82-
dependencies:
83-
- connection
84-
- x509 >=1.7
85-
- x509-store >=1.6
86-
- x509-system >=1.6
87-
- x509-validation >=1.6

stack-8.10.7.yaml

Lines changed: 0 additions & 8 deletions
This file was deleted.

stack-8.10.7.yaml.lock

Lines changed: 0 additions & 19 deletions
This file was deleted.

stack-9.0.2-aeson1.yaml

Lines changed: 0 additions & 12 deletions
This file was deleted.

stack-9.0.2-aeson1.yaml.lock

Lines changed: 0 additions & 40 deletions
This file was deleted.

stack-9.0.2-aeson2.yaml

Lines changed: 0 additions & 10 deletions
This file was deleted.

stack-9.0.2-aeson2.yaml.lock

Lines changed: 0 additions & 26 deletions
This file was deleted.

0 commit comments

Comments
 (0)