From b45127d4a1fcdfc1dfce839fde02ee1c8a41ecca Mon Sep 17 00:00:00 2001
From: Daniel Suchy <suchydan@gmail.com>
Date: Thu, 14 Nov 2024 00:24:46 +0100
Subject: [PATCH] fix: android build

---
 packages/react-native-usb/android/build.gradle |  6 +++---
 suite-native/app/app.config.ts                 |  2 ++
 suite-native/app/package.json                  |  2 +-
 yarn.lock                                      | 10 +++++-----
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/packages/react-native-usb/android/build.gradle b/packages/react-native-usb/android/build.gradle
index 4d27d752a92..88b937572e4 100644
--- a/packages/react-native-usb/android/build.gradle
+++ b/packages/react-native-usb/android/build.gradle
@@ -22,7 +22,7 @@ buildscript {
     if (ext.has("kotlinVersion")) {
       ext.kotlinVersion()
     } else {
-      ext.safeExtGet("kotlinVersion", "1.8.10")
+      ext.safeExtGet("kotlinVersion", "1.9.24")
     }
   }
 
@@ -51,7 +51,7 @@ afterEvaluate {
 }
 
 android {
-  compileSdkVersion safeExtGet("compileSdkVersion", 33)
+  compileSdkVersion safeExtGet("compileSdkVersion", 35)
 
   compileOptions {
     sourceCompatibility JavaVersion.VERSION_17
@@ -65,7 +65,7 @@ android {
   namespace "io.trezor.rnusb"
   defaultConfig {
     minSdkVersion safeExtGet("minSdkVersion", 21)
-    targetSdkVersion safeExtGet("targetSdkVersion", 33)
+    targetSdkVersion safeExtGet("targetSdkVersion", 34)
     versionCode 1
     versionName "0.1.0"
   }
diff --git a/suite-native/app/app.config.ts b/suite-native/app/app.config.ts
index 26c36fde7cf..18ea0a83ab7 100644
--- a/suite-native/app/app.config.ts
+++ b/suite-native/app/app.config.ts
@@ -100,6 +100,8 @@ const getPlugins = (): ExpoPlugins => {
             {
                 android: {
                     minSdkVersion: 28,
+                    // this fixes expo-updates build error
+                    kotlinVersion: '1.9.24',
                 },
                 ios: {
                     deploymentTarget: '15.1',
diff --git a/suite-native/app/package.json b/suite-native/app/package.json
index aa466c77d4d..c0248daa448 100644
--- a/suite-native/app/package.json
+++ b/suite-native/app/package.json
@@ -102,7 +102,7 @@
         "expo-splash-screen": "^0.29.7",
         "expo-status-bar": "^2.0.0",
         "expo-system-ui": "^4.0.2",
-        "expo-updates": "0.26.5",
+        "expo-updates": "0.26.6",
         "lottie-react-native": "^7.1.0",
         "node-libs-browser": "^2.2.1",
         "react": "18.2.0",
diff --git a/yarn.lock b/yarn.lock
index 13bce98cd15..1aadfe01a8a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9262,7 +9262,7 @@ __metadata:
     expo-splash-screen: "npm:^0.29.7"
     expo-status-bar: "npm:^2.0.0"
     expo-system-ui: "npm:^4.0.2"
-    expo-updates: "npm:0.26.5"
+    expo-updates: "npm:0.26.6"
     jest: "npm:^29.7.0"
     lottie-react-native: "npm:^7.1.0"
     metro: "npm:0.81.0"
@@ -22251,9 +22251,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"expo-updates@npm:0.26.5":
-  version: 0.26.5
-  resolution: "expo-updates@npm:0.26.5"
+"expo-updates@npm:0.26.6":
+  version: 0.26.6
+  resolution: "expo-updates@npm:0.26.6"
   dependencies:
     "@expo/code-signing-certificates": "npm:0.0.5"
     "@expo/config": "npm:~10.0.0"
@@ -22274,7 +22274,7 @@ __metadata:
     react: "*"
   bin:
     expo-updates: bin/cli.js
-  checksum: 10/7fb8d181287d479ff4f39e0e76a97dbd19521de4959dc469e87bb31ad602ec7b367a1d3642d0ed55ecebe785ed46c1eabe7c912f45c10adeada4ab9a5760b7ea
+  checksum: 10/48bba9bc2a6d0855f3a33e1379bb941d9cdbd44bee28fa693975819d78140e2a141dcfd3bacc5b6b5c7866725b93de35ed40b0031df5e6789ebef3af8875d9cf
   languageName: node
   linkType: hard