Upgrade version to 0.9.3

* Fix `drom new` to use correctly `--drom-share` argument
* Fix drom.toml to use latest drom-share version with fixes for dune
  Should fix github CI
* Use :version in dune files instead of version, starting with drom-version = 0.9.3
* Set OCaml min-version to 4.14
* set directories min-version to 0.6
* Remove approx merlin in dune-project

Author: lefessan

.drom

@@ -5,17 +5,17 @@ version:0.9.0
 
 # hash of toml configuration files
 # used for generation of all files
-812a88073a143fbfd65d11dd1ac586fd:.
+1a7f438a9a5be7f02e5bef42dc8bf870:.
 # end context for .
 
 # begin context for .github/workflows/workflow.yml
 # file .github/workflows/workflow.yml
-eee26f5d13b222b48706c4fcbd98a19a:.github/workflows/workflow.yml
+89b0f9c99502d62badaf5677ea2647e7:.github/workflows/workflow.yml
 # end context for .github/workflows/workflow.yml
 
 # begin context for .gitignore
 # file .gitignore
-33c88a25e8b40f3683f6c03ec26be5db:.gitignore
+f7a24abcad0ba9301c03bb64464b1718:.gitignore
 # end context for .gitignore
 
 # begin context for .ocamlformat
@@ -40,7 +40,7 @@ eee26f5d13b222b48706c4fcbd98a19a:.github/workflows/workflow.yml
 
 # begin context for LICENSE.md
 # file LICENSE.md
-8fc45323c2500fb66e52deb392dda4f2:LICENSE.md
+cf4da9c43c0026cec0ba46b9cfe8407e:LICENSE.md
 # end context for LICENSE.md
 
 # begin context for Makefile
@@ -88,31 +88,11 @@ e739f3026aa997af4026bc428f4c9ef6:docs/favicon.png
 c8281f46ba9a11d0b61bc8ef67eaa357:docs/style.css
 # end context for docs/style.css
 
-# begin context for docs\README.txt
-# file docs\README.txt
-bfbacf00053bb9ab2a6e2ce94ed4a642:docs\README.txt
-# end context for docs\README.txt
-
-# begin context for docs\favicon.png
-# file docs\favicon.png
-e739f3026aa997af4026bc428f4c9ef6:docs\favicon.png
-# end context for docs\favicon.png
-
-# begin context for docs\style.css
-# file docs\style.css
-c8281f46ba9a11d0b61bc8ef67eaa357:docs\style.css
-# end context for docs\style.css
-
 # begin context for dot_gitattributes
 # file dot_gitattributes
 20bbe7a5dbb3c3278a1511d960616fe5:dot_gitattributes
 # end context for dot_gitattributes
 
-# begin context for dot_github\workflows\workflow.yml
-# file dot_github\workflows\workflow.yml
-004b92dd628d26b4f8a5a5139bf4aa79:dot_github\workflows\workflow.yml
-# end context for dot_github\workflows\workflow.yml
-
 # begin context for drom.toml
 # file drom.toml
 9949d65b87e55480a30122e9e77ae7d3:drom.toml
@@ -125,22 +105,22 @@ e850a13c004f963e9f5a568eac93c217:dune
 
 # begin context for dune-project
 # file dune-project
-7f0439af8599faf105447755ebd72e7e:dune-project
+b5f0d96d72a9cbd9f919146017fd56ce:dune-project
 # end context for dune-project
 
 # begin context for opam/drom.opam
 # file opam/drom.opam
-ff84198ff87fa46b8ac39ed2951d2d26:opam/drom.opam
+19e1a75cf2fe4fc2efe908b9198dced6:opam/drom.opam
 # end context for opam/drom.opam
 
 # begin context for opam/drom_lib.opam
 # file opam/drom_lib.opam
-788b17212e259bbb8fe7c22c85c76d35:opam/drom_lib.opam
+ba1d14620d3d4d4b8b556ffb4f88689e:opam/drom_lib.opam
 # end context for opam/drom_lib.opam
 
 # begin context for opam/drom_toml.opam
 # file opam/drom_toml.opam
-e55d659410b556d7bc60183d8ff1f788:opam/drom_toml.opam
+efefcfe94894b254753121a1db1c1a29:opam/drom_toml.opam
 # end context for opam/drom_toml.opam
 
 # begin context for scripts/after.sh
