diff --git a/.github/workflows/app.yml b/.github/workflows/app.yml
index 4f580fc..8cc52c5 100644
--- a/.github/workflows/app.yml
+++ b/.github/workflows/app.yml
@@ -6,31 +6,29 @@ on:
 
 jobs:
   build:
-    runs-on: [ubuntu-22.04, ubuntu-20.04, ubuntu-18.04]
+    runs-on: ubuntu-22.04
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: Checkout submodules
         run: git submodule update --init --recursive
       - name: Setup Ionic
         uses: coturiv/setup-ionic@v1.0.3
       - name: Set up python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v5
         with:
           python-version: '3.8'
-      # - name: Set up JDK 1.8
-      #   uses: actions/setup-java@v1
-      #   with:
-      #     java-version: 1.8
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: '17'
       - name: Setup Android SDK
-        uses: android-actions/setup-android@v2
-      # - name: Install build-tools
-      #   run: (echo y; echo y; echo y;) | sdkmanager "build-tools;28.0.3"
-      - name: Use build-tools 30
-        run: |
-          sdkmanager --uninstall "build-tools;32.0.0"
-          sdkmanager --uninstall "build-tools;31.0.0"
-
+        uses: android-actions/setup-android@v3
+        with:
+          packages: 'platform-tools build-tools;35.0.0 platforms;android-35'
+      - name: Install global TypeScript (cordova plugin hooks call bare 'tsc')
+        run: npm install -g typescript@4.5.5
       - name: Build
         run: |
           ./ToolChains/bin/build all -pf android --build
diff --git a/App b/App
index 1bc2a42..770afbc 160000
--- a/App
+++ b/App
@@ -1 +1 @@
-Subproject commit 1bc2a42312b8c91dffcf66bc80befc2ed6ed0286
+Subproject commit 770afbcd1d71d6987b566f1d2805fc23f596d945