Skip to content
This repository was archived by the owner on Oct 19, 2024. It is now read-only.

Commit f692c90

Browse files
authored
♻️ Run cabal-fmt and extract library example (#264)
1 parent 35db14d commit f692c90

30 files changed

+201
-509
lines changed

.github/workflows/haskell.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ jobs:
55
runs-on: ubuntu-latest
66
steps:
77
- uses: actions/[email protected]
8+
with:
9+
submodules: true
810
- uses: cachix/install-nix-action@v12
911
- uses: cachix/cachix-action@v8
1012
with:

.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[submodule "examples/library"]
2+
path = examples/library
3+
url = https://github.com/higherkindness/mu-graphql-example-elm.git

adapter/avro/mu-avro.cabal

Lines changed: 23 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,10 @@ copyright: Copyright © 2019-2020 <http://47deg.com 47 Degrees>
1212
category: Network
1313
build-type: Simple
1414
cabal-version: >=1.10
15-
data-files: test/avro/*.avsc, test/avro/*.avdl
15+
data-files:
16+
test/avro/*.avsc
17+
test/avro/*.avdl
18+
1619
homepage: https://higherkindness.io/mu-haskell/
1720
bug-reports: https://github.com/higherkindness/mu-haskell/issues
1821

@@ -28,24 +31,24 @@ library
2831
Mu.Quasi.Avro.Example
2932

3033
build-depends:
31-
aeson >=1.4 && <2
32-
, avro >=0.5.1 && <0.6
33-
, base >=4.12 && <5
34-
, bytestring >=0.10 && <0.11
35-
, containers >=0.6 && <0.7
36-
, deepseq >=1.4 && <2
37-
, language-avro >=0.1.3 && <0.2
38-
, mu-rpc ==0.4.*
39-
, mu-schema ==0.3.*
40-
, sop-core >=0.5.0 && <0.6
41-
, tagged >=0.8.6 && <0.9
42-
, template-haskell >=2.14 && <2.17
43-
, text >=1.2 && <2
44-
, time >=1.9 && <2
45-
, transformers >=0.5 && <0.6
46-
, unordered-containers >=0.2 && <0.3
47-
, uuid >=1.3 && <2
48-
, vector >=0.12 && <0.13
34+
aeson >=1.4 && <2
35+
, avro >=0.5.1 && <0.6
36+
, base >=4.12 && <5
37+
, bytestring >=0.10 && <0.11
38+
, containers >=0.6 && <0.7
39+
, deepseq >=1.4 && <2
40+
, language-avro >=0.1.3 && <0.2
41+
, mu-rpc >=0.4 && <0.5
42+
, mu-schema >=0.3 && <0.4
43+
, sop-core >=0.5.0 && <0.6
44+
, tagged >=0.8.6 && <0.9
45+
, template-haskell >=2.14 && <2.17
46+
, text >=1.2 && <2
47+
, time >=1.9 && <2
48+
, transformers >=0.5 && <0.6
49+
, unordered-containers >=0.2 && <0.3
50+
, uuid >=1.3 && <2
51+
, vector >=0.12 && <0.13
4952

5053
hs-source-dirs: src
5154
default-language: Haskell2010
@@ -58,7 +61,7 @@ executable test-avro
5861
, base >=4.12 && <5
5962
, bytestring >=0.10 && <0.11
6063
, mu-avro
61-
, mu-schema ==0.3.*
64+
, mu-schema >=0.3 && <0.4
6265

6366
hs-source-dirs: test
6467
default-language: Haskell2010

adapter/kafka/mu-kafka.cabal

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ library
3535
, conduit >=1.3.2 && <2
3636
, hw-kafka-client >=3 && <4
3737
, hw-kafka-conduit >=2.7 && <3
38-
, mu-avro ==0.4.*
39-
, mu-schema ==0.3.*
40-
, resourcet >=1.2 && <2
38+
, mu-avro >=0.4 && <0.5
39+
, mu-schema >=0.3 && <0.4
40+
, resourcet >=1.2 && <2
4141

4242
ghc-options: -Wall

adapter/persistent/mu-persistent.cabal

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@ library
2727
hs-source-dirs: src
2828
default-language: Haskell2010
2929
build-depends:
30-
base >=4.12 && <5
31-
, monad-logger >=0.3 && <0.4
32-
, mu-schema ==0.3.*
33-
, persistent >=2.10 && <3
34-
, resourcet >=1.2 && <2
35-
, resource-pool >=0.2 && <0.3
36-
, transformers >=0.5 && <0.6
30+
base >=4.12 && <5
31+
, monad-logger >=0.3 && <0.4
32+
, mu-schema >=0.3 && <0.4
33+
, persistent >=2.10 && <3
34+
, resource-pool >=0.2 && <0.3
35+
, resourcet >=1.2 && <2
36+
, transformers >=0.5 && <0.6
3737

3838
ghc-options: -Wall

adapter/protobuf/mu-protobuf.cabal

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,13 @@ library
3333
build-depends:
3434
base >=4.12 && <5
3535
, bytestring >=0.10 && <0.11
36-
, compendium-client ==0.2.*
36+
, compendium-client >=0.2 && <0.3
3737
, http-client >=0.6 && <0.7
3838
, http2-grpc-proto3-wire >=0.1 && <0.2
3939
, language-protobuf >=1.0.1 && <2
40-
, mu-rpc ==0.4.*
41-
, mu-schema ==0.3.*
42-
, proto3-wire >=1.1 && < 2
40+
, mu-rpc >=0.4 && <0.5
41+
, mu-schema >=0.3 && <0.4
42+
, proto3-wire >=1.1 && <2
4343
, servant-client-core >=0.16 && <0.19
4444
, sop-core >=0.5 && <0.6
4545
, template-haskell >=2.14 && <2.17

cabal.project

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,28 +2,28 @@ allow-newer: base, network, ghc-prim, template-haskell, proto3-wire, http2
22

33
preferences: base16-bytestring < 1
44

5-
packages: compendium-client/
6-
core/schema/
7-
core/rpc/
8-
core/optics/
9-
core/lens/
10-
adapter/avro/
11-
adapter/protobuf/
12-
adapter/persistent/
5+
packages: adapter/avro/
136
adapter/kafka/
7+
adapter/persistent/
8+
adapter/protobuf/
9+
compendium-client/
10+
core/lens/
11+
core/optics/
12+
core/rpc/
13+
core/schema/
1414
examples/health-check/
15-
examples/library/
15+
examples/library/backend
1616
examples/route-guide/
1717
examples/seed/
1818
examples/todolist/
1919
examples/with-persistent/
20-
grpc/common/
20+
graphql/
2121
grpc/client/
22+
grpc/common/
2223
grpc/server/
23-
graphql/
24-
servant/server/
2524
instrumentation/prometheus/
2625
instrumentation/tracing/
26+
servant/server/
2727

2828
source-repository-package
2929
type: git

core/lens/mu-lens.cabal

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@ source-repository head
2222
library
2323
exposed-modules: Mu.Schema.Lens
2424
build-depends:
25-
base >=4.12 && <5
25+
base >=4.12 && <5
2626
, containers
27-
, lens
2827
, generic-lens
29-
, mu-schema
28+
, lens
3029
, mu-rpc
30+
, mu-schema
3131
, sop-core
3232
, text
3333

core/optics/mu-optics.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ library
2424
build-depends:
2525
base >=4.12 && <5
2626
, containers >=0.6 && <0.7
27-
, mu-schema ==0.3.*
27+
, mu-schema >=0.3 && <0.4
2828
, optics-core >=0.2 && <0.4
2929
, sop-core >=0.5 && <0.6
3030

core/rpc/mu-rpc.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ library
3333
, conduit >=1.3.2 && <1.4
3434
, http-types >=0.12 && <0.13
3535
, mtl >=2.2 && <2.3
36-
, mu-schema ==0.3.*
36+
, mu-schema >=0.3 && <0.4
3737
, sop-core >=0.5 && <0.6
3838
, template-haskell >=2.14 && <2.17
3939
, text >=1.2 && <1.3

0 commit comments

Comments
 (0)