Skip to content

Commit

Permalink
downgrade js_of_ocaml to version 4 for Windows
Browse files Browse the repository at this point in the history
  • Loading branch information
lefessan committed Apr 12, 2023
1 parent 389bd53 commit 3a26f01
Show file tree
Hide file tree
Showing 17 changed files with 332 additions and 53 deletions.
16 changes: 8 additions & 8 deletions .drom
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ version:0.9.0

# hash of toml configuration files
# used for generation of all files
297b83c58854bc74c95224ad4d59312a:.
2286c35e1ea29c82696bcde84496f156:.
# end context for .

# begin context for .github/workflows/workflow.yml
Expand Down Expand Up @@ -50,17 +50,17 @@ edfecf246f5178999b757bb30a11aaba:drom.toml

# begin context for dune-project
# file dune-project
22a083c5f6206cf0e56c1889aa306ee0:dune-project
8025269a065c6464908d6c6a5986c3fe:dune-project
# end context for dune-project

# begin context for opam/interop-js-stubs.opam
# file opam/interop-js-stubs.opam
3704b46ac5cd4793fd61714f3bd6cf10:opam/interop-js-stubs.opam
7d19f8e0a7f83c11dabf928ee75c0c87:opam/interop-js-stubs.opam
# end context for opam/interop-js-stubs.opam

# begin context for opam/node-js-stubs.opam
# file opam/node-js-stubs.opam
dd7dde4e293ba0e8c85514b5d478e1c8:opam/node-js-stubs.opam
12385b6240dcaa9a1f4542350426a732:opam/node-js-stubs.opam
# end context for opam/node-js-stubs.opam

# begin context for opam/package-json.opam
Expand All @@ -70,17 +70,17 @@ dcf0ebaa8b12787df9efcaa0ce8cbbe5:opam/package-json.opam

# begin context for opam/polka-js-stubs.opam
# file opam/polka-js-stubs.opam
0d5af23c7fa13408fbcb4c4ebf6998b5:opam/polka-js-stubs.opam
f9e64ee80e101f435248cab1582af699:opam/polka-js-stubs.opam
# end context for opam/polka-js-stubs.opam

# begin context for opam/superbol-vscode-extension.opam
# file opam/superbol-vscode-extension.opam
49da3d109b0d2a783198d2754ca3d016:opam/superbol-vscode-extension.opam
c32800ad616a3e394ed271d057f6a2aa:opam/superbol-vscode-extension.opam
# end context for opam/superbol-vscode-extension.opam

# begin context for opam/vscode-js-stubs.opam
# file opam/vscode-js-stubs.opam
b439593de026c1aff0dad24461c827b3:opam/vscode-js-stubs.opam
5cadb3d65abcf1766ed39b491e6450ad:opam/vscode-js-stubs.opam
# end context for opam/vscode-js-stubs.opam

# begin context for opam/vscode-json.opam
Expand All @@ -90,7 +90,7 @@ b439593de026c1aff0dad24461c827b3:opam/vscode-js-stubs.opam

# begin context for opam/vscode-languageclient-js-stubs.opam
# file opam/vscode-languageclient-js-stubs.opam
b2c08001aca6fbb3ce109c87fc2896ec:opam/vscode-languageclient-js-stubs.opam
9de01bf6be8ea7266e1d2bc0ed5947a3:opam/vscode-languageclient-js-stubs.opam
# end context for opam/vscode-languageclient-js-stubs.opam

# begin context for opam/vscode-package-json.opam
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ jobs:
- run: opam pin add . -y --no-action

- run: opam depext -y superbol-vscode-extension polka-js-stubs interop-js-stubs node-js-stubs vscode-js-stubs vscode-languageclient-js-stubs vscode-package-json vscode-json
# if: steps.cache-opam.outputs.cache-hit != 'true'
if: matrix.os != 'windows-latest'

