Skip to content

Commit

Permalink
Merge pull request #146 from GaloisInc/sc/5.1.1
Browse files Browse the repository at this point in the history
treewide: update to OCaml 5.1.1
  • Loading branch information
samcowger authored Jan 25, 2025
2 parents 3f66ea6 + 302ce2a commit 50e3197
Show file tree
Hide file tree
Showing 5 changed files with 32 additions and 23 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ocaml-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
build:
strategy:
matrix:
ocaml-version: [4.14.1]
ocaml-version: [5.1.1]
os: [ubuntu-22.04]

runs-on: ${{ matrix.os }}
Expand Down
6 changes: 3 additions & 3 deletions cn-lsp.opam
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ depends: [
"cerberus-lib" {= "b9daa22"}
"cn" {= "b9daa22"}
"jsonrpc" {>= "1.17.0" & < "2.0.0"}
"linol" {>= "0.6" & < "1.0"}
"linol-lwt" {>= "0.6" & < "1.0"}
"linol" {>= "0.6" & < "0.7"}
"linol-lwt" {>= "0.6" & < "0.7"}
"logs" {>= "0.7.0" & < "1.0.0"}
"lsp" {>= "1.17.0" & < "2.0.0"}
"telemetry"
"telemetry" {= "dev"}
"odoc" {with-doc}
]
build: [
Expand Down
26 changes: 17 additions & 9 deletions cn-lsp.opam.locked-5.1.1
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
opam-version: "2.0"
name: "cnlsp"
name: "cn-lsp"
version: "dev"
synopsis: "CN Language Server"
description: "A language server protocol implementation for the CN language"
maintainer: "Sam Cowger"
authors: "Sam Cowger"
depends: [
"alcotest" {= "1.8.0"}
"astring" {= "0.8.5"}
"base" {= "v0.17.1"}
"base-bigarray" {= "base"}
"base-bytes" {= "base"}
Expand All @@ -19,18 +21,19 @@ depends: [
"cn" {= "b9daa22"}
"conf-findutils" {= "1"}
"conf-gmp" {= "4"}
"conf-pkg-config" {= "3"}
"cppo" {= "1.7.0"}
"conf-pkg-config" {= "4"}
"cppo" {= "1.8.0"}
"csexp" {= "1.5.2"}
"dune" {= "3.16.1"}
"dune-configurator" {= "3.16.1"}
"dune" {= "3.17.1"}
"dune-configurator" {= "3.17.1"}
"fmt" {= "0.9.0"}
"jsonrpc" {= "1.17.0"}
"lem" {= "2022-12-10"}
"linol" {= "0.6"}
"linol-lwt" {= "0.6"}
"logs" {= "0.7.0"}
"lsp" {= "1.17.0"}
"lwt" {= "5.8.0"}
"lwt" {= "5.9.0"}
"menhir" {= "20240715"}
"menhirCST" {= "20240715"}
"menhirLib" {= "20240715"}
Expand All @@ -42,28 +45,33 @@ depends: [
"ocaml-compiler-libs" {= "v0.12.4"}
"ocaml-config" {= "3"}
"ocaml-options-vanilla" {= "1"}
"ocaml-syntax-shims" {= "1.0.0"}
"ocaml_intrinsics_kernel" {= "v0.17.1"}
"ocamlbuild" {= "0.15.0"}
"ocamlfind" {= "1.9.6"}
"ocamlgraph" {= "2.1.0"}
"ocplib-endian" {= "1.2"}
"parsexp" {= "v0.17.0"}
"pprint" {= "20230830"}
"ppx_compare" {= "v0.17.0"}
"ppx_derivers" {= "1.2.1"}
"ppx_deriving" {= "6.0.3"}
"ppx_deriving_yojson" {= "3.9.0"}
"ppx_deriving_yojson" {= "3.9.1"}
"ppx_hash" {= "v0.17.0"}
"ppx_sexp_conv" {= "v0.17.0"}
"ppx_yojson_conv_lib" {= "v0.17.0"}
"ppxlib" {= "0.33.0"}
"ppxlib" {= "0.34.0"}
"ppxlib_jane" {= "v0.17.0"}
"re" {= "1.12.0"}
"result" {= "1.5"}
"seq" {= "base"}
"sexplib" {= "v0.17.0"}
"sexplib0" {= "v0.17.0"}
"sha" {= "1.15.4"}
"stdlib-shims" {= "0.3.0"}
"telemetry" {= "dev"}
"topkg" {= "1.0.7"}
"trace" {= "0.8"}
"trace" {= "0.9"}
"uutf" {= "1.0.3"}
"yojson" {= "2.2.2"}
"zarith" {= "1.14"}
Expand Down
7 changes: 4 additions & 3 deletions dune-project
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,11 @@
(linol
(and
(>= 0.6)
(< 1.0)))
(< 0.7)))
(linol-lwt
(and
(>= 0.6)
(< 1.0)))
(< 0.7)))
(logs
(and
(>= 0.7.0)
Expand All @@ -50,7 +50,8 @@
(and
(>= 1.17.0)
(< 2.0.0)))
telemetry))
(telemetry
(= "dev"))))

(package
(name telemetry)
Expand Down
14 changes: 7 additions & 7 deletions telemetry.opam.locked-5.1.1
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
opam-version: "2.0"
synopsis: "Telemetry collection"
name: "telemetry"
version: "0.0.1"
version: "dev"
synopsis: "Telemetry collection"
maintainer: "Sam Cowger"
authors: "Sam Cowger"
depends: [
Expand All @@ -14,10 +14,10 @@ depends: [
"base-threads" {= "base"}
"base-unix" {= "base"}
"cmdliner" {= "1.3.0"}
"cppo" {= "1.7.0"}
"cppo" {= "1.8.0"}
"csexp" {= "1.5.2"}
"dune" {= "3.16.1"}
"dune-configurator" {= "3.16.1"}
"dune" {= "3.17.1"}
"dune-configurator" {= "3.17.1"}
"fmt" {= "0.9.0"}
"ocaml" {= "5.1.1"}
"ocaml-base-compiler" {= "5.1.1"}
Expand All @@ -31,10 +31,10 @@ depends: [
"ppx_compare" {= "v0.17.0"}
"ppx_derivers" {= "1.2.1"}
"ppx_deriving" {= "6.0.3"}
"ppx_deriving_yojson" {= "3.9.0"}
"ppx_deriving_yojson" {= "3.9.1"}
"ppx_hash" {= "v0.17.0"}
"ppx_sexp_conv" {= "v0.17.0"}
"ppxlib" {= "0.33.0"}
"ppxlib" {= "0.34.0"}
"ppxlib_jane" {= "v0.17.0"}
"re" {= "1.12.0"}
"seq" {= "base"}
Expand Down

0 comments on commit 50e3197

Please sign in to comment.