From 00be9db5950442e4068bae88dcf3fbb74cce97a8 Mon Sep 17 00:00:00 2001 From: Leszek Zalewski Date: Tue, 20 Apr 2021 06:14:15 +0200 Subject: [PATCH 1/2] Bump versions --- .rubocop.yml | 2 +- .tool-versions | 2 +- CHANGELOG.md | 9 ++- Cargo.lock | 111 +++++-------------------------- Cargo.toml | 4 +- Gemfile.lock | 4 +- lib/rusty_json_schema/version.rb | 2 +- rusty_json_schema.gemspec | 2 +- 8 files changed, 30 insertions(+), 106 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index 4300215..f52ed69 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -3,7 +3,7 @@ require: - rubocop-rspec AllCops: - TargetRubyVersion: 2.5 + TargetRubyVersion: 2.6 NewCops: enable SuggestExtensions: false Exclude: diff --git a/.tool-versions b/.tool-versions index 1b00fc2..c25b1a0 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1,2 +1,2 @@ -ruby 2.5.0 +ruby 2.6.0 rust 1.48.0 diff --git a/CHANGELOG.md b/CHANGELOG.md index 6a0a71d..87dceb3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,10 +7,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [0.6.1] +### Changed +- Update `jsonschema` dependency +- Update minimum Ruby version to 2.6 + ## [0.5.0] ### Changed -- update `jsonschema` dependency -- match versioning with `jsonschema` +- Update `jsonschema` dependency +- Match versioning with `jsonschema` ## [0.3.2] ### Changed diff --git a/Cargo.lock b/Cargo.lock index 9826228..df2dbb2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1,5 +1,16 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. +[[package]] +name = "ahash" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f200cbb1e856866d9eade941cf3aa0c5d7dd36f74311c4273b494f4ef036957" +dependencies = [ + "getrandom", + "once_cell", + "version_check", +] + [[package]] name = "aho-corasick" version = "0.7.15" @@ -99,12 +110,6 @@ dependencies = [ "vec_map", ] -[[package]] -name = "const_fn" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28b9d6de7f49e22cf97ad17fc4036ece69300032f45f78f30b4a4482cdc3f4a6" - [[package]] name = "core-foundation" version = "0.9.1" @@ -121,58 +126,6 @@ version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ea221b5284a47e40033bf9b66f35f984ec0ea2931eb03505246cd27a963f981b" -[[package]] -name = "crossbeam-channel" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dca26ee1f8d361640700bde38b2c37d8c22b3ce2d360e1fc1c74ea4b0aa7d775" -dependencies = [ - "cfg-if", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-deque" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94af6efb46fef72616855b036a624cf27ba656ffc9be1b9a3c931cfc7749a9a9" -dependencies = [ - "cfg-if", - "crossbeam-epoch", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-epoch" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1aaa739f95311c2c7887a76863f500026092fb1dce0161dab577e559ef3569d" -dependencies = [ - "cfg-if", - "const_fn", - "crossbeam-utils", - "lazy_static", - "memoffset", - "scopeguard", -] - -[[package]] -name = "crossbeam-utils" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02d96d1e189ef58269ebe5b97953da3274d83a93af647c2ddd6f9dab28cedb8d" -dependencies = [ - "autocfg", - "cfg-if", - "lazy_static", -] - -[[package]] -name = "either" -version = "1.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" - [[package]] name = "encoding_rs" version = "0.8.26" @@ -442,7 +395,7 @@ dependencies = [ [[package]] name = "json_schema" -version = "0.3.0" +version = "0.6.1" dependencies = [ "jsonschema", "libc", @@ -451,10 +404,11 @@ dependencies = [ [[package]] name = "jsonschema" -version = "0.5.0" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6eee5c16f8d96dcb43b6458faeed3d1556a7cbea7c72fd5d1e481484605e2bf" +checksum = "8a16a61c76ff526dd0b767720b2e386f7659cc69df89bee9f9dd92a3e62df137" dependencies = [ + "ahash", "base64", "chrono", "idna", @@ -462,7 +416,6 @@ dependencies = [ "num-cmp", "parking_lot", "percent-encoding", - "rayon", "regex", "reqwest", "serde_json", @@ -512,15 +465,6 @@ version = "2.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525" -[[package]] -name = "memoffset" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "157b4208e3059a8f9e78d559edc658e13df41410cb3ae03979c83130067fdd87" -dependencies = [ - "autocfg", -] - [[package]] name = "mime" version = "0.3.16" @@ -828,31 +772,6 @@ dependencies = [ "rand_core", ] -[[package]] -name = "rayon" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b0d8e0819fadc20c74ea8373106ead0600e3a67ef1fe8da56e39b9ae7275674" -dependencies = [ - "autocfg", - "crossbeam-deque", - "either", - "rayon-core", -] - -[[package]] -name = "rayon-core" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ab346ac5921dc62ffa9f89b7a773907511cdfa5490c572ae9be1be33e8afa4a" -dependencies = [ - "crossbeam-channel", - "crossbeam-deque", - "crossbeam-utils", - "lazy_static", - "num_cpus", -] - [[package]] name = "redox_syscall" version = "0.1.57" diff --git a/Cargo.toml b/Cargo.toml index fa962cb..d2a09e3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "json_schema" -version = "0.5.0" +version = "0.6.1" authors = ["Leszek Zalewski "] edition = "2018" @@ -10,5 +10,5 @@ crate-type = ["cdylib"] [dependencies] libc = "0.2.81" -jsonschema = "0.5.0" +jsonschema = "0.6.1" serde_json = "1.0" diff --git a/Gemfile.lock b/Gemfile.lock index 66fb4d1..af3c202 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: . specs: - rusty_json_schema (0.5.0) + rusty_json_schema (0.6.1) ffi (~> 1.14) json (>= 1.0) thermite (~> 0) @@ -14,7 +14,7 @@ GEM diff-lcs (1.4.4) ecma-re-validator (0.3.0) regexp_parser (~> 2.0) - ffi (1.14.2) + ffi (1.15.0) hana (1.3.7) json (2.5.1) json_schemer (0.2.17) diff --git a/lib/rusty_json_schema/version.rb b/lib/rusty_json_schema/version.rb index 8cd20c6..3bd03bf 100644 --- a/lib/rusty_json_schema/version.rb +++ b/lib/rusty_json_schema/version.rb @@ -2,6 +2,6 @@ module RustyJSONSchema - VERSION = "0.5.0" + VERSION = "0.6.1" end diff --git a/rusty_json_schema.gemspec b/rusty_json_schema.gemspec index edb56ba..9090868 100644 --- a/rusty_json_schema.gemspec +++ b/rusty_json_schema.gemspec @@ -16,7 +16,7 @@ Gem::Specification.new do |spec| # rubocop:disable Metrics/BlockLength Currently during heavy development. STR - spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0") + spec.required_ruby_version = Gem::Requirement.new(">= 2.6.0") spec.metadata["allowed_push_host"] = "https://rubygems.org" spec.metadata["homepage_uri"] = spec.homepage From 19e253863a6a4867ee35bff97571ef65e3e1032c Mon Sep 17 00:00:00 2001 From: Leszek Zalewski Date: Tue, 20 Apr 2021 08:59:23 +0200 Subject: [PATCH 2/2] Remove ruby 2.5 from test matrix --- .github/workflows/main.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 0b15e20..a2ac62f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -143,10 +143,9 @@ jobs: - windows-latest - macos-latest ruby: - - 2.5.0 - - 2.6.0 - - 2.7.0 - - 3.0.0 + - 2.6 + - 2.7 + - 3.0 runs-on: ${{ matrix.os }}