Skip to content
Snippets Groups Projects
Commit 9da18338 authored by Jean-Paul Calderone's avatar Jean-Paul Calderone
Browse files

Get some versions of the tools to line up

parent 46ad1e5a
No related branches found
No related tags found
No related merge requests found
{ androidenv, cmakeVersion }: { androidenv, cmakeVersion, buildToolsVersion, ndkVersion }:
let let
androidComposition = androidenv.composeAndroidPackages { androidComposition = androidenv.composeAndroidPackages {
toolsVersion = "26.1.1"; toolsVersion = "26.1.1";
# platformToolsVersion = "30.0.5"; # platformToolsVersion = "30.0.5";
buildToolsVersions = [ "30.0.3" ]; buildToolsVersions = [ buildToolsVersion ];
includeEmulator = false; includeEmulator = false;
emulatorVersion = "30.3.4"; emulatorVersion = "30.3.4";
platformVersions = [ "27" "28" "29" "30" ]; platformVersions = [ "31" ];
includeSources = false; includeSources = false;
includeSystemImages = false; includeSystemImages = false;
systemImageTypes = [ "google_apis_playstore" ]; systemImageTypes = [ "google_apis_playstore" ];
abiVersions = [ "armeabi-v7a" "arm64-v8a" ]; abiVersions = [ "armeabi-v7a" "arm64-v8a" ];
cmakeVersions = [ cmakeVersion ]; cmakeVersions = [ cmakeVersion ];
includeNDK = true; includeNDK = true;
# Check out pkgs/development/mobile/androidenv/repo.json ndkVersions = [ ndkVersion ];
ndkVersions = [ "23.0.7123448-rc1" "22.0.7026061" ];
useGoogleAPIs = false; useGoogleAPIs = false;
useGoogleTVAddOns = false; useGoogleTVAddOns = false;
includeExtras = [ includeExtras = [
......
...@@ -5,7 +5,14 @@ plugins { ...@@ -5,7 +5,14 @@ plugins {
} }
android { android {
compileSdk 32 compileSdk 31
buildToolsVersion "30.0.3"
ndkVersion "23.0.7123448"
externalNAtiveBuild {
cmake {
version "3.10.2"
}
}
defaultConfig { defaultConfig {
applicationId "com.example.privatestorage" applicationId "com.example.privatestorage"
......
...@@ -64,10 +64,28 @@ ...@@ -64,10 +64,28 @@
}; };
# THESE MUST AGREE WITH app/app/build.gradle
#
# If they do not you will get failures that look something like:
# FAILURE: Build failed with an exception.
#
# * What went wrong:
# Could not determine the dependencies of task ':app:compileReleaseJavaWithJavac'.
# > Failed to install the following SDK components:
# platforms;android-32 Android SDK Platform 32
# The SDK directory is not writable (/nix/store/46214a16f22rd7q8vkrhsa907ra0405l-androidsdk/libexec/android-sdk)
cmakeVersion = "3.10.2"; cmakeVersion = "3.10.2";
buildToolsVersion = "30.0.3";
# Check out pkgs/development/mobile/androidenv/repo.json for
# nixpkgs-supported versions.
ndkVersion = "23.0.7123448-rc1";
# Also includes ndk # Also includes ndk
androidComposition = pkgs.callPackage ./android.nix { inherit cmakeVersion; }; androidComposition = pkgs.callPackage ./android.nix {
inherit cmakeVersion buildToolsVersion ndkVersion;
};
getBuildInputs = getInputs: xs: builtins.foldl' (accum: drv: (getInputs drv) ++ accum) [] xs; getBuildInputs = getInputs: xs: builtins.foldl' (accum: drv: (getInputs drv) ++ accum) [] xs;
...@@ -79,12 +97,12 @@ ...@@ -79,12 +97,12 @@
}; };
in { in {
packages.default = pkgs.androidenv.buildApp { packages.apk = pkgs.androidenv.buildApp {
name = "PrivateStorage Mobile"; name = "PrivateStorage Mobile";
src = ./app; src = ./app;
release = false; release = false;
platformVersions = [ "27" ]; platformVersions = [ "31" ];
includeNDK = false; includeNDK = false;
}; };
...@@ -93,7 +111,7 @@ ...@@ -93,7 +111,7 @@
program = let program = let
emulator = pkgs.androidenv.emulateApp { emulator = pkgs.androidenv.emulateApp {
name = "PrivateStorage Mobile"; name = "PrivateStorage Mobile";
platformVersion = "27"; platformVersion = "31";
abiVersion = "x86_64"; abiVersion = "x86_64";
systemImageType = "default"; systemImageType = "default";
app = ./app/app/build/outputs/apk/debug/app-debug.apk; app = ./app/app/build/outputs/apk/debug/app-debug.apk;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment