Skip to content

Commit 7f4f495

Browse files
author
vikt0r0
authored
Support lts-20.4. (#3)
* Support and ghc version . * Bump version of dependencies in constraints. * Rebuild protocol buffer schemas, fix compiler warnings.
1 parent dcfa812 commit 7f4f495

File tree

15 files changed

+53
-49
lines changed

15 files changed

+53
-49
lines changed

‎bench-tool/bench-tool.cabal‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
cabal-version: 1.12
22

3-
-- This file has been generated from package.yaml by hpack version 0.34.6.
3+
-- This file has been generated from package.yaml by hpack version 0.35.0.
44
--
55
-- see: https://github.com/sol/hpack
66
--
7-
-- hash: e2c0b94f518b929cef4b5d01f972bc4e25cde9360b6bcc532730e62dea7187a5
7+
-- hash: 0c2988657eb0fb11bf40db6480adf1974e85fc19f0631ae2e22b42456a0316c5
88

99
name: bench-tool
1010
version: 0.4.0.1
@@ -40,11 +40,11 @@ library
4040
async >=2.2.1 && <3
4141
, base >=4.10 && <5
4242
, binary >=0.8.5 && <0.9
43-
, bytestring >=0.10.8 && <0.11
43+
, bytestring >=0.10.8 && <0.12
4444
, case-insensitive >=1.2.0 && <1.3
4545
, containers
4646
, http-types ==0.12.*
47-
, http2 >=1.6 && <3
47+
, http2 >=1.6 && <3.0.4
4848
, http2-client
4949
, http2-client-grpc
5050
, http2-grpc-proto-lens
@@ -76,11 +76,11 @@ executable bench-tool-exe
7676
, base >=4.10 && <5
7777
, bench-tool
7878
, binary >=0.8.5 && <0.9
79-
, bytestring >=0.10.8 && <0.11
79+
, bytestring >=0.10.8 && <0.12
8080
, case-insensitive >=1.2.0 && <1.3
8181
, containers
8282
, http-types ==0.12.*
83-
, http2 >=1.6 && <3
83+
, http2 >=1.6 && <3.0.4
8484
, http2-client
8585
, http2-client-grpc
8686
, http2-grpc-proto-lens

‎bench-tool/package.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ dependencies:
1919
- base >= 4.10 && < 5
2020
- async >= 2.2.1 && < 3
2121
- binary >= 0.8.5 && < 0.9
22-
- bytestring >= 0.10.8 && < 0.11
22+
- bytestring >= 0.10.8 && < 0.12
2323
- case-insensitive >= 1.2.0 && < 1.3
24-
- http2 >= 1.6 && < 3
24+
- http2 >= 1.6 && < 3.0.4
2525
- http2-grpc-types >= 0.5 && < 0.6
2626
- http-types >= 0.12 && < 0.13
2727
- unliftio-core >= 0.1 && < 0.3

‎bench-tool/rebuild-protos.sh‎

100644100755
File mode changed.

‎bench-tool/src/Proto/Protos/Bench.hs‎

Lines changed: 14 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -173,8 +173,7 @@ instance Data.ProtoLens.Message BenchObject where
173173
(Prelude.show (missing :: [Prelude.String]))))
174174
Prelude.return
175175
(Lens.Family2.over
176-
Data.ProtoLens.unknownFields
177-
(\ !t -> Prelude.reverse t)
176+
Data.ProtoLens.unknownFields (\ !t -> Prelude.reverse t)
178177
(Lens.Family2.set
179178
(Data.ProtoLens.Field.field @"vec'strings") frozen'strings x))
180179
else
@@ -234,8 +233,7 @@ instance Data.ProtoLens.Message BenchObject where
234233
(Data.ProtoLens.Encoding.Bytes.putVarInt
235234
(Prelude.fromIntegral (Data.ByteString.length bs)))
236235
(Data.ProtoLens.Encoding.Bytes.putBytes bs))
237-
Data.ProtoLens.encodeMessage
238-
_v))
236+
Data.ProtoLens.encodeMessage _v))
239237
(Lens.Family2.view (Data.ProtoLens.Field.field @"vec'strings") _x))
240238
((Data.Monoid.<>)
241239
(case
@@ -251,8 +249,7 @@ instance Data.ProtoLens.Message BenchObject where
251249
(Data.ProtoLens.Encoding.Bytes.putVarInt
252250
(Prelude.fromIntegral (Data.ByteString.length bs)))
253251
(Data.ProtoLens.Encoding.Bytes.putBytes bs))
254-
Data.ProtoLens.encodeMessage
255-
_v))
252+
Data.ProtoLens.encodeMessage _v))
256253
((Data.Monoid.<>)
257254
(case
258255
Lens.Family2.view (Data.ProtoLens.Field.field @"maybe'req") _x
@@ -267,8 +264,7 @@ instance Data.ProtoLens.Message BenchObject where
267264
(Data.ProtoLens.Encoding.Bytes.putVarInt
268265
(Prelude.fromIntegral (Data.ByteString.length bs)))
269266
(Data.ProtoLens.Encoding.Bytes.putBytes bs))
270-
Data.ProtoLens.encodeMessage
271-
_v))
267+
Data.ProtoLens.encodeMessage _v))
272268
(Data.ProtoLens.Encoding.Wire.buildFieldSet
273269
(Lens.Family2.view Data.ProtoLens.unknownFields _x))))
274270
instance Control.DeepSeq.NFData BenchObject where
@@ -609,8 +605,7 @@ instance Data.ProtoLens.Message BenchObject'StringContent where
609605
(Data.ProtoLens.Encoding.Bytes.putVarInt
610606
(Prelude.fromIntegral (Data.ByteString.length bs)))
611607
(Data.ProtoLens.Encoding.Bytes.putBytes bs))
612-
Data.Text.Encoding.encodeUtf8
613-
_v))
608+
Data.Text.Encoding.encodeUtf8 _v))
614609
(Data.ProtoLens.Encoding.Wire.buildFieldSet
615610
(Lens.Family2.view Data.ProtoLens.unknownFields _x))
616611
instance Control.DeepSeq.NFData BenchObject'StringContent where
@@ -627,6 +622,13 @@ instance Data.ProtoLens.Service.Types.Service Bench where
627622
type ServiceMethods Bench = '["clientStreamQuery",
628623
"serverStreamQuery",
629624
"unaryQuery"]
625+
packedServiceDescriptor _
626+
= "\n\
627+
\\ENQBench\DC26\n\
628+
\\n\
629+
\UnaryQuery\DC2\DC2.bench.BenchObject\SUB\DC2.bench.BenchObject\"\NUL\DC2?\n\
630+
\\DC1ServerStreamQuery\DC2\DC2.bench.BenchObject\SUB\DC2.bench.BenchObject\"\NUL0\SOH\DC2?\n\
631+
\\DC1ClientStreamQuery\DC2\DC2.bench.BenchObject\SUB\DC2.bench.BenchObject\"\NUL(\SOH"
630632
instance Data.ProtoLens.Service.Types.HasMethodImpl Bench "unaryQuery" where
631633
type MethodName Bench "unaryQuery" = "UnaryQuery"
632634
type MethodInput Bench "unaryQuery" = BenchObject
@@ -662,12 +664,12 @@ packedFileDescriptor
662664
\\n\
663665
\UnaryQuery\DC2\DC2.bench.BenchObject\SUB\DC2.bench.BenchObject\"\NUL\DC2?\n\
664666
\\DC1ServerStreamQuery\DC2\DC2.bench.BenchObject\SUB\DC2.bench.BenchObject\"\NUL0\SOH\DC2?\n\
665-
\\DC1ClientStreamQuery\DC2\DC2.bench.BenchObject\SUB\DC2.bench.BenchObject\"\NUL(\SOHJ\162\ACK\n\
667+
\\DC1ClientStreamQuery\DC2\DC2.bench.BenchObject\SUB\DC2.bench.BenchObject\"\NUL(\SOHJ\209\ENQ\n\
666668
\\ACK\DC2\EOT\NUL\NUL\ETB\SOH\n\
667669
\\b\n\
668670
\\SOH\f\DC2\ETX\NUL\NUL\DC2\n\
669671
\\b\n\
670-
\\SOH\STX\DC2\ETX\STX\b\r\n\
672+
\\SOH\STX\DC2\ETX\STX\NUL\SO\n\
671673
\\n\
672674
\\n\
673675
\\STX\ACK\NUL\DC2\EOT\EOT\NUL\b\SOH\n\
@@ -717,8 +719,6 @@ packedFileDescriptor
717719
\\ETB\n\
718720
\\r\n\
719721
\\ACK\EOT\NUL\ETX\NUL\STX\NUL\DC2\ETX\f\EOT\ETB\n\
720-
\\SI\n\
721-
\\a\EOT\NUL\ETX\NUL\STX\NUL\EOT\DC2\EOT\f\EOT\v\EM\n\
722722
\\SO\n\
723723
\\a\EOT\NUL\ETX\NUL\STX\NUL\ENQ\DC2\ETX\f\EOT\n\
724724
\\n\
@@ -733,8 +733,6 @@ packedFileDescriptor
733733
\\SI\n\
734734
\\r\n\
735735
\\ACK\EOT\NUL\ETX\SOH\STX\NUL\DC2\ETX\SI\EOT\DC4\n\
736-
\\SI\n\
737-
\\a\EOT\NUL\ETX\SOH\STX\NUL\EOT\DC2\EOT\SI\EOT\SO\DC1\n\
738736
\\SO\n\
739737
\\a\EOT\NUL\ETX\SOH\STX\NUL\ENQ\DC2\ETX\SI\EOT\t\n\
740738
\\SO\n\
@@ -749,8 +747,6 @@ packedFileDescriptor
749747
\\r\n\
750748
\\r\n\
751749
\\ACK\EOT\NUL\ETX\STX\STX\NUL\DC2\ETX\DC2\EOT\EM\n\
752-
\\SI\n\
753-
\\a\EOT\NUL\ETX\STX\STX\NUL\EOT\DC2\EOT\DC2\EOT\DC1\SI\n\
754750
\\SO\n\
755751
\\a\EOT\NUL\ETX\STX\STX\NUL\ENQ\DC2\ETX\DC2\EOT\t\n\
756752
\\SO\n\
@@ -771,8 +767,6 @@ packedFileDescriptor
771767
\\ENQ\EOT\NUL\STX\NUL\ETX\DC2\ETX\DC4#$\n\
772768
\\v\n\
773769
\\EOT\EOT\NUL\STX\SOH\DC2\ETX\NAK\STX\DC2\n\
774-
\\r\n\
775-
\\ENQ\EOT\NUL\STX\SOH\EOT\DC2\EOT\NAK\STX\DC4%\n\
776770
\\f\n\
777771
\\ENQ\EOT\NUL\STX\SOH\ACK\DC2\ETX\NAK\STX\a\n\
778772
\\f\n\
@@ -781,8 +775,6 @@ packedFileDescriptor
781775
\\ENQ\EOT\NUL\STX\SOH\ETX\DC2\ETX\NAK\DLE\DC1\n\
782776
\\v\n\
783777
\\EOT\EOT\NUL\STX\STX\DC2\ETX\SYN\STX\SO\n\
784-
\\r\n\
785-
\\ENQ\EOT\NUL\STX\STX\EOT\DC2\EOT\SYN\STX\NAK\DC2\n\
786778
\\f\n\
787779
\\ENQ\EOT\NUL\STX\STX\ACK\DC2\ETX\SYN\STX\ENQ\n\
788780
\\f\n\