@@ -163,16 +143,6 @@ e55d659410b556d7bc60183d8ff1f788:opam/drom_toml.opam
 cda3f8bad69d9c6e8cbeab1c720d739a:scripts/static-build.sh
 # end context for scripts/static-build.sh
 
-# begin context for scripts\after.sh
-# file scripts\after.sh
-cb2282903fb6ae1ac71fb2fbbcccffbd:scripts\after.sh
-# end context for scripts\after.sh
-
-# begin context for scripts\before.sh
-# file scripts\before.sh
-97c9b1f22a04f7c0b42477aee6f4393e:scripts\before.sh
-# end context for scripts\before.sh
-
 # begin context for sphinx/_static/css/fixes.css
 # file sphinx/_static/css/fixes.css
 68b329da9893e34099c7d8ad5cb9c940:sphinx/_static/css/fixes.css
@@ -200,24 +170,9 @@ a44c87f3a364dd95f55427fe40b2c5d1:sphinx/about.rst
 
 # begin context for sphinx/license.rst
 # file sphinx/license.rst
-8f504f01aea592543c0a662b81169d91:sphinx/license.rst
+a02d5245d1626431fbfc4bdb99a413cf:sphinx/license.rst
 # end context for sphinx/license.rst
 
-# begin context for sphinx\conf.py
-# file sphinx\conf.py
-67496ee935ab27fdabb4544f4f81eeb6:sphinx\conf.py
-# end context for sphinx\conf.py
-
-# begin context for sphinx\license.rst
-# file sphinx\license.rst
-8f504f01aea592543c0a662b81169d91:sphinx\license.rst
-# end context for sphinx\license.rst
-
-# begin context for sphinx\under_static\css\fixes.css
-# file sphinx\under_static\css\fixes.css
-20bbe7a5dbb3c3278a1511d960616fe5:sphinx\under_static\css\fixes.css
-# end context for sphinx\under_static\css\fixes.css
-
 # begin context for src/drom/dune
 # file src/drom/dune
 68aec4169671c0163b98bb38205d2e4d:src/drom/dune
@@ -243,14 +198,9 @@ a44c87f3a364dd95f55427fe40b2c5d1:sphinx/about.rst
 bb6803d414fd5a5479ed6381914604de:src/drom/package.toml
 # end context for src/drom/package.toml
 
-# begin context for src/drom\index.mld
-# file src/drom\index.mld
-2818d15f527a37c2cfafe85ef89f675b:src/drom\index.mld
-# end context for src/drom\index.mld
-
 # begin context for src/drom_lib/dune
 # file src/drom_lib/dune
-103b365e9f24dbbae02b6be22b3efd0a:src/drom_lib/dune
+42d9d18b7b63adfd834f4de13c4fd892:src/drom_lib/dune
 # end context for src/drom_lib/dune
 
 # begin context for src/drom_lib/index.mld
@@ -265,24 +215,9 @@ c4d6597dc5b0966758c213bfffb9d594:src/drom_lib/package.toml
 
 # begin context for src/drom_lib/version.mlt
 # file src/drom_lib/version.mlt
-a3e5d8a00664ceaa6addf376bedf6de1:src/drom_lib/version.mlt
+ad0048099dd6df9d2c73875be2ba28e7:src/drom_lib/version.mlt
 # end context for src/drom_lib/version.mlt
 
-# begin context for src/drom_lib\dune
-# file src/drom_lib\dune
-8c189e7a8bac651b008889b1dd38a8fe:src/drom_lib\dune
-# end context for src/drom_lib\dune
-
-# begin context for src/drom_lib\index.mld
-# file src/drom_lib\index.mld
-3e03ec5e98f99c1d5b09dd366177ad13:src/drom_lib\index.mld
-# end context for src/drom_lib\index.mld
-
-# begin context for src/drom_lib\version.mlt
-# file src/drom_lib\version.mlt
-a3e5d8a00664ceaa6addf376bedf6de1:src/drom_lib\version.mlt
-# end context for src/drom_lib\version.mlt
-
 # begin context for src/toml.7.1.0/dune
 # file src/toml.7.1.0/dune
 0841a2e47118b9fcd9b900f84ff66c34:src/toml.7.1.0/dune
