diff --git a/Dockerfile b/Dockerfile index 016f56370..3682140bc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,11 +1,11 @@ -FROM gradle:7.0.4-jdk17 +FROM gradle:7.4.1-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-32 +ENV ANDROID_BUILD_TOOLS_VERSION 32.1.0-rc1 ENV ANDROID_HOME /usr/local/android-sdk-linux ENV ANDROID_NDK_VERSION 21.4.7075529 -ENV ANDROID_VERSION 31 +ENV ANDROID_VERSION 32 ENV ANDROID_NDK_HOME ${ANDROID_HOME}/ndk/${ANDROID_NDK_VERSION}/ ENV PATH ${PATH}:${ANDROID_HOME}/tools:${ANDROID_HOME}/platform-tools diff --git a/TMessagesProj/build.gradle b/TMessagesProj/build.gradle index c3a0d58a1..994a3571e 100644 --- a/TMessagesProj/build.gradle +++ b/TMessagesProj/build.gradle @@ -84,10 +84,8 @@ android { } } - lintOptions { - disable 'MissingTranslation' - disable 'ExtraTranslation' - disable 'BlockedPrivateApi' + lint { + disable 'MissingTranslation', 'ExtraTranslation', 'BlockedPrivateApi' } compileOptions { diff --git a/build.gradle b/build.gradle index 2ae46a078..3a4f0ac17 100644 --- a/build.gradle +++ b/build.gradle @@ -6,9 +6,9 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:7.0.4' + classpath 'com.android.tools.build:gradle:7.3.0-alpha07' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - classpath 'com.google.gms:google-services:4.3.10' + classpath 'com.google.gms:google-services:4.3.5' } } repositories { diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 77804b66c..3cb79e9c3 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.1-bin.zip