Update capacitor and browser compat check (#4359)

* Update capacitor and browser compat check

* Remove commands

* Use native capacitor api

Author: haslinghuis

.gitattributes

@@ -1,3 +1,15 @@
+#
+# https://help.github.com/articles/dealing-with-line-endings/
+#
+# Linux start script should use lf
+/gradlew        text eol=lf
+
+# These are Windows script files and should use crlf
+*.bat           text eol=crlf
+
+# Binary files should be left untouched
+*.jar           binary
+
 LICENSE text eol=lf
 *.md text eol=lf
 *.c text eol=lf

.gitignore

@@ -37,3 +37,9 @@ test-results-junit/
 
 # Capacitor config file, we generate it at runtime
 capacitor.config.json
+
+# Ignore Gradle project-specific cache directory
+.gradle
+
+# Ignore Gradle build output directory
+build

android/app/capacitor.build.gradle

@@ -2,8 +2,8 @@
 
 android {
   compileOptions {
-      sourceCompatibility JavaVersion.VERSION_17
-      targetCompatibility JavaVersion.VERSION_17
+      sourceCompatibility JavaVersion.VERSION_21
+      targetCompatibility JavaVersion.VERSION_21
   }
 }
 

android/build.gradle

@@ -7,7 +7,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.4.0'
+        classpath 'com.android.tools.build:gradle:8.8.1'
         classpath 'com.google.gms:google-services:4.4.0'
 
         // NOTE: Do not place your application dependencies here; they belong

android/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

package.json

@@ -17,6 +17,8 @@
     "android:dev": "node capacitor.config.generator.mjs --dev && npx cap run android",
     "android:open": "vite build && node capacitor.config.generator.mjs && npx cap open android",
     "android:run": "vite build && node capacitor.config.generator.mjs && npx cap run android",
+    "android:sync": "vite build && node capacitor.config.generator.mjs && npx cap sync android",
+    "android:release": "vite build && node capacitor.config.generator.mjs && npx cap build android --release",
     "format": "prettier --write {src,test}/**/*.{js,vue,css,less}",
     "storybook": "start-storybook -p 6006",
     "prepare": "husky install"
@@ -38,8 +40,8 @@
     "node": "20.x"
   },
   "dependencies": {
-    "@capacitor/android": "^6.0.0",
-    "@capacitor/core": "^6.0.0",
+    "@capacitor/android": "^7.0.1",
+    "@capacitor/core": "^7.0.1",
     "@fortawesome/fontawesome-free": "^6.5.2",
     "@vitejs/plugin-vue": "^5.1.4",
     "crypto-es": "^2.1.0",
@@ -72,7 +74,7 @@
   },
   "devDependencies": {
     "@babel/core": "^7.24.4",
-    "@capacitor/cli": "^6.0.0",
+    "@capacitor/cli": "^7.0.1",
     "@quanle94/innosetup": "^6.0.2",
     "@rollup/plugin-alias": "^4.0.2",
     "@rollup/plugin-commonjs": "^24.0.0",

src/js/utils/checkBrowserCompatibilty.js

@@ -1,3 +1,5 @@
+import { Capacitor } from "@capacitor/core";
+
 export function isChromium() {
     // https://developer.mozilla.org/en-US/docs/Web/HTTP/Browser_detection_using_the_user_agent
     if (!navigator.userAgentData) {
@@ -12,10 +14,45 @@ export function isChromium() {
     });
 }
 
+export function isAndroid() {
+    if (Capacitor.isNativePlatform()) {
+        return Capacitor.getPlatform() === "android";
+    }
+    return false;
+}
+
+export function isIOS() {
+    if (Capacitor.isNativePlatform()) {
+        return Capacitor.getPlatform() === "ios";
+    }
+    return false;
+}
+
+export function isWeb() {
+    if (Capacitor.isNativePlatform()) {
+        return Capacitor.getPlatform() === "web";
+    }
+    if (navigator.userAgentData) {
+        return ["Linux", "Mac", "Windows"].includes(navigator.userAgentData.platform);
+    }
+}
+
 export function checkBrowserCompatibility() {
-    const compatible = "serial" in navigator;
+    const androidDevice = isAndroid();
+    const iosDevice = isIOS();
+    const web = isWeb();
+    const webSerial = "serial" in navigator;
+    const isNative = Capacitor.isNativePlatform();
+
+    const compatible = isNative || (web && webSerial && isChromium());
+
+    console.log("Android: ", androidDevice);
+    console.log("iOS: ", iosDevice);
+    console.log("Web: ", web);
+    console.log("Web Serial: ", webSerial);
+    console.log("Native: ", isNative);
 
-    if (isChromium() && compatible) {
+    if (compatible) {
         return true;
     }
 
@@ -24,7 +61,7 @@ export function checkBrowserCompatibility() {
         errorMessage = "Betaflight app requires a Chromium based browser (Chrome, Chromium, Edge).";
     }
 
-    if (!compatible) {
+    if (!webSerial) {
         errorMessage += " Web Serial API support is disabled.";
     }