‎http2-client-grpc/http2-client-grpc.cabal‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ library
2020
build-depends: base >= 4.10 && < 5
2121
, async >= 2.2 && < 2.3
2222
, binary >= 0.8 && < 0.9
23-
, bytestring >= 0.10.8 && < 0.11
23+
, bytestring >= 0.10.8 && < 0.11.4
2424
, case-insensitive >= 1.2.0 && < 1.3
2525
, data-default-class >= 0.1 && <0.2
2626
, lifted-async >= 0.10 && < 0.11

‎http2-grpc-proto-lens/http2-grpc-proto-lens.cabal‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
cabal-version: 1.12
22

3-
-- This file has been generated from package.yaml by hpack version 0.31.2.
3+
-- This file has been generated from package.yaml by hpack version 0.35.0.
44
--
55
-- see: https://github.com/sol/hpack
6-
--
7-
-- hash: 57a4f4c88bc0fead3bcfeb0a5ceb013176d1102a131d797f0d2273d03db1c760
86

97
name: http2-grpc-proto-lens
108
version: 0.1.0.0
@@ -38,7 +36,7 @@ library
3836
build-depends:
3937
base >=4.10 && <5
4038
, binary >=0.8.5 && <0.11
41-
, bytestring >=0.10.8 && <0.11
39+
, bytestring >=0.10.8 && <0.11.4
4240
, case-insensitive >=1.2.0 && <1.3
4341
, http2-grpc-types
4442
, proto-lens >=0.5 && <0.8

