From ffcb973a716d9422a196f65a36330fc1705606ab Mon Sep 17 00:00:00 2001 From: Brett Logan Date: Mon, 14 Feb 2022 16:45:11 -0500 Subject: [PATCH] update extra deps (#2498) * update extra deps * Update ruby lockfile * Fix lockfile * Update scala template Co-authored-by: Lukas Gravley --- Dockerfile | 16 ++++++++-------- TEMPLATES/.scalafmt.conf | 2 +- dependencies/Gemfile | 4 ++-- dependencies/Gemfile.lock | 14 +++++++------- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/Dockerfile b/Dockerfile index 4a49c7e4..e98447b2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,23 +7,23 @@ ######################################### # Get dependency images as build stages # ######################################### -FROM accurics/terrascan:1.13.0 as terrascan -FROM alpine/terragrunt:1.1.4 as terragrunt +FROM accurics/terrascan:1.13.1 as terrascan +FROM alpine/terragrunt:1.1.5 as terragrunt FROM assignuser/chktex-alpine:v0.1.1 as chktex FROM cljkondo/clj-kondo:2022.02.09-alpine as clj-kondo -FROM dotenvlinter/dotenv-linter:3.1.1 as dotenv-linter +FROM dotenvlinter/dotenv-linter:3.2.0 as dotenv-linter FROM garethr/kubeval:0.15.0 as kubeval FROM ghcr.io/awkbar-devops/clang-format:v1.0.2 as clang-format -FROM ghcr.io/terraform-linters/tflint-bundle:v0.34.1.1 as tflint -FROM golangci/golangci-lint:v1.43.0 as golangci-lint +FROM ghcr.io/terraform-linters/tflint-bundle:v0.34.1.2 as tflint +FROM golangci/golangci-lint:v1.44.0 as golangci-lint FROM hadolint/hadolint:latest-alpine as dockerfile-lint -FROM hashicorp/terraform:1.1.4 as terraform +FROM hashicorp/terraform:1.1.5 as terraform FROM koalaman/shellcheck:v0.8.0 as shellcheck FROM mstruebing/editorconfig-checker:2.4.0 as editorconfig-checker FROM mvdan/shfmt:v3.4.2 as shfmt FROM rhysd/actionlint:1.6.8 as actionlint -FROM scalameta/scalafmt:v3.3.3 as scalafmt -FROM yoheimuta/protolint:v0.36.0 as protolint +FROM scalameta/scalafmt:v3.4.3 as scalafmt +FROM yoheimuta/protolint:v0.37.0 as protolint FROM zricethezav/gitleaks:v8.2.7 as gitleaks ################## diff --git a/TEMPLATES/.scalafmt.conf b/TEMPLATES/.scalafmt.conf index 6c70c139..508a3944 100644 --- a/TEMPLATES/.scalafmt.conf +++ b/TEMPLATES/.scalafmt.conf @@ -1,6 +1,6 @@ // Scala Format Configuration // https://scalameta.org/scalafmt/docs/configuration.html -version = 3.3.3 +version = 3.4.3 align.preset = more // For pretty alignment. maxColumn = 80 // https://scalameta.org/scalafmt/docs/configuration.html#scala-dialects diff --git a/dependencies/Gemfile b/dependencies/Gemfile index 0cc77944..3600257c 100644 --- a/dependencies/Gemfile +++ b/dependencies/Gemfile @@ -4,8 +4,8 @@ source "https://rubygems.org" git_source(:github) { |repo_name| "https://github.com/#{repo_name}" } -gem "rubocop", "~> 1.25.0" +gem "rubocop", "~> 1.25.1" gem "rubocop-github", "~> 0.17.0" -gem "rubocop-performance", "~>1.11.0" +gem "rubocop-performance", "~>1.13.2" gem "rubocop-rails", "~> 2.7" gem "rubocop-rspec", "~> 2.8.0" diff --git a/dependencies/Gemfile.lock b/dependencies/Gemfile.lock index 0f74ecc0..4ff8ce23 100644 --- a/dependencies/Gemfile.lock +++ b/dependencies/Gemfile.lock @@ -1,14 +1,14 @@ GEM remote: https://rubygems.org/ specs: - activesupport (7.0.1) + activesupport (7.0.2.2) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) tzinfo (~> 2.0) ast (2.4.2) concurrent-ruby (1.1.9) - i18n (1.8.11) + i18n (1.9.1) concurrent-ruby (~> 1.0) minitest (5.15.0) parallel (1.21.0) @@ -18,7 +18,7 @@ GEM rainbow (3.1.1) regexp_parser (2.2.1) rexml (3.2.5) - rubocop (1.25.0) + rubocop (1.25.1) parallel (~> 1.10) parser (>= 3.1.0.0) rainbow (>= 2.2.2, < 4.0) @@ -33,7 +33,7 @@ GEM rubocop rubocop-performance rubocop-rails - rubocop-performance (1.11.5) + rubocop-performance (1.13.2) rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) rubocop-rails (2.13.2) @@ -51,11 +51,11 @@ PLATFORMS ruby DEPENDENCIES - rubocop (~> 1.25.0) + rubocop (~> 1.25.1) rubocop-github (~> 0.17.0) - rubocop-performance (~> 1.11.0) + rubocop-performance (~> 1.13.2) rubocop-rails (~> 2.7) rubocop-rspec (~> 2.8.0) BUNDLED WITH - 2.3.5 + 2.3.7