diff --git a/CHANGELOG.md b/CHANGELOG.md index 979401ba..768106f1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,10 @@ # Changelog All notable changes to this project will be documented in this file. +## ??? - Unreleased +- Reduce number of hash collisiions from pointer hashing +- Add optional parameter to `marshal` to skip cycle checking code. + ## 1.24.1 - 2022-08-24 - Fix FFI bug on Linux/Posix - Improve parse error messages for bad delimiters. diff --git a/Makefile b/Makefile index e59691f2..45499772 100644 --- a/Makefile +++ b/Makefile @@ -168,9 +168,9 @@ build/c/janet.c: build/janet_boot src/boot/boot.janet ######################## ifeq ($(UNAME), Darwin) -SONAME=libjanet.1.24.dylib +SONAME=libjanet.1.25.dylib else -SONAME=libjanet.so.1.24 +SONAME=libjanet.so.1.25 endif build/c/shell.c: src/mainclient/shell.c diff --git a/meson.build b/meson.build index 0470021c..1567f3d9 100644 --- a/meson.build +++ b/meson.build @@ -20,7 +20,7 @@ project('janet', 'c', default_options : ['c_std=c99', 'build.c_std=c99', 'b_lundef=false', 'default_library=both'], - version : '1.24.1') + version : '1.25.0') # Global settings janet_path = join_paths(get_option('prefix'), get_option('libdir'), 'janet') diff --git a/src/conf/janetconf.h b/src/conf/janetconf.h index 7839f836..2a959a69 100644 --- a/src/conf/janetconf.h +++ b/src/conf/janetconf.h @@ -4,10 +4,10 @@ #define JANETCONF_H #define JANET_VERSION_MAJOR 1 -#define JANET_VERSION_MINOR 24 -#define JANET_VERSION_PATCH 1 -#define JANET_VERSION_EXTRA "" -#define JANET_VERSION "1.24.1" +#define JANET_VERSION_MINOR 25 +#define JANET_VERSION_PATCH 0 +#define JANET_VERSION_EXTRA "-dev" +#define JANET_VERSION "1.25.0-dev" /* #define JANET_BUILD "local" */