‎http2-grpc-proto-lens/package.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ dependencies:
2323
- base >= 4.10 && < 5
2424
- http2-grpc-types
2525
- binary >= 0.8.5 && < 0.11
26-
- bytestring >= 0.10.8 && < 0.11
26+
- bytestring >= 0.10.8 && < 0.11.4
2727
- case-insensitive >= 1.2.0 && < 1.3
2828
- zlib >= 0.6.2 && < 0.7
2929
- proto-lens >= 0.5 && < 0.8

‎http2-grpc-proto-lens/src/Network/GRPC/HTTP2/ProtoLens.hs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import Data.ProtoLens.Message (Message)
1616
import Data.ProtoLens.Service.Types (Service(..), HasMethod, HasMethodImpl(..))
1717
import Data.Proxy (Proxy(..))
1818
import GHC.TypeLits (Symbol, symbolVal)
19+
import Data.Kind
1920

2021
#if MIN_VERSION_base(4,11,0)
2122
#else
@@ -26,7 +27,7 @@ import Network.GRPC.HTTP2.Types
2627
import Network.GRPC.HTTP2.Encoding
2728

2829
-- | A proxy type for giving static information about RPCs.
29-
data RPC (s :: *) (m :: Symbol) = RPC
30+
data RPC (s :: Type) (m :: Symbol) = RPC
3031

