From 5bcfbcfea103dbdd2af7a97a258e7e103f5e7688 Mon Sep 17 00:00:00 2001 From: Andrey Prokopyuk Date: Wed, 2 Sep 2026 01:46:22 +0300 Subject: [PATCH 1/7] Install Android API 26 in F-Droid builds --- .fdroid.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.fdroid.yml b/.fdroid.yml index 005e2b0..b64e073 100644 --- a/.fdroid.yml +++ b/.fdroid.yml @@ -20,6 +20,7 @@ Builds: - apt-get update - apt-get install -t trixie-backports -y golang-go - apt-get install -y gcc libc-dev make + - sdkmanager 'platforms;android-26' gradle: - yes srclibs: From 0d991f4e12bbcda439310ec9ea8ac6fa224956ef Mon Sep 17 00:00:00 2001 From: Andrey Prokopyuk Date: Wed, 2 Sep 2026 01:53:22 +0300 Subject: [PATCH 2/7] Install Java 17 for F-Droid builds --- .fdroid.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.fdroid.yml b/.fdroid.yml index b64e073..641253e 100644 --- a/.fdroid.yml +++ b/.fdroid.yml @@ -19,7 +19,7 @@ Builds: sudo: - apt-get update - apt-get install -t trixie-backports -y golang-go - - apt-get install -y gcc libc-dev make + - apt-get install -y gcc libc-dev make openjdk-17-jdk-headless - sdkmanager 'platforms;android-26' gradle: - yes From 738b45bef7cd3a7a5529bb4c1d6a8302b4048d25 Mon Sep 17 00:00:00 2001 From: Andrey Prokopyuk Date: Wed, 2 Sep 2026 02:10:59 +0300 Subject: [PATCH 3/7] Fix Java 17 setup for F-Droid build --- .fdroid.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.fdroid.yml b/.fdroid.yml index 641253e..e10810b 100644 --- a/.fdroid.yml +++ b/.fdroid.yml @@ -17,9 +17,11 @@ Builds: subdir: app ndk: 29.0.14206865 sudo: + - echo "deb https://deb.debian.org/debian bookworm main" > /etc/apt/sources.list.d/bookworm.list - apt-get update - apt-get install -t trixie-backports -y golang-go - - apt-get install -y gcc libc-dev make openjdk-17-jdk-headless + - apt-get install -y gcc libc-dev make + - apt-get install -y -t bookworm openjdk-17-jdk-headless - sdkmanager 'platforms;android-26' gradle: - yes From 271959c03cc4105770cdf41b2c78a5df1726f02e Mon Sep 17 00:00:00 2001 From: Andrey Prokopyuk Date: Wed, 2 Sep 2026 02:28:09 +0300 Subject: [PATCH 4/7] Match F-Droid native build path to release --- .fdroid.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.fdroid.yml b/.fdroid.yml index e10810b..22b9fa2 100644 --- a/.fdroid.yml +++ b/.fdroid.yml @@ -23,6 +23,8 @@ Builds: - apt-get install -y gcc libc-dev make - apt-get install -y -t bookworm openjdk-17-jdk-headless - sdkmanager 'platforms;android-26' + - mkdir -p /home/runner/work/AndroidMegaProxy + - chown -R vagrant:vagrant /home/runner gradle: - yes srclibs: @@ -35,7 +37,10 @@ Builds: - export GOROOT=$$go$$ - export GOPATH=$HOME/go - export PATH=$GOROOT/bin:$GOPATH/bin:$PATH + - cp -a .. /home/runner/work/AndroidMegaProxy/AndroidMegaProxy + - cd /home/runner/work/AndroidMegaProxy/AndroidMegaProxy/app - ../scripts/build-fdroid-native.sh + - cp libs/megaproxy.aar $OLDPWD/libs/ AutoUpdateMode: Version UpdateCheckMode: Tags From 98665b7e6059093eb8519ab76d40f2d41fd202ed Mon Sep 17 00:00:00 2001 From: Andrey Prokopyuk Date: Wed, 2 Sep 2026 02:33:58 +0300 Subject: [PATCH 5/7] Create F-Droid AAR destination directory --- .fdroid.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.fdroid.yml b/.fdroid.yml index 22b9fa2..b43319a 100644 --- a/.fdroid.yml +++ b/.fdroid.yml @@ -40,6 +40,7 @@ Builds: - cp -a .. /home/runner/work/AndroidMegaProxy/AndroidMegaProxy - cd /home/runner/work/AndroidMegaProxy/AndroidMegaProxy/app - ../scripts/build-fdroid-native.sh + - mkdir -p $OLDPWD/libs - cp libs/megaproxy.aar $OLDPWD/libs/ AutoUpdateMode: Version From 5b47d42d0dc28a1113ee009674482c12f1c8778e Mon Sep 17 00:00:00 2001 From: Andrey Prokopyuk Date: Wed, 2 Sep 2026 11:00:14 +0300 Subject: [PATCH 6/7] Prepare v0.0.6 for F-Droid --- .fdroid.yml | 10 +++++----- app/build.gradle.kts | 8 ++++++-- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/.fdroid.yml b/.fdroid.yml index b43319a..59a76f6 100644 --- a/.fdroid.yml +++ b/.fdroid.yml @@ -11,9 +11,9 @@ RepoType: git Repo: https://github.com/andre487/AndroidMegaProxy.git Builds: - - versionName: 0.0.5 - versionCode: 5 - commit: v0.0.5 + - versionName: 0.0.6 + versionCode: 6 + commit: v0.0.6 subdir: app ndk: 29.0.14206865 sudo: @@ -45,5 +45,5 @@ Builds: AutoUpdateMode: Version UpdateCheckMode: Tags -CurrentVersion: 0.0.5 -CurrentVersionCode: 5 +CurrentVersion: 0.0.6 +CurrentVersionCode: 6 diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 83d9f40..e0a191d 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -28,8 +28,8 @@ android { applicationId = "net.megaproxy487" minSdk = 26 targetSdk = 35 - versionCode = 5 - versionName = "0.0.5" + versionCode = 6 + versionName = "0.0.6" buildConfigField("String", "GIT_COMMIT_HASH", "\"$gitCommitHash\"") testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } @@ -62,6 +62,10 @@ android { compose = true buildConfig = true } + dependenciesInfo { + includeInApk = false + includeInBundle = false + } compileOptions { sourceCompatibility = JavaVersion.VERSION_17 targetCompatibility = JavaVersion.VERSION_17 From ed5c34fa8c845e9f0c33fc4c51c5bc65b89a9bf6 Mon Sep 17 00:00:00 2001 From: Andrey Prokopyuk Date: Wed, 2 Sep 2026 11:07:14 +0300 Subject: [PATCH 7/7] Address F-Droid recipe review --- .fdroid.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.fdroid.yml b/.fdroid.yml index 59a76f6..c8cc121 100644 --- a/.fdroid.yml +++ b/.fdroid.yml @@ -1,7 +1,8 @@ Categories: - Connectivity License: MIT -WebSite: https://github.com/andre487/AndroidMegaProxy +AuthorName: Andrey Prokopyuk +AuthorWebSite: https://github.com/andre487 SourceCode: https://github.com/andre487/AndroidMegaProxy IssueTracker: https://github.com/andre487/AndroidMegaProxy/issues Changelog: https://github.com/andre487/AndroidMegaProxy/releases @@ -17,14 +18,13 @@ Builds: subdir: app ndk: 29.0.14206865 sudo: - - echo "deb https://deb.debian.org/debian bookworm main" > /etc/apt/sources.list.d/bookworm.list - apt-get update - apt-get install -t trixie-backports -y golang-go - - apt-get install -y gcc libc-dev make - - apt-get install -y -t bookworm openjdk-17-jdk-headless - - sdkmanager 'platforms;android-26' + - apt-get install -y gcc libc-dev make openjdk-21-jdk-headless - mkdir -p /home/runner/work/AndroidMegaProxy - chown -R vagrant:vagrant /home/runner + prebuild: + - sdkmanager 'platforms;android-26' gradle: - yes srclibs: