remove sdkmanager since it's pre-installed

.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"

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

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'

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:

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

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

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

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:

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'

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:

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

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

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

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:

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'

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: