From ef9453c2ad5c63a69538458c476040e57312d377 Mon Sep 17 00:00:00 2001 From: gnought <1684105+gnought@users.noreply.github.com> Date: Sun, 18 Feb 2024 00:30:45 +0800 Subject: [PATCH 1/5] switch to universal arch --- Casks/v/visual-studio-code.rb | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/Casks/v/visual-studio-code.rb b/Casks/v/visual-studio-code.rb index 6632250b43..4d7dc6f8e1 100644 --- a/Casks/v/visual-studio-code.rb +++ b/Casks/v/visual-studio-code.rb @@ -1,18 +1,15 @@ cask "visual-studio-code" do - arch arm: "darwin-arm64", intel: "darwin" - version "1.86.2" - sha256 arm: "b82dcb4bc6b2316ef4fdc5a0ab924152758a1a0e437831bd63d501d717e36b6f", - intel: "0ac71d38cf0a50c8757153a8db238e60d33d50c1559d26998b5c002af69f6b8b" + sha256 "b9fe35872597f54afa0391bbea7470ae847074051067c09daabbfb4b1388b5ff" - url "https://update.code.visualstudio.com/#{version}/#{arch}/stable" + url "https://update.code.visualstudio.com/#{version}/darwin-universal/stable" name "Microsoft Visual Studio Code" name "VS Code" desc "Open-source code editor" homepage "https://code.visualstudio.com/" livecheck do - url "https://update.code.visualstudio.com/api/update/#{arch}/stable/latest" + url "https://update.code.visualstudio.com/api/update/darwin-universal/stable/latest" regex(/"productVersion"\s*:\s*"(\d+(:?\.\d+)+)"/i) end From 3ad129f4bc904235654c6ca9bc990d44b533b08f Mon Sep 17 00:00:00 2001 From: gnought <1684105+gnought@users.noreply.github.com> Date: Sun, 18 Feb 2024 00:31:15 +0800 Subject: [PATCH 2/5] uninstall launchctl and quite the app --- Casks/v/visual-studio-code.rb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Casks/v/visual-studio-code.rb b/Casks/v/visual-studio-code.rb index 4d7dc6f8e1..c5c09d657d 100644 --- a/Casks/v/visual-studio-code.rb +++ b/Casks/v/visual-studio-code.rb @@ -19,6 +19,9 @@ cask "visual-studio-code" do app "Visual Studio Code.app" binary "#{appdir}/Visual Studio Code.app/Contents/Resources/app/bin/code" + uninstall launchctl: "com.microsoft.VSCode.ShipIt", + quit: "com.microsoft.VSCode" + zap trash: [ "~/.vscode", "~/Library/Application Support/Code", From 79f01411b7d46893aa397efdf87421256834a243 Mon Sep 17 00:00:00 2001 From: gnought <1684105+gnought@users.noreply.github.com> Date: Sun, 18 Feb 2024 00:40:03 +0800 Subject: [PATCH 3/5] update minimum macos requirement --- Casks/v/visual-studio-code.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Casks/v/visual-studio-code.rb b/Casks/v/visual-studio-code.rb index c5c09d657d..373357f43c 100644 --- a/Casks/v/visual-studio-code.rb +++ b/Casks/v/visual-studio-code.rb @@ -14,7 +14,7 @@ cask "visual-studio-code" do end auto_updates true - depends_on macos: ">= :high_sierra" + depends_on macos: ">= :catalina" app "Visual Studio Code.app" binary "#{appdir}/Visual Studio Code.app/Contents/Resources/app/bin/code" From 04c26c71853af12e0ef3812ef6a71b8e035c96e7 Mon Sep 17 00:00:00 2001 From: gnought <1684105+gnought@users.noreply.github.com> Date: Sun, 18 Feb 2024 00:48:10 +0800 Subject: [PATCH 4/5] update livecheck strategy --- Casks/v/visual-studio-code.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Casks/v/visual-studio-code.rb b/Casks/v/visual-studio-code.rb index 373357f43c..340d965bc5 100644 --- a/Casks/v/visual-studio-code.rb +++ b/Casks/v/visual-studio-code.rb @@ -10,7 +10,9 @@ cask "visual-studio-code" do livecheck do url "https://update.code.visualstudio.com/api/update/darwin-universal/stable/latest" - regex(/"productVersion"\s*:\s*"(\d+(:?\.\d+)+)"/i) + strategy :json do |json| + json["productVersion"] + end end auto_updates true From 057d16bdc970ed856c4db0cd85e30be53875d3f0 Mon Sep 17 00:00:00 2001 From: gnought <1684105+gnought@users.noreply.github.com> Date: Sun, 18 Feb 2024 13:00:26 +0800 Subject: [PATCH 5/5] revert arch changes --- Casks/v/visual-studio-code.rb | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/Casks/v/visual-studio-code.rb b/Casks/v/visual-studio-code.rb index 340d965bc5..ae6bbe870a 100644 --- a/Casks/v/visual-studio-code.rb +++ b/Casks/v/visual-studio-code.rb @@ -1,15 +1,18 @@ cask "visual-studio-code" do - version "1.86.2" - sha256 "b9fe35872597f54afa0391bbea7470ae847074051067c09daabbfb4b1388b5ff" + arch arm: "darwin-arm64", intel: "darwin" - url "https://update.code.visualstudio.com/#{version}/darwin-universal/stable" + version "1.86.2" + sha256 arm: "b82dcb4bc6b2316ef4fdc5a0ab924152758a1a0e437831bd63d501d717e36b6f", + intel: "0ac71d38cf0a50c8757153a8db238e60d33d50c1559d26998b5c002af69f6b8b" + + url "https://update.code.visualstudio.com/#{version}/#{arch}/stable" name "Microsoft Visual Studio Code" name "VS Code" desc "Open-source code editor" homepage "https://code.visualstudio.com/" livecheck do - url "https://update.code.visualstudio.com/api/update/darwin-universal/stable/latest" + url "https://update.code.visualstudio.com/api/update/#{arch}/stable/latest" strategy :json do |json| json["productVersion"] end