Drop support for Android 3 and 4

Support for Android 4 was broken for several releases and no one
noticed. The lowest supported version is now Android 5.
This commit is contained in:
Jules Aguillon 2024-12-29 00:27:44 +01:00
parent d9b5b36c27
commit a9b78923c0
2 changed files with 7 additions and 8 deletions

View File

@ -12,7 +12,7 @@ android {
defaultConfig { defaultConfig {
applicationId "juloo.keyboard2" applicationId "juloo.keyboard2"
minSdk 11 minSdk 21
targetSdkVersion 35 targetSdkVersion 35
versionCode 44 versionCode 44
versionName "1.30.1" versionName "1.30.1"

View File

@ -22,14 +22,11 @@ let
}; };
emulators = let emulators = let
mk_emulator = { platformVersion, device ? "pixel_6" }: mk_emulator = { platformVersion, device ? "pixel_6", abiVersion ? "x86_64", systemImageType ? "default" }:
pkgs.androidenv.emulateApp rec { pkgs.androidenv.emulateApp rec {
name = "emulator_api${platformVersion}"; name = "emulator_api${platformVersion}";
inherit platformVersion; inherit platformVersion abiVersion systemImageType;
abiVersion = "x86_64";
androidAvdFlags = "--device ${device}"; androidAvdFlags = "--device ${device}";
# There's no 'default' image for Android 15
systemImageType = "google_apis";
sdkExtraArgs = { inherit repoJson; }; sdkExtraArgs = { inherit repoJson; };
}; };
# Allow to install several emulators in the same environment # Allow to install several emulators in the same environment
@ -38,8 +35,10 @@ let
path = "${mk_emulator args}/bin/run-test-emulator"; path = "${mk_emulator args}/bin/run-test-emulator";
}; };
in pkgs.linkFarm "emulator" [ in pkgs.linkFarm "emulator" [
(link_emulator "14" { platformVersion = "34"; }) (link_emulator "5" { platformVersion = "21"; })
(link_emulator "15" { platformVersion = "35"; }) # (link_emulator "14" { platformVersion = "34"; })
# There's no 'default' image for Android 15
(link_emulator "15" { platformVersion = "35"; systemImageType = "google_apis"; })
]; ];
ANDROID_SDK_ROOT = "${android.androidsdk}/libexec/android-sdk"; ANDROID_SDK_ROOT = "${android.androidsdk}/libexec/android-sdk";