From 57f764fccf33e9c1042eb35844cb0dfde071e3d0 Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Thu, 7 Mar 2024 17:50:47 +0000 Subject: [PATCH 1/8] ibabel: use default hash syntax. For https://github.com/Homebrew/brew/pull/16848 --- Casks/i/ibabel.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Casks/i/ibabel.rb b/Casks/i/ibabel.rb index e198ee059f..e85386aa28 100644 --- a/Casks/i/ibabel.rb +++ b/Casks/i/ibabel.rb @@ -15,7 +15,7 @@ cask "ibabel" do cask = CaskLoader.load(__FILE__) download_url = "https://macinchem.org/wp-content/uploads/#{match[1]}/#{match[2]}/iBabel.zip" - app_version = Homebrew::Livecheck::Strategy::ExtractPlist.find_versions(cask: cask, + app_version = Homebrew::Livecheck::Strategy::ExtractPlist.find_versions(cask:, url: download_url)[:matches].values.max next if app_version.blank? From e0b2d2a22dde3cff1bb26f65f761b8815ecbf660 Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Thu, 7 Mar 2024 17:50:47 +0000 Subject: [PATCH 2/8] redquits: use default hash syntax. For https://github.com/Homebrew/brew/pull/16848 --- Casks/r/redquits.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Casks/r/redquits.rb b/Casks/r/redquits.rb index 7fa55e81f2..cf7fc087d5 100644 --- a/Casks/r/redquits.rb +++ b/Casks/r/redquits.rb @@ -17,7 +17,7 @@ cask "redquits" do cask = CaskLoader.load(__FILE__) download_url = "http://redquits.s3.amazonaws.com/RedQuits_v#{major_version}.pkg" - Homebrew::Livecheck::Strategy::ExtractPlist.find_versions(cask: cask, url: download_url)[:matches].values + Homebrew::Livecheck::Strategy::ExtractPlist.find_versions(cask:, url: download_url)[:matches].values end end From 9215fc3f348e6c67b4d779a3b4d8551f1e320fc9 Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Thu, 7 Mar 2024 17:50:47 +0000 Subject: [PATCH 3/8] smultron: use default hash syntax. For https://github.com/Homebrew/brew/pull/16848 --- Casks/s/smultron.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Casks/s/smultron.rb b/Casks/s/smultron.rb index 8eab87fa56..fafda57711 100644 --- a/Casks/s/smultron.rb +++ b/Casks/s/smultron.rb @@ -16,7 +16,7 @@ cask "smultron" do cask = CaskLoader.load(__FILE__) download_url = "https://www.peterborgapps.com/downloads/Smultron#{major_version}.zip" - Homebrew::Livecheck::Strategy::ExtractPlist.find_versions(cask: cask, url: download_url)[:matches].values + Homebrew::Livecheck::Strategy::ExtractPlist.find_versions(cask:, url: download_url)[:matches].values end end From a2bb55a15dcb58352107192d5bed7d66c90487d7 Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Thu, 7 Mar 2024 17:50:47 +0000 Subject: [PATCH 4/8] winzip: use default hash syntax. For https://github.com/Homebrew/brew/pull/16848 --- Casks/w/winzip.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Casks/w/winzip.rb b/Casks/w/winzip.rb index cf6d88ddf8..c907505281 100644 --- a/Casks/w/winzip.rb +++ b/Casks/w/winzip.rb @@ -16,7 +16,7 @@ cask "winzip" do cask = CaskLoader.load(__FILE__) download_url = "https://download.winzip.com/winzipmacedition#{major_version}.dmg" - Homebrew::Livecheck::Strategy::ExtractPlist.find_versions(cask: cask, url: download_url)[:matches].values + Homebrew::Livecheck::Strategy::ExtractPlist.find_versions(cask:, url: download_url)[:matches].values end end From 8f41fc59b826374b0413f612326829a9ba6287cf Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Thu, 7 Mar 2024 17:50:48 +0000 Subject: [PATCH 5/8] cmd/lib/changed_files: use default hash syntax. For https://github.com/Homebrew/brew/pull/16848 --- cmd/lib/changed_files.rb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/cmd/lib/changed_files.rb b/cmd/lib/changed_files.rb index a3cc144fa2..b3fd79a502 100644 --- a/cmd/lib/changed_files.rb +++ b/cmd/lib/changed_files.rb @@ -26,12 +26,12 @@ module ChangedFiles modified_cask_files = modified_files.select { |path| cask_file?(path) } { - modified_files: modified_files, - added_files: added_files, - modified_ruby_files: modified_ruby_files, - modified_command_files: modified_command_files, - modified_github_actions_files: modified_github_actions_files, - modified_cask_files: modified_cask_files, + modified_files:, + added_files:, + modified_ruby_files:, + modified_command_files:, + modified_github_actions_files:, + modified_cask_files:, } end end From dac9a3449f4ba28d97a264e6ca3b3b3f1c0fda5b Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Thu, 7 Mar 2024 17:50:48 +0000 Subject: [PATCH 6/8] cmd/lib/check: use default hash syntax. For https://github.com/Homebrew/brew/pull/16848 --- cmd/lib/check.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/lib/check.rb b/cmd/lib/check.rb index 3bd98953b8..80209f6377 100644 --- a/cmd/lib/check.rb +++ b/cmd/lib/check.rb @@ -54,7 +54,7 @@ module Check }, loaded_launchjobs: lambda { launchctl = lambda do |sudo| - system_command!("/bin/launchctl", args: ["list"], print_stderr: false, sudo: sudo) + system_command!("/bin/launchctl", args: ["list"], print_stderr: false, sudo:) .stdout .lines.drop(1) .grep_v(APPLE_LAUNCHJOBS_REGEX) From f38b1c9e96291a8fc6625aa57bf697f619029561 Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Thu, 7 Mar 2024 17:50:48 +0000 Subject: [PATCH 7/8] cmd/lib/ci_matrix: use default hash syntax. For https://github.com/Homebrew/brew/pull/16848 --- cmd/lib/ci_matrix.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmd/lib/ci_matrix.rb b/cmd/lib/ci_matrix.rb index d04998ae11..381588159b 100644 --- a/cmd/lib/ci_matrix.rb +++ b/cmd/lib/ci_matrix.rb @@ -179,8 +179,8 @@ module CiMatrix cask_content = path.read - runners, multi_os = runners(cask_content: cask_content) - runners.product(architectures(cask_content: cask_content)).filter_map do |runner, arch| + runners, multi_os = runners(cask_content:) + runners.product(architectures(cask_content:)).filter_map do |runner, arch| native_runner_arch = arch == runner.fetch(:arch) # If it's just a single OS test then we can just use the two real arch runners. next if !native_runner_arch && !multi_os From a149f88556d82e9e45a5921e835a51969b43044e Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Thu, 7 Mar 2024 17:50:48 +0000 Subject: [PATCH 8/8] cmd/lib/generate-matrix: use default hash syntax. For https://github.com/Homebrew/brew/pull/16848 --- cmd/lib/generate-matrix.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cmd/lib/generate-matrix.rb b/cmd/lib/generate-matrix.rb index d4be7551a3..d708ff7323 100755 --- a/cmd/lib/generate-matrix.rb +++ b/cmd/lib/generate-matrix.rb @@ -48,16 +48,16 @@ module Homebrew syntax_job = { name: "syntax", tap: tap.name, - runner: runner, + runner:, } matrix = [syntax_job] unless labels&.include?("ci-syntax-only") cask_jobs = if args.casks&.any? - CiMatrix.generate(tap, labels: labels, cask_names: casks, skip_install: skip_install, new_cask: new_cask) + CiMatrix.generate(tap, labels:, cask_names: casks, skip_install:, new_cask:) else - CiMatrix.generate(tap, labels: labels, skip_install: skip_install, new_cask: new_cask) + CiMatrix.generate(tap, labels:, skip_install:, new_cask:) end if cask_jobs.any?