Skip to content

Commit

Permalink
Upgrade to OCaml 5.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
SGrondin committed Jun 8, 2023
1 parent ce2e3d8 commit 47a17b2
Show file tree
Hide file tree
Showing 18 changed files with 310 additions and 316 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,11 @@ src/flow_parser
src/prototype
*.strings
*.exe
*.mac
*.mac*
*.linux
*.tar.gz
strings/
strings-backup/
lib/
flow/
test/
Expand Down
52 changes: 24 additions & 28 deletions .ocamlformat
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# "Asemio Style" v1.2
# Last updated for ocamlformat 0.21.0
# "Asemio Style" v1.3
# Last updated for ocamlformat 0.25.1
ocaml-version=5.0.0

# All available options are listed.
# An option is commented out when the value matches the default
Expand All @@ -9,66 +10,61 @@
# - if a default changed, see if we should follow it or not

# assignment-operator = end-line
# break-before-in = fit-or-vertical
break-cases = all
# break-collection-expressions = fit-or-vertical
# break-colon = after
# break-fun-decl = wrap
# break-fun-sig = wrap
break-infix = fit-or-vertical
# break-infix-before-func = false
# break-separators = after
# break-sequences = true
# break-string-literals = auto
# break-struct = force
cases-exp-indent = 2
# cases-matching-exp-indent = normal
disambiguate-non-breaking-match = true
doc-comments = before
# doc-comments-padding = 2
# doc-comments-tag-only = default
# dock-collection-brackets = true
exp-grouping = preserve
# extension-indent = 2
field-space = tight-decl
function-indent = 0
# function-indent-nested = never
if-then-else = keyword-first
# indicate-multiline-delimiters = no
# indent-after-in = 0
indicate-multiline-delimiters = space
indicate-nested-or-patterns = space
# infix-precedence = indent
# leading-nested-match-parens = false
let-and = sparse
# let-binding-indent = 2
# let-binding-spacing = compact
# let-module = compact
line-endings = lf
# line-endings = lf
margin = 106
max-indent = 3
# match-indent = 0
# match-indent-nested = never
max-indent = 2
module-item-spacing = sparse
# nested-match = wrap
parens-ite = true
parens-tuple = multi-line-only
# parens-tuple-patterns = multi-line-only
# parse-docstrings = false
# parse-toplevel-phrases = false
# sequence-blank-line = preserve-one
# sequence-style = terminator
single-case = sparse
# space-around-arrays = true
# space-around-lists = true
# space-around-records = true
# space-around-variants = true
# stritem-extension-indent = 0
type-decl = sparse
# type-decl-indent = 2
# wrap-comments = false
# wrap-fun-args = true


# DEPRECATED

# align-cases = false
align-constructors-decl = true
align-variants-decl = true
# break-before-in = fit-or-vertical
# break-collection-expressions = fit-or-vertical
# break-string-literals = auto
# break-struct = force
disambiguate-non-breaking-match = true
# extension-indent = 2
function-indent = 0
# function-indent-nested = never
# indent-after-in = 0
# let-binding-indent = 2
# match-indent = 0
# match-indent-nested = never
# nested-match = wrap
# parens-tuple-patterns = multi-line-only
# stritem-extension-indent = 0
# type-decl-indent = 2
2 changes: 1 addition & 1 deletion DEVELOPMENT.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ From the root of the repo:
```sh
brew install opam libomp mold

opam switch create . ocaml-variants.4.14.0+options --no-install
opam switch create . ocaml-variants.5.0.0+options --no-install
opam install . --deps-only -t

# Remove old Flow version
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM asemio/mountain-caravan:2.0.1
FROM asemio/mountain-caravan:2.1.0
WORKDIR /app
RUN sudo apk update \
&& sudo apk upgrade \
Expand Down
Loading

0 comments on commit 47a17b2

Please sign in to comment.