Skip to content

Upgrade Core and Blaze #918

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

Merged
jviotti merged 2 commits into from
Jun 8, 2026
Merged

Upgrade Core and Blaze #918

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
edd19a4
Upgrade Core and Blaze
jviotti Jun 8, 2026
e8debc0
Fix
jviotti Jun 8, 2026
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
4 changes: 2 additions & 2 deletions DEPENDENCIES
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
vendorpull https://github.com/sourcemeta/vendorpull 1dcbac42809cf87cb5b045106b863e17ad84ba02
core https://github.com/sourcemeta/core e586f557af367c74d08d2818bc4bd0d07c8b20bc
blaze https://github.com/sourcemeta/blaze bc1f434acafd38803f58a941a756a6f788e556e2
core https://github.com/sourcemeta/core 9a8c6370c53b4b3b24f4ba0caa2d897a5094ff4e
blaze https://github.com/sourcemeta/blaze 4c311d45803eaeeb17cbd49af4fffdb5f224d180
bootstrap https://github.com/twbs/bootstrap 1a6fdfae6be09b09eaced8f0e442ca6f7680a61e
3 changes: 3 additions & 0 deletions cmake/FindBlaze.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ if(NOT Blaze_FOUND)

set(BLAZE_TEST OFF CACHE BOOL "disable")
set(BLAZE_CONFIGURATION OFF CACHE BOOL "disable")
set(BLAZE_CODEGEN OFF CACHE BOOL "disable")
set(BLAZE_DOCUMENTATION OFF CACHE BOOL "disable")
set(BLAZE_EDITOR OFF CACHE BOOL "disable")
set(BLAZE_CONTRIB OFF CACHE BOOL "disable")
add_subdirectory("${PROJECT_SOURCE_DIR}/vendor/blaze")
include(Sourcemeta)
Expand Down
13 changes: 9 additions & 4 deletions cmake/FindCore.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,18 @@ if(NOT Core_FOUND)
set(SOURCEMETA_CORE_INSTALL OFF CACHE BOOL "disable installation")
endif()

set(SOURCEMETA_CORE_UUID OFF CACHE BOOL "disable")
set(SOURCEMETA_CORE_LANG_PROCESS OFF CACHE BOOL "disable")
set(SOURCEMETA_CORE_LANG_PARALLEL OFF CACHE BOOL "disable")
set(SOURCEMETA_CORE_LANG_ERROR OFF CACHE BOOL "disable")
set(SOURCEMETA_CORE_LANG_STACKTRACE OFF CACHE BOOL "disable")
set(SOURCEMETA_CORE_GZIP OFF CACHE BOOL "disable")
set(SOURCEMETA_CORE_MD5 OFF CACHE BOOL "disable")
set(SOURCEMETA_CORE_JSONL OFF CACHE BOOL "disable JSONL support")
set(SOURCEMETA_CORE_JSONRPC OFF CACHE BOOL "disable")
set(SOURCEMETA_CORE_MCP OFF CACHE BOOL "disable")
set(SOURCEMETA_CORE_HTTP OFF CACHE BOOL "disable")
set(SOURCEMETA_CORE_SEMVER OFF CACHE BOOL "disable")
set(SOURCEMETA_CORE_MARKDOWN OFF CACHE BOOL "disable")
set(SOURCEMETA_CORE_YAML ON CACHE BOOL "needed by Blaze")
set(SOURCEMETA_CORE_EXTENSION_OPTIONS OFF CACHE BOOL "disable")
set(SOURCEMETA_CORE_EXTENSION_BUILD OFF CACHE BOOL "disable")
set(SOURCEMETA_CORE_CONTRIB_GOOGLETEST ${JSONBINPACK_TESTS} CACHE BOOL "GoogleTest")
set(SOURCEMETA_CORE_CONTRIB_GOOGLEBENCHMARK OFF CACHE BOOL "GoogleBenchmark")
add_subdirectory("${PROJECT_SOURCE_DIR}/vendor/core")
Expand Down
2 changes: 1 addition & 1 deletion config.cmake.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ if(NOT JSONBINPACK_COMPONENTS)
endif()

