From 8ed46936cb02bbebca789a4c06f0199aef2e443c Mon Sep 17 00:00:00 2001
From: Charlotte Van Petegem <charlotte@vanpetegem.be>
Date: Sat, 29 Jun 2024 16:53:13 +0200
Subject: [PATCH] Update to Android API level 35

---
 .github/workflows/release.yml |  6 +++---
 app/build.gradle.kts          |  4 ++--
 flake.lock                    | 12 ++++++------
 flake.nix                     |  8 ++++----
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 49b5dce..fa70222 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -25,10 +25,10 @@ jobs:
     - name: Build release APK
       run: |
         ./gradlew assembleRelease
-        $ANDROID_SDK_ROOT/build-tools/34.0.0/zipalign -v -p 4 app/build/outputs/apk/release/app-release-unsigned.apk app/build/outputs/apk/release/app-release-unsigned-aligned.apk
+        $ANDROID_SDK_ROOT/build-tools/35.0.0/zipalign -v -p 4 app/build/outputs/apk/release/app-release-unsigned.apk app/build/outputs/apk/release/app-release-unsigned-aligned.apk
         echo "${{ secrets.KEYSTORE_FILE }}" | base64 -d > keystore.jks
-        echo "${{ secrets.KEYSTORE_PASSWORD }}" | $ANDROID_SDK_ROOT/build-tools/34.0.0/apksigner sign --ks keystore.jks --out app-release.apk app/build/outputs/apk/release/app-release-unsigned-aligned.apk
-        $ANDROID_SDK_ROOT/build-tools/34.0.0/apksigner verify app-release.apk
+        echo "${{ secrets.KEYSTORE_PASSWORD }}" | $ANDROID_SDK_ROOT/build-tools/35.0.0/apksigner sign --ks keystore.jks --out app-release.apk app/build/outputs/apk/release/app-release-unsigned-aligned.apk
+        $ANDROID_SDK_ROOT/build-tools/35.0.0/apksigner verify app-release.apk
     - name: Parse tag
       id: parse_tag
       run: "echo ${{ github.ref }} | sed 's#^refs/tags/#::set-output name=version::#'"
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 3bb35a3..eef6f38 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -8,12 +8,12 @@ plugins {
 
 android {
     namespace = "be.chvp.nanoledger"
-    compileSdk = 34
+    compileSdk = 35
 
     defaultConfig {
         applicationId = "be.chvp.nanoledger"
         minSdk = 21
-        targetSdk = 34
+        targetSdk = 35
         versionCode = 40200
         versionName = "0.4.1"
 
diff --git a/flake.lock b/flake.lock
index 7406a93..f45a65e 100644
--- a/flake.lock
+++ b/flake.lock
@@ -59,16 +59,16 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1719468428,
-        "narHash": "sha256-vN5xJAZ4UGREEglh3lfbbkIj+MPEYMuqewMn4atZFaQ=",
-        "owner": "nixos",
+        "lastModified": 1719672060,
+        "narHash": "sha256-ii/Boz9O1WlMAFGvzyvuxfPkabxlQ29evLq+d7QvFzY=",
+        "owner": "chvp",
         "repo": "nixpkgs",
-        "rev": "1e3deb3d8a86a870d925760db1a5adecc64d329d",
+        "rev": "3e1ea04727d569a01b3b6f161a176a4dc93e97a9",
         "type": "github"
       },
       "original": {
-        "owner": "nixos",
-        "ref": "nixpkgs-unstable",
+        "owner": "chvp",
+        "ref": "bump-androidenv",
         "repo": "nixpkgs",
         "type": "github"
       }
diff --git a/flake.nix b/flake.nix
index 65df458..6792327 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,7 +2,7 @@
   description = "Nanoledger android app";
 
   inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
+    nixpkgs.url = "github:chvp/nixpkgs/bump-androidenv";
     devshell = {
       url = "github:numtide/devshell";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -13,10 +13,10 @@
     flake-utils.lib.eachDefaultSystem (system:
       let
         pkgs = import nixpkgs { inherit system; config = { android_sdk.accept_license = true; allowUnfree = true; }; overlays = [ devshell.overlays.default ]; };
-        buildToolsVersion = "34.0.0";
+        buildToolsVersion = "35.0.0";
         composed = pkgs.androidenv.composeAndroidPackages {
-          buildToolsVersions = [ buildToolsVersion ];
-          platformVersions = [ "33" "34" ];
+          buildToolsVersions = [ "34.0.0" buildToolsVersion ];
+          platformVersions = [ "34" "35" ];
         };
         fhsEnv = pkgs.buildFHSUserEnv {
           name = "android-sdk-env";