Merge pull request #172431 from miccal/bump-surge-5.7.1-2757-e7b680d5…

…dc23e1258188adc4d81116d7

surge 5.7.1

Casks/s/surge.rb

@@ -1,6 +1,6 @@
 cask "surge" do
-  version "5.7.0,2724,acaafccea020f6afdc758c83057ffcbb"
-  sha256 "38f2143ea462185b4a794b045ff4fefb40f8c4c343f113c2da3ceec4fcd2bca9"
+  version "5.7.1,2757,e7b680d5dc23e1258188adc4d81116d7"
+  sha256 "dbdb23dedb4234b019599b823ffa02061ec1e1f864f03b6962b8e574b1af3c5f"
 
   url "https://dl.nssurge.com/mac/v#{version.major}/Surge-#{version.tr(",", "-")}.zip"
   name "Surge"
@@ -18,7 +18,7 @@
   end
 
   auto_updates true
-  conflicts_with cask: "homebrew/cask-versions/surge4"
+  conflicts_with cask: "surge4"
   depends_on macos: ">= :high_sierra"
 
   app "Surge.app"
@@ -29,13 +29,10 @@
   zap delete: [
     "~/Library/Application Support/com.nssurge.surge-mac",
     "~/Library/Application Support/Surge",
-    "~/Library/Caches/com.nssurge.surge-mac",
-    "~/Library/Caches/com.nssurge.surge-mac.plist",
+    "~/Library/Caches/com.nssurge.surge-mac*",
     "~/Library/HTTPStorages/com.nssurge.surge-mac",
     "~/Library/Logs/Surge",
-    "~/Library/Preferences/com.nssurge.surge-dashboard.plist",
-    "~/Library/Preferences/com.nssurge.surge-mac.plist",
-    "~/Library/Saved Application State/com.nssurge.surge-dashboard.savedState",
-    "~/Library/Saved Application State/com.nssurge.surge-mac.savedState",
+    "~/Library/Preferences/com.nssurge.surge*",
+    "~/Library/Saved Application State/com.nssurge.surge*",
   ]
 end