Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2025-12-27 14:40:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Upgrade to Gradle 7.2 and AGP 7.0.2

Browse Source
This commit is contained in:
Alex Hart
2021-09-14 09:01:42 -03:00
parent d29ebc7768
commit 662ba85c5a
15 changed files with 100 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
reproducible-builds/Dockerfile
View File

@@ -10,7 +10,7 @@ RUN apt-get update -y && apt-get install -y apt-utils
RUN apt-get update -y && apt-get install -y $(cat docker/dependencies.txt)
RUN docker/print-versions.sh docker/dependencies.txt
ENV ANDROID_COMMAND_LINE_TOOLS_FILENAME commandlinetools-linux-6858069_latest.zip
ENV ANDROID_COMMAND_LINE_TOOLS_FILENAME commandlinetools-linux-7583922_latest.zip
ENV ANDROID_API_LEVELS android-30
ENV ANDROID_BUILD_TOOLS_VERSION 30.0.2
@@ -24,7 +24,10 @@ RUN rm ${ANDROID_COMMAND_LINE_TOOLS_FILENAME}
RUN yes | sdkmanager --update --sdk_root="${ANDROID_HOME}"
RUN yes | sdkmanager --sdk_root="${ANDROID_HOME}" "platforms;${ANDROID_API_LEVELS}" "build-tools;${ANDROID_BUILD_TOOLS_VERSION}" "extras;google;m2repository" "extras;android;m2repository" "extras;google;google_play_services"
RUN update-java-alternatives -s java-1.8.0-openjdk-amd64
RUN yes | ${ANDROID_HOME}/tools/bin/sdkmanager --licenses --sdk_root="${ANDROID_HOME}"
RUN update-java-alternatives -s java-1.11.0-openjdk-amd64
RUN rm -rf ${ANDROID_HOME}/tools

1
reproducible-builds/docker/dependencies.txt
View File

@@ -4,5 +4,6 @@ libstdc++6:i386=10.2.0-3
lib32z1=1:1.2.11.dfsg-2
wget=1.20.3-1+b3
openjdk-8-jdk=8u252-b09-1
openjdk-11-jdk=11.0.8+10-1
git=1:2.28.0-1
unzip=6.0-25

8
reproducible-builds/docker/gradlewarmer/gradle/wrapper/gradle-wrapper.properties vendored
View File

@@ -1,7 +1,7 @@
# Note: Check https://gradle.org/release-checksums/ before updating wrapper or distribution
#Wed Jul 21 15:41:52 ADT 2021
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip
distributionPath=wrapper/dists
distributionSha256Sum=c9910513d0eed63cd8f5c7fec4cb4a05731144770104a0871234a4edc3ba3cef
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionSha256Sum=a8da5b02437a60819cad23e10fc7e9cf32bcb57029d9cb277e26eeff76ce014b
zipStoreBase=GRADLE_USER_HOME