From 09ccd284e709198a25ceaa57063287261d185c00 Mon Sep 17 00:00:00 2001
From: maxwen <max.weninger@gmail.com>
Date: Thu, 18 Nov 2021 20:54:17 +0100
Subject: [PATCH 1/2] devices: add android-12.0

Change-Id: I223741f9046b1ee79fd31618d0c54b6bc8f747d1
---
 views/devices/devices.html | 3 +++
 views/devices/devices.js   | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/views/devices/devices.html b/views/devices/devices.html
index 0c94339..dd5c628 100644
--- a/views/devices/devices.html
+++ b/views/devices/devices.html
@@ -6,6 +6,9 @@
     <div class="col-lg-2 col-md-3 col-sm-6">
       <a href="#devices/android-11" id="android-11" class="btn btn-light">Android R (11)</a>
     </div>
+    <div class="col-lg-2 col-md-3 col-sm-6">
+      <a href="#devices/android-12.0" id="android-12.0" class="btn btn-light">Android S (12)</a>
+    </div>
   </div>
   <div class="row justify-content-center" id="device-list">
 
diff --git a/views/devices/devices.js b/views/devices/devices.js
index 8cb0553..7a72268 100644
--- a/views/devices/devices.js
+++ b/views/devices/devices.js
@@ -3,7 +3,7 @@ import { siteURL, container, showSpinner } from '../../js/const.js'
 var devicesList = []
 const gerritURL = 'https://gerrit.omnirom.org'
 const rawURL = 'https://raw.githubusercontent.com/omnirom/'
-var currentVersion = 'android-11'
+var currentVersion = 'android-12.0'
 
 class DevicesView {
 

From 9072071d47dfc8457b8a6bab8c206947410a3e48 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 18 Nov 2021 19:55:35 +0000
Subject: [PATCH 2/2] Bump axios from 0.19.2 to 0.21.2

Bumps [axios](https://github.com/axios/axios) from 0.19.2 to 0.21.2.
- [Release notes](https://github.com/axios/axios/releases)
- [Changelog](https://github.com/axios/axios/blob/master/CHANGELOG.md)
- [Commits](https://github.com/axios/axios/compare/v0.19.2...v0.21.2)

---
updated-dependencies:
- dependency-name: axios
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 20 +++++++++++++++-----
 package.json      |  2 +-
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index d2ef1a3..e4cf1b4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -316,11 +316,18 @@
             "dev": true
         },
         "axios": {
-            "version": "0.19.2",
-            "resolved": "https://registry.npmjs.org/axios/-/axios-0.19.2.tgz",
-            "integrity": "sha512-fjgm5MvRHLhx+osE2xoekY70AhARk3a6hkN+3Io1jc00jtquGvxYlKlsFUhmUET0V5te6CcZI7lcv2Ym61mjHA==",
+            "version": "0.21.2",
+            "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.2.tgz",
+            "integrity": "sha512-87otirqUw3e8CzHTMO+/9kh/FSgXt/eVDvipijwDtEuwbkySWZ9SBm6VEubmJ/kLKEoLQV/POhxXFb66bfekfg==",
             "requires": {
-                "follow-redirects": "1.5.10"
+                "follow-redirects": "^1.14.0"
+            },
+            "dependencies": {
+                "follow-redirects": {
+                    "version": "1.14.5",
+                    "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.5.tgz",
+                    "integrity": "sha512-wtphSXy7d4/OR+MvIFbCVBDzZ5520qV8XfPklSN5QtxuMUJZ+b0Wnst1e1lCDocfzuCkHqj8k0FpZqO+UIaKNA=="
+                }
             }
         },
         "bach": {
@@ -863,6 +870,7 @@
             "version": "3.1.0",
             "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
             "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+            "dev": true,
             "requires": {
                 "ms": "2.0.0"
             }
@@ -1457,6 +1465,7 @@
             "version": "1.5.10",
             "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.10.tgz",
             "integrity": "sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==",
+            "dev": true,
             "requires": {
                 "debug": "=3.1.0"
             }
@@ -3026,7 +3035,8 @@
         "ms": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-            "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+            "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+            "dev": true
         },
         "mute-stdout": {
             "version": "1.0.1",
diff --git a/package.json b/package.json
index f074d98..04f51c1 100644
--- a/package.json
+++ b/package.json
@@ -31,7 +31,7 @@
     "dependencies": {
         "bootstrap": "4.3.1",
         "jquery": "3.4.1",
-        "axios": "^0.19.1",
+        "axios": "^0.21.2",
         "jquery.easing": "^1.4.1"
     },
     "devDependencies": {