- run: opam install -y opam/*.opam --deps-only --with-test
# if: steps.cache-opam.outputs.cache-hit != 'true'
Expand Down
24 changes: 12 additions & 12 deletions dune-project
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@
(polka-js-stubs (= version))
(node-js-stubs (= version))
(jsonoo (and (>= 0.2.1) (< 1.0.0)))
(js_of_ocaml (and (>= 5.0.0) (< 6.0.0)))
(js_of_ocaml ( >= 4 ))
(gen_js_api (and (>= 1.1.1) (< 2.0.0)))
(js_of_ocaml-ppx (and (>= 5.0.0) (< 6.0.0)))
(js_of_ocaml-ppx ( >= 4 ))
ppx_inline_test
ppx_expect
odoc
Expand All @@ -39,10 +39,10 @@
(promise_jsoo (and (>= 0.3.1) (< 1.0.0)))
(node-js-stubs (= version))
(jsonoo (and (>= 0.2.1) (< 1.0.0)))
(js_of_ocaml (and (>= 5.0.0) (< 6.0.0)))
(js_of_ocaml ( >= 4 ))
(interop-js-stubs (= version))
(gen_js_api (and (>= 1.1.1) (< 2.0.0)))
(js_of_ocaml-ppx (and (>= 5.0.0) (< 6.0.0)))
(js_of_ocaml-ppx ( >= 4 ))
ppx_inline_test
ppx_expect
odoc
Expand All @@ -56,9 +56,9 @@
(description "This is the description\nof the superbol-vscode-extension OCaml project\n")
(depends
(ocaml (>= 4.13.0))
(js_of_ocaml (and (>= 5.0.0) (< 6.0.0)))
(js_of_ocaml ( >= 4 ))
(gen_js_api (and (>= 1.1.1) (< 2.0.0)))
(js_of_ocaml-ppx (and (>= 5.0.0) (< 6.0.0)))
(js_of_ocaml-ppx ( >= 4 ))
ppx_inline_test
ppx_expect
odoc
Expand All @@ -74,10 +74,10 @@
(ocaml (>= 4.13.0))
(promise_jsoo (and (>= 0.3.1) (< 1.0.0)))
(jsonoo (and (>= 0.2.1) (< 1.0.0)))
(js_of_ocaml (and (>= 5.0.0) (< 6.0.0)))
(js_of_ocaml ( >= 4 ))
(interop-js-stubs (= version))
(gen_js_api (and (>= 1.1.1) (< 2.0.0)))
(js_of_ocaml-ppx (and (>= 5.0.0) (< 6.0.0)))
(js_of_ocaml-ppx ( >= 4 ))
ppx_inline_test
ppx_expect
odoc
Expand All @@ -93,10 +93,10 @@
(ocaml (>= 4.13.0))
(promise_jsoo (and (>= 0.3.1) (< 1.0.0)))
(jsonoo (and (>= 0.2.1) (< 1.0.0)))
(js_of_ocaml (and (>= 5.0.0) (< 6.0.0)))
(js_of_ocaml ( >= 4 ))
(interop-js-stubs (= version))
(gen_js_api (and (>= 1.1.1) (< 2.0.0)))
(js_of_ocaml-ppx (and (>= 5.0.0) (< 6.0.0)))
(js_of_ocaml-ppx ( >= 4 ))
ppx_inline_test
ppx_expect
odoc
Expand All @@ -113,10 +113,10 @@
(vscode-js-stubs (= version))
(promise_jsoo (and (>= 0.3.1) (< 1.0.0)))
(jsonoo (and (>= 0.2.1) (< 1.0.0)))
(js_of_ocaml (and (>= 5.0.0) (< 6.0.0)))
(js_of_ocaml ( >= 4 ))
(interop-js-stubs (= version))
(gen_js_api (and (>= 1.1.1) (< 2.0.0)))
(js_of_ocaml-ppx (and (>= 5.0.0) (< 6.0.0)))
(js_of_ocaml-ppx ( >= 4 ))
ppx_inline_test
ppx_expect
odoc
Expand Down
4 changes: 2 additions & 2 deletions opam/interop-js-stubs.opam
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@ install: [
depends: [
"ocaml" {>= "4.13.0"}
"dune" {>= "2.7.0"}
"js_of_ocaml" {>= "5.0.0" & < "6.0.0"}
"js_of_ocaml" {>= "4"}
"gen_js_api" {>= "1.1.1" & < "2.0.0"}
"js_of_ocaml-ppx" {>= "5.0.0" & < "6.0.0"}
"js_of_ocaml-ppx" {>= "4"}
"ppx_inline_test" {with-test}
"ppx_expect" {with-test}
"odoc" {with-doc}
Expand Down
4 changes: 2 additions & 2 deletions opam/node-js-stubs.opam
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,10 @@ depends: [
"dune" {>= "2.7.0"}
"promise_jsoo" {>= "0.3.1" & < "1.0.0"}
"jsonoo" {>= "0.2.1" & < "1.0.0"}
"js_of_ocaml" {>= "5.0.0" & < "6.0.0"}
"js_of_ocaml" {>= "4"}
"interop-js-stubs" {= version}
"gen_js_api" {>= "1.1.1" & < "2.0.0"}
"js_of_ocaml-ppx" {>= "5.0.0" & < "6.0.0"}
"js_of_ocaml-ppx" {>= "4"}
"ppx_inline_test" {with-test}
"ppx_expect" {with-test}
"odoc" {with-doc}
Expand Down
4 changes: 2 additions & 2 deletions opam/polka-js-stubs.opam
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,10 @@ depends: [
"promise_jsoo" {>= "0.3.1" & < "1.0.0"}
"node-js-stubs" {= version}
"jsonoo" {>= "0.2.1" & < "1.0.0"}
"js_of_ocaml" {>= "5.0.0" & < "6.0.0"}
"js_of_ocaml" {>= "4"}
"interop-js-stubs" {= version}
"gen_js_api" {>= "1.1.1" & < "2.0.0"}
"js_of_ocaml-ppx" {>= "5.0.0" & < "6.0.0"}
"js_of_ocaml-ppx" {>= "4"}
"ppx_inline_test" {with-test}
"ppx_expect" {with-test}
"odoc" {with-doc}
Expand Down
4 changes: 2 additions & 2 deletions opam/superbol-vscode-extension.opam
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,9 @@ depends: [
"polka-js-stubs" {= version}
"node-js-stubs" {= version}
"jsonoo" {>= "0.2.1" & < "1.0.0"}
"js_of_ocaml" {>= "5.0.0" & < "6.0.0"}
"js_of_ocaml" {>= "4"}
"gen_js_api" {>= "1.1.1" & < "2.0.0"}
"js_of_ocaml-ppx" {>= "5.0.0" & < "6.0.0"}
"js_of_ocaml-ppx" {>= "4"}
"ppx_inline_test" {with-test}
"ppx_expect" {with-test}
"odoc" {with-doc}
Expand Down
4 changes: 2 additions & 2 deletions opam/vscode-js-stubs.opam
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,10 @@ depends: [
"dune" {>= "2.7.0"}
"promise_jsoo" {>= "0.3.1" & < "1.0.0"}
"jsonoo" {>= "0.2.1" & < "1.0.0"}
"js_of_ocaml" {>= "5.0.0" & < "6.0.0"}
"js_of_ocaml" {>= "4"}
"interop-js-stubs" {= version}
"gen_js_api" {>= "1.1.1" & < "2.0.0"}
"js_of_ocaml-ppx" {>= "5.0.0" & < "6.0.0"}
"js_of_ocaml-ppx" {>= "4"}
"ppx_inline_test" {with-test}
"ppx_expect" {with-test}
"odoc" {with-doc}
Expand Down
4 changes: 2 additions & 2 deletions opam/vscode-languageclient-js-stubs.opam
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,10 @@ depends: [
"vscode-js-stubs" {= version}
"promise_jsoo" {>= "0.3.1" & < "1.0.0"}
"jsonoo" {>= "0.2.1" & < "1.0.0"}
"js_of_ocaml" {>= "5.0.0" & < "6.0.0"}
"js_of_ocaml" {>= "4"}
"interop-js-stubs" {= version}
"gen_js_api" {>= "1.1.1" & < "2.0.0"}
"js_of_ocaml-ppx" {>= "5.0.0" & < "6.0.0"}
"js_of_ocaml-ppx" {>= "4"}
"ppx_inline_test" {with-test}
"ppx_expect" {with-test}
"odoc" {with-doc}
Expand Down
19 changes: 11 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,19 +14,22 @@
"name": "OCamlPro SAS",
"email": "[email protected]"
},
"keywords": [ "cobol", "gnucobol" ],
"keywords": [
"cobol",
"gnucobol"
],
"engines": {
"vscode": "^1.64.0"
},
"categories": [
"Formatters",
"Programming Languages",
"Linters",
"Snippets",
"Other"
"Formatters",
"Programming Languages",
"Linters",
"Snippets",
"Other"
],
"activationEvents": [
"onLanguage:cobol"
"onLanguage:cobol"
],
"contributes": {
"configuration": {
Expand Down Expand Up @@ -64,7 +67,7 @@
"npm-run-all": "4.1.5",
"ovsx": "0.1.0-next.97d460c",
"prettier": "^2.5.1",
"vsce": "2.14.0",
"vsce": "^2.15.0",
"vscode-test": "1.6.1"
}
}
4 changes: 2 additions & 2 deletions src/interop-js-stubs/package.toml
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,11 @@ skip = ["main.ml"]
# base-unix = { libname = "unix", version = ">=base" }
[dependencies]
gen_js_api = "1.1.1"
js_of_ocaml = "5.0.0"
js_of_ocaml = "4"

# package tools dependencies
[tools]
js_of_ocaml-ppx = "5.0.0"
js_of_ocaml-ppx = "4"

# package fields (depends on package skeleton)
#Examples:
Expand Down
4 changes: 2 additions & 2 deletions src/node-js-stubs/package.toml
Original file line number Diff line number Diff line change
Expand Up @@ -48,13 +48,13 @@ skip = ["main.ml"]
[dependencies]
gen_js_api = "1.1.1"
interop-js-stubs = "version"
js_of_ocaml = "5.0.0"
js_of_ocaml = "4"
jsonoo = "0.2.1"
promise_jsoo = "0.3.1"

# package tools dependencies
[tools]
js_of_ocaml-ppx = "5.0.0"
js_of_ocaml-ppx = "4"

# package fields (depends on package skeleton)
#Examples:
Expand Down
4 changes: 2 additions & 2 deletions src/polka-js-stubs/package.toml
Original file line number Diff line number Diff line change
Expand Up @@ -48,14 +48,14 @@ skip = ["main.ml"]
[dependencies]
gen_js_api = "1.1.1"
interop-js-stubs = "version"
js_of_ocaml = "5.0.0"
js_of_ocaml = "4"
jsonoo = "0.2.1"
node-js-stubs = "version"
promise_jsoo = "0.3.1"

# package tools dependencies
[tools]
js_of_ocaml-ppx = "5.0.0"
js_of_ocaml-ppx = "4"

# package fields (depends on package skeleton)
#Examples:
Expand Down
4 changes: 2 additions & 2 deletions src/superbol-vscode-extension/package.toml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ skip = []
# base-unix = { libname = "unix", version = ">=base" }
[dependencies]
gen_js_api = "1.1.1"
js_of_ocaml = "5.0.0"
js_of_ocaml = "4"
jsonoo = "0.2.1"
node-js-stubs = "version"
polka-js-stubs = "version"
Expand All @@ -57,7 +57,7 @@ vscode-languageclient-js-stubs = "version"

# package tools dependencies
[tools]
js_of_ocaml-ppx = "5.0.0"
js_of_ocaml-ppx = "4"

# package fields (depends on package skeleton)
#Examples:
Expand Down
4 changes: 2 additions & 2 deletions src/vscode-js-stubs/package.toml
Original file line number Diff line number Diff line change
Expand Up @@ -48,13 +48,13 @@ skip = ["main.ml"]
[dependencies]
gen_js_api = "1.1.1"
interop-js-stubs = "version"
js_of_ocaml = "5.0.0"
js_of_ocaml = "4"
jsonoo = "0.2.1"
promise_jsoo = "0.3.1"

# package tools dependencies
[tools]
js_of_ocaml-ppx = "5.0.0"
js_of_ocaml-ppx = "4"

# package fields (depends on package skeleton)
#Examples:
Expand Down
Loading

0 comments on commit 3a26f01

Please sign in to comment.