From 813876ac1fdc90032522b553fd3cf7140862b5d5 Mon Sep 17 00:00:00 2001 From: folkengine Date: Sun, 17 Dec 2023 15:02:13 -0800 Subject: [PATCH 1/3] Upgraded deps added devcontainer --- .devcontainer/Dockerfile | 13 ++++++++++++ .devcontainer/devcontainer.json | 37 +++++++++++++++++++++++++++++++++ Cargo.toml | 12 +++++------ 3 files changed, 56 insertions(+), 6 deletions(-) create mode 100644 .devcontainer/Dockerfile create mode 100644 .devcontainer/devcontainer.json diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile new file mode 100644 index 0000000..7f9260c --- /dev/null +++ b/.devcontainer/Dockerfile @@ -0,0 +1,13 @@ +FROM mcr.microsoft.com/devcontainers/rust:latest + +# install a few tools for more convenient developing +#RUN apt-get update; \ +# apt-get -y install --fix-missing \ +# git python3 cmake g++ python-is-python3 + +# [Optional] Uncomment this section to install additional packages. +#RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \ +# && apt-get -y install --no-install-recommends python-is-python3 + +# Add ./bin to PATH +ENV PATH="./bin:${PATH}" diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json new file mode 100644 index 0000000..2b8c629 --- /dev/null +++ b/.devcontainer/devcontainer.json @@ -0,0 +1,37 @@ +// For format details, see https://aka.ms/devcontainer.json. For config options, see the +// README at: https://github.com/devcontainers/templates/tree/main/src/cpp +// Based on https://github.com/microsoft/vscode-remote-try-cpp?tab=readme-ov-file +{ + "name": "Rust Dev Playbook", + "build": { + "dockerfile": "Dockerfile" + }, + // Features to add to the dev container. More info: https://containers.dev/features. + "features": { + "ghcr.io/devcontainers/features/github-cli:1": {}, // https://github.com/devcontainers/features/tree/main/src/github-cli + "ghcr.io/devcontainers-contrib/features/actions-runner:1": {}, // https://github.com/devcontainers-contrib/features/tree/main/src/actions-runner + "ghcr.io/devcontainers-contrib/features/actionlint:1": {}, // https://github.com/devcontainers-contrib/features/tree/main/src/actionlint + "ghcr.io/devcontainers-contrib/features/direnv:1": {}, // https://github.com/devcontainers-contrib/features/tree/main/src/direnv + "ghcr.io/devcontainers-contrib/features/fd:1": {}, // https://github.com/devcontainers-contrib/features/tree/main/src/fd + }, + + // Configure tool-specific properties. + "customizations": { + // Configure properties specific to VS Code. + "vscode": { + "settings": {}, + "extensions": [ + "eamodio.gitlens", + "streetsidesoftware.code-spell-checker", + ] + } + }, + // Use 'forwardPorts' to make a list of ports inside the container available locally. + // "forwardPorts": [], + + // Use 'postCreateCommand' to run commands after the container is created. + // "postCreateCommand": "", + + // Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root. + // "remoteUser": "root" +} \ No newline at end of file diff --git a/Cargo.toml b/Cargo.toml index 99a87d7..8565036 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "cardpack" description = "Generic Deck of Cards" -version = "0.4.20" +version = "0.4.21" authors = ["electronicpanopticon "] repository = "https://github.com/ImperialBower/cardpack.rs.git" homepage = "https://github.com/ImperialBower/cardpack.rs" @@ -17,15 +17,15 @@ path = "src/lib.rs" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -colored = "2" +colored = "2.1.0" fluent-templates = "0.8.0" -flume = "0.10.14" +flume = "0.11.0" lazy_static = "1.4.0" -log = "0.4" +log = "0.4.20" rand = "0.8.5" spin = "0.9.8" term-table = "1.3.2" -unic-langid = { version = "0.9.0", features = ["macros"] } +unic-langid = { version = "0.9.4", features = ["macros"] } [dev-dependencies] -rstest = "0.17.0" +rstest = "0.18.2" From 615e3871f3d93bdd7596b443ad00b0c8cc13b123 Mon Sep 17 00:00:00 2001 From: folkengine Date: Sun, 17 Dec 2023 15:05:29 -0800 Subject: [PATCH 2/3] Bumped minimum version to 1.70 --- .github/workflows/CI.yaml | 2 +- Cargo.toml | 2 +- clippy.toml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/CI.yaml b/.github/workflows/CI.yaml index 6f30c7e..09ecab1 100644 --- a/.github/workflows/CI.yaml +++ b/.github/workflows/CI.yaml @@ -17,7 +17,7 @@ jobs: strategy: fail-fast: false matrix: - rust: [beta, stable, 1.66.0] + rust: [beta, stable, 1.70.0] include: - rust: nightly rustflags: --cfg thiserror_nightly_testing diff --git a/Cargo.toml b/Cargo.toml index 8565036..31bf3bb 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -6,7 +6,7 @@ authors = ["electronicpanopticon "] repository = "https://github.com/ImperialBower/cardpack.rs.git" homepage = "https://github.com/ImperialBower/cardpack.rs" edition = "2021" -rust-version = "1.66" +rust-version = "1.70" license = "Apache-2.0" exclude = [".github/workflows/*", "examples/*", ".gitignore", ".travis.yml", "Cargo.lock"] diff --git a/clippy.toml b/clippy.toml index ff36ff0..e8ff6c5 100644 --- a/clippy.toml +++ b/clippy.toml @@ -1,4 +1,4 @@ -msrv = "1.66" +msrv = "1.70" cognitive-complexity-threshold = 30 From 50b8d81c130f8ac1f3617029b8096e1656f99614 Mon Sep 17 00:00:00 2001 From: folkengine Date: Sun, 17 Dec 2023 15:07:25 -0800 Subject: [PATCH 3/3] Updated version to 0.5.0 --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 31bf3bb..3d048f0 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "cardpack" description = "Generic Deck of Cards" -version = "0.4.21" +version = "0.5.0" authors = ["electronicpanopticon "] repository = "https://github.com/ImperialBower/cardpack.rs.git" homepage = "https://github.com/ImperialBower/cardpack.rs"