Sulkta-OSS/element-x-ada
3
0
Fork 0
Code Issues 1 Pull requests 10 Projects Releases Packages Wiki Activity Actions

Merge pull request #3084 from element-hq/feature/bma/reproBuild

Browse source 
Upgrade build tools and fix `pg-map-id` for F-Droid
This commit is contained in:
Benoit Marty 2024-06-25 11:43:26 +02:00 • committed by GitHub
commit 6abdf0a5b1
2 changed files with 14 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
plugins/src/main/kotlin/Versions.kt
View file

@ -63,6 +63,7 @@ object Versions {
val versionName = "$versionMajor.$versionMinor.$versionPatch" val versionName = "$versionMajor.$versionMinor.$versionPatch"
const val compileSdk = 34 const val compileSdk = 34
const val targetSdk = 33 const val targetSdk = 33
// When updating the `minSdk`, make sure to update the value of `minSdkVersion` in the file `tools/release/release.sh`
const val minSdk = 24 const val minSdk = 24
val javaCompileVersion = JavaVersion.VERSION_17 val javaCompileVersion = JavaVersion.VERSION_17
val javaLanguageVersion: JavaLanguageVersion = JavaLanguageVersion.of(11) val javaLanguageVersion: JavaLanguageVersion = JavaLanguageVersion.of(11)

15
tools/release/release.sh
View file

@ -73,8 +73,8 @@ if [ ${envError} == 1 ]; then
exit 1 exit 1
fi fi
minSdkVersion=23 minSdkVersion=24
buildToolsVersion="32.0.0" buildToolsVersion="35.0.0"
buildToolsPath="${androidHome}/build-tools/${buildToolsVersion}" buildToolsPath="${androidHome}/build-tools/${buildToolsVersion}"
if [[ ! -d ${buildToolsPath} ]]; then if [[ ! -d ${buildToolsPath} ]]; then
@ -230,6 +230,17 @@ printf "Unzipping the F-Droid artifact...\n"
fdroidTargetPath="${targetPath}/fdroid" fdroidTargetPath="${targetPath}/fdroid"
unzip "${targetPath}"/elementx-app-fdroid-apks-unsigned.zip -d "${fdroidTargetPath}" unzip "${targetPath}"/elementx-app-fdroid-apks-unsigned.zip -d "${fdroidTargetPath}"
printf "\n================================================================================\n"
printf "Patching the FDroid APKs using inplace-fix.py...\n"
inplaceFixScript="./tmp/inplace-fix.py"
curl -s https://raw.githubusercontent.com/obfusk/reproducible-apk-tools/master/inplace-fix.py --output "${inplaceFixScript}"
python3 "${inplaceFixScript}" --page-size 16 fix-pg-map-id "${fdroidTargetPath}"/app-fdroid-arm64-v8a-release.apk '0000000'
python3 "${inplaceFixScript}" --page-size 16 fix-pg-map-id "${fdroidTargetPath}"/app-fdroid-armeabi-v7a-release.apk '0000000'
python3 "${inplaceFixScript}" --page-size 16 fix-pg-map-id "${fdroidTargetPath}"/app-fdroid-x86-release.apk '0000000'
python3 "${inplaceFixScript}" --page-size 16 fix-pg-map-id "${fdroidTargetPath}"/app-fdroid-x86_64-release.apk '0000000'
printf "\n================================================================================\n" printf "\n================================================================================\n"
printf "Signing the FDroid APKs...\n" printf "Signing the FDroid APKs...\n"