Skip to content

Commit 2f1bf8f

Browse files
mbarbinmbarbin
authored
Merge pull request #14 from mbarbin/rework-dependencies
Rework dependencies
2 parents ad8c441 + 66b4757 commit 2f1bf8f

26 files changed

+653
-217
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
opam-repositories: |
3333
default: https://github.com/ocaml/opam-repository.git
3434
mbarbin: https://github.com/mbarbin/opam-repository.git
35-
# alpha: https://github.com/kit-ty-kate/opam-alpha-repository.git
35+
alpha: https://github.com/kit-ty-kate/opam-alpha-repository.git
3636
# janestreet-bleeding: https://github.com/janestreet/opam-repository.git
3737
# janestreet-bleeding-external: https://github.com/janestreet/opam-repository.git#external-packages
3838

‎.github/workflows/deploy-odoc.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
opam-repositories: |
2929
default: https://github.com/ocaml/opam-repository.git
3030
mbarbin: https://github.com/mbarbin/opam-repository.git
31-
# alpha: https://github.com/kit-ty-kate/opam-alpha-repository.git
31+
alpha: https://github.com/kit-ty-kate/opam-alpha-repository.git
3232
# janestreet-bleeding: https://github.com/janestreet/opam-repository.git
3333
# janestreet-bleeding-external: https://github.com/janestreet/opam-repository.git#external-packages
3434

‎.github/workflows/more-ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
opam-repositories: |
5151
default: https://github.com/ocaml/opam-repository.git
5252
mbarbin: https://github.com/mbarbin/opam-repository.git
53-
# alpha: https://github.com/kit-ty-kate/opam-alpha-repository.git
53+
alpha: https://github.com/kit-ty-kate/opam-alpha-repository.git
5454
# janestreet-bleeding: https://github.com/janestreet/opam-repository.git
5555
# janestreet-bleeding-external: https://github.com/janestreet/opam-repository.git#external-packages
5656

‎.headache.dirs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
# List of directories for headache.sh
22
# Add new directories below. Lines starting with '#' are ignored.
33
src
4+
src/stdlib
45
test
6+
test/stdlib

‎auto-format-dev.opam‎

