diff --git a/shells/accentor-android.nix b/shells/accentor-android.nix index 38e7f91b..c926a068 100644 --- a/shells/accentor-android.nix +++ b/shells/accentor-android.nix @@ -47,29 +47,29 @@ let '''; runScript = "''${run}"; }).env - ''; + ''; - gradle-run-script = pkgs.writeScriptBin "gradle" '' - #!${pkgs.bash}/bin/bash + gradle-run-script = pkgs.writeScriptBin "gradle" '' + #!${pkgs.bash}/bin/bash - REPO_ROOT="$(git rev-parse --show-toplevel)" - nix-shell --argstr run "$REPO_ROOT/gradlew $@" "${gradle-fhs-nix}" - ''; + REPO_ROOT="$(git rev-parse --show-toplevel)" + nix-shell --argstr run "$REPO_ROOT/gradlew $@" "${gradle-fhs-nix}" + ''; - sign-release = pkgs.writeScriptBin "sign-release" '' - #!${pkgs.bash}/bin/bash + sign-release = pkgs.writeScriptBin "sign-release" '' + #!${pkgs.bash}/bin/bash - BUILD_TOOLS_PATH="${composed.androidsdk}/libexec/android-sdk/build-tools/28.0.3" - REPO_ROOT="$(git rev-parse --show-toplevel)" - APK_DIR="$REPO_ROOT/app/build/outputs/apk/release" + BUILD_TOOLS_PATH="${composed.androidsdk}/libexec/android-sdk/build-tools/28.0.3" + REPO_ROOT="$(git rev-parse --show-toplevel)" + APK_DIR="$REPO_ROOT/app/build/outputs/apk/release" - rm "$APK_DIR/"* - ${gradle-run-script}/bin/gradle assembleRelease - "$BUILD_TOOLS_PATH/zipalign" -v -p 4 "$APK_DIR/app-release-unsigned.apk" "$APK_DIR/app-release-unsigned-aligned.apk" + rm "$APK_DIR/"* + ${gradle-run-script}/bin/gradle assembleRelease + "$BUILD_TOOLS_PATH/zipalign" -v -p 4 "$APK_DIR/app-release-unsigned.apk" "$APK_DIR/app-release-unsigned-aligned.apk" - "$BUILD_TOOLS_PATH/apksigner" sign --ks "$REPO_ROOT/keystore.jks" --out "$APK_DIR/app-release.apk" "$APK_DIR/app-release-unsigned-aligned.apk" - "$BUILD_TOOLS_PATH/apksigner" verify "$APK_DIR/app-release.apk" - ''; + "$BUILD_TOOLS_PATH/apksigner" sign --ks "$REPO_ROOT/keystore.jks" --out "$APK_DIR/app-release.apk" "$APK_DIR/app-release-unsigned-aligned.apk" + "$BUILD_TOOLS_PATH/apksigner" verify "$APK_DIR/app-release.apk" + ''; in pkgs.mkShell { buildInputs = with pkgs; [