diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 84d1423..d0da1db 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -17,7 +17,7 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest, macos-latest, windows-latest] - rust: [1.56.0, stable] + rust: [1.60.0, stable] features: ['', '--all-features'] runs-on: ${{ matrix.os }} steps: @@ -28,7 +28,7 @@ jobs: toolchain: ${{ matrix.rust }} components: rustfmt clippy - name: use MSRV-compatible dependencies for MSRV check - if: ${{ matrix.os != 'stable' }} + if: ${{ matrix.rust != 'stable' }} run: cp Cargo.lock.rust-msrv Cargo.lock - name: build run: cargo build ${{ matrix.features }} diff --git a/CHANGELOG.md b/CHANGELOG.md index 1553db5..7250653 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] - ReleaseDate +### Changed +* Update to `oracle 0.6.0` +* The Minimum Supported Rust Version (MSRV) is now 1.60.0 due to changes in recent releases of + `oracle`. ## [0.6.0] - 2023-01-07 ### Changed diff --git a/Cargo.lock.rust-msrv b/Cargo.lock.rust-msrv index 7c94276..f6e4bdd 100644 --- a/Cargo.lock.rust-msrv +++ b/Cargo.lock.rust-msrv @@ -58,10 +58,7 @@ checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5" dependencies = [ "android-tzdata", "iana-time-zone", - "js-sys", "num-traits", - "time", - "wasm-bindgen", "winapi", ] @@ -198,9 +195,9 @@ checksum = "9670a07f94779e00908f3e686eab508878ebb390ba6e604d3a284c00e8d0487b" [[package]] name = "oracle" -version = "0.5.7" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfe80334af1fbaea016fbef0af77f5fa32452362e29a039389b8c93737585003" +checksum = "3d31801ec5434036d0205d587ec9120e18114a0d087d906421a1901adec13077" dependencies = [ "cc", "chrono", @@ -283,8 +280,6 @@ dependencies = [ name = "r2d2-oracle" version = "0.6.0" dependencies = [ - "chrono", - "log", "oracle", "r2d2", ] @@ -347,29 +342,12 @@ dependencies = [ "unicode-ident", ] -[[package]] -name = "time" -version = "0.1.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a" -dependencies = [ - "libc", - "wasi", - "winapi", -] - [[package]] name = "unicode-ident" version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" -[[package]] -name = "wasi" -version = "0.10.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" - [[package]] name = "wasm-bindgen" version = "0.2.87" diff --git a/Cargo.toml b/Cargo.toml index 0d0585b..4f79883 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -3,7 +3,7 @@ name = "r2d2-oracle" version = "0.6.0" authors = ["Ralph Ursprung "] edition = "2021" -rust-version = "1.56" +rust-version = "1.60" description = "Oracle support for the r2d2 connection pool" repository = "https://github.com/rursprung/r2d2-oracle" @@ -16,4 +16,4 @@ chrono=["oracle/chrono"] [dependencies] r2d2 = "0.8" -oracle = "0.5.1" +oracle = "0.6" diff --git a/README.md b/README.md index 2d67e69..9fdb9d4 100644 --- a/README.md +++ b/README.md @@ -54,5 +54,5 @@ You may also want to consider the following alternatives to this crate, dependin * There is an `async` ([`tokio`](https://crates.io/crates/tokio)-based) version of `r2d2`, [`bb8`](https://crates.io/crates/bb8) and a corresponding [`bb8-oracle`](https://crates.io/crates/bb8-oracle) fork of `r2d2-oracle` exists ## Minimum Supported Rust Version (MSRV) -This crate is guaranteed to compile on stable Rust 1.54 and up. It *might* +This crate is guaranteed to compile on stable Rust 1.60 and up. It *might* compile with older versions but that may change in any new patch release.