Skip to content

Commit c465eb6

Browse files
[Android]: Add support for Android devices with 16kb page size (#4212)
* [Android]: Add support for Android devices with 16kb page size * Upgrade Android SDK to 35, NDK to 28 * [Android]: Update wallet-core-kotlin AGP, SDK and NDK * Change CI internal cache * MISC: agp and kgp version bumps (#4213) * [CI]: Update gradle to 8.10.2 * MISC: specify java compatibility version * MISC: remove expect-actual-classes warnings * [Misc]: Fix C++ Android warnings * [Misc]: Fix iOS KMP compile errors * [Misc]: Fix Android and KMP Android compile errors * [Misc]: Fix KMP JVM * [Misc]: minor change * [Misc]: Disable `[[maybe_unused]]` for KMP --------- Co-authored-by: Egor Kurnikov <[email protected]>
1 parent ea602ba commit c465eb6

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+179
-134
lines changed

.github/workflows/android-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848
uses: actions/cache@v3
4949
with:
5050
path: build/local
51-
key: ${{ runner.os }}-${{ runner.arch }}-internal-${{ hashFiles('tools/install-dependencies') }}
51+
key: ${{ runner.os }}-${{ runner.arch }}-internal-${{ hashFiles('tools/install-dependencies') }}-${{ hashFiles('tools/dependencies-version') }}
5252

5353
- name: Install internal dependencies
5454
run: tools/install-dependencies

.github/workflows/ios-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
uses: actions/cache@v3
3737
with:
3838
path: build/local
39-
key: ${{ runner.os }}-internal-${{ hashFiles('tools/install-dependencies') }}
39+
key: ${{ runner.os }}-${{ runner.arch }}-internal-${{ hashFiles('tools/install-dependencies') }}-${{ hashFiles('tools/dependencies-version') }}
4040

4141
- name: Install internal dependencies
4242
run: |

.github/workflows/kotlin-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
uses: actions/cache@v3
5757
with:
5858
path: build/local
59-
key: ${{ runner.os }}-internal-${{ hashFiles('tools/install-dependencies') }}
59+
key: ${{ runner.os }}-${{ runner.arch }}-internal-${{ hashFiles('tools/install-dependencies') }}-${{ hashFiles('tools/dependencies-version') }}
6060

6161
- name: Install internal dependencies
6262
run: tools/install-dependencies

.github/workflows/linux-ci-sonarcloud.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
uses: actions/cache@v3
3434
with:
3535
path: build/local
36-
key: ${{ runner.os }}-internal-${{ hashFiles('tools/install-dependencies') }}
36+
key: ${{ runner.os }}-${{ runner.arch }}-internal-${{ hashFiles('tools/install-dependencies') }}-${{ hashFiles('tools/dependencies-version') }}
3737

3838
- name: Install internal dependencies
3939
run: |

.github/workflows/linux-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
uses: actions/cache@v3
2626
with:
2727
path: build/local
28-
key: ${{ runner.os }}-internal-${{ hashFiles('tools/install-sys-dependencies-linux') }}-${{ hashFiles('tools/install-dependencies') }}
28+
key: ${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('tools/install-sys-dependencies-linux') }}-internal-${{ hashFiles('tools/install-dependencies') }}-${{ hashFiles('tools/dependencies-version') }}
2929
- name: Install internal dependencies
3030
run: |
3131
tools/install-dependencies

.github/workflows/linux-sampleapp-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
uses: actions/cache@v3
2626
with:
2727
path: build/local
28-
key: ${{ runner.os }}-internal-${{ hashFiles('tools/install-sys-dependencies-linux') }}-${{ hashFiles('tools/install-dependencies') }}
28+
key: ${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('tools/install-sys-dependencies-linux') }}-internal-${{ hashFiles('tools/install-dependencies') }}-${{ hashFiles('tools/dependencies-version') }}
2929
- name: Install internal dependencies
3030
run: |
3131
tools/install-dependencies

.github/workflows/wasm-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
uses: actions/cache@v3
3030
with:
3131
path: build/local
32-
key: ${{ runner.os }}-internal-${{ hashFiles('tools/install-dependencies') }}
32+
key: ${{ runner.os }}-${{ runner.arch }}-internal-${{ hashFiles('tools/install-dependencies') }}-${{ hashFiles('tools/dependencies-version') }}
3333

3434
- name: Install internal dependencies
3535
run: tools/install-dependencies

android/app/build.gradle

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ apply plugin: 'kotlin-android'
33

44
android {
55
namespace 'com.trustwallet.core.app'
6-
compileSdkVersion 32
7-
ndkVersion '23.1.7779620'
6+
compileSdk 35
7+
ndkVersion '28.0.12674087'
88
defaultConfig {
99
applicationId "com.trustwallet.core.app"
1010
minSdkVersion 23
@@ -25,6 +25,10 @@ android {
2525
}
2626
}
2727
}
28+
compileOptions {
29+
sourceCompatibility JavaVersion.VERSION_17
30+
targetCompatibility JavaVersion.VERSION_17
31+
}
2832
}
2933

3034
dependencies {

android/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
buildscript {
2-
ext.kotlin_version = '1.6.10'
2+
ext.kotlin_version = '2.1.0'
33
repositories {
44
google()
55
mavenCentral()
66
}
77
dependencies {
8-
classpath 'com.android.tools.build:gradle:8.0.0'
8+
classpath 'com.android.tools.build:gradle:8.8.0'
99
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1010
}
1111
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip
44
networkTimeout=10000
55
zipStoreBase=GRADLE_USER_HOME
66
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)