Bump ocaml max version to 4.12

Author: chambart

.travis.yml

@@ -8,7 +8,6 @@ env:
     - TESTS=true
   matrix:
     - OCAML_VERSION=4.03
-    - OCAML_VERSION=4.04
-    - OCAML_VERSION=4.05
+    - OCAML_VERSION=4.11
 os:
   - linux

CHANGES.md

@@ -1,3 +1,8 @@
+### 1.0 (2020-11-05)
+
+* Check compatibility up to 4.12 and bump dependencies
+* Migrate from jbuilder to dune
+
 ### 0.1 (2017-05-23)
 
 * Initial release

Makefile

@@ -2,23 +2,26 @@ INSTALL_ARGS := $(if $(PREFIX),--prefix $(PREFIX),)
 
 # Default rule
 default:
-	jbuilder build @install
+	dune build @install
 
 test:
-	jbuilder runtest
+	dune runtest
 
 dev:
-	jbuilder build --dev @install
+	dune build
 
 install:
-	jbuilder install $(INSTALL_ARGS)
+	dune install $(INSTALL_ARGS)
 
 uninstall:
 	jbuilder uninstall $(INSTALL_ARGS)
 
 reinstall: uninstall reinstall
 
 clean:
-	rm -rf _build
+	dune clean
 
-.PHONY: default test dev install uninstall reinstall clean
+doc:
+	dune build @doc
+
+.PHONY: default test dev install uninstall reinstall clean doc

appveyor.yml

@@ -8,11 +8,16 @@ environment:
   PACKAGE: nullable-array
   TESTS: true
   matrix:
-    - OPAM_SWITCH: 4.03.0+mingw64c
     - OPAM_SWITCH: 4.04.0+msvc64c
     - OPAM_SWITCH: 4.04.0+mingw32c
     - OPAM_SWITCH: 4.04.0+mingw64c
     - OPAM_SWITCH: 4.04.0+flambda+mingw64c
+    - OPAM_SWITCH: 4.04.0+flambda+mingw64c
+    - OPAM_SWITCH: 4.11.1+msvc64c
+    - OPAM_SWITCH: 4.11.1+mingw32c
+    - OPAM_SWITCH: 4.11.1+mingw64c
+    - OPAM_SWITCH: 4.11.1+flambda+mingw64c
+    - OPAM_SWITCH: 4.11.1+flambda+mingw64c
 
 install:
   - ps: iex ((new-object net.webclient).DownloadString("https://raw.githubusercontent.com/$env:FORK_USER/ocaml-ci-scripts/$env:FORK_BRANCH/appveyor-install.ps1"))

lib/.merlin

@@ -0,0 +1,4 @@
+(library
+  (name        nullable_array)
+  (public_name nullable-array)
+  (modules nullable_array))

lib/dune

@@ -1,26 +1,28 @@
-opam-version: "1.2"
+opam-version: "2.0"
 name: "ocplib-nullable-array"
-version: "0.1"
+version: "1.0.0"
 maintainer: "Pierre Chambart <pierre.chambart@ocamlpro.com>"
-authors: "Pierre Chambart <pierre.chambart@ocamlpro.com>"
-homepage: "https://github.com/chambart/ocplib-nullable-array"
-bug-reports: "https://github.com/chambart/ocplib-nullable-array/issues"
+authors: "Pierre Chambart"
+homepage: "https://github.com/chambart/ocaml-nullable-array"
+bug-reports: "https://github.com/chambart/ocaml-nullable-array/issues"
 license: "MIT"
-dev-repo: "https://github.com/chambart/ocplib-nullable-array.git"
+dev-repo: "git+https://github.com/chambart/ocaml-nullable-array.git"
+synopsis:
+  "More efficient `'a option array`"
+description: """
 
-build: [
-  ["jbuilder" "build" "--only-packages" "nullable-array" "--root" "." "-j" jobs "@install"]
-]
+Small self-contained library providing an efficient implementation for a type equivalent to `'a option array`
+"""
 
-build-test: [
-  ["jbuilder" "runtest"]
-]
-
-available: [
-  ocaml-version >= "4.03"   (* use Sys.opaque_identity *)
-  & ocaml-version <= "4.06" (* need to be tested before announcing that a version is correct *)
+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}
 ]
 
 depends: [
-  "jbuilder" {build & >= "1.0+beta8"}
+  "dune" {>= "1.10"}
+  "ocaml" {>= "4.03"   (* use Sys.opaque_identity *)
+           & < "4.13~"} (* need to be tested before announcing that a version is correct *)
 ]