diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a28a0f4f15..c092daa7f5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -12,8 +12,6 @@ stages: variables: pip: pip3 --timeout 100 --retries 10 - ANDROID_CMDLINE_TOOLS: 8512546 - ANDROID_CMDLINE_TOOLS_SHA256: 2ccbda4302db862a28ada25aa7425d99dce9462046003c1714b059b5c47970d8 # needs lots of git history since it has to compare the merge request to current master GIT_DEPTH: "5000" @@ -299,7 +297,6 @@ fdroid build: - test -n "$fdroidserver" || source /etc/profile.d/bsenv.sh - - apt-get install -y sdkmanager/bullseye-backports - rm -rf $ANDROID_HOME/tools # TODO remove once sdkmanager can upgrade installed packages # These packages are needed to make this env like the production buildserver. - sdkmanager "tools" "platform-tools" "build-tools;31.0.0" diff --git a/metadata/ch.protonvpn.android.yml b/metadata/ch.protonvpn.android.yml index a3a37bef8e..94843b8b87 100644 --- a/metadata/ch.protonvpn.android.yml +++ b/metadata/ch.protonvpn.android.yml @@ -1183,7 +1183,7 @@ Builds: - apt-get update - apt-get install -y --no-install-recommends make libgmp-dev autoconf automake libtool pkg-config autogen gettext libssl-dev libsqlite3-dev libpam0g-dev - libldap2-dev sdkmanager gperf bison bzip2 flex swig + libldap2-dev gperf bison bzip2 flex swig gradle: - prod output: build/outputs/apk/prod/release/ProtonVPN-*-prod-release-unsigned.apk diff --git a/metadata/com.odysee.floss.yml b/metadata/com.odysee.floss.yml index 1b838359ad..9153ffbcc3 100644 --- a/metadata/com.odysee.floss.yml +++ b/metadata/com.odysee.floss.yml @@ -78,9 +78,6 @@ Builds: versionCode: 65 commit: 4af9eb360b1f8b92eeff71e60d8d58c4f39cdefc subdir: app - sudo: - - apt-get update - - apt-get install -y sdkmanager gradle: - yes prebuild: sdkmanager 'platforms;android-30' 'build-tools;30.0.3' diff --git a/metadata/com.shatteredpixel.shatteredpixeldungeon.yml b/metadata/com.shatteredpixel.shatteredpixeldungeon.yml index 8618cf9d12..a8a8d5560c 100644 --- a/metadata/com.shatteredpixel.shatteredpixeldungeon.yml +++ b/metadata/com.shatteredpixel.shatteredpixeldungeon.yml @@ -1081,9 +1081,6 @@ Builds: versionCode: 662 commit: 46525d4784a06123c83ae3fc8d766cb39317b2ca subdir: android - sudo: - - apt-get update - - apt-get install -y sdkmanager gradle: - yes rm: diff --git a/metadata/com.tailscale.ipn.yml b/metadata/com.tailscale.ipn.yml index d39530ca90..335198118b 100644 --- a/metadata/com.tailscale.ipn.yml +++ b/metadata/com.tailscale.ipn.yml @@ -1066,7 +1066,7 @@ Builds: subdir: android sudo: - apt-get update - - apt-get install -y golang-go sdkmanager + - apt-get install -y golang-go gradle: - fdroid prebuild: sdkmanager 'platforms;android-31' 'build-tools;31.0.0' @@ -1082,7 +1082,7 @@ Builds: subdir: android sudo: - apt-get update - - apt-get install -y golang-go sdkmanager + - apt-get install -y golang-go gradle: - fdroid prebuild: sdkmanager 'platforms;android-31' 'build-tools;31.0.0' @@ -1092,7 +1092,7 @@ Builds: - make -C .. release_aar ndk: r23b -AutoUpdateMode: Version v%v +AutoUpdateMode: Version UpdateCheckMode: Tags CurrentVersion: 1.32.0-tfc688fe02-g13fc35a8bd5 CurrentVersionCode: 130 diff --git a/metadata/com.tutpro.baresip.plus.yml b/metadata/com.tutpro.baresip.plus.yml index 7025632be5..d9eaa3590d 100644 --- a/metadata/com.tutpro.baresip.plus.yml +++ b/metadata/com.tutpro.baresip.plus.yml @@ -1831,7 +1831,7 @@ Builds: subdir: app sudo: - apt-get update - - apt-get -y install sdkmanager wget make libtool m4 automake pkg-config + - apt-get -y install wget make libtool m4 automake pkg-config - apt-get -y install -t bullseye-backports cmake gradle: - yes diff --git a/metadata/com.tutpro.baresip.yml b/metadata/com.tutpro.baresip.yml index 26edd01805..913791c585 100644 --- a/metadata/com.tutpro.baresip.yml +++ b/metadata/com.tutpro.baresip.yml @@ -2848,7 +2848,7 @@ Builds: subdir: app sudo: - apt-get update - - apt-get install -y sdkmanager wget make libtool m4 automake pkg-config + - apt-get install -y wget make libtool m4 automake pkg-config - apt-get install -t bullseye-backports cmake gradle: - yes diff --git a/metadata/com.unciv.app.yml b/metadata/com.unciv.app.yml index 636558c330..4e352f1936 100644 --- a/metadata/com.unciv.app.yml +++ b/metadata/com.unciv.app.yml @@ -3779,9 +3779,6 @@ Builds: versionCode: 756 commit: 2ef0284235344522701b7fe81a63ae1e4a2bf124 subdir: android - sudo: - - apt-get update - - apt-get install -y sdkmanager gradle: - yes rm: diff --git a/metadata/com.zoffcc.applications.trifa.yml b/metadata/com.zoffcc.applications.trifa.yml index 5294412567..da5e01c361 100644 --- a/metadata/com.zoffcc.applications.trifa.yml +++ b/metadata/com.zoffcc.applications.trifa.yml @@ -1278,9 +1278,6 @@ Builds: versionCode: 10175 commit: 9e8965c9d77e9d1a3bb949c75e1280099cbc7cb8 subdir: android-refimpl-app/app - sudo: - - apt-get update - - apt-get install -y sdkmanager gradle: - yes prebuild: sdkmanager 'cmake;3.10.2.4988404' diff --git a/metadata/cx.ring.yml b/metadata/cx.ring.yml index e881d0b710..d681b3f4a8 100644 --- a/metadata/cx.ring.yml +++ b/metadata/cx.ring.yml @@ -2064,8 +2064,8 @@ Builds: submodules: true sudo: - apt-get update - - apt-get install -y cmake g++ swig sdkmanager autoconf automake m4 libtool - pkg-config yasm tar gettext autopoint xz-utils bzip2 make python-is-python3 + - apt-get install -y cmake g++ swig autoconf automake m4 libtool pkg-config + yasm tar gettext autopoint xz-utils bzip2 make python-is-python3 gradle: - noPush rm: diff --git a/metadata/de.jepfa.bdt.yml b/metadata/de.jepfa.bdt.yml index 94be162260..c308c0683f 100644 --- a/metadata/de.jepfa.bdt.yml +++ b/metadata/de.jepfa.bdt.yml @@ -18,9 +18,6 @@ Builds: versionCode: 10000 commit: v1.0.0 submodules: true - sudo: - - apt-get update - - apt-get install -y sdkmanager output: build/app/outputs/flutter-apk/app-release.apk srclibs: - flutter@3.0.4 diff --git a/metadata/de.wger.flutter.yml b/metadata/de.wger.flutter.yml index 97cc0605bd..9066b5b90c 100644 --- a/metadata/de.wger.flutter.yml +++ b/metadata/de.wger.flutter.yml @@ -75,9 +75,6 @@ Builds: - versionName: 1.5.0 versionCode: 27 commit: 280143362552fa3af2a612edf326ebac1697285b - sudo: - - apt-get update - - apt-get install -y sdkmanager output: build/app/outputs/flutter-apk/app-release.apk srclibs: - flutter@2.10.4 diff --git a/metadata/io.anuke.mindustry.yml b/metadata/io.anuke.mindustry.yml index 5c2ede68a9..f2471ae637 100644 --- a/metadata/io.anuke.mindustry.yml +++ b/metadata/io.anuke.mindustry.yml @@ -184,7 +184,7 @@ Builds: subdir: android sudo: - apt-get update - - apt-get install -y openjdk-17-jdk-headless sdkmanager + - apt-get install -y openjdk-17-jdk-headless - update-alternatives --auto java gradle: - yes diff --git a/metadata/org.atalk.android.yml b/metadata/org.atalk.android.yml index e23b0051fc..985f55079e 100644 --- a/metadata/org.atalk.android.yml +++ b/metadata/org.atalk.android.yml @@ -1932,9 +1932,6 @@ Builds: versionCode: 300020 commit: bea564250e8d2938bf1451f782ae6994b2de418f subdir: aTalk - sudo: - - apt-get update - - apt-get install -y sdkmanager gradle: - fdroid rm: diff --git a/metadata/org.dolphinemu.dolphinemu.yml b/metadata/org.dolphinemu.dolphinemu.yml index a2ee6acd8c..34ad30f0b3 100644 --- a/metadata/org.dolphinemu.dolphinemu.yml +++ b/metadata/org.dolphinemu.dolphinemu.yml @@ -162,7 +162,7 @@ Builds: subdir: Source/Android/app sudo: - apt-get update - - apt-get install -y sdkmanager lib32stdc++6 + - apt-get install -y lib32stdc++6 gradle: - yes prebuild: sdkmanager 'cmake;3.18.1' diff --git a/metadata/org.xcsoar.yml b/metadata/org.xcsoar.yml index e6d90b8acd..5a657cbdb2 100644 --- a/metadata/org.xcsoar.yml +++ b/metadata/org.xcsoar.yml @@ -363,8 +363,8 @@ Builds: submodules: true sudo: - apt-get update - - apt-get install -y ninja-build g++ vorbis-tools librsvg2-bin imagemagick sdkmanager - make gettext quilt sox m4 xsltproc cmake xz-utils pkg-config + - apt-get install -y ninja-build g++ vorbis-tools librsvg2-bin imagemagick make + gettext quilt sox m4 xsltproc cmake xz-utils pkg-config output: output/ANDROID/opt/build/unsigned.apk prebuild: sdkmanager 'platforms;android-30' 'build-tools;29.0.3' scandelete: