Upgrade Sourcemeta dependencies

DEPENDENCIES

@@ -1,4 +1,4 @@
 vendorpull https://github.com/sourcemeta/vendorpull 1dcbac42809cf87cb5b045106b863e17ad84ba02
-core https://github.com/sourcemeta/core 5dabb7f983b54e302b35ab74547b58c86576537b
-blaze https://github.com/sourcemeta/blaze f25c2ab22cb13964a47be77acb8bbcc01ad1f2dd
+core https://github.com/sourcemeta/core 9c3323a59a4f8113e269cfb713c85ba34cf06d96
+blaze https://github.com/sourcemeta/blaze d8d3b28a989b49672fa141b5d37792551999d532
 bootstrap https://github.com/twbs/bootstrap 1a6fdfae6be09b09eaced8f0e442ca6f7680a61e

test/e2e/CMakeLists.txt

@@ -3,7 +3,7 @@ sourcemeta_add_default_options(PRIVATE jsonbinpack_e2e_test_runner)
 target_link_libraries(jsonbinpack_e2e_test_runner PRIVATE sourcemeta::core::json)
 target_link_libraries(jsonbinpack_e2e_test_runner PRIVATE sourcemeta::jsonbinpack::compiler)
 target_link_libraries(jsonbinpack_e2e_test_runner PRIVATE sourcemeta::jsonbinpack::runtime)
-target_link_libraries(jsonbinpack_e2e_test_runner PRIVATE sourcemeta::blaze::format)
+target_link_libraries(jsonbinpack_e2e_test_runner PRIVATE sourcemeta::core::jsonschema)
 set_target_properties(jsonbinpack_e2e_test_runner
   PROPERTIES FOLDER "JSON BinPack/E2E")
 

test/e2e/runner.cc

@@ -1,7 +1,6 @@
 #include <sourcemeta/jsonbinpack/compiler.h>
 #include <sourcemeta/jsonbinpack/runtime.h>
 
-#include <sourcemeta/blaze/format.h>
 #include <sourcemeta/core/json.h>
 #include <sourcemeta/core/jsonschema.h>
 
@@ -43,9 +42,11 @@ auto main(int argc, char *argv[]) -> int {
                                         std::ios::binary);
   canonical_output_stream.exceptions(std::ios_base::badbit);
 
-  sourcemeta::blaze::format(schema, sourcemeta::core::schema_walker,
-                            sourcemeta::core::schema_resolver,
-                            "https://json-schema.org/draft/2020-12/schema");
+  const sourcemeta::core::SchemaFrame frame{
+      sourcemeta::core::SchemaFrame::Mode::Locations, schema,
+      sourcemeta::core::schema_walker, sourcemeta::core::schema_resolver,
+      DEFAULT_METASCHEMA};
+  sourcemeta::core::schema_format(schema, frame);
   sourcemeta::core::prettify(schema, canonical_output_stream);
   canonical_output_stream << "\n";
   canonical_output_stream.flush();