include(CMakeFindDependencyMacro)
find_dependency(Core COMPONENTS numeric regex uri json jsonpointer io)
find_dependency(Core COMPONENTS json uri jsonpointer numeric regex io)
find_dependency(Blaze COMPONENTS foundation bundle alterschema)

foreach(component ${JSONBINPACK_COMPONENTS})
Expand Down
2 changes: 1 addition & 1 deletion src/compiler/mapper/enum_8_bit.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ class Enum8Bit final : public sourcemeta::blaze::SchemaTransformRule {
const sourcemeta::blaze::SchemaFrame &,
const sourcemeta::blaze::SchemaFrame::Location &location,
const sourcemeta::blaze::SchemaWalker &,
const sourcemeta::blaze::SchemaResolver &) const
const sourcemeta::blaze::SchemaResolver &, const bool) const
-> sourcemeta::blaze::SchemaTransformRule::Result override {
return location.dialect == "https://json-schema.org/draft/2020-12/schema" &&
vocabularies.contains(sourcemeta::blaze::Vocabularies::Known::
Expand Down
2 changes: 1 addition & 1 deletion src/compiler/mapper/enum_8_bit_top_level.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ class Enum8BitTopLevel final : public sourcemeta::blaze::SchemaTransformRule {
const sourcemeta::blaze::SchemaFrame &,
const sourcemeta::blaze::SchemaFrame::Location &location,
const sourcemeta::blaze::SchemaWalker &,
const sourcemeta::blaze::SchemaResolver &) const
const sourcemeta::blaze::SchemaResolver &, const bool) const
-> sourcemeta::blaze::SchemaTransformRule::Result override {
return location.dialect == "https://json-schema.org/draft/2020-12/schema" &&
vocabularies.contains(sourcemeta::blaze::Vocabularies::Known::
Expand Down
2 changes: 1 addition & 1 deletion src/compiler/mapper/enum_arbitrary.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ class EnumArbitrary final : public sourcemeta::blaze::SchemaTransformRule {
const sourcemeta::blaze::SchemaFrame &,
const sourcemeta::blaze::SchemaFrame::Location &location,
const sourcemeta::blaze::SchemaWalker &,
const sourcemeta::blaze::SchemaResolver &) const
const sourcemeta::blaze::SchemaResolver &, const bool) const
-> sourcemeta::blaze::SchemaTransformRule::Result override {
return location.dialect == "https://json-schema.org/draft/2020-12/schema" &&
vocabularies.contains(sourcemeta::blaze::Vocabularies::Known::
Expand Down
2 changes: 1 addition & 1 deletion src/compiler/mapper/enum_singleton.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ class EnumSingleton final : public sourcemeta::blaze::SchemaTransformRule {
const sourcemeta::blaze::SchemaFrame &,
const sourcemeta::blaze::SchemaFrame::Location &location,
const sourcemeta::blaze::SchemaWalker &,
const sourcemeta::blaze::SchemaResolver &) const
const sourcemeta::blaze::SchemaResolver &, const bool) const
-> sourcemeta::blaze::SchemaTransformRule::Result override {
return location.dialect == "https://json-schema.org/draft/2020-12/schema" &&
vocabularies.contains(sourcemeta::blaze::Vocabularies::Known::
Expand Down
2 changes: 1 addition & 1 deletion src/compiler/mapper/integer_bounded_8_bit.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ class IntegerBounded8Bit final : public sourcemeta::blaze::SchemaTransformRule {
const sourcemeta::blaze::SchemaFrame &,
const sourcemeta::blaze::SchemaFrame::Location &location,
const sourcemeta::blaze::SchemaWalker &,
const sourcemeta::blaze::SchemaResolver &) const
const sourcemeta::blaze::SchemaResolver &, const bool) const
-> sourcemeta::blaze::SchemaTransformRule::Result override {
return location.dialect == "https://json-schema.org/draft/2020-12/schema" &&
vocabularies.contains(sourcemeta::blaze::Vocabularies::Known::
Expand Down
2 changes: 1 addition & 1 deletion src/compiler/mapper/integer_bounded_greater_than_8_bit.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ class IntegerBoundedGreaterThan8Bit final
const sourcemeta::blaze::SchemaFrame &,
const sourcemeta::blaze::SchemaFrame::Location &location,
const sourcemeta::blaze::SchemaWalker &,
const sourcemeta::blaze::SchemaResolver &) const
const sourcemeta::blaze::SchemaResolver &, const bool) const
-> sourcemeta::blaze::SchemaTransformRule::Result override {
return location.dialect == "https://json-schema.org/draft/2020-12/schema" &&
vocabularies.contains(sourcemeta::blaze::Vocabularies::Known::
Expand Down
2 changes: 1 addition & 1 deletion src/compiler/mapper/integer_bounded_multiplier_8_bit.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ class IntegerBoundedMultiplier8Bit final
const sourcemeta::blaze::SchemaFrame &,
const sourcemeta::blaze::SchemaFrame::Location &location,
const sourcemeta::blaze::SchemaWalker &,
const sourcemeta::blaze::SchemaResolver &) const
const sourcemeta::blaze::SchemaResolver &, const bool) const
-> sourcemeta::blaze::SchemaTransformRule::Result override {
if (location.dialect != "https://json-schema.org/draft/2020-12/schema" ||
!vocabularies.contains(sourcemeta::blaze::Vocabularies::Known::
Expand Down
2 changes: 1 addition & 1 deletion src/compiler/mapper/integer_bounded_multiplier_greater_than_8_bit.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ class IntegerBoundedMultiplierGreaterThan8Bit final
const sourcemeta::blaze::SchemaFrame &,
const sourcemeta::blaze::SchemaFrame::Location &location,
const sourcemeta::blaze::SchemaWalker &,
const sourcemeta::blaze::SchemaResolver &) const
const sourcemeta::blaze::SchemaResolver &, const bool) const
-> sourcemeta::blaze::SchemaTransformRule::Result override {
if (location.dialect != "https://json-schema.org/draft/2020-12/schema" ||
!vocabularies.contains(sourcemeta::blaze::Vocabularies::Known::
Expand Down
2 changes: 1 addition & 1 deletion src/compiler/mapper/integer_lower_bound.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ class IntegerLowerBound final : public sourcemeta::blaze::SchemaTransformRule {
const sourcemeta::blaze::SchemaFrame &,
const sourcemeta::blaze::SchemaFrame::Location &location,
const sourcemeta::blaze::SchemaWalker &,
const sourcemeta::blaze::SchemaResolver &) const
const sourcemeta::blaze::SchemaResolver &, const bool) const
-> sourcemeta::blaze::SchemaTransformRule::Result override {
return location.dialect == "https://json-schema.org/draft/2020-12/schema" &&
vocabularies.contains(sourcemeta::blaze::Vocabularies::Known::
Expand Down
2 changes: 1 addition & 1 deletion src/compiler/mapper/integer_lower_bound_multiplier.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ class IntegerLowerBoundMultiplier final
const sourcemeta::blaze::SchemaFrame &,
const sourcemeta::blaze::SchemaFrame::Location &location,
const sourcemeta::blaze::SchemaWalker &,
const sourcemeta::blaze::SchemaResolver &) const
const sourcemeta::blaze::SchemaResolver &, const bool) const
-> sourcemeta::blaze::SchemaTransformRule::Result override {
return location.dialect == "https://json-schema.org/draft/2020-12/schema" &&
vocabularies.contains(sourcemeta::blaze::Vocabularies::Known::
Expand Down
2 changes: 1 addition & 1 deletion src/compiler/mapper/integer_unbound.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ class IntegerUnbound final : public sourcemeta::blaze::SchemaTransformRule {
const sourcemeta::blaze::SchemaFrame &,
const sourcemeta::blaze::SchemaFrame::Location &location,
const sourcemeta::blaze::SchemaWalker &,
const sourcemeta::blaze::SchemaResolver &) const
const sourcemeta::blaze::SchemaResolver &, const bool) const
-> sourcemeta::blaze::SchemaTransformRule::Result override {
return location.dialect == "https://json-schema.org/draft/2020-12/schema" &&
vocabularies.contains(sourcemeta::blaze::Vocabularies::Known::
Expand Down
2 changes: 1 addition & 1 deletion src/compiler/mapper/integer_unbound_multiplier.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ class IntegerUnboundMultiplier final
const sourcemeta::blaze::SchemaFrame &,
const sourcemeta::blaze::SchemaFrame::Location &location,
const sourcemeta::blaze::SchemaWalker &,
const sourcemeta::blaze::SchemaResolver &) const
const sourcemeta::blaze::SchemaResolver &, const bool) const
-> sourcemeta::blaze::SchemaTransformRule::Result override {
return location.dialect == "https://json-schema.org/draft/2020-12/schema" &&
vocabularies.contains(sourcemeta::blaze::Vocabularies::Known::
Expand Down
2 changes: 1 addition & 1 deletion src/compiler/mapper/integer_upper_bound.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ class IntegerUpperBound final : public sourcemeta::blaze::SchemaTransformRule {
const sourcemeta::blaze::SchemaFrame &,
const sourcemeta::blaze::SchemaFrame::Location &location,
const sourcemeta::blaze::SchemaWalker &,
const sourcemeta::blaze::SchemaResolver &) const
const sourcemeta::blaze::SchemaResolver &, const bool) const
-> sourcemeta::blaze::SchemaTransformRule::Result override {
return location.dialect == "https://json-schema.org/draft/2020-12/schema" &&
vocabularies.contains(sourcemeta::blaze::Vocabularies::Known::
Expand Down
2 changes: 1 addition & 1 deletion src/compiler/mapper/integer_upper_bound_multiplier.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ class IntegerUpperBoundMultiplier final
const sourcemeta::blaze::SchemaFrame &,
const sourcemeta::blaze::SchemaFrame::Location &location,
const sourcemeta::blaze::SchemaWalker &,
const sourcemeta::blaze::SchemaResolver &) const
const sourcemeta::blaze::SchemaResolver &, const bool) const
-> sourcemeta::blaze::SchemaTransformRule::Result override {
return location.dialect == "https://json-schema.org/draft/2020-12/schema" &&
vocabularies.contains(sourcemeta::blaze::Vocabularies::Known::
Expand Down
2 changes: 1 addition & 1 deletion src/compiler/mapper/number_arbitrary.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ class NumberArbitrary final : public sourcemeta::blaze::SchemaTransformRule {
const sourcemeta::blaze::SchemaFrame &,
const sourcemeta::blaze::SchemaFrame::Location &location,
const sourcemeta::blaze::SchemaWalker &,
const sourcemeta::blaze::SchemaResolver &) const
const sourcemeta::blaze::SchemaResolver &, const bool) const
-> sourcemeta::blaze::SchemaTransformRule::Result override {
return location.dialect == "https://json-schema.org/draft/2020-12/schema" &&
vocabularies.contains(sourcemeta::blaze::Vocabularies::Known::
Expand Down
2 changes: 0 additions & 2 deletions test/runtime/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ sourcemeta_googletest(NAMESPACE sourcemeta PROJECT jsonbinpack NAME runtime
decode_string_test.cc
decode_test.cc
decode_traits_test.cc
decode_utils.h
encode_any_test.cc
encode_array_test.cc
encode_cache_test.cc
Expand All @@ -20,7 +19,6 @@ sourcemeta_googletest(NAMESPACE sourcemeta PROJECT jsonbinpack NAME runtime
encode_string_test.cc
encode_test.cc
encode_traits_test.cc
encode_utils.h
input_stream_varint_test.cc
output_stream_varint_test.cc
encoding_traits_test.cc
Expand Down
Loading
Loading