Skip to content

Commit 7255118

Browse files
committed
Drop deprecated js type specifications.
1 parent 07e8594 commit 7255118

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+10
-673
lines changed

.githooks/pre-commit/versioning

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,3 @@ check () {
1616

1717
check "timmy/lib/src/timmy.ml"
1818
check "timmy/lib/src/versions.ml"
19-
check "timmy-jsoo/lib/src/timmy_jsoo.ml"
20-
check "timmy-jsoo/lib/src/versions.ml"

dune-project

Lines changed: 4 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -40,49 +40,15 @@
4040
:with-test
4141
(>= 1.4.0)))
4242
; Doc
43-
(odoc :with-doc)
44-
; Dev
45-
(cmdliner
46-
(and :dev :with-test))
47-
(opam-file-format
48-
(and :dev :with-test))
49-
(sexplib
50-
(and :dev :with-test))
51-
(stdio
52-
(and :dev :with-test))
53-
(shexp
54-
(and :dev :with-test)))
55-
(depopts js_of_ocaml js_of_ocaml-ppx schematic)
43+
(odoc :with-doc))
44+
(depopts schematic)
5645
(conflicts
5746
(schematic
5847
(or
5948
(< 0.18.2)
6049
(= 0.20.0)
6150
(>= 0.21.0)))))
6251

63-
(package
64-
(name timmy-jsoo)
65-
(synopsis "Js_of_ocaml bindings for Timmy")
66-
(depends
67-
ptime
68-
ppx_here
69-
(alcotest
70-
(and
71-
:with-test
72-
(>= 1.4.0)))
73-
(conf-npm :with-test)
74-
fmt
75-
js_of_ocaml
76-
js_of_ocaml-ppx
77-
(timmy
78-
(= :version)))
79-
(depopts schematic-jsoo)
80-
(conflicts
81-
(schematic-jsoo
82-
(or
83-
(< 0.18.2)
84-
(>= 0.21.0)))))
85-
8652
(package
8753
(name timmy-unix)
8854
(synopsis "Unix clock implementation for Timmy")
@@ -130,7 +96,8 @@
13096
(name timmy-timezones)
13197
(synopsis "Timezone database support for Timmy")
13298
(depends
133-
(timedesc (>= 3.0))
99+
(timedesc
100+
(>= 3.0))
134101
ppx_here
135102
(ppx_deriving
136103
(>= 5.0))
@@ -147,16 +114,3 @@
147114
:with-test
148115
(= :version))))
149116
(depopts js_of_ocaml-lwt))
150-
151-
; Timmy-js won't build on OCaml-CI as schematic is not available.
152-
; (package
153-
; (name timmy-js)
154-
; (synopsis "Javascript binding of Timmy")
155-
; (depends
156-
; (conf-tzdata :with-test)
157-
; (schematic-jsoo
158-
; (and
159-
; (>= 0.18.2)
160-
; (< 0.19.0)))
161-
; (timmy-jsoo
162-
; (= :version))))

opam/timmy-android.opam

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ depends: [
1717
"ppx_deriving-android" {>= "5.0"}
1818
"ptime-android"
1919
]
20-
depopts: ["js_of_ocaml-ppx" "schematic-android"]
20+
depopts: ["schematic-android"]
2121
conflicts: [
2222
"schematic" {< "0.18.2" | = "0.20.0" | >= "0.21.0"}
2323
]

opam/timmy-ios.opam

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ depends: [
1717
"ppx_deriving-ios" {>= "5.0"}
1818
"ptime-ios"
1919
]
20-
depopts: ["js_of_ocaml-ppx" "schematic-ios"]
20+
depopts: ["schematic-ios"]
2121
conflicts: [
2222
"schematic" {< "0.18.2" | = "0.20.0" | >= "0.21.0"}
2323
]

opam/timmy-jsoo-android.opam

Lines changed: 0 additions & 27 deletions
This file was deleted.

opam/timmy-jsoo-ios.opam

Lines changed: 0 additions & 27 deletions
This file was deleted.

opam/timmy-jsoo-macos.opam

Lines changed: 0 additions & 27 deletions
This file was deleted.

opam/timmy-jsoo-windows.opam

Lines changed: 0 additions & 27 deletions
This file was deleted.

opam/timmy-jsoo.opam.extdeps

Lines changed: 0 additions & 72 deletions
This file was deleted.

opam/timmy-macos.opam

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ depends: [
1717
"ppx_deriving-macos" {>= "5.0"}
1818
"ptime-macos"
1919
]
20-
depopts: ["js_of_ocaml-ppx" "schematic-macos"]
20+
depopts: ["schematic-macos"]
2121
conflicts: [
2222
"schematic" {< "0.18.2" | = "0.20.0" | >= "0.21.0"}
2323
]

0 commit comments

Comments
 (0)