Resolve conflicts

This commit is contained in:
Sergei Maklagin
2026-02-26 22:57:25 +03:00
130 changed files with 13487 additions and 285 deletions

View File

@@ -350,7 +350,7 @@ jobs:
mkdir clients/android/app/libs
cp libbox.aar clients/android/app/libs
cd clients/android
./gradlew :app:assemblePlayRelease :app:assembleOtherRelease
./gradlew :app:assemblePlayRelease
env:
JAVA_HOME: /usr/lib/jvm/java-17-openjdk-amd64
ANDROID_NDK_HOME: ${{ steps.setup-ndk.outputs.ndk-path }}