androidenv: regenerate repo.json

2 files changed, 302 insertions, 146 deletions

diff --git a/pkgs/development/mobile/androidenv/compose-android-packages.nix b/pkgs/development/mobile/androidenv/compose-android-packages.nix
index f528fcd8558..316c1ba8313 100644
--- a/pkgs/development/mobile/androidenv/compose-android-packages.nix
+++ b/pkgs/development/mobile/androidenv/compose-android-packages.nix
@@ -3,8 +3,8 @@
 }:
 
 { toolsVersion ? "26.1.1"
-, platformToolsVersion ? "31.0.2"
-, buildToolsVersions ? [ "30.0.3" ]
+, platformToolsVersion ? "31.0.3"
+, buildToolsVersions ? [ "31.0.0" ]
 , includeEmulator ? false
 , emulatorVersion ? "30.6.3"
 , platformVersions ? []
diff --git a/pkgs/development/mobile/androidenv/repo.json b/pkgs/development/mobile/androidenv/repo.json
index e8e0bf080fe..d8d55e641bb 100644
--- a/pkgs/development/mobile/androidenv/repo.json
+++ b/pkgs/development/mobile/androidenv/repo.json
@@ -1400,6 +1400,27 @@
     },
     "29": {
       "google_apis_playstore": {
+        "arm64-v8a": {
+          "archives": [
+            {
+              "os": "macosx",
+              "sha1": "47705387b8fbbfe87e3679d272c29f7064defba8",
+              "size": 1242979582,
+              "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-29_r09-darwin.zip"
+            },
+            {
+              "os": "linux",
+              "sha1": "47705387b8fbbfe87e3679d272c29f7064defba8",
+              "size": 1242979582,
+              "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-29_r09-linux.zip"
+            }
+          ],
+          "displayName": "Google Play ARM 64 v8a System Image",
+          "license": "android-sdk-arm-dbt-license",
+          "name": "system-image-29-google_apis_playstore-arm64-v8a",
+          "path": "system-images/android-29/google_apis_playstore/arm64-v8a",
+          "revision": "29-google_apis_playstore-arm64-v8a"
+        },
         "x86": {
           "archives": [
             {
@@ -1462,15 +1483,15 @@
           "archives": [
             {
               "os": "macosx",
-              "sha1": "38dc28908c1784a15fbaf64dd8f8d58279d9ce75",
-              "size": 1207055010,
-              "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-30_r09-darwin.zip"
+              "sha1": "7208c0b72b51adb561595e62891763d7322964a0",
+              "size": 1308440072,
+              "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-30_r10-darwin.zip"
             },
             {
               "os": "linux",
-              "sha1": "38dc28908c1784a15fbaf64dd8f8d58279d9ce75",
-              "size": 1207055010,
-              "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-30_r09-linux.zip"
+              "sha1": "7208c0b72b51adb561595e62891763d7322964a0",
+              "size": 1308440072,
+              "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-30_r10-linux.zip"
             }
           ],
           "displayName": "Google Play ARM 64 v8a System Image",
@@ -1535,55 +1556,55 @@
         }
       }
     },
-    "S": {
+    "31": {
       "google_apis_playstore": {
         "arm64-v8a": {
           "archives": [
             {
               "os": "macosx",
-              "sha1": "528e302e9966e8320d1c2bdc8235762fe4a9e733",
-              "size": 1333046412,
-              "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-S_r03-darwin.zip"
+              "sha1": "bef2699f7fd74fe0c4106a8898833074de72984d",
+              "size": 1394878415,
+              "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-31_r06-darwin.zip"
             },
             {
               "os": "linux",
-              "sha1": "528e302e9966e8320d1c2bdc8235762fe4a9e733",
-              "size": 1333046412,
-              "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-S_r03-linux.zip"
+              "sha1": "bef2699f7fd74fe0c4106a8898833074de72984d",
+              "size": 1394878415,
+              "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-31_r06-linux.zip"
             }
           ],
           "displayName": "Google Play ARM 64 v8a System Image",
           "license": "android-sdk-arm-dbt-license",
-          "name": "system-image-S-google_apis_playstore-arm64-v8a",
-          "path": "system-images/android-S/google_apis_playstore/arm64-v8a",
-          "revision": "S-google_apis_playstore-arm64-v8a"
+          "name": "system-image-31-google_apis_playstore-arm64-v8a",
+          "path": "system-images/android-31/google_apis_playstore/arm64-v8a",
+          "revision": "31-google_apis_playstore-arm64-v8a"
         },
         "x86_64": {
           "archives": [
             {
               "os": "windows",
-              "sha1": "093e0537cb18b25d8399a1af3ec955d2085f15ff",
-              "size": 1384401947,
-              "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-S_r03-windows.zip"
+              "sha1": "6450e33574aba4746682cfa72edd4e89947fed38",
+              "size": 1433583169,
+              "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-31_r06-windows.zip"
             },
             {
               "os": "macosx",
-              "sha1": "093e0537cb18b25d8399a1af3ec955d2085f15ff",
-              "size": 1384401947,
-              "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-S_r03-darwin.zip"
+              "sha1": "6450e33574aba4746682cfa72edd4e89947fed38",
+              "size": 1433583169,
+              "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-31_r06-darwin.zip"
             },
             {
               "os": "linux",
-              "sha1": "093e0537cb18b25d8399a1af3ec955d2085f15ff",
-              "size": 1384401947,
-              "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-S_r03-linux.zip"
+              "sha1": "6450e33574aba4746682cfa72edd4e89947fed38",
+              "size": 1433583169,
+              "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-31_r06-linux.zip"
             }
           ],
           "displayName": "Google Play Intel x86 Atom_64 System Image",
           "license": "android-sdk-preview-license",
-          "name": "system-image-S-google_apis_playstore-x86_64",
-          "path": "system-images/android-S/google_apis_playstore/x86_64",
-          "revision": "S-google_apis_playstore-x86_64"
+          "name": "system-image-31-google_apis_playstore-x86_64",
+          "path": "system-images/android-31/google_apis_playstore/x86_64",
+          "revision": "31-google_apis_playstore-x86_64"
         }
       }
     }
@@ -3101,32 +3122,32 @@
         "path": "build-tools/30.0.3",
         "revision": "30.0.3"
       },
-      "31.0.0-rc3": {
+      "31.0.0": {
         "archives": [
           {
-            "os": "macosx",
-            "sha1": "e75dfb7a975809ba0ca0d25c2b82f7fd56444a4b",
-            "size": 53224980,
-            "url": "https://dl.google.com/android/repository/012061446cfd98341585d0d07401d0bd1a4c30f6.build-tools_r31-rc3-macosx.zip"
-          },
-          {
             "os": "windows",
-            "sha1": "9d9ce209353c9046abe16285d58ef893c4b42221",
-            "size": 57592553,
-            "url": "https://dl.google.com/android/repository/41966dc138d44a3e3797b92fb68bf70552011d5d.build-tools_r31-rc3-windows.zip"
+            "sha1": "032da328482814e6ef7fe918665c07e8f8f806ca",
+            "size": 56688233,
+            "url": "https://dl.google.com/android/repository/09489e417c0a266f2862ddd82b4ac29a1b7af55e.build-tools_r31-windows.zip"
           },
           {
             "os": "linux",
-            "sha1": "6859f11348d3984afbfcc74984802bd2e31cc0e2",
-            "size": 54724181,
-            "url": "https://dl.google.com/android/repository/build-tools_r31-rc3-linux.zip"
+            "sha1": "9dbebfdb9ff4c0dbc4ef00677986bf571ddcf99c",
+            "size": 54931191,
+            "url": "https://dl.google.com/android/repository/build-tools_r31-linux.zip"
+          },
+          {
+            "os": "macosx",
+            "sha1": "c9b4215affd183974b1b2d1c5745911203f56de5",
+            "size": 52867497,
+            "url": "https://dl.google.com/android/repository/d32e21a8aa8492ef8b86a489f601da425842b5da.build-tools_r31-macosx.zip"
           }
         ],
-        "displayName": "Android SDK Build-Tools 31-rc3",
-        "license": "android-sdk-preview-license",
+        "displayName": "Android SDK Build-Tools 31",
+        "license": "android-sdk-license",
         "name": "build-tools",
-        "path": "build-tools/31.0.0-rc3",
-        "revision": "31.0.0-rc3"
+        "path": "build-tools/31.0.0",
+        "revision": "31.0.0"
       }
     },
     "cmake": {
@@ -3321,115 +3342,115 @@
         "path": "cmdline-tools/3.0",
         "revision": "3.0"
       },
-      "4.0-rc01": {
+      "4.0": {
         "archives": [
           {
             "os": "linux",
-            "sha1": "98d3f2715f6bfbacef063d1376d7765fe5b93309",
-            "size": 99514756,
-            "url": "https://dl.google.com/android/repository/commandlinetools-linux-6987402_latest.zip"
+            "sha1": "87e7cd8879ed469117f20090dc4d454a24e30170",
+            "size": 103957858,
+            "url": "https://dl.google.com/android/repository/commandlinetools-linux-7302050_latest.zip"
           },
           {
             "os": "macosx",
-            "sha1": "573d312a3fdc7700d9c395d647292d90b193d4ee",
-            "size": 99514744,
-            "url": "https://dl.google.com/android/repository/commandlinetools-mac-6987402_latest.zip"
+            "sha1": "8fcf59d208cb5d48e1233979aa5187e7dfb98cf3",
+            "size": 103957846,
+            "url": "https://dl.google.com/android/repository/commandlinetools-mac-7302050_latest.zip"
           },
           {
             "os": "windows",
-            "sha1": "72fae22d41fb8aa4f22e408e18c9d00f06050f7b",
-            "size": 99496635,
-            "url": "https://dl.google.com/android/repository/commandlinetools-win-6987402_latest.zip"
+            "sha1": "ede5b054c06a7fea51bfd27041a100bae5521803",
+            "size": 103939737,
+            "url": "https://dl.google.com/android/repository/commandlinetools-win-7302050_latest.zip"
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "license": "android-sdk-preview-license",
+        "license": "android-sdk-license",
         "name": "cmdline-tools",
-        "path": "cmdline-tools/4.0-beta01",
-        "revision": "4.0-rc01"
+        "path": "cmdline-tools/4.0",
+        "revision": "4.0"
       },
-      "5.0-rc01": {
+      "5.0": {
         "archives": [
           {
             "os": "linux",
-            "sha1": "f06b1642396ef1e431b990dbe386d5f1e3deabcc",
-            "size": 102189958,
-            "url": "https://dl.google.com/android/repository/commandlinetools-linux-7006259_latest.zip"
+            "sha1": "0885385de11983c020ff0d47039987fe372160d2",
+            "size": 109673042,
+            "url": "https://dl.google.com/android/repository/commandlinetools-linux-7583922_latest.zip"
           },
           {
             "os": "macosx",
-            "sha1": "0752424530724f76cb5a28de84d663e63739e6ee",
-            "size": 102189946,
-            "url": "https://dl.google.com/android/repository/commandlinetools-mac-7006259_latest.zip"
+            "sha1": "49538fa064c077b188bdb51f3aa57bb2882b0abd",
+            "size": 109673028,
+            "url": "https://dl.google.com/android/repository/commandlinetools-mac-7583922_latest.zip"
           },
           {
             "os": "windows",
-            "sha1": "6f8e359dba91af39c046a791ea32e3ca5149a078",
-            "size": 102171837,
-            "url": "https://dl.google.com/android/repository/commandlinetools-win-7006259_latest.zip"
+            "sha1": "a2f359fb8b075acebcb3e3e48b4170cfe4071882",
+            "size": 109651902,
+            "url": "https://dl.google.com/android/repository/commandlinetools-win-7583922_latest.zip"
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "license": "android-sdk-preview-license",
+        "license": "android-sdk-license",
         "name": "cmdline-tools",
-        "path": "cmdline-tools/5.0-alpha01",
-        "revision": "5.0-rc01"
+        "path": "cmdline-tools/5.0",
+        "revision": "5.0"
       }
     },
     "emulator": {
-      "30.5.5": {
+      "30.8.4": {
         "archives": [
           {
-            "os": "macosx",
-            "sha1": "90f8a9942253db75ab4d13f791377e9739a88617",
-            "size": 300476485,
-            "url": "https://dl.google.com/android/repository/emulator-darwin_x64-7285888.zip"
-          },
-          {
             "os": "linux",
-            "sha1": "ccdee1aa99e4ec39f5a762d6912682ac248b92f0",
-            "size": 272500365,
-            "url": "https://dl.google.com/android/repository/emulator-linux_x64-7285888.zip"
+            "sha1": "140f833321684f7696e4b9012636c45eaa5b6a4a",
+            "size": 277522999,
+            "url": "https://dl.google.com/android/repository/emulator-linux_x64-7600983.zip"
           },
           {
             "os": "windows",
-            "sha1": "84c3105ba1a3a94963e1f99b3f706d0231948fc9",
-            "size": 324371999,
-            "url": "https://dl.google.com/android/repository/emulator-windows_x64-7285888.zip"
+            "sha1": "c26170db8aba1bbfcfe63481e95a90bc7b2ff129",
+            "size": 326723360,
+            "url": "https://dl.google.com/android/repository/emulator-windows_x64-7600983.zip"
+          },
+          {
+            "os": "macosx",
+            "sha1": "9811a649c516153681471f897a02398947640045",
+            "size": 315292647,
+            "url": "https://dl.google.com/android/repository/emulator-darwin_x64-7600983.zip"
           }
         ],
         "displayName": "Android Emulator",
         "license": "android-sdk-license",
         "name": "emulator",
         "path": "emulator",
-        "revision": "30.5.5"
+        "revision": "30.8.4"
       },
-      "30.6.3": {
+      "30.9.0": {
         "archives": [
           {
             "os": "macosx",
-            "sha1": "66c9b788de49548d0faab052274f97b042f7241d",
-            "size": 308984491,
-            "url": "https://dl.google.com/android/repository/emulator-darwin_x64-7266284.zip"
+            "sha1": "b197e04e0543271899a1bd956a3f828e1159086b",
+            "size": 315330447,
+            "url": "https://dl.google.com/android/repository/emulator-darwin_x64-7634933.zip"
           },
           {
             "os": "linux",
-            "sha1": "ecd9b55fe4784b6c8683faa4b1d2c951b8929154",
-            "size": 272243636,
-            "url": "https://dl.google.com/android/repository/emulator-linux_x64-7266284.zip"
+            "sha1": "5cdfb2b27f24ded22348535f2de28ec373e203c8",
+            "size": 277557089,
+            "url": "https://dl.google.com/android/repository/emulator-linux_x64-7634933.zip"
           },
           {
             "os": "windows",
-            "sha1": "5736749dc46ad950ec84e8275dfde2606d3e8a80",
-            "size": 324657514,
-            "url": "https://dl.google.com/android/repository/emulator-windows_x64-7266284.zip"
+            "sha1": "aed5ba827d0c1d68c8663a4d786f184aaeb939ed",
+            "size": 326205048,
+            "url": "https://dl.google.com/android/repository/emulator-windows_x64-7634933.zip"
           }
         ],
         "displayName": "Android Emulator",
         "license": "android-sdk-preview-license",
         "name": "emulator",
         "path": "emulator",
-        "revision": "30.6.3"
+        "revision": "30.9.0"
       }
     },
     "extras": {
@@ -3460,32 +3481,32 @@
         "path": "extras/google/auto",
         "revision": "1.1"
       },
-      "2.0-rc1": {
+      "2.0-rc2": {
         "archives": [
           {
             "os": "linux",
-            "sha1": "b480489e604371301da10731a793b234b01b8f42",
-            "size": 4527281,
-            "url": "https://dl.google.com/android/repository/desktop-head-unit-linux_r02.0.rc1.zip"
+            "sha1": "dbb771c2be299fd88ca05d8b0e381c369a7f7009",
+            "size": 6947111,
+            "url": "https://dl.google.com/android/repository/desktop-head-unit-linux_r02.0.rc2.zip"
           },
           {
             "os": "macosx",
-            "sha1": "3adaf99d06eaeeb31f7bdbb62ae841e740bfc156",
-            "size": 5592023,
-            "url": "https://dl.google.com/android/repository/desktop-head-unit-macosx_r02.0.rc1.zip"
+            "sha1": "ec1f68f9acc234f8493f4ba24954d1d45291b736",
+            "size": 8593497,
+            "url": "https://dl.google.com/android/repository/desktop-head-unit-macosx_r02.0.rc2.zip"
           },
           {
             "os": "windows",
-            "sha1": "e07788ed91d8e6dd3374f77da1cf78afb2664cc0",
-            "size": 5703857,
-            "url": "https://dl.google.com/android/repository/desktop-head-unit-windows_r02.0.rc1.zip"
+            "sha1": "471ae94176512f859580e6ac9e8b8f5010632c78",
+            "size": 7130894,
+            "url": "https://dl.google.com/android/repository/desktop-head-unit-windows_r02.0.rc2.zip"
           }
         ],
         "displayName": "Android Auto Desktop Head Unit Emulator",
         "license": "android-sdk-preview-license",
         "name": "extras",
         "path": "extras/google/auto",
-        "revision": "2.0-rc1"
+        "revision": "2.0-rc2"
       }
     },
     "ndk": {
@@ -4136,6 +4157,114 @@
         "name": "ndk",
         "path": "ndk/23.0.7272597",
         "revision": "23.0.7272597-rc3"
+      },
+      "23.0.7344513-rc4": {
+        "archives": [
+          {
+            "os": "macosx",
+            "sha1": "a8fedcf0dd3b3a340e68684a5a2308154a952039",
+            "size": 694920487,
+            "url": "https://dl.google.com/android/repository/android-ndk-r23-beta4-darwin-x86_64.zip"
+          },
+          {
+            "os": "linux",
+            "sha1": "5f44bc1789042358a73c15e0ef732ea729cf47cc",
+            "size": 724510864,
+            "url": "https://dl.google.com/android/repository/android-ndk-r23-beta4-linux-x86_64.zip"
+          },
+          {
+            "os": "windows",
+            "sha1": "4492af1296d07c0c65ce42f10ecac06c3c307b94",
+            "size": 785615074,
+            "url": "https://dl.google.com/android/repository/android-ndk-r23-beta4-windows-x86_64.zip"
+          }
+        ],
+        "displayName": "NDK (Side by side) 23.0.7344513",
+        "license": "android-sdk-preview-license",
+        "name": "ndk",
+        "path": "ndk/23.0.7344513",
+        "revision": "23.0.7344513-rc4"
+      },
+      "23.0.7421159-rc5": {
+        "archives": [
+          {
+            "os": "macosx",
+            "sha1": "9ef60fcc7a4bb0477d4189c711853cbc12b24efe",
+            "size": 694850942,
+            "url": "https://dl.google.com/android/repository/android-ndk-r23-beta5-darwin.zip"
+          },
+          {
+            "os": "linux",
+            "sha1": "453ba0ca124e43337318f8a40d26cab114e7092c",
+            "size": 724438684,
+            "url": "https://dl.google.com/android/repository/android-ndk-r23-beta5-linux.zip"
+          },
+          {
+            "os": "windows",
+            "sha1": "ace75623181ce86bc70df312155c04b9d8ff3e46",
+            "size": 785543078,
+            "url": "https://dl.google.com/android/repository/android-ndk-r23-beta5-windows.zip"
+          }
+        ],
+        "displayName": "NDK (Side by side) 23.0.7421159",
+        "license": "android-sdk-preview-license",
+        "name": "ndk",
+        "path": "ndk/23.0.7421159",
+        "revision": "23.0.7421159-rc5"
+      },
+      "23.0.7530507-rc6": {
+        "archives": [
+          {
+            "os": "macosx",
+            "sha1": "af299c3e4f6fd3e6f05b1699a0181d84a95068c4",
+            "size": 695336572,
+            "url": "https://dl.google.com/android/repository/android-ndk-r23-beta6-darwin.zip"
+          },
+          {
+            "os": "linux",
+            "sha1": "b3118a9daeff8ad1801c4dbaeda1e5e5fb33b8a5",
+            "size": 725026229,
+            "url": "https://dl.google.com/android/repository/android-ndk-r23-beta6-linux.zip"
+          },
+          {
+            "os": "windows",
+            "sha1": "386f5c80217f6f33d6420f7de4f935eaff831868",
+            "size": 786033634,
+            "url": "https://dl.google.com/android/repository/android-ndk-r23-beta6-windows.zip"
+          }
+        ],
+        "displayName": "NDK (Side by side) 23.0.7530507",
+        "license": "android-sdk-preview-license",
+        "name": "ndk",
+        "path": "ndk/23.0.7530507",
+        "revision": "23.0.7530507-rc6"
+      },
+      "23.0.7599858": {
+        "archives": [
+          {
+            "os": "macosx",
+            "sha1": "c19f4a29e03689ea31bebe77f2d0a256d8e16925",
+            "size": 691981924,
+            "url": "https://dl.google.com/android/repository/android-ndk-r23-darwin.zip"
+          },
+          {
+            "os": "linux",
+            "sha1": "9bad35f442caeda747780ba1dd92f2d98609d9cd",
+            "size": 721667870,
+            "url": "https://dl.google.com/android/repository/android-ndk-r23-linux.zip"
+          },
+          {
+            "os": "windows",
+            "sha1": "14af52e23af9f7a9e7576a17e1814701192745be",
+            "size": 782684423,
+            "url": "https://dl.google.com/android/repository/android-ndk-r23-windows.zip"
+          }
+        ],
+        "displayName": "NDK (Side by side) 23.0.7599858",
+        "license": "android-sdk-license",
+        "name": "ndk",
+        "path": "ndk/23.0.7599858",
+        "revision": "23.0.7599858"
       }
     },
     "ndk-bundle": {
@@ -4786,6 +4915,33 @@
         "name": "ndk-bundle",
         "path": "ndk-bundle",
         "revision": "23.0.7272597-rc3"
+      },
+      "23.0.7344513-rc4": {
+        "archives": [
+          {
+            "os": "macosx",
+            "sha1": "a8fedcf0dd3b3a340e68684a5a2308154a952039",
+            "size": 694920487,
+            "url": "https://dl.google.com/android/repository/android-ndk-r23-beta4-darwin-x86_64.zip"
+          },
+          {
+            "os": "linux",
+            "sha1": "5f44bc1789042358a73c15e0ef732ea729cf47cc",
+            "size": 724510864,
+            "url": "https://dl.google.com/android/repository/android-ndk-r23-beta4-linux-x86_64.zip"
+          },
+          {
+            "os": "windows",
+            "sha1": "4492af1296d07c0c65ce42f10ecac06c3c307b94",
+            "size": 785615074,
+            "url": "https://dl.google.com/android/repository/android-ndk-r23-beta4-windows-x86_64.zip"
+          }
+        ],
+        "displayName": "NDK",
+        "license": "android-sdk-preview-license",
+        "name": "ndk-bundle",
+        "path": "ndk-bundle",
+        "revision": "23.0.7344513-rc4"
       }
     },
     "patcher": {
@@ -4806,32 +4962,32 @@
       }
     },
     "platform-tools": {
-      "31.0.2": {
+      "31.0.3": {
         "archives": [
           {
             "os": "macosx",
-            "sha1": "78937049851e1db90317612c6b831759f56fc86d",
-            "size": 13829393,
-            "url": "https://dl.google.com/android/repository/42b081e1e068bb936179551684cdcb30315e245c.platform-tools_r31.0.2-darwin.zip"
+            "sha1": "15f6f7e97b35994d538a0fc5147ad5fb502ba03d",
+            "size": 13227985,
+            "url": "https://dl.google.com/android/repository/e8b2b4cbe47c728c1e54c5f524440b52d4e1a33c.platform-tools_r31.0.3-darwin.zip"
           },
           {
             "os": "linux",
-            "sha1": "ff02a9d8c6fa9687e1207fc0c4b84033925d452d",
-            "size": 13876419,
-            "url": "https://dl.google.com/android/repository/platform-tools_r31.0.2-linux.zip"
+            "sha1": "f09581347ed39978abb3a99c6bb286de6adc98ef",
+            "size": 13302579,
+            "url": "https://dl.google.com/android/repository/platform-tools_r31.0.3-linux.zip"
           },
           {
             "os": "windows",
-            "sha1": "9cc0f642a66706a978214395b85c8e8228c24f2f",
-            "size": 12537668,
-            "url": "https://dl.google.com/android/repository/platform-tools_r31.0.2-windows.zip"
+            "sha1": "26bc02bbd920e8ed461ae526cc4c69d773b72395",
+            "size": 11912013,
+            "url": "https://dl.google.com/android/repository/platform-tools_r31.0.3-windows.zip"
           }
         ],
         "displayName": "Android SDK Platform-Tools",
         "license": "android-sdk-license",
         "name": "platform-tools",
         "path": "platform-tools",
-        "revision": "31.0.2"
+        "revision": "31.0.3"
       }
     },
     "platforms": {
@@ -5204,6 +5360,21 @@
         "path": "platforms/android-30",
         "revision": "30"
       },
+      "31": {
+        "archives": [
+          {
+            "os": "all",
+            "sha1": "ca5bcaa565cb37e9d287051d6dd0e49a5426ec29",
+            "size": 56475526,
+            "url": "https://dl.google.com/android/repository/platform-31_r01.zip"
+          }
+        ],
+        "displayName": "Android SDK Platform 31",
+        "license": "android-sdk-license",
+        "name": "platforms",
+        "path": "platforms/android-31",
+        "revision": "31"
+      },
       "4": {
         "archives": [
           {
@@ -5329,50 +5500,35 @@
         "name": "platforms",
         "path": "platforms/android-9",
         "revision": "9"
-      },
-      "S": {
-        "archives": [
-          {
-            "os": "all",
-            "sha1": "3aee3ad760dc7becf657d6421629fe360215f92e",
-            "size": 56206479,
-            "url": "https://dl.google.com/android/repository/platform-S_r03.zip"
-          }
-        ],
-        "displayName": "Android SDK Platform S",
-        "license": "android-sdk-license",
-        "name": "platforms",
-        "path": "platforms/android-S",
-        "revision": "S"
       }
     },
     "skiaparser": {
-      "2": {
+      "3": {
         "archives": [
           {
             "os": "linux",
-            "sha1": "2703a570224a5ced1f73eb3efbdb3192a1ecec81",
-            "size": 6681896,
-            "url": "https://dl.google.com/android/repository/skiaparser-7248848-linux.zip"
+            "sha1": "36e2c30f7745f4c062129a0fd549d29ab991db41",
+            "size": 6767192,
+            "url": "https://dl.google.com/android/repository/skiaparser-7478287-linux.zip"
           },
           {
             "os": "macosx",
-            "sha1": "ecf8794beccf578d4130bb9f7f2c7fa0c40c62c2",
-            "size": 7340904,
-            "url": "https://dl.google.com/android/repository/skiaparser-7248848-mac.zip"
+            "sha1": "04a834a8ab3efd4612300da7cef7f43a6b257468",
+            "size": 7401688,
+            "url": "https://dl.google.com/android/repository/skiaparser-7478287-mac.zip"
           },
           {
             "os": "windows",
-            "sha1": "84c28480ca057e48e8d2fed0ae8f52fc21aa7e61",
-            "size": 6450856,
-            "url": "https://dl.google.com/android/repository/skiaparser-7248848-win.zip"
+            "sha1": "567f24512f9d9487a3b948032a136261f5d59c92",
+            "size": 6532776,
+            "url": "https://dl.google.com/android/repository/skiaparser-7478287-win.zip"
           }
         ],
         "displayName": "Layout Inspector image server for API S",
         "license": "android-sdk-license",
         "name": "skiaparser",
         "path": "skiaparser/2",
-        "revision": "2"
+        "revision": "3"
       },
       "6": {
         "archives": [