Merge pull request #213 from SFTtech/milo/dependency-upgrades

dependency upgrades
SFTtech · Mar 2, 2024 · 6616f35 · 6616f35
2 parents 8906064 + f581008
commit 6616f35
Show file tree

Hide file tree

Showing 6 changed files with 6,327 additions and 6,576 deletions.
diff --git a/.github/workflows/frontend.yaml b/.github/workflows/frontend.yaml
@@ -92,8 +92,14 @@ jobs:
       - name: Install dependencies
         run: npm ci
 
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
+        with:
+          java-version: '17'
+          distribution: 'temurin'
+
       - name: Setup Android SDK
-        uses: android-actions/setup-android@v2
+        uses: android-actions/setup-android@v3
 
       - uses: actions/cache@v3
         with:

diff --git a/frontend/apps/web/src/components/LanguageSelect.tsx b/frontend/apps/web/src/components/LanguageSelect.tsx
@@ -2,7 +2,7 @@ import { MenuItem, Select, SelectChangeEvent, SelectProps } from "@mui/material"
 import * as React from "react";
 import { useTranslation } from "react-i18next";
 
-export type LanguageSelectProps = Omit<SelectProps, "value" | "onChange">;
+export type LanguageSelectProps = Omit<SelectProps, "value" | "onChange" | "variant">;
 
 export const LanguageSelect: React.FC<LanguageSelectProps> = (props) => {
     const { t, i18n } = useTranslation();
@@ -13,7 +13,13 @@ export const LanguageSelect: React.FC<LanguageSelectProps> = (props) => {
     };
 
     return (
-        <Select value={i18n.language} sx={{ color: "inherit" }} onChange={handleSetLanguage} {...props}>
+        <Select
+            value={i18n.language}
+            sx={{ color: "inherit" }}
+            variant="outlined"
+            onChange={handleSetLanguage}
+            {...props}
+        >
             <MenuItem value="en-US">{t("languages.en")}</MenuItem>
             <MenuItem value="de-DE">{t("languages.de")}</MenuItem>
         </Select>

diff --git a/frontend/nx.json b/frontend/nx.json
@@ -14,10 +14,6 @@
             "inputs": ["production", "^production"],
             "cache": true
         },
-        "lint": {
-            "inputs": ["default", "{workspaceRoot}/.eslintrc.json"],
-            "cache": true
-        },
         "@nx/jest:jest": {
             "inputs": ["default", "^production", "{workspaceRoot}/jest.preset.js"],
             "cache": true,
@@ -30,6 +26,10 @@
                     "codeCoverage": true
                 }
             }
+        },
+        "@nx/eslint:lint": {
+            "inputs": ["default", "{workspaceRoot}/.eslintrc.json"],
+            "cache": true
         }
     },
     "namedInputs": {