ANDROID: update dependencies

chrisws · chrisws · commit ddb9f8e69524 · 2024-04-14T19:49:57.000+09:30
diff --git a/src/platform/android/app/build.gradle b/src/platform/android/app/build.gradle
@@ -2,13 +2,13 @@ apply plugin: 'com.android.application'
 
 android {
   // app can use the API features included in this API level and lower.
-  compileSdkVersion 33
+  compileSdk 34
 
   // can override some attributes in main/AndroidManifest.xml
   defaultConfig {
     applicationId 'net.sourceforge.smallbasic'
     minSdkVersion 16
-    targetSdkVersion 33
+    targetSdkVersion 34
     versionCode 59
     versionName '12.26'
     resConfigs 'en'
@@ -59,6 +59,6 @@ android {
 }
 
 dependencies {
-  implementation 'androidx.core:core:1.10.0'
+  implementation 'androidx.core:core:1.12.0'
   testImplementation 'junit:junit:4.13.2'
 }
diff --git a/src/platform/android/build.gradle b/src/platform/android/build.gradle
@@ -5,7 +5,7 @@ buildscript {
     mavenCentral()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:8.0.1'
+    classpath 'com.android.tools.build:gradle:8.3.0'
   }
 }
 
@@ -18,11 +18,11 @@ allprojects {
 
 apply plugin: 'idea'
 
-task clean(type: Delete) {
+tasks.register('clean', Delete) {
   delete rootProject.buildDir
 }
 
-task test {
+tasks.register('test') {
   doLast {
     exec {
       commandLine 'sh', '-c', 'adb -a logcat -c && \
diff --git a/src/platform/android/webui/.eslintrc.js b/src/platform/android/webui/.eslintrc.js
@@ -0,0 +1,33 @@
+module.exports = {
+  "env": {
+    "browser": true,
+    "es2021": true
+  },
+  "extends": [
+    "eslint:recommended",
+    "plugin:react/recommended"
+  ],
+  "overrides": [
+    {
+      "env": {
+        "node": true
+      },
+      "files": [
+        ".eslintrc.{js,cjs}"
+      ],
+      "parserOptions": {
+        "sourceType": "script"
+      }
+    }
+  ],
+  "parserOptions": {
+    "ecmaVersion": "latest",
+    "sourceType": "module"
+  },
+  "plugins": [
+    "react"
+  ],
+  "rules": {
+    "react/prop-types": "off"
+  }
+}
diff --git a/src/platform/android/webui/index.html b/src/platform/android/webui/index.html
@@ -10,5 +10,6 @@
   <body>
     <noscript>You need to enable JavaScript to run this app.</noscript>
     <div id="root"></div>
+    <script type="module" src="/src/index.jsx"></script>
   </body>
 </html>
diff --git a/src/platform/android/webui/package.json b/src/platform/android/webui/package.json
@@ -2,22 +2,28 @@
   "name": "webui",
   "version": "1.0.0",
   "private": true,
-  "proxy": "http://localhost:8080", 
   "dependencies": {
-    "@emotion/react": "^11.11.0",
+    "@emotion/react": "^11.11.4",
     "@emotion/styled": "^11.11.0",
-    "@mui/icons-material": "^5.11.16",
-    "@mui/material": "^5.13.0",
-    "@mui/x-data-grid": "^6.3.1",
-    "npm-check-updates": "^16.10.12",
+    "@mui/icons-material": "^5.15.12",
+    "@mui/material": "^5.15.12",
+    "@mui/x-data-grid": "^6.19.6",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
-    "react-scripts": "5.0.1"
+    "vite-plugin-eslint": "^1.8.1"
+  },
+  "devDependencies": {
+    "@vitejs/plugin-react": "^4.2.1",
+    "eslint": "^8.57.0",
+    "eslint-plugin-react": "^7.34.0",
+    "npm-check-updates": "^16.14.15",
+    "vite": "^5.1.5",
+    "vite-tsconfig-paths": "^4.3.1"
   },
   "scripts": {
-    "start": "react-scripts start",
-    "build": "GENERATE_SOURCEMAP=false react-scripts build && rm ../app/src/main/assets/webui/static/js/main.* && cp -R build/* ../app/src/main/assets/webui/",
-    "update": "npm update && ncu -u"
+    "start": "vite --host",
+    "build": "GENERATE_SOURCEMAP=false vite && rm ../app/src/main/assets/webui/static/js/main.* && cp -R build/* ../app/src/main/assets/webui/",
+    "update": "npm update && ncu -u && npm install && npm audit fix"
   },
   "eslintConfig": {
     "extends": [
diff --git a/src/platform/android/webui/src/App.jsx b/src/platform/android/webui/src/App.jsx
@@ -1,5 +1,5 @@
-
 import {
+  React,
   Fragment,
   useState
 } from 'react';
@@ -290,7 +290,7 @@ function onCellEditCommit(props, params, setError) {
       });
     }
   });
-};
+}
 
 function FileList(props) {
   const [selectionModel, setSelectionModel] = useState([]);
diff --git a/src/platform/android/webui/src/index.jsx b/src/platform/android/webui/src/index.jsx
diff --git a/src/platform/android/webui/vite.config.js b/src/platform/android/webui/vite.config.js
@@ -0,0 +1,17 @@
+import { defineConfig } from 'vite'
+import react from '@vitejs/plugin-react'
+import eslint from 'vite-plugin-eslint'
+
+export default defineConfig({
+  base: '/',
+  plugins: [react(), eslint()],
+  server: {
+    open: true,
+    port: 3000,
+    proxy: {
+      '/api': {
+        target: 'http://localhost:8080'
+      }
+    }
+  },
+})

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ buildscript {`
`5`	`5`	`mavenCentral()`
`6`	`6`	`}`
`7`	`7`	`dependencies {`
`8`		`- classpath 'com.android.tools.build:gradle:8.0.1'`
	`8`	`+ classpath 'com.android.tools.build:gradle:8.3.0'`
`9`	`9`	`}`
`10`	`10`	`}`
`11`	`11`
`@@ -18,11 +18,11 @@ allprojects {`
`18`	`18`
`19`	`19`	`apply plugin: 'idea'`
`20`	`20`
`21`		`-task clean(type: Delete) {`
	`21`	`+tasks.register('clean', Delete) {`
`22`	`22`	`delete rootProject.buildDir`
`23`	`23`	`}`
`24`	`24`
`25`		`-task test {`
	`25`	`+tasks.register('test') {`
`26`	`26`	`doLast {`
`27`	`27`	`exec {`
`28`	`28`	`commandLine 'sh', '-c', 'adb -a logcat -c && \`