@@ -305,19 +240,9 @@ d1b05207fce876a1b44a8b268bcaf226:src/toml.7.1.0/index.mld
 
 # begin context for src/toml.7.1.0/version.mlt
 # file src/toml.7.1.0/version.mlt
-a3e5d8a00664ceaa6addf376bedf6de1:src/toml.7.1.0/version.mlt
+ad0048099dd6df9d2c73875be2ba28e7:src/toml.7.1.0/version.mlt
 # end context for src/toml.7.1.0/version.mlt
 
-# begin context for src/toml.7.1.0\index.mld
-# file src/toml.7.1.0\index.mld
-d1b05207fce876a1b44a8b268bcaf226:src/toml.7.1.0\index.mld
-# end context for src/toml.7.1.0\index.mld
-
-# begin context for src/toml.7.1.0\version.mlt
-# file src/toml.7.1.0\version.mlt
-a3e5d8a00664ceaa6addf376bedf6de1:src/toml.7.1.0\version.mlt
-# end context for src/toml.7.1.0\version.mlt
-
 # begin context for test/expect-tests/dune
 # file test/expect-tests/dune
 d7e2675a767e30edf28d061c94f0ec62:test/expect-tests/dune
@@ -387,13 +312,3 @@ ee63957b3b77455a12e6c269a5032c3f:test/output-tests/test2.expected
 # file test/output-tests/test2.ml
 e8eaab7626ef0aace5e570fffe81f869:test/output-tests/test2.ml
 # end context for test/output-tests/test2.ml
-
-# begin context for test\inline-tests\test.ml
-# file test\inline-tests\test.ml
-37b8bc6035cda6302a80178c61f9626e:test\inline-tests\test.ml
-# end context for test\inline-tests\test.ml
-
-# begin context for test\output-tests\test1.expected
-# file test\output-tests\test1.expected
-dc8d6157230e9ef8e965865f990fbc49:test\output-tests\test1.expected
-# end context for test\output-tests\test1.expected

.github/workflows/workflow.yml

@@ -25,10 +25,14 @@ jobs:
 
         include:
           - os: ubuntu-latest
-            ocaml-compiler: 4.08.0
+            ocaml-compiler: 4.14.0
             skip_test: true
 
 
+# we need permissions to deploy docs
+    permissions:
+      contents: write
+
     runs-on: ${{ matrix.os }}
 
     # use fields.github-workflow-env to add something here
@@ -38,20 +42,19 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Retrieve opam cache
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         id: cache-opam
         with:
           path: ~/.opam
-          key: v2-${{ runner.os }}-drom-${{ matrix.ocaml-compiler }}-${{ hashFiles('opam/*.opam') }}
+          key: v4-${{ runner.os }}-drom-${{ matrix.ocaml-compiler }}-${{ hashFiles('opam/*.opam') }}
 #          restore-keys: |
-#            v2-${{ runner.os }}-opam-${{ matrix.ocaml-compiler }}-
+#            v4-${{ runner.os }}-opam-${{ matrix.ocaml-compiler }}-
 
       - name: Use OCaml ${{ matrix.ocaml-compiler }}
-        uses: avsm/setup-ocaml@v2
+        uses: avsm/setup-ocaml@v3
         with:
           ocaml-compiler: ${{ matrix.ocaml-compiler }}
           opam-pin: false
-          opam-depext: false
 
       - name: Set git user
         run: |
@@ -62,14 +65,7 @@ jobs:
 
       - run: opam pin add . -y --no-action
 
