Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

index: bump magic number and update opam pkg #1886

Merged
merged 2 commits into from
Jan 13, 2025
Merged

index: bump magic number and update opam pkg #1886

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6fb68e3
index: bump magic number and update opam pkg
voodoos Jan 13, 2025
9e88322
Changes for 5.4.1
voodoos Jan 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions CHANGES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
merlin 5.4.1
============
Mon Jan 13 10:55:42 CET 2025

+ ocaml-index
- Bump magic number after index file format change (#1886)

merlin 5.4
==========
Fri Jan 10 17:55:42 CET 2025
Expand Down
5 changes: 2 additions & 3 deletions ocaml-index.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
# This file is generated by dune, edit dune-project instead
opam-version: "2.0"
synopsis: "A tool that indexes value usages from cmt files"
description:
Expand All @@ -10,8 +9,8 @@ homepage: "https://github.com/ocaml/merlin/ocaml-index"
bug-reports: "https://github.com/ocaml/merlin/issues"
depends: [
"dune" {>= "3.0.0"}
"ocaml" {>= "5.2"}
"merlin-lib" {>= "5.1-502"}
"ocaml" {>= "5.3"}
"merlin-lib" {= version}
"odoc" {with-doc}
]
build: [
Expand Down
2 changes: 1 addition & 1 deletion src/ocaml/utils/config.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ and ast_impl_magic_number = "Caml1999M035"
and ast_intf_magic_number = "Caml1999N035"
and cmxs_magic_number = "Caml1999D035"
and cmt_magic_number = "Caml1999T035"
and index_magic_number = "Merl2023I002"
and index_magic_number = "Merl2023I003"

let interface_suffix = ref ".mli"
let flat_float_array = true
Expand Down
Loading