Drop dependency to OCaml 5

lthms · Jan 11, 2024 · ca7aee4 · ca7aee4
1 parent 519f598
commit ca7aee4
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 4 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,5 +1,7 @@
 # 7 (unreleased)
 
+- Drop dependency to OCaml 5.
+
 # 6 (2023-12-29)
 
 ## `spatial`

diff --git a/Makefile b/Makefile
@@ -1,5 +1,5 @@
 DESTDIR ?= ${HOME}/.local
-OCAML_COMPILER ?= ocaml.5.1.1
+OCAML_COMPILER ?= ocaml-system
 BUILD_PROFILE ?= release
 
 .PHONY: all

diff --git a/bin/spatialblock/main.ml b/bin/spatialblock/main.ml
@@ -1,5 +1,11 @@
 open Spatial_ipc
-module App_id_map = Hashtbl.Make (String)
+
+module App_id_map = Hashtbl.Make (struct
+  type t = string
+
+  let equal = String.equal
+  let hash = Hashtbl.hash
+end)
 
 let app_id_map = App_id_map.create 10
 

diff --git a/dune-project b/dune-project
@@ -18,7 +18,7 @@
  (name spatial-shell)
  (synopsis
   "Implementing a spatial model inspired by Material Shell, for i3 and Sway")
- (depends (ocaml (>= "5.0.0")) poll (clap (>= "0.3.0")) ezjsonm-encoding conf-scdoc))
+ (depends (ocaml (>= "4.12")) poll (clap (>= "0.3.0")) ezjsonm-encoding conf-scdoc))
 
 (package
  (allow_empty)

diff --git a/spatial-shell.opam b/spatial-shell.opam
@@ -10,7 +10,7 @@ homepage: "https://github.com/lthms/spatial-shell"
 bug-reports: "https://github.com/lthms/spatial-shell/issues"
 depends: [
   "dune" {>= "3.0"}
-  "ocaml" {>= "5.0.0"}
+  "ocaml" {>= "4.12"}
   "poll"
   "clap" {>= "0.3.0"}
   "ezjsonm-encoding"