From 960dcc44780acae7feff512fb0e793dd055e634c Mon Sep 17 00:00:00 2001
From: meatball <69751659+meatball133@users.noreply.github.com>
Date: Sat, 9 Nov 2024 19:26:22 +0100
Subject: [PATCH 1/2] Depricate beer song (#1731)

---
 config.json | 23 +++++++++--------------
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/config.json b/config.json
index 1b4dbdc4ad..ba3faf7bf1 100644
--- a/config.json
+++ b/config.json
@@ -992,20 +992,6 @@
         ],
         "difficulty": 3
       },
-      {
-        "slug": "beer-song",
-        "name": "Beer Song",
-        "uuid": "e4f0873a-e834-4b28-9902-795f52f76adb",
-        "practices": [
-          "strings"
-        ],
-        "prerequisites": [
-          "strings",
-          "numbers",
-          "loops"
-        ],
-        "difficulty": 3
-      },
       {
         "slug": "protein-translation",
         "name": "Protein Translation",
@@ -1547,6 +1533,15 @@
         "difficulty": 1,
         "status": "deprecated"
       },
+      {
+        "slug": "beer-song",
+        "name": "Beer Song",
+        "uuid": "e4f0873a-e834-4b28-9902-795f52f76adb",
+        "practices": [],
+        "prerequisites": [],
+        "difficulty": 3,
+        "status": "deprecated"
+      },
       {
         "slug": "microwave",
         "name": "Microwave",

From 21705a7811c1c3cbb00af25fc177deb70e35642b Mon Sep 17 00:00:00 2001
From: Victor Goff <keeperotphones+github@gmail.com>
Date: Sat, 9 Nov 2024 18:13:59 -0500
Subject: [PATCH 2/2] Address deprecations (#1732)

- Rubocop changed auto-correct to autocorrect
- base64 will be dropped from stdlib in Ruby 3.4
---
 Gemfile           | 1 +
 Gemfile.lock      | 2 ++
 bin/rubocop-quick | 2 +-
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/Gemfile b/Gemfile
index 6ec775621a..581d8bfda7 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,5 +1,6 @@
 source 'https://rubygems.org'
 
+gem 'base64'
 gem 'minitest'
 gem 'rake'
 gem 'mocha', require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index 73af3549cb..322f49cbc3 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -2,6 +2,7 @@ GEM
   remote: https://rubygems.org/
   specs:
     ast (2.4.2)
+    base64 (0.2.0)
     docile (1.4.0)
     json (2.7.2)
     minitest (5.22.3)
@@ -47,6 +48,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  base64
   minitest
   mocha
   racc
diff --git a/bin/rubocop-quick b/bin/rubocop-quick
index db00b3c19a..ca319c29bc 100755
--- a/bin/rubocop-quick
+++ b/bin/rubocop-quick
@@ -1,4 +1,4 @@
 #!/bin/bash
 
-git diff --name-status --staged | grep '^[MA]' | grep -o '\s\+.*rb' | xargs bundle exec rubocop --except Metrics --auto-correct --format quiet --force-exclusion Gemfile.lock && \
+git diff --name-status --staged | grep '^[MA]' | grep -o '\s\+.*rb' | xargs bundle exec rubocop --except Metrics --autocorrect --format quiet --force-exclusion Gemfile.lock && \
 git diff --name-status --staged | grep '^[MA]' | grep -o '\s\+.*rb' | xargs git add