3132
instance (Service s, HasMethod s m) => IsRPC (RPC s m) where
3233
path rpc = "/" <> pkg rpc Proxy <> "." <> srv rpc Proxy <> "/" <> meth rpc Proxy

‎http2-grpc-proto3-wire/http2-grpc-proto3-wire.cabal‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
cabal-version: 1.12
22

3-
-- This file has been generated from package.yaml by hpack version 0.33.0.
3+
-- This file has been generated from package.yaml by hpack version 0.35.0.
44
--
55
-- see: https://github.com/sol/hpack
66
--
7-
-- hash: 7dc4b2158bfca69e18262ad3e9432df60c5ae0d5be20324954b66b51420750a4
7+
-- hash: 40b388434b02840585a305d65819267509ffb838a91165a99b8ba5ca305e2e52
88

99
name: http2-grpc-proto3-wire
1010
version: 0.1.0.1
@@ -38,9 +38,9 @@ library
3838
build-depends:
3939
base >=4.10 && <5
4040
, binary >=0.8.5 && <0.11
41-
, bytestring >=0.10.8 && <0.11
41+
, bytestring >=0.10.8 && <=0.11.4
4242
, case-insensitive >=1.2.0 && <1.3
4343
, http2-grpc-types
44-
, proto3-wire >=1 && <=1.1
44+
, proto3-wire >=1 && <=1.4.0
4545
, zlib >=0.6.2 && <0.7
4646
default-language: Haskell2010

‎http2-grpc-proto3-wire/package.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ dependencies:
2323
- base >= 4.10 && < 5
2424
- http2-grpc-types
2525
- binary >= 0.8.5 && < 0.11
26-
- bytestring >= 0.10.8 && < 0.11
26+
- bytestring >= 0.10.8 && <= 0.11.4
2727
- case-insensitive >= 1.2.0 && < 1.3
2828
- zlib >= 0.6.2 && < 0.7
29-
- proto3-wire >= 1 && <= 1.1
29+
- proto3-wire >= 1 && <= 1.4.0
3030

3131
library:
3232
source-dirs: src

0 commit comments

Comments
 (0)