[pull] master from DrKLO:master

.gitignore

@@ -4,3 +4,12 @@ build/
 obj/
 *.iml
 local.properties
+TMessagesProj/.cxx/
+TMessagesProj/jniLibs/
+TMessagesProj/jniRes/
+**/.DS_Store
+TMessagesProj/afat/
+TMessagesProj_App/afat/
+TMessagesProj_AppHockeyApp/afat/
+TMessagesProj_AppStandalone/afat/
+TMessagesProj_AppHuawei/afat/

Dockerfile

@@ -1,11 +1,11 @@
-FROM gradle:7.0.2-jdk11
+FROM gradle:8.7.0-jdk17
 
 ENV ANDROID_SDK_URL https://dl.google.com/android/repository/commandlinetools-linux-7302050_latest.zip
-ENV ANDROID_API_LEVEL android-31
-ENV ANDROID_BUILD_TOOLS_VERSION 31.0.0
+ENV ANDROID_API_LEVEL android-35
+ENV ANDROID_BUILD_TOOLS_VERSION 35.0.0
 ENV ANDROID_HOME /usr/local/android-sdk-linux
 ENV ANDROID_NDK_VERSION 21.4.7075529
-ENV ANDROID_VERSION 31
+ENV ANDROID_VERSION 35
 ENV ANDROID_NDK_HOME ${ANDROID_HOME}/ndk/${ANDROID_NDK_VERSION}/
 ENV PATH ${PATH}:${ANDROID_HOME}/tools:${ANDROID_HOME}/platform-tools
 
@@ -22,9 +22,22 @@ RUN $ANDROID_HOME/cmdline-tools/bin/sdkmanager --sdk_root=$ANDROID_HOME "build-t
     "platforms;android-${ANDROID_VERSION}" \
     "platform-tools" \
     "ndk;$ANDROID_NDK_VERSION"
-RUN cp $ANDROID_HOME/build-tools/30.0.3/dx $ANDROID_HOME/build-tools/31.0.0/dx
-RUN cp $ANDROID_HOME/build-tools/30.0.3/lib/dx.jar $ANDROID_HOME/build-tools/31.0.0/lib/dx.jar
+RUN cp $ANDROID_HOME/build-tools/30.0.3/dx $ANDROID_HOME/build-tools/35.0.0/dx
+RUN cp $ANDROID_HOME/build-tools/30.0.3/lib/dx.jar $ANDROID_HOME/build-tools/35.0.0/lib/dx.jar
 ENV PATH ${ANDROID_NDK_HOME}:$PATH
 ENV PATH ${ANDROID_NDK_HOME}/prebuilt/linux-x86_64/bin/:$PATH
 
-CMD mkdir -p /home/source/TMessagesProj/build/outputs/apk && mkdir -p /home/source/TMessagesProj/build/outputs/native-debug-symbols && cp -R /home/source/. /home/gradle && cd /home/gradle && gradle assembleRelease && gradle assembleStandalone && cp -R /home/gradle/TMessagesProj/build/outputs/apk/. /home/source/TMessagesProj/build/outputs/apk && cp -R /home/gradle/TMessagesProj/build/outputs/native-debug-symbols/. /home/source/TMessagesProj/build/outputs/native-debug-symbols
+CMD mkdir -p /home/source/TMessagesProj/build/outputs/apk && \
+    mkdir -p /home/gradle/TMessagesProj/build/outputs/bundle && \
+    mkdir -p /home/source/TMessagesProj/build/outputs/native-debug-symbols && \
+    cp -R /home/source/. /home/gradle && \
+    cd /home/gradle && \
+    gradle :TMessagesProj_App:bundleBundleAfat_SDK23Release && \
+    gradle :TMessagesProj_App:bundleBundleAfatRelease && \
+    gradle :TMessagesProj_AppStandalone:assembleAfatStandalone && \
+    gradle :TMessagesProj_App:assembleAfatRelease && \
+    gradle :TMessagesProj_AppHuawei:assembleAfatRelease && \
+    cp -R /home/gradle/TMessagesProj_App/build/outputs/apk/. /home/source/TMessagesProj/build/outputs/apk && \
+    cp -R /home/gradle/TMessagesProj_AppHuawei/build/outputs/apk/. /home/source/TMessagesProj/build/outputs/apk && \
+    cp -R /home/gradle/TMessagesProj_AppStandalone/build/outputs/apk/. /home/source/TMessagesProj/build/outputs/apk && \
+    cp -R /home/gradle/TMessagesProj_App/build/outputs/bundle/. /home/source/TMessagesProj/build/outputs/bundle