-      - run: opam depext -y drom drom_lib drom_toml
-#        if: steps.cache-opam.outputs.cache-hit != 'true'
-
-      - run: opam install -y opam/*.opam --deps-only --with-test
-#        if: steps.cache-opam.outputs.cache-hit != 'true'
-
-#     - run: opam upgrade --fixup
-#        if: steps.cache-opam.outputs.cache-hit == 'true'
+      - run: opam install -y ./opam/*.opam --deps-only --with-test
 
       # Use fields.build-scripts to add more scripts to convert here
       - run: dos2unix scripts/*.sh 

.gitignore

@@ -2,7 +2,6 @@
 *~
 _build
 .merlin
-.vscode
 /_drom
 /_opam
 /_build

LICENSE.md

@@ -1,4 +1,4 @@
-Copyright (c) 2024 OCamlPro SAS
+Copyright (c) 2025 OCamlPro SAS
 
 This software is distributed under the terms of the
 GNU Lesser General Public License (LGPL) version 2.1 (included below).

drom.toml

@@ -1,8 +1,9 @@
 [project]
 create-project = false
-drom-version = "0.1"
-share-repo = "https://github.com/OCamlPro/drom-share"
-share-version = "0.9.0"
+drom-version = "0.9.3"
+#share-repo = "https://github.com/OCamlPro/drom-share"
+share-repo = "/home/lefessan/GIT/ocp/github/drom-share"
+share-version = "0.9.3"
 
 [project]
 authors = ["Fabrice Le Fessant <fabrice.le_fessant@ocamlpro.com>", "Léo Andrès <leo.andres@ocamlpro.com>"]
@@ -11,11 +12,11 @@ copyright = "OCamlPro SAS"
 edition = "4.14.1"
 github-organization = "ocamlpro"
 license = "LGPL2"
-min-edition = "4.08.0"
+min-edition = "4.14.0"
 name = "drom"
 skeleton = "program"
 synopsis = "The drom tool is a wrapper over opam/dune in an attempt to provide a cargo-like user experience"
-version = "0.9.2"
+version = "0.9.3"
 
 # keys that you could also define:
 # odoc-target = "...odoc-target..."

dune-project

@@ -3,9 +3,8 @@
 
 (cram enable)
 (name drom)
-(allow_approximate_merlin)
 (generate_opam_files false)
-(version 0.9.2)
+(version 0.9.3)
 (formatting (enabled_for ocaml reason))
 (using menhir 2.0)
 
@@ -19,8 +18,8 @@
   )
 
  (depends
-   (ocaml (>= 4.08.0))
-   (drom_lib (= version))
+   (ocaml (>= 4.14.0))
+   (drom_lib (= :version))
    ppx_inline_test
    ppx_expect
    odoc
@@ -39,7 +38,7 @@
   )
 
  (depends
-   (ocaml (>= 4.08.0))
+   (ocaml (>= 4.14.0))
    (ppx_protocol_conv ( >= 5.2.1 ))
    (otoml ( >= 1.0.4 ))
    (omd ( >= 2.0 ))
@@ -49,9 +48,9 @@
    (ez_opam_file (and (>= 0.1.0) (< 1.0.0)))
    (ez_file (and (>= 0.3.0) (< 1.0.0)))
    (ez_cmdliner (and (>= 0.2.0) (< 1.0.0)))
-   (drom_toml (= version))
-   (directories ( >= 0.2 ))
-   bos
+   (drom_toml (= :version))
+   (directories ( >= 0.6 ))
+   (bos ( >= 0.2.1 ))
    ppx_inline_test
    ppx_expect
    odoc
@@ -70,7 +69,7 @@
   )
 
  (depends
-   (ocaml (>= 4.08.0))
+   (ocaml (>= 4.14.0))
    (menhirLib ( > 2019 ))
    (ISO8601 ( >= 0.2 ))
    (menhir ( > 2019 ))
@@ -82,4 +81,7 @@
   )
  )
 
+; the next line is deprecated for recent versions of dune, but
+; can still be added into the dune-project-trailer field
+;(allow_approximate_merlin)
 

opam/drom.opam

@@ -2,7 +2,7 @@
 # Do not modify, or add to the `skip` field of `drom.toml`.
 opam-version: "2.0"
 name: "drom"
-version: "0.9.2"
+version: "0.9.3"
 license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception"
 synopsis:
   "The drom tool is a wrapper over opam/dune in an attempt to provide a cargo-like user experience"
@@ -45,7 +45,7 @@ install: [
   ["sh" "-c" "./scripts/before.sh install '%{name}%'"]
 ]
 depends: [
-  "ocaml" {>= "4.08.0"}
+  "ocaml" {>= "4.14.0"}
   "dune" {>= "2.8"}
   "drom_lib" {= version}
   "ppx_inline_test" {with-test}