-
Notifications
You must be signed in to change notification settings - Fork 326
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #7522 from LedgerHQ/fix/ton-inte-android
fix: ton integration on android build
- Loading branch information
Showing
2 changed files
with
17 additions
and
6 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,18 +1,29 @@ | ||
diff --git a/android/build.gradle b/android/build.gradle | ||
index a022b38..2102b47 100644 | ||
index a022b38c398d5e64bb77df6c6fc1c2f73932f019..2e47e85d013b5dc3b18e5519bdaf241399c16a0f 100644 | ||
--- a/android/build.gradle | ||
+++ b/android/build.gradle | ||
@@ -18,11 +18,11 @@ def safeExtGet(prop, fallback) { | ||
} | ||
|
||
android { | ||
- compileSdkVersion safeExtGet('Pbkdf2_compileSdkVersion', 29) | ||
+ compileSdkVersion safeExtGet('Pbkdf2_compileSdkVersion', 30) | ||
+ compileSdkVersion safeExtGet('Pbkdf2_compileSdkVersion', 34) | ||
buildToolsVersion safeExtGet('Pbkdf2_buildToolsVersion', '29.0.2') | ||
defaultConfig { | ||
minSdkVersion safeExtGet('Pbkdf2_minSdkVersion', 16) | ||
- targetSdkVersion safeExtGet('Pbkdf2_targetSdkVersion', 29) | ||
+ targetSdkVersion safeExtGet('Pbkdf2_targetSdkVersion', 30) | ||
+ targetSdkVersion safeExtGet('Pbkdf2_targetSdkVersion', 34) | ||
versionCode 1 | ||
versionName "1.0" | ||
|
||
@@ -37,8 +37,8 @@ android { | ||
disable 'GradleCompatible' | ||
} | ||
compileOptions { | ||
- sourceCompatibility JavaVersion.VERSION_1_8 | ||
- targetCompatibility JavaVersion.VERSION_1_8 | ||
+ sourceCompatibility JavaVersion.VERSION_17 | ||
+ targetCompatibility JavaVersion.VERSION_17 | ||
} | ||
} | ||
|
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
8fe8b24
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
[Bot] Testing with 'Nitrogen' ✅ 3 txs ❌ 1 txs ($2.52) ⏲ 1min 42s
❌ 1 mutation errors
Details of the 4 mutations
Spec Algorand (6)
Details of the 2 uncovered mutations
Spec Algorand (2)
Portfolio ($2.52) – Details of the 1 currencies
TM4WJOS4MZ2TD775W7GSXZMBUF74YT6SKSBXCZY3N7OUIAPXE54MZ5FCD4
Performance ⏲ 1min 42s
Time spent for each spec: (total across mutations)