diff --git a/.travis.yml b/.travis.yml index 57e2ab9..d21ee2d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,8 +17,8 @@ os: - osx rust: - - 1.13.0 - - 1.14.0 + - 1.17.0 + - beta - nightly env: @@ -26,30 +26,23 @@ env: - ARCH=x86_64 - ARCH=i686 -matrix: - allow_failures: - - env: ARCH=i686 - rust: nightly - # Note: nightly-i686 keeps failing, it seems that travis's nightly is outdated. - install: - if [ "$TRAVIS_OS_NAME" = 'linux' ]; then OS=unknown-linux-gnu; else OS=apple-darwin; fi - - SYSROOT=$(rustc --print sysroot) - export HOST=$ARCH-$OS - - | - if [ ! -d "$SYSROOT/lib/rustlib/$HOST" ]; then - curl -SfLO "https://static.rust-lang.org/dist/rust-$TRAVIS_RUST_VERSION-$HOST.tar.gz" && - tar xf "rust-$TRAVIS_RUST_VERSION-$HOST.tar.gz" "rust-$TRAVIS_RUST_VERSION-$HOST/rust-std-$HOST/lib/rustlib/$HOST" && - mv "rust-$TRAVIS_RUST_VERSION-$HOST/rust-std-$HOST/lib/rustlib/$HOST" "$SYSROOT/lib/rustlib" - fi + - curl -SfLO "https://static.rust-lang.org/rustup/dist/$HOST/rustup-init" + - chmod u+x rustup-init + - ./rustup-init -y --default-host "$HOST" --default-toolchain "$TRAVIS_RUST_VERSION" + - export PATH=$HOME/.cargo/bin:$HOME/.local/bin:$PATH + - rustc -vV + - cargo -vV script: - - cargo test --target "$HOST" - - if [ "$TRAVIS_RUST_VERSION" = 'nightly' ]; then cargo bench --target "$HOST" --features bench; fi + - cargo test --no-default-features + - cargo test + - if [ "$TRAVIS_RUST_VERSION" = 'nightly' ]; then cargo bench; fi after_success: - - export PATH=$HOME/.cargo/bin:$HOME/.local/bin:$PATH - cargo install cargo-kcov - cargo kcov --print-install-kcov-sh | bash - - cargo kcov --target "$HOST" --coveralls -- --verify + - cargo kcov --coveralls -- --verify diff --git a/Cargo.toml b/Cargo.toml index 780b2ab..6d272d6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -2,7 +2,7 @@ name = "qrcode" description = "QR code encoder in Rust" license = "MIT / Apache-2.0" -version = "0.2.1" +version = "0.3.0" authors = ["kennytm "] keywords = ["qrcode"] repository = "https://github.com/kennytm/qrcode-rust" @@ -16,8 +16,8 @@ exclude = [ travis-ci = { repository = "kennytm/qrcode-rust" } [dependencies] -num-traits = "0.1.33" -image = { version = "0.12.2", optional = true } +num-traits = "0.1" +image = { version = "0.13", optional = true } [features] default = ["image"]