Merge branch 'master' into ofcolor-vector

Author: danoli3

.editorconfig

@@ -13,7 +13,7 @@ trim_trailing_whitespace = true
 charset = utf-8
 
 [*.sh]
-indent_style = tab
+indent_style = space
 indent_size = 4
 tab_width = 4
 insert_final_newline = true

.gitattributes

@@ -1,20 +1,23 @@
 # This is based on the Github .gitattributes templates
-# Set default behaviour, in case users don't have core.autocrlf set.
 * text=auto
 
-# Explicitly declare text files we want to always be normalized and converted
-# to native line endings on checkout.
+# Explicitly declare text files to normalize
 *.cpp text
 *.h text
 *.mm text
 
-# Declare files that will always have CRLF line endings on checkout.
+# Files with CRLF line endings for Windows
 *.sln text eol=crlf
 *.vcxproj* text eol=crlf
 .appveyor.yml text eol=crlf
 *.bat text eol=crlf
+*.props text eol=crlf
+*.filters text eol=crlf
 
-# Denote all files that are truly binary and should not be modified.
+# Files with LF line endings for Unix-like systems
+*.sh text eol=lf
+
+# Binary files (no EOL normalization)
 *.png binary
 *.jpg binary
 

.github/disabled/build-android.yml

@@ -22,11 +22,13 @@ jobs:
         cfg:
         - {target: android, gradle_target: compileArm7DebugSources}
         - {target: android, gradle_target: compileX86DebugSources}
+        - {target: android, gradle_target: compileArm64DebugSources}
+        - {target: android, gradle_target: compileX8664DebugSources}
 
     env:
       TARGET: ${{matrix.cfg.target}}
       GRADLE_TARGET: ${{matrix.cfg.gradle_target}}
-      NDK_DIR: android-ndk-r15c
+      NDK_DIR: android-ndk-r23b
     steps:
     - uses: actions/checkout@v3
     - name: Cache projectGenerator folder
@@ -37,7 +39,7 @@ jobs:
     - name: Cache NDK
       uses: actions/cache@v3
       with:
-        path: '~/android-ndk-r15c'
+        path: '~/android-ndk-r23b'
         key: ${{ runner.os }}-android-ndk-${{matrix.cfg.gradle_target}}
     - name: install
       run: ./scripts/ci/$TARGET/install.sh