androidenv update packages

This commit is contained in:
Hadi 2023-08-10 20:27:06 -04:00
parent cf73a86c35
commit 430200fe06
No known key found for this signature in database
GPG key ID: 416AD9E8E372C075
4 changed files with 1330 additions and 450 deletions

View file

@ -2,12 +2,12 @@
, licenseAccepted ? false
}:
{ cmdLineToolsVersion ? "9.0"
{ cmdLineToolsVersion ? "11.0"
, toolsVersion ? "26.1.1"
, platformToolsVersion ? "34.0.1"
, buildToolsVersions ? [ "33.0.2" ]
, platformToolsVersion ? "34.0.4"
, buildToolsVersions ? [ "34.0.0" ]
, includeEmulator ? false
, emulatorVersion ? "33.1.6"
, emulatorVersion ? "32.1.14"
, platformVersions ? []
, includeSources ? false
, includeSystemImages ? false

View file

@ -26,7 +26,7 @@ let
# Declaration of versions for everything. This is useful since these
# versions may be used in multiple places in this Nix expression.
android = {
platforms = [ "33" ];
platforms = [ "34" ];
systemImageTypes = [ "google_apis" ];
abis = [ "arm64-v8a" "x86_64" ];
};
@ -115,10 +115,10 @@ pkgs.mkShell rec {
echo "installed_packages_section: ''${installed_packages_section}"
packages=(
"build-tools;33.0.2" "cmdline-tools;9.0" \
"emulator" "patcher;v4" "platform-tools" "platforms;android-33" \
"system-images;android-33;google_apis;arm64-v8a" \
"system-images;android-33;google_apis;x86_64"
"build-tools;34.0.0" "cmdline-tools;11.0" \
"emulator" "patcher;v4" "platform-tools" "platforms;android-34" \
"system-images;android-34;google_apis;arm64-v8a" \
"system-images;android-34;google_apis;x86_64"
)
for package in "''${packages[@]}"; do
@ -135,7 +135,7 @@ pkgs.mkShell rec {
nativeBuildInputs = [ androidSdk androidEmulator jdk ];
} ''
avdmanager delete avd -n testAVD || true
echo "" | avdmanager create avd --force --name testAVD --package 'system-images;android-33;google_apis;x86_64'
echo "" | avdmanager create avd --force --name testAVD --package 'system-images;android-34;google_apis;x86_64'
result=$(avdmanager list avd)
if [[ ! $result =~ "Name: testAVD" ]]; then

View file

@ -25,18 +25,18 @@ let
# versions may be used in multiple places in this Nix expression.
android = {
versions = {
cmdLineToolsVersion = "9.0";
platformTools = "34.0.1";
buildTools = "33.0.2";
cmdLineToolsVersion = "11.0";
platformTools = "34.0.4";
buildTools = "34.0.0";
ndk = [
"25.1.8937393" # LTS NDK
"25.2.9519653"
"26.0.10404224-rc1"
];
cmake = "3.6.4111459";
emulator = "33.1.6";
emulator = "33.1.17";
};
platforms = ["23" "24" "25" "26" "27" "28" "29" "30" "31" "32" "33"];
platforms = [ "23" "24" "25" "26" "27" "28" "29" "30" "31" "32" "33" "34" ];
abis = ["armeabi-v7a" "arm64-v8a"];
extras = ["extras;google;gcm"];
};
@ -165,19 +165,20 @@ pkgs.mkShell rec {
installed_packages_section=$(echo "''${output%%Available Packages*}" | awk 'NR>4 {print $1}')
packages=(
"build-tools;33.0.2" "platform-tools" \
"build-tools;34.0.0" "platform-tools" \
"platforms;android-23" "platforms;android-24" "platforms;android-25" "platforms;android-26" \
"platforms;android-27" "platforms;android-28" "platforms;android-29" "platforms;android-30" \
"platforms;android-31" "platforms;android-32" "platforms;android-33" \
"platforms;android-31" "platforms;android-32" "platforms;android-33" "platforms;android-34" \
"sources;android-23" "sources;android-24" "sources;android-25" "sources;android-26" \
"sources;android-27" "sources;android-28" "sources;android-29" "sources;android-30" \
"sources;android-31" "sources;android-32" "sources;android-33" \
"sources;android-31" "sources;android-32" "sources;android-33" "sources;android-34" \
"system-images;android-28;google_apis_playstore;arm64-v8a" \
"system-images;android-29;google_apis_playstore;arm64-v8a" \
"system-images;android-30;google_apis_playstore;arm64-v8a" \
"system-images;android-31;google_apis_playstore;arm64-v8a" \
"system-images;android-32;google_apis_playstore;arm64-v8a" \
"system-images;android-33;google_apis_playstore;arm64-v8a"
"system-images;android-33;google_apis_playstore;arm64-v8a" \
"system-images;android-34;google_apis_playstore;arm64-v8a"
)
for package in "''${packages[@]}"; do

File diff suppressed because it is too large Load diff