Update to Android API level 35

chvp · Jun 29, 2024 · 8ed4693 · 8ed4693
1 parent 847b26b
commit 8ed4693
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 15 deletions.
diff --git 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
@@ -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
diff --git 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";