Update Github build workflow

- Fix Android build
- Use universal MacOS architecture

Author: mphe

.github/workflows/build.yml

@@ -2,9 +2,9 @@
 name: Builds
 on:
   push:
-    branches: [ "master", "godot_4.2" ]
+    branches: [ "master" ]
   pull_request:
-    branches: [ "master", "godot_4.2" ]
+    branches: [ "master" ]
 
 jobs:
   build:
@@ -38,25 +38,25 @@ jobs:
             target: template_release
             platform: windows
             arch: x86_64
+          # Untested
           - identifier: android-release
             name: Android Release
             runner: ubuntu-20.04
             target: template_release
             platform: android
             arch: arm64
-          # Untested
           - identifier: macos-debug
-            name: MacOS Debug
+            name: macOS (universal) Debug
             runner: macos-latest
             target: template_debug
             platform: macos
-            arch: x86_64
+            arch: universal
           - identifier: macos-release
-            name: MacOS Release
+            name: macOS (universal) Release
             runner: macos-latest
             target: template_release
             platform: macos
-            arch: x86_64
+            arch: universal
 
     steps:
       - name: (Windows) Install mingw64
@@ -67,21 +67,30 @@ jobs:
           sudo update-alternatives --set x86_64-w64-mingw32-gcc /usr/bin/x86_64-w64-mingw32-gcc-posix
           sudo update-alternatives --set x86_64-w64-mingw32-g++ /usr/bin/x86_64-w64-mingw32-g++-posix
 
-      - name: (Android) Set up Java 11
+      - name: (Android) Install JDK 17
         if: ${{ startsWith(matrix.identifier, 'android-') }}
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v3
         with:
-          java-version: 11
+          java-version: 17
+          distribution: temurin
 
-      - name: (Android) Set up Android SDK
+      - name: (Android) Install Android SDK
         if: ${{ startsWith(matrix.identifier, 'android-') }}
-        uses: android-actions/setup-android@v2
+        uses: android-actions/setup-android@v3
 
-      - name: (Android) Install Android Tools
-        if: ${{ startsWith(matrix.identifier, 'android-') }}
-        shell: sh
-        run: |
-          "$ANDROID_SDK_ROOT"/cmdline-tools/latest/bin/sdkmanager --sdk_root="$ANDROID_SDK_ROOT" "platform-tools" "build-tools;30.0.3" "platforms;android-29" "cmdline-tools;latest" "cmake;3.10.2.4988404" "ndk;21.4.7075529"
+      # From Godot docs, might not be necessary.
+      #- name: (Android) Install Android Tools
+      #  if: ${{ startsWith(matrix.identifier, 'android-') }}
+      #  shell: sh
+      #  run: |
+      #    "$ANDROID_SDK_ROOT"/cmdline-tools/latest/bin/sdkmanager --sdk_root="$ANDROID_SDK_ROOT" "platform-tools" "build-tools;30.0.3" "platforms;android-29" "cmdline-tools;latest" "cmake;3.10.2.4988404"
+
+      - name: (Android) Install NDK r23c
+        if: ${{ matrix.platform == 'android' }}
+        uses: nttld/setup-ndk@v1
+        with:
+          ndk-version: r23c
+          link-to-sdk: true
 
       - name: Set up Python
         uses: actions/setup-python@v2