Merge pull request #66 from ulrikstrid/anmonteiro/no-cstruct

Remove cstruct and upgrade mirage-crypto

.github/workflows/build-master.yml

@@ -13,9 +13,9 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
         with:
-          persist-credentials: falsene
+          persist-credentials: false
 
-      - uses: cachix/install-nix-action@v22
+      - uses: cachix/install-nix-action@v30
         with:
           extra_nix_config: |
             access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}

.github/workflows/check-pr.yml

@@ -3,7 +3,7 @@ name: Check PR
 on:
   pull_request:
     branches:
-    - master
+      - master
 
 jobs:
   opam:
@@ -13,10 +13,10 @@ jobs:
         os:
           - macos-latest
           - ubuntu-latest
-          - windows-latest
+          # - windows-latest
         ocaml-compiler:
-          - 4.13.x
-          - 4.08.x
+          - 4.14.x
+          - 5.2.x
 
     runs-on: ${{ matrix.os }}
 
@@ -45,23 +45,19 @@ jobs:
         with:
           persist-credentials: false
 
-      - uses: cachix/install-nix-action@v22
+      - uses: cachix/install-nix-action@v30
         with:
           extra_nix_config: |
             access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
 
-      - uses: cachix/cachix-action@v12
-        with:
-          name: anmonteiro
-
       - name: Build
         run: nix develop --accept-flake-config -c dune build
 
       - name: Test with coverage
         run: nix develop --accept-flake-config -c dune build @runtest --instrument-with bisect_ppx --force
 
       - name: Upload coverage
-        run: nix develop --accept-flake-config -c bisect-ppx-report send-to Codecov
+        run: nix develop --accept-flake-config -c bisect-ppx-report send-to Codecov --repo-token="${{ secrets.CODECOV_TOKEN }}"
 
       - name: Build docs
         run: nix develop --accept-flake-config -c dune build @doc

.ocamlformat

@@ -1,3 +1,3 @@
-version = 0.24.1
+version = 0.27.0
 
 wrap-comments = false

CHANGES.md

@@ -1,3 +1,7 @@
+next
+--------------
+- Upgrade mirage-crypto and remove cstruct
+
 0.9.0
 --------------
 - Support all serialization formats, previously only the compact serialization was supported, now we support both general and flattened JSON format (by @ulrikstrid) 

dune-project

@@ -33,11 +33,9 @@
   (eqaf
    (>= 0.7))
   (mirage-crypto
-   (>= 0.10.0))
+   (>= 1.0.0))
   (x509
    (>= 0.13.0))
-  (cstruct
-   (>= 6.0.0))
   astring
   (yojson
    (>= 1.6.0))
@@ -46,7 +44,8 @@
   (mirage-crypto-rng
    (and
     :with-test
-    (>= 0.11.0)))
+    (>= 1.0.0)))
+  digestif
   (containers :with-test)
   (bisect_ppx :with-test)
   (alcotest :with-test)

jose.opam

@@ -17,14 +17,14 @@ depends: [
   "base64" {>= "3.3.0"}
   "dune" {>= "2.8"}
   "eqaf" {>= "0.7"}
-  "mirage-crypto" {>= "0.10.0"}
+  "mirage-crypto" {>= "1.0.0"}
   "x509" {>= "0.13.0"}
-  "cstruct" {>= "6.0.0"}
   "astring"
   "yojson" {>= "1.6.0"}
   "zarith"
   "ptime"
-  "mirage-crypto-rng" {with-test & >= "0.11.0"}
+  "mirage-crypto-rng" {with-test & >= "1.0.0"}
+  "digestif"
   "containers" {with-test}
   "bisect_ppx" {with-test}
   "alcotest" {with-test}

jose/Header.ml

@@ -101,10 +101,9 @@ let to_json t =
   `Assoc (List.filter_map Fun.id values @ t.extra)
 
 let of_string header_str =
-  let s = U_Base64.url_decode header_str
-  in
+  let s = U_Base64.url_decode header_str in
   Result.bind s (fun decoded_header ->
-    Yojson.Safe.from_string decoded_header |> of_json)
+      Yojson.Safe.from_string decoded_header |> of_json)
 
 let to_string header =
   to_json header |> Yojson.Safe.to_string |> U_Base64.url_encode_string