Format
This commit is contained in:
parent
2b5a0d6a20
commit
85a94a1c4c
4 changed files with 30 additions and 27 deletions
|
@ -1,19 +1,20 @@
|
|||
{ inputs, system, ... }: let
|
||||
pkgs = import inputs.nixpkgs { inherit system; config = { android_sdk.accept_license = true; allowUnfree = true; }; overlays = [ inputs.devshell.overlays.default ]; };
|
||||
buildToolsVersion = "30.0.3";
|
||||
composed = pkgs.androidenv.composeAndroidPackages {
|
||||
buildToolsVersions = [ buildToolsVersion ];
|
||||
platformVersions = [ "32" ];
|
||||
};
|
||||
fhsEnv = pkgs.buildFHSUserEnv {
|
||||
name = "android-sdk-env";
|
||||
targetPkgs = pkgs: (with pkgs; [ glibc ]);
|
||||
profile = ''
|
||||
export ANDROID_SDK_ROOT="${composed.androidsdk}/libexec/android-sdk/"
|
||||
'';
|
||||
};
|
||||
{ inputs, system, ... }:
|
||||
let
|
||||
pkgs = import inputs.nixpkgs { inherit system; config = { android_sdk.accept_license = true; allowUnfree = true; }; overlays = [ inputs.devshell.overlays.default ]; };
|
||||
buildToolsVersion = "30.0.3";
|
||||
composed = pkgs.androidenv.composeAndroidPackages {
|
||||
buildToolsVersions = [ buildToolsVersion ];
|
||||
platformVersions = [ "32" ];
|
||||
};
|
||||
fhsEnv = pkgs.buildFHSUserEnv {
|
||||
name = "android-sdk-env";
|
||||
targetPkgs = pkgs: (with pkgs; [ glibc ]);
|
||||
profile = ''
|
||||
export ANDROID_SDK_ROOT="${composed.androidsdk}/libexec/android-sdk/"
|
||||
'';
|
||||
};
|
||||
in
|
||||
pkgs.devshell.mkShell {
|
||||
pkgs.devshell.mkShell {
|
||||
name = "Orgzly";
|
||||
packages = [ pkgs.jdk17 pkgs.kotlin-language-server pkgs.nixpkgs-fmt ];
|
||||
env = [
|
||||
|
@ -33,12 +34,12 @@ in
|
|||
category = "tools";
|
||||
help = "Install a debug signed release APK";
|
||||
command = ''
|
||||
rm -f "$APK_DIR/"*
|
||||
gradle assembleRelease
|
||||
"$BUILD_TOOLS_PATH/zipalign" -v -p 4 "$APK_DIR/app-premium-release-unsigned.apk" "$APK_DIR/app-release-unsigned-aligned.apk"
|
||||
echo android | "$BUILD_TOOLS_PATH/apksigner" sign --ks "$HOME/.android/debug.keystore" --out "$APK_DIR/app-release.apk" "$APK_DIR/app-release-unsigned-aligned.apk"
|
||||
adb install -r "$APK_DIR/app-release.apk"
|
||||
'';
|
||||
rm -f "$APK_DIR/"*
|
||||
gradle assembleRelease
|
||||
"$BUILD_TOOLS_PATH/zipalign" -v -p 4 "$APK_DIR/app-premium-release-unsigned.apk" "$APK_DIR/app-release-unsigned-aligned.apk"
|
||||
echo android | "$BUILD_TOOLS_PATH/apksigner" sign --ks "$HOME/.android/debug.keystore" --out "$APK_DIR/app-release.apk" "$APK_DIR/app-release-unsigned-aligned.apk"
|
||||
adb install -r "$APK_DIR/app-release.apk"
|
||||
'';
|
||||
}
|
||||
];
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue