Merge pull request #996 from ocsigen/remove-luv

Remove luv
ocsigen · Jul 18, 2023 · f83bcf3 · f83bcf3
2 parents fc8edd6 + 9983986
commit f83bcf3
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 144 deletions.
diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
@@ -93,17 +93,17 @@ jobs:
       - run: opam depext conf-libev --install
         if: ${{ matrix.libev == true }}
 
-      - run: opam install lwt_luv lwt_react lwt --deps-only --with-test
+      - run: opam install lwt_react lwt --deps-only --with-test
 
       - run: opam install lwt_ppx --deps-only --with-test
         if: ${{ matrix.ppx == true }}
 
-      - run: opam exec -- dune build --only-packages lwt_luv,lwt_react,lwt
+      - run: opam exec -- dune build --only-packages lwt_react,lwt
 
       - run: opam exec -- dune build --only-packages lwt_ppx
         if: ${{ matrix.ppx == true }}
 
-      - run: opam exec -- dune runtest --only-packages lwt_luv,lwt_react,lwt
+      - run: opam exec -- dune runtest --only-packages lwt_react,lwt
 
       - run: opam exec -- dune runtest --only-packages lwt_ppx
         if: ${{ matrix.ppx == true }}

diff --git a/esy.json b/esy.json
@@ -5,12 +5,10 @@
     "dependencies": {
       "ocaml": "~4.9.0",
       "@opam/conf-libev": "*",
-      "@opam/bisect_ppx": "*",
-      "@opam/luv": "*"
+      "@opam/bisect_ppx": "*"
     },
     "resolutions": {
-      "@opam/conf-libev": "esy-packages/libev:package.json#0b5eb66",
-      "@opam/luv": "aantron/luv:luv.opam#df02a9ac6e9e9fc6427e7853d260230fcb96bd2a"
+      "@opam/conf-libev": "esy-packages/libev:package.json#0b5eb66"
     }
   }
 }
diff --git a/lwt_luv.opam b/lwt_luv.opam
diff --git a/src/unix/luv/dune b/src/unix/luv/dune
diff --git a/src/unix/luv/lwt_luv.ml b/src/unix/luv/lwt_luv.ml
diff --git a/src/unix/luv/lwt_luv.mli b/src/unix/luv/lwt_luv.mli
diff --git a/test/unix/dune b/test/unix/dune
@@ -1,7 +1,7 @@
 (library
  (name tester)
  (libraries lwt lwttester)
- (modules (:standard \ main luv_main dummy) ))
+ (modules (:standard \ main dummy) ))
 
 (executable
  (name dummy)
@@ -13,21 +13,9 @@
  (libraries lwttester tester)
  (modules main))
 
-(executable
- (name luv_main)
- (libraries lwt lwt_luv lwttester tester)
- (modules luv_main))
-
 (alias
  (name runtest)
  (package lwt)
  (action (run %{exe:main.exe}))
  (deps bytes_io_data %{exe:dummy.exe})
 )
-
-(alias
- (name runtest_libuv)
- (package lwt)
- (action (run %{exe:luv_main.exe}))
- (deps bytes_io_data)
-)
diff --git a/test/unix/luv_main.ml b/test/unix/luv_main.ml