Skip to content

Support Cohttp 4.0 #257

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tmcgilchrist merged 2 commits into from
Jul 19, 2021
Merged

Support Cohttp 4.0 #257

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5b59671
Support cohttp 4.0.
tmcgilchrist Jul 15, 2021
b89d763
Make all lib_test executables buildable.
tmcgilchrist Jul 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 14 additions & 16 deletions dune-project
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
(lang dune 1.10)
(lang dune 2.7)
(name github)

(generate_opam_files true)
(formatting disabled)

(license MIT)
(maintainers "Anil Madhavapeddy <[email protected]>")
Expand All @@ -15,12 +16,12 @@
(name github)
(tags (org:mirage org:xapi-project git))
(depends
(ocaml (>= 4.03.0))
(dune (>= 1.10))
(ocaml (>= 4.08.0))
(uri (>= 1.9.0))
(cohttp (and (>= 0.99.0) (< 3.0.0)))
(cohttp-lwt (and (>= 0.99.0) (< 3.0.0)))
(cohttp (>= 4.0.0))
(cohttp-lwt-jsoo (>= 4.0.0))
(lwt (>= 2.4.4))
(cohttp-lwt (>= 4.0.0))
(github-data (= :version))
(yojson (>= 1.6.0))
stringext)
Expand All @@ -35,11 +36,10 @@ JavaScript via [js_of_ocaml](http://ocsigen.org/js_of_ocaml)."))
(name github-jsoo)
(tags (org:mirage org:xapi-project git))
(depends
(ocaml (>= 4.03.0))
(dune (>= 1.10))
(ocaml (>= 4.08.0))
(github (= :version))
(cohttp (and (>= 0.99.0) (< 3.0.0)))
(cohttp-lwt-jsoo (and (>= 0.99.0) (< 3.0.0)))
(cohttp (>= 4.0.0))
(cohttp-lwt-jsoo (>= 4.0.0))
(js_of_ocaml-lwt (>= 3.4.0)))
(synopsis "GitHub APIv3 JavaScript library")
(description "This library provides an OCaml interface to the [GitHub APIv3](https://docs.github.com/rest/)
Expand All @@ -49,11 +49,10 @@ JavaScript via [js_of_ocaml](http://ocsigen.org/js_of_ocaml)."))
(name github-unix)
(tags (org:mirage org:xapi-project git))
(depends
(ocaml (>= 4.03.0))
(dune (>= 1.10))
(ocaml (>= 4.08.0))
(github (= :version))
(cohttp (and (>= 0.99.0) (< 3.0.0)))
(cohttp-lwt-unix (and (>= 0.99.0) (< 3.0.0)))
(cohttp (>= 4.0.0))
(cohttp-lwt-unix (>= 4.0.0))
stringext
(cmdliner (>= 0.9.8))
base-unix
Expand All @@ -66,9 +65,8 @@ JavaScript via [js_of_ocaml](http://ocsigen.org/js_of_ocaml)."))
(name github-data)
(tags (org:mirage org:xapi-project git))
(depends
(ocaml (>= 4.03.0))
(dune (>= 1.10))
(yojson (>= 1.6.0))
(ocaml (>= 4.08.0))
(yojson (>= 1.7.0))
(atdgen (>= 2.0.0)))
(synopsis "GitHub APIv3 data library")
(description "This library provides an OCaml interface to the [GitHub APIv3](https://docs.github.com/rest/)
Expand Down
42 changes: 26 additions & 16 deletions github-data.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
# This file is generated by dune, edit dune-project instead
opam-version: "2.0"
build: [
["dune" "subst"] {pinned}
["dune" "build" "-p" name "-j" jobs]
["dune" "runtest" "-p" name "-j" jobs] {with-test}
["dune" "build" "-p" name "@doc"] {with-doc}
]
synopsis: "GitHub APIv3 data library"
description: """
This library provides an OCaml interface to the [GitHub APIv3](https://docs.github.com/rest/)
(JSON). This package installs the data conversion library."""
maintainer: ["Anil Madhavapeddy <[email protected]>"]
authors: [
"Anil Madhavapeddy"
Expand All @@ -18,18 +16,30 @@ authors: [
"Jeremy Yallop"
"Dave Tucker"
]
bug-reports: "https://github.com/mirage/ocaml-github/issues"
license: "MIT"
tags: ["org:mirage" "org:xapi-project" "git"]
homepage: "https://github.com/mirage/ocaml-github"
doc: "https://mirage.github.io/ocaml-github/"
license: "MIT"
dev-repo: "git+https://github.com/mirage/ocaml-github.git"
synopsis: "GitHub APIv3 data library"
description: """
This library provides an OCaml interface to the [GitHub APIv3](https://docs.github.com/rest/)
(JSON). This package installs the data conversion library."""
bug-reports: "https://github.com/mirage/ocaml-github/issues"
depends: [
"ocaml" {>= "4.03.0"}
"dune" {>= "1.10"}
"yojson" {>= "1.6.0"}
"dune" {>= "2.7"}
"ocaml" {>= "4.08.0"}
"yojson" {>= "1.7.0"}
"atdgen" {>= "2.0.0"}
"odoc" {with-doc}
]
build: [
["dune" "subst"] {dev}
[
"dune"
"build"
"-p"
name
"-j"
jobs
"@install"
"@runtest" {with-test}
"@doc" {with-doc}
]
]
dev-repo: "git+https://github.com/mirage/ocaml-github.git"
44 changes: 27 additions & 17 deletions github-jsoo.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
# This file is generated by dune, edit dune-project instead
opam-version: "2.0"
build: [
["dune" "subst"] {pinned}
["dune" "build" "-p" name "-j" jobs]
["dune" "runtest" "-p" name "-j" jobs] {with-test}
["dune" "build" "-p" name "@doc"] {with-doc}
]
synopsis: "GitHub APIv3 JavaScript library"
description: """
This library provides an OCaml interface to the [GitHub APIv3](https://docs.github.com/rest/)
(JSON). This library installs the JavaScript version, which uses [js_of_ocaml](http://ocsigen.org/js_of_ocaml)."""
maintainer: ["Anil Madhavapeddy <[email protected]>"]
authors: [
"Anil Madhavapeddy"
Expand All @@ -18,20 +16,32 @@ authors: [
"Jeremy Yallop"
"Dave Tucker"
]
bug-reports: "https://github.com/mirage/ocaml-github/issues"
license: "MIT"
tags: ["org:mirage" "org:xapi-project" "git"]
homepage: "https://github.com/mirage/ocaml-github"
doc: "https://mirage.github.io/ocaml-github/"
license: "MIT"
dev-repo: "git+https://github.com/mirage/ocaml-github.git"
synopsis: "GitHub APIv3 JavaScript library"
description: """
This library provides an OCaml interface to the [GitHub APIv3](https://docs.github.com/rest/)
(JSON). This library installs the JavaScript version, which uses [js_of_ocaml](http://ocsigen.org/js_of_ocaml)."""
bug-reports: "https://github.com/mirage/ocaml-github/issues"
depends: [
"ocaml" {>= "4.03.0"}
"dune" {>= "1.10"}
"dune" {>= "2.7"}
"ocaml" {>= "4.08.0"}
"github" {= version}
"cohttp" {>= "0.99.0" & < "3.0.0"}
"cohttp-lwt-jsoo" {>= "0.99.0" & < "3.0.0"}
"cohttp" {>= "4.0.0"}
"cohttp-lwt-jsoo" {>= "4.0.0"}
"js_of_ocaml-lwt" {>= "3.4.0"}
"odoc" {with-doc}
]
build: [
["dune" "subst"] {dev}
[
"dune"
"build"
"-p"
name
"-j"
jobs
"@install"
"@runtest" {with-test}
"@doc" {with-doc}
]
]
dev-repo: "git+https://github.com/mirage/ocaml-github.git"
44 changes: 27 additions & 17 deletions github-unix.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
# This file is generated by dune, edit dune-project instead
opam-version: "2.0"
build: [
["dune" "subst"] {pinned}
["dune" "build" "-p" name "-j" jobs]
["dune" "runtest" "-p" name "-j" jobs] {with-test}
["dune" "build" "-p" name "@doc"] {with-doc}
]
synopsis: "GitHub APIv3 Unix library"
description: """
This library provides an OCaml interface to the [GitHub APIv3](https://docs.github.com/rest/)
(JSON). This package installs the Unix (Lwt) version."""
maintainer: ["Anil Madhavapeddy <[email protected]>"]
authors: [
"Anil Madhavapeddy"
Expand All @@ -18,23 +16,35 @@ authors: [
"Jeremy Yallop"
"Dave Tucker"
]
bug-reports: "https://github.com/mirage/ocaml-github/issues"
license: "MIT"
tags: ["org:mirage" "org:xapi-project" "git"]
homepage: "https://github.com/mirage/ocaml-github"
doc: "https://mirage.github.io/ocaml-github/"
license: "MIT"
dev-repo: "git+https://github.com/mirage/ocaml-github.git"
synopsis: "GitHub APIv3 Unix library"
description: """
This library provides an OCaml interface to the [GitHub APIv3](https://docs.github.com/rest/)
(JSON). This package installs the Unix (Lwt) version."""
bug-reports: "https://github.com/mirage/ocaml-github/issues"
depends: [
"ocaml" {>= "4.03.0"}
"dune" {>= "1.10"}
"dune" {>= "2.7"}
"ocaml" {>= "4.08.0"}
"github" {= version}
"cohttp" {>= "0.99.0" & < "3.0.0"}
"cohttp-lwt-unix" {>= "0.99.0" & < "3.0.0"}
"cohttp" {>= "4.0.0"}
"cohttp-lwt-unix" {>= "4.0.0"}
"stringext"
"cmdliner" {>= "0.9.8"}
"base-unix"
"lwt"
"odoc" {with-doc}
]
build: [
["dune" "subst"] {dev}
[
"dune"
"build"
"-p"
name
"-j"
jobs
"@install"
"@runtest" {with-test}
"@doc" {with-doc}
]
]
dev-repo: "git+https://github.com/mirage/ocaml-github.git"
51 changes: 31 additions & 20 deletions github.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
# This file is generated by dune, edit dune-project instead
opam-version: "2.0"
build: [
["dune" "subst"] {pinned}
["dune" "build" "-p" name "-j" jobs]
["dune" "runtest" "-p" name "-j" jobs] {with-test}
["dune" "build" "-p" name "@doc"] {with-doc}
]
synopsis: "GitHub APIv3 OCaml library"
description: """
This library provides an OCaml interface to the
[GitHub APIv3](https://docs.github.com/rest/) (JSON).

It is compatible with [MirageOS](https://mirage.io) and also compiles to pure
JavaScript via [js_of_ocaml](http://ocsigen.org/js_of_ocaml)."""
maintainer: ["Anil Madhavapeddy <[email protected]>"]
authors: [
"Anil Madhavapeddy"
Expand All @@ -18,26 +19,36 @@ authors: [
"Jeremy Yallop"
"Dave Tucker"
]
bug-reports: "https://github.com/mirage/ocaml-github/issues"
license: "MIT"
tags: ["org:mirage" "org:xapi-project" "git"]
homepage: "https://github.com/mirage/ocaml-github"
doc: "https://mirage.github.io/ocaml-github/"
license: "MIT"
dev-repo: "git+https://github.com/mirage/ocaml-github.git"
synopsis: "GitHub APIv3 OCaml library"
description: """
This library provides an OCaml interface to the
[GitHub APIv3](https://docs.github.com/rest/) (JSON).

It is compatible with [MirageOS](https://mirage.io) and also compiles to pure
JavaScript via [js_of_ocaml](http://ocsigen.org/js_of_ocaml)."""
bug-reports: "https://github.com/mirage/ocaml-github/issues"
depends: [
"ocaml" {>= "4.03.0"}
"dune" {>= "1.10"}
"dune" {>= "2.7"}
"ocaml" {>= "4.08.0"}
"uri" {>= "1.9.0"}
"cohttp" {>= "0.99.0" & < "3.0.0"}
"cohttp-lwt" {>= "0.99.0" & < "3.0.0"}
"cohttp" {>= "4.0.0"}
"cohttp-lwt-jsoo" {>= "4.0.0"}
"lwt" {>= "2.4.4"}
"cohttp-lwt" {>= "4.0.0"}
"github-data" {= version}
"yojson" {>= "1.6.0"}
"stringext"
"odoc" {with-doc}
]
build: [
["dune" "subst"] {dev}
[
"dune"
"build"
"-p"
name
"-j"
jobs
"@install"
"@runtest" {with-test}
"@doc" {with-doc}
]
]
dev-repo: "git+https://github.com/mirage/ocaml-github.git"
2 changes: 1 addition & 1 deletion js/github.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,6 @@ module Env = struct
let debug = false
end

module Github' = Github_core.Make(Env)(Time)(Cohttp_lwt_xhr.Client)
module Github' = Github_core.Make(Env)(Time)(Cohttp_lwt_jsoo.Client)
include Github'

46 changes: 28 additions & 18 deletions lib_test/dune
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,33 +1,43 @@
(executables
(libraries cohttp-lwt-unix github_unix atdgen stringext cmdliner)
(names
checks
contributors
current_user
current_user_orgs
organizations
get_token
issues
labels
milestones
organization_repos
checks
rwo
get_token
repo_info
repo_stats
contributors
releases
user_type))
organizations
pulls
releases
repo_info
repo_stats
rwo
tags
user_type))

(rule (copy config.ml.in config.ml))

(alias
(name DEFAULT)
(deps
checks.exe
contributors.exe
current_user.exe
current_user_orgs.exe
organizations.exe
get_token.exe
issues.exe
labels.exe
milestones.exe
organization_repos.exe
checks.exe
rwo.exe
get_token.exe
repo_info.exe
repo_stats.exe
releases.exe
contributors.exe
user_type.exe))
organizations.exe
pulls.exe
releases.exe
repo_info.exe
repo_stats.exe
rwo.exe
tags.exe
user_type.exe))
Loading