From b4a7e800b0c7d5b7b1f0a9587492e5a9350dea95 Mon Sep 17 00:00:00 2001 From: BanHammer Date: Fri, 14 Jun 2024 15:41:23 +0900 Subject: [PATCH 1/4] Update checkver regex --- bucket/android-studio-beta.json | 5 +---- bucket/android-studio-canary.json | 5 +---- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/bucket/android-studio-beta.json b/bucket/android-studio-beta.json index 62e01c8505d..9ee7b56fbe9 100644 --- a/bucket/android-studio-beta.json +++ b/bucket/android-studio-beta.json @@ -24,10 +24,7 @@ "pre_install": "'uninstall.exe' | ForEach-Object { Remove-Item \"$dir/$_\" -Recurse }", "extract_dir": "android-studio", "checkver": { - "regex": [ - "agree_beta_win_bundle_download(?:.|", - ")+?android-studio-([\\d.]+)-windows\\.exe" - ] + "regex": "agree_beta_win_bundle_download(?:.)+?android-studio-([\\d.]+)-windows\\.exe" }, "autoupdate": { "architecture": { diff --git a/bucket/android-studio-canary.json b/bucket/android-studio-canary.json index 802bb46552b..80d692f663b 100644 --- a/bucket/android-studio-canary.json +++ b/bucket/android-studio-canary.json @@ -24,10 +24,7 @@ "pre_install": "'uninstall.exe' | ForEach-Object { Remove-Item \"$dir/$_\" -Recurse }", "extract_dir": "android-studio", "checkver": { - "regex": [ - "agree_canary_win_bundle_download(?:.|", - ")+?android-studio-([\\d.]+)-windows\\.exe" - ] + "regex": "agree_canary_win_bundle_download(?:.)+?android-studio-([\\d.]+)-windows\\.exe" }, "autoupdate": { "architecture": { From a02d2b9e258d5d1d0b527a5fc759280f5cecde13 Mon Sep 17 00:00:00 2001 From: BanHammer Date: Fri, 14 Jun 2024 15:47:55 +0900 Subject: [PATCH 2/4] Update checkver regex --- bucket/android-studio-beta.json | 2 +- bucket/android-studio-canary.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bucket/android-studio-beta.json b/bucket/android-studio-beta.json index 9ee7b56fbe9..a4fbe5afbe9 100644 --- a/bucket/android-studio-beta.json +++ b/bucket/android-studio-beta.json @@ -24,7 +24,7 @@ "pre_install": "'uninstall.exe' | ForEach-Object { Remove-Item \"$dir/$_\" -Recurse }", "extract_dir": "android-studio", "checkver": { - "regex": "agree_beta_win_bundle_download(?:.)+?android-studio-([\\d.]+)-windows\\.exe" + "regex": "agree_beta_win_bundle_download(?:.|\\n)+?android-studio-([\\d.]+)-windows\\.exe" }, "autoupdate": { "architecture": { diff --git a/bucket/android-studio-canary.json b/bucket/android-studio-canary.json index 80d692f663b..83d89e02b6d 100644 --- a/bucket/android-studio-canary.json +++ b/bucket/android-studio-canary.json @@ -24,7 +24,7 @@ "pre_install": "'uninstall.exe' | ForEach-Object { Remove-Item \"$dir/$_\" -Recurse }", "extract_dir": "android-studio", "checkver": { - "regex": "agree_canary_win_bundle_download(?:.)+?android-studio-([\\d.]+)-windows\\.exe" + "regex": "agree_canary_win_bundle_download(?:.|\\n)+?android-studio-([\\d.]+)-windows\\.exe" }, "autoupdate": { "architecture": { From 31c8749546ff4b57bd7b6e6658bbc5e348889579 Mon Sep 17 00:00:00 2001 From: BanHammerYKT Date: Fri, 14 Jun 2024 18:26:15 +0900 Subject: [PATCH 3/4] Update checkver regex --- bucket/android-studio-beta.json | 2 +- bucket/android-studio-canary.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bucket/android-studio-beta.json b/bucket/android-studio-beta.json index a4fbe5afbe9..cab2c85c8f6 100644 --- a/bucket/android-studio-beta.json +++ b/bucket/android-studio-beta.json @@ -24,7 +24,7 @@ "pre_install": "'uninstall.exe' | ForEach-Object { Remove-Item \"$dir/$_\" -Recurse }", "extract_dir": "android-studio", "checkver": { - "regex": "agree_beta_win_bundle_download(?:.|\\n)+?android-studio-([\\d.]+)-windows\\.exe" + "regex": "agree_beta_win_bundle_download[\\s\\S]+?android-studio-([\\d.]+)-windows\\.exe" }, "autoupdate": { "architecture": { diff --git a/bucket/android-studio-canary.json b/bucket/android-studio-canary.json index 83d89e02b6d..b1b4e41fdfa 100644 --- a/bucket/android-studio-canary.json +++ b/bucket/android-studio-canary.json @@ -24,7 +24,7 @@ "pre_install": "'uninstall.exe' | ForEach-Object { Remove-Item \"$dir/$_\" -Recurse }", "extract_dir": "android-studio", "checkver": { - "regex": "agree_canary_win_bundle_download(?:.|\\n)+?android-studio-([\\d.]+)-windows\\.exe" + "regex": "agree_canary_win_bundle_download[\\s\\S]+?android-studio-([\\d.]+)-windows\\.exe" }, "autoupdate": { "architecture": { From 4936389f1ef09ac3ddb593a69b3718b4f7ea88a0 Mon Sep 17 00:00:00 2001 From: BanHammer Date: Mon, 17 Jun 2024 10:35:47 +0900 Subject: [PATCH 4/4] Bump versions --- bucket/android-studio-beta.json | 6 +++--- bucket/android-studio-canary.json | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/bucket/android-studio-beta.json b/bucket/android-studio-beta.json index cab2c85c8f6..bb5a044fe88 100644 --- a/bucket/android-studio-beta.json +++ b/bucket/android-studio-beta.json @@ -1,5 +1,5 @@ { - "version": "2024.1.1.9", + "version": "2024.1.1.10", "description": "The official IDE for Android development, which includes everything you need to build Android apps.", "homepage": "https://developer.android.com/studio/preview", "license": { @@ -11,8 +11,8 @@ }, "architecture": { "64bit": { - "url": "https://redirector.gvt1.com/edgedl/android/studio/ide-zips/2024.1.1.9/android-studio-2024.1.1.9-windows.zip", - "hash": "27639bad3a1628b1fc3cde59724ab0f3ee4c82c8071e5cd0265a48a58df4d03a", + "url": "https://redirector.gvt1.com/edgedl/android/studio/ide-zips/2024.1.1.10/android-studio-2024.1.1.10-windows.zip", + "hash": "c28471dd736b9bce7dc22fb1ca0c2c99e3e2fb5074beb957dfc8b9b9090e3520", "shortcuts": [ [ "bin\\studio64.exe", diff --git a/bucket/android-studio-canary.json b/bucket/android-studio-canary.json index b1b4e41fdfa..d8405dc20d1 100644 --- a/bucket/android-studio-canary.json +++ b/bucket/android-studio-canary.json @@ -1,5 +1,5 @@ { - "version": "2024.1.2.2", + "version": "2024.1.2.5", "description": "The official IDE for Android development, which includes everything you need to build Android apps.", "homepage": "https://developer.android.com/studio/preview", "license": { @@ -11,8 +11,8 @@ }, "architecture": { "64bit": { - "url": "https://redirector.gvt1.com/edgedl/android/studio/ide-zips/2024.1.2.2/android-studio-2024.1.2.2-windows.zip", - "hash": "e7f3c8c8dddf2a8d78e6258370fdd59b9d4b4cea30c7e4853b1d091eff8baabb", + "url": "https://redirector.gvt1.com/edgedl/android/studio/ide-zips/2024.1.2.5/android-studio-2024.1.2.5-windows.zip", + "hash": "e404b734f9bbae7c0bf5ac1c4d6a0a538bd326b141a89516080bcb66b9710638", "shortcuts": [ [ "bin\\studio64.exe",