Lines changed: 3 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -12,30 +12,12 @@ depends: [
1212
"ocaml" {>= "5.2"}
1313
"ocamlformat" {= "0.28.1"}
1414
"auto-format" {= version}
15+
"auto-format-example" {= version}
1516
"auto-format-tests" {= version}
16-
"base" {>= "v0.17"}
17-
"cmdlang" {>= "0.0.9"}
18-
"expect_test_helpers_core" {>= "v0.17"}
19-
"fpath" {>= "0.7.3"}
20-
"fpath-base" {>= "0.2.2"}
21-
"loc" {>= "0.2.2"}
22-
"parsing-utils" {>= "0.2.3"}
23-
"pp" {>= "2.0.0"}
24-
"pp-extended" {>= "0.0.2"}
25-
"pplumbing-err" {>= "0.0.16"}
26-
"pplumbing-log-cli" {>= "0.0.16"}
27-
"ppx_compare" {>= "v0.17"}
28-
"ppx_enumerate" {>= "v0.17"}
29-
"ppx_expect" {>= "v0.17"}
30-
"ppx_hash" {>= "v0.17"}
31-
"ppx_here" {>= "v0.17"}
17+
"bisect_ppx" {>= "2.8.3"}
3218
"ppx_js_style" {>= "v0.17"}
33-
"ppx_let" {>= "v0.17"}
34-
"ppx_sexp_conv" {>= "v0.17"}
35-
"ppx_sexp_value" {>= "v0.17"}
3619
"ppxlib" {>= "0.33"}
37-
"stdio" {>= "v0.17"}
38-
"sherlodoc" {with-doc & >= "0.2"}
20+
"sherlodoc" {>= "0.2"}
3921
"odoc" {with-doc}
4022
]
4123
build: [

‎auto-format-example.opam‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
# This file is generated by dune, edit dune-project instead
2+
opam-version: "2.0"
3+
synopsis: "Example usage of auto-format library"
4+
maintainer: ["Mathieu Barbin <opensource@mbarbin.org>"]
5+
authors: ["Mathieu Barbin"]
6+
license: "MIT"
7+
homepage: "https://github.com/mbarbin/auto-format"
8+
doc: "https://mbarbin.github.io/auto-format/"
9+
bug-reports: "https://github.com/mbarbin/auto-format/issues"
10+
depends: [
11+
"dune" {>= "3.18"}
12+
"ocaml" {>= "5.2"}
13+
"auto-format" {= version}
14+
"cmdlang" {>= "0.0.9"}
15+
"cmdlang-cmdliner-err-runner" {>= "0.0.16"}
16+
"loc" {>= "0.2.2"}
17+
"menhir" {>= "20220210"}
18+
"parsing-utils" {>= "0.2.3"}
19+
"pp" {>= "2.0.0"}
20+
"sexplib0" {>= "v0.17"}
21+
"odoc" {with-doc}
22+
]
23+
build: [
24+
["dune" "subst"] {dev}
25+
[
26+
"dune"
27+
"build"
28+
"-p"
29+
name
30+
"-j"
31+
jobs
32+
"@install"
33+
"@runtest" {with-test}
34+
"@doc" {with-doc}
35+
]
36+
]
37+
dev-repo: "git+https://github.com/mbarbin/auto-format.git"
38+
x-maintenance-intent: ["(latest)"]

‎auto-format-tests.opam‎

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -11,27 +11,13 @@ depends: [
1111
"dune" {>= "3.18"}
1212
"ocaml" {>= "5.2"}
1313
"auto-format" {= version}
14-
"base" {>= "v0.17"}
15-
"cmdlang" {>= "0.0.9"}
16-
"expect_test_helpers_core" {>= "v0.17"}
1714
"fpath" {>= "0.7.3"}
18-
"fpath-base" {>= "0.2.2"}
15+
"fpath-sexp0" {>= "0.2.2"}
1916
"loc" {>= "0.2.2"}
20-
"parsing-utils" {>= "0.2.3"}
2117
"pp" {>= "2.0.0"}
22-
"pp-extended" {>= "0.0.2"}
2318
"pplumbing-err" {>= "0.0.16"}
24-
"pplumbing-log-cli" {>= "0.0.16"}
25-
"ppx_compare" {>= "v0.17"}
26-
"ppx_enumerate" {>= "v0.17"}
2719
"ppx_expect" {>= "v0.17"}
28-
"ppx_hash" {>= "v0.17"}
29-
"ppx_here" {>= "v0.17"}
30-
"ppx_let" {>= "v0.17"}
31-
"ppx_sexp_conv" {>= "v0.17"}
32-
"ppx_sexp_value" {>= "v0.17"}
3320
"ppxlib" {>= "0.33"}
34-
"stdio" {>= "v0.17"}
3521
"odoc" {with-doc}
3622
]
3723
build: [

‎auto-format.opam‎

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,25 +10,17 @@ bug-reports: "https://github.com/mbarbin/auto-format/issues"
1010
depends: [
1111
"dune" {>= "3.18"}
1212
"ocaml" {>= "5.2"}
13-
"base" {>= "v0.17"}
1413
"cmdlang" {>= "0.0.9"}
14+
"dyn" {>= "3.18"}
1515
"fpath" {>= "0.7.3"}
16-
"fpath-base" {>= "0.2.2"}
16+
"fpath-sexp0" {>= "0.2.2"}
1717
"loc" {>= "0.2.2"}
18+
"ordering" {>= "3.18"}
1819
"parsing-utils" {>= "0.2.3"}
1920
"pp" {>= "2.0.0"}
20-
"pp-extended" {>= "0.0.2" & < "0.0.7"}
2121
"pplumbing-err" {>= "0.0.16"}
2222
"pplumbing-log-cli" {>= "0.0.16"}
23-
"ppx_compare" {>= "v0.17"}
24-
"ppx_enumerate" {>= "v0.17"}
25-
"ppx_hash" {>= "v0.17"}
26-
"ppx_here" {>= "v0.17"}
27-
"ppx_let" {>= "v0.17"}
28-
"ppx_sexp_conv" {>= "v0.17"}
29-
"ppx_sexp_value" {>= "v0.17"}
30-
"ppxlib" {>= "0.33"}
31-
"stdio" {>= "v0.17"}
23+
"sexplib0" {>= "v0.17"}
3224
"odoc" {with-doc}
3325
]
3426
build: [

‎dune-project‎

Lines changed: 37 additions & 95 deletions
Original file line numberDiff line numberDiff line change
@@ -17,51 +17,35 @@
1717

1818
(implicit_transitive_deps false)
1919

20+
(using menhir 3.0)
21+
2022
(package
2123
(name auto-format)
2224
(synopsis "Build auto-format commands for custom languages")
2325
(depends
2426
(ocaml
2527
(>= 5.2))
26-
(base
27-
(>= v0.17))
2828
(cmdlang
2929
(>= 0.0.9))
30+
(dyn
31+
(>= 3.18))
3032
(fpath
3133
(>= 0.7.3))
32-
(fpath-base
34+
(fpath-sexp0
3335
(>= 0.2.2))
3436
(loc
3537
(>= 0.2.2))
38+
(ordering
39+
(>= 3.18))
3640
(parsing-utils
3741
(>= 0.2.3))
3842
(pp
3943
(>= 2.0.0))
40-
(pp-extended
41-
(and
42-
(>= 0.0.2)
43-
(< 0.0.7)))
4444
(pplumbing-err
4545
(>= 0.0.16))
4646
(pplumbing-log-cli
4747
(>= 0.0.16))
48-
(ppx_compare
49-
(>= v0.17))
50-
(ppx_enumerate
51-
(>= v0.17))
52-
(ppx_hash
53-
(>= v0.17))
54-
(ppx_here
55-
(>= v0.17))
56-
(ppx_let
57-
(>= v0.17))
58-
(ppx_sexp_conv
59-
(>= v0.17))
60-
(ppx_sexp_value
61-
(>= v0.17))
62-
(ppxlib
63-
(>= 0.33))
64-
(stdio
48+
(sexplib0
6549
(>= v0.17))))
6650

6751
(package
@@ -72,107 +56,65 @@
7256
(>= 5.2))
7357
(auto-format
7458
(= :version))
75-
(base
76-
(>= v0.17))
77-
(cmdlang
78-
(>= 0.0.9))
79-
(expect_test_helpers_core
80-
(>= v0.17))
8159
(fpath
8260
(>= 0.7.3))
83-
(fpath-base
61+
(fpath-sexp0
8462
(>= 0.2.2))
8563
(loc
8664
(>= 0.2.2))
87-
(parsing-utils
88-
(>= 0.2.3))
8965
(pp
9066
(>= 2.0.0))
91-
(pp-extended
92-
(>= 0.0.2))
9367
(pplumbing-err
9468
(>= 0.0.16))
95-
(pplumbing-log-cli
96-
(>= 0.0.16))
97-
(ppx_compare
98-
(>= v0.17))
99-
(ppx_enumerate
100-
(>= v0.17))
10169
(ppx_expect
10270
(>= v0.17))
103-
(ppx_hash
104-
(>= v0.17))
105-
(ppx_here
106-
(>= v0.17))
107-
(ppx_let
108-
(>= v0.17))
109-
(ppx_sexp_conv
110-
(>= v0.17))
111-
(ppx_sexp_value
112-
(>= v0.17))
11371
(ppxlib
114-
(>= 0.33))
115-
(stdio
116-
(>= v0.17))))
72+
(>= 0.33))))
11773

11874
(package
119-
(name auto-format-dev)
120-
(synopsis "Package to regroup dev targets, documentation, and more")
75+
(name auto-format-example)
76+
(synopsis "Example usage of auto-format library")
12177
(allow_empty)
12278
(depends
12379
(ocaml
12480
(>= 5.2))
125-
(ocamlformat
126-
(= 0.28.1))
12781
(auto-format
12882
(= :version))
129-
(auto-format-tests
130-
(= :version))
131-
(base
132-
(>= v0.17))
13383
(cmdlang
13484
(>= 0.0.9))
135-
(expect_test_helpers_core
136-
(>= v0.17))
137-
(fpath
138-
(>= 0.7.3))
139-
(fpath-base
140-
(>= 0.2.2))
85+
(cmdlang-cmdliner-err-runner
86+
(>= 0.0.16))
14187
(loc
14288
(>= 0.2.2))
89+
(menhir
90+
(>= 20220210))
14391
(parsing-utils
14492
(>= 0.2.3))
14593
(pp
14694
(>= 2.0.0))
147-
(pp-extended
148-
(>= 0.0.2))
149-
(pplumbing-err
150-
(>= 0.0.16))
151-
(pplumbing-log-cli
152-
(>= 0.0.16))
153-
(ppx_compare
154-
(>= v0.17))
155-
(ppx_enumerate
156-
(>= v0.17))
157-
(ppx_expect
158-
(>= v0.17))
159-
(ppx_hash
160-
(>= v0.17))
161-
(ppx_here
162-
(>= v0.17))
95+
(sexplib0
96+
(>= v0.17))))
97+
98+
(package
99+
(name auto-format-dev)
100+
(synopsis "Package to regroup dev targets, documentation, and more")
101+
(allow_empty)
102+
(depends
103+
(ocaml
104+
(>= 5.2))
105+
(ocamlformat
106+
(= 0.28.1))
107+
(auto-format
108+
(= :version))
109+
(auto-format-example
110+
(= :version))
111+
(auto-format-tests
112+
(= :version))
113+
(bisect_ppx
114+
(>= 2.8.3))
163115
(ppx_js_style
164116
(>= v0.17))
165-
(ppx_let
166-
(>= v0.17))
167-
(ppx_sexp_conv
168-
(>= v0.17))
169-
(ppx_sexp_value
170-
(>= v0.17))
171117
(ppxlib
172118
(>= 0.33))
173-
(stdio
174-
(>= v0.17))
175119
(sherlodoc
176-
(and
177-
:with-doc
178-
(>= 0.2)))))
120+
(>= 0.2))))

‎dune-workspace‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
11
(lang dune 3.20)
22

33
(lock_dir
4-
(repositories overlay upstream mbarbin))
4+
(repositories overlay upstream alpha mbarbin))
55

66
(repository
77
(name mbarbin)
88
(url "git+https://github.com/mbarbin/opam-repository.git"))
9+
10+
(repository
11+
(name alpha)
12+
(url "git+https://github.com/kit-ty-kate/opam-alpha-repository.git"))

0 commit comments

Comments
 (0)