diff --git a/.travis.yml b/.travis.yml index 988130a..238fb10 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,7 @@ rust: - stable - beta - nightly -- 1.31.0 +- 1.32.0 matrix: allow_failures: - rust: nightly @@ -19,13 +19,11 @@ addons: - gcc - binutils-dev - libiberty-dev - - npm before_script: - smtp-sink 2525 1000& - sudo chgrp -R postdrop /var/spool/postfix/maildrop -- sudo npm set strict-ssl false && sudo npm install -g gitbook-cli script: - cargo test --verbose --all --all-features after_success: - ./.build-scripts/codecov.sh -- '[ "$TRAVIS_BRANCH" = "v0.9.x" ] && [ $TRAVIS_PULL_REQUEST = false ] && ./.build-scripts/site-upload.sh' +- '[ "$TRAVIS_RUST_VERSION" = "stable" ] && [ "$TRAVIS_BRANCH" = "v0.9.x" ] && [ $TRAVIS_PULL_REQUEST = false ] && ./.build-scripts/site-upload.sh' diff --git a/README.md b/README.md index d3f5640..ed31946 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,7 @@ Lettre provides the following features: ## Example -This library requires Rust 1.31 or newer. +This library requires Rust 1.32 or newer. To use this library, add the following to your `Cargo.toml`: ```toml diff --git a/lettre/Cargo.toml b/lettre/Cargo.toml index bc43cb0..72e616f 100644 --- a/lettre/Cargo.toml +++ b/lettre/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "lettre" -version = "0.10.0-pre" # remember to update html_root_url +version = "0.9.1" # remember to update html_root_url description = "Email client" readme = "README.md" homepage = "http://lettre.at" diff --git a/lettre/src/lib.rs b/lettre/src/lib.rs index 2b86514..245569b 100644 --- a/lettre/src/lib.rs +++ b/lettre/src/lib.rs @@ -3,7 +3,7 @@ //! This mailer contains the available transports for your emails. //! -#![doc(html_root_url = "https://docs.rs/lettre/0.10.0-pre")] +#![doc(html_root_url = "https://docs.rs/lettre/0.9.1")] #![deny( missing_copy_implementations, trivial_casts, diff --git a/lettre_email/Cargo.toml b/lettre_email/Cargo.toml index 05bf70b..26c825c 100644 --- a/lettre_email/Cargo.toml +++ b/lettre_email/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "lettre_email" -version = "0.10.0-pre" # remember to update html_root_url +version = "0.9.1" # remember to update html_root_url description = "Email builder" readme = "README.md" homepage = "http://lettre.at" diff --git a/lettre_email/src/lib.rs b/lettre_email/src/lib.rs index 4231505..b713d21 100644 --- a/lettre_email/src/lib.rs +++ b/lettre_email/src/lib.rs @@ -13,6 +13,18 @@ unused_import_braces )] +<<<<<<< HEAD +======= +extern crate failure; +#[macro_use] +extern crate failure_derive; + +extern crate base64; +extern crate email as email_format; +extern crate lettre; +extern crate time; +extern crate uuid; +>>>>>>> v0.9.x pub extern crate mime; pub mod error; diff --git a/website/.gitignore b/website/.gitignore index eba11f5..f27eddc 100644 --- a/website/.gitignore +++ b/website/.gitignore @@ -1,2 +1 @@ -node_modules /_book diff --git a/website/Makefile b/website/Makefile index 89f4490..79ae62f 100644 --- a/website/Makefile +++ b/website/Makefile @@ -1,13 +1,16 @@ all: depends _book depends: - gitbook install + cargo install --force mdbook --vers "^0.2" + cargo install --force mdbook-linkcheck --vers "^0.2" serve: - gitbook serve + mdbook serve _book: - gitbook build + mdbook build clean: rm -rf _book/ + +.PHONY: _book \ No newline at end of file diff --git a/website/book.json b/website/book.json deleted file mode 100644 index f101a41..0000000 --- a/website/book.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "root": "./content", - "plugins": [ "-sharing", "edit-link" ], - "pluginsConfig": { - "edit-link": { - "base": "https://github.com/lettre/lettre/edit/master/website/content", - "label": "Edit" - } - } -} diff --git a/website/book.toml b/website/book.toml new file mode 100644 index 0000000..403a6e9 --- /dev/null +++ b/website/book.toml @@ -0,0 +1,11 @@ +[book] +title = "Lettre" +author = "Alexis Mousset" +description = "The user documentation of the Lettre crate." + +[build] +build-dir = "_book" + +[output.html] + +[output.linkcheck] \ No newline at end of file diff --git a/website/content/README.md b/website/src/README.md similarity index 88% rename from website/content/README.md rename to website/src/README.md index 36a346a..9566399 100644 --- a/website/content/README.md +++ b/website/src/README.md @@ -10,7 +10,7 @@ Lettre is an email library that allows creating and sending messages. It provide The `lettre_email` crate allows you to compose messages, and the `lettre` provide transports to send them. -Lettre requires Rust 1.31 or newer. Add the following to your `Cargo.toml`: +Lettre requires Rust 1.32 or newer. Add the following to your `Cargo.toml`: ```toml [dependencies] diff --git a/website/content/SUMMARY.md b/website/src/SUMMARY.md similarity index 100% rename from website/content/SUMMARY.md rename to website/src/SUMMARY.md diff --git a/website/content/creating-messages/email.md b/website/src/creating-messages/email.md similarity index 100% rename from website/content/creating-messages/email.md rename to website/src/creating-messages/email.md diff --git a/website/content/sending-messages/_index.md b/website/src/sending-messages/_index.md similarity index 100% rename from website/content/sending-messages/_index.md rename to website/src/sending-messages/_index.md diff --git a/website/content/sending-messages/file.md b/website/src/sending-messages/file.md similarity index 100% rename from website/content/sending-messages/file.md rename to website/src/sending-messages/file.md diff --git a/website/content/sending-messages/sendmail.md b/website/src/sending-messages/sendmail.md similarity index 100% rename from website/content/sending-messages/sendmail.md rename to website/src/sending-messages/sendmail.md diff --git a/website/content/sending-messages/smtp.md b/website/src/sending-messages/smtp.md similarity index 100% rename from website/content/sending-messages/smtp.md rename to website/src/sending-messages/smtp.md diff --git a/website/content/sending-messages/stub.md b/website/src/sending-messages/stub.md similarity index 100% rename from website/content/sending-messages/stub.md rename to website/src/sending-messages/stub.md