Skip to content

Commit

Permalink
fix: android build
Browse files Browse the repository at this point in the history
  • Loading branch information
Nodonisko committed Nov 15, 2024
1 parent 3a16ea2 commit dac2ad1
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 9 deletions.
6 changes: 3 additions & 3 deletions packages/react-native-usb/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ buildscript {
if (ext.has("kotlinVersion")) {
ext.kotlinVersion()
} else {
ext.safeExtGet("kotlinVersion", "1.8.10")
ext.safeExtGet("kotlinVersion", "1.9.24")
}
}

Expand Down Expand Up @@ -51,7 +51,7 @@ afterEvaluate {
}

android {
compileSdkVersion safeExtGet("compileSdkVersion", 33)
compileSdkVersion safeExtGet("compileSdkVersion", 35)

compileOptions {
sourceCompatibility JavaVersion.VERSION_17
Expand All @@ -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"
}
Expand Down
2 changes: 2 additions & 0 deletions suite-native/app/app.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,8 @@ const getPlugins = (): ExpoPlugins => {
{
android: {
minSdkVersion: 28,
// this fixes expo-updates build error
kotlinVersion: '1.9.24',
},
ios: {
deploymentTarget: '15.1',
Expand Down
2 changes: 1 addition & 1 deletion suite-native/app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
10 changes: 5 additions & 5 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -22263,9 +22263,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"
Expand All @@ -22286,7 +22286,7 @@ __metadata:
react: "*"
bin:
expo-updates: bin/cli.js
checksum: 10/7fb8d181287d479ff4f39e0e76a97dbd19521de4959dc469e87bb31ad602ec7b367a1d3642d0ed55ecebe785ed46c1eabe7c912f45c10adeada4ab9a5760b7ea
checksum: 10/48bba9bc2a6d0855f3a33e1379bb941d9cdbd44bee28fa693975819d78140e2a141dcfd3bacc5b6b5c7866725b93de35ed40b0031df5e6789ebef3af8875d9cf
languageName: node
linkType: hard

Expand Down

0 comments on commit dac2ad1

Please sign in to comment.