Skip to content

Commit 6b1a56a

Browse files
authored
Merge pull request zingolabs#798 from juanky201271/dev_bump_RN_0.78
Upgrade to RN 0.78
2 parents 6c318db + 95636b8 commit 6b1a56a

File tree

21 files changed

+522
-382
lines changed

21 files changed

+522
-382
lines changed

.github/workflows/android-ubuntu-integration-test-ci.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ jobs:
103103
android-ubuntu-integration-test-ci:
104104
name: Android Ubuntu Integration test
105105
needs: android-ubuntu-integration-test-ci-avd-cache
106-
runs-on: ubuntu-22.04
106+
runs-on: ubuntu-24.04
107107
strategy:
108108
fail-fast: false
109109
matrix:
Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
1-
export const requestBioAuth = jest.fn(() => Promise.resolve(true));
1+
export const RNBiometrics = {
2+
requestBioAuth: jest.fn(() => Promise.resolve(true)),
3+
};

__tests__/MessagesAddress.snapshot.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import { mockInfo } from '../__mocks__/dataMocks/mockInfo';
1414
import { mockTotalBalance } from '../__mocks__/dataMocks/mockTotalBalance';
1515
import { mockTranslate } from '../__mocks__/dataMocks/mockTranslate';
1616
import { mockAddresses } from '../__mocks__/dataMocks/mockAddresses';
17+
import Utils from '../app/utils';
1718

1819
// test suite
1920
describe('Component Messages Address - test', () => {
@@ -40,7 +41,7 @@ describe('Component Messages Address - test', () => {
4041
setPrivacyOption={onFunction}
4142
setScrollToBottom={onFunction}
4243
scrollToBottom={false}
43-
address={mockAddresses[0].uOrchardAddress}
44+
address={Utils.messagesAddress(mockValueTransfers[0])}
4445
sendTransaction={onFunction}
4546
setServerOption={onFunction}
4647
/>

android/app/build.gradle

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -63,14 +63,14 @@ def enableProguardInReleaseBuilds = false
6363
* The preferred build flavor of JavaScriptCore (JSC).
6464
*
6565
* For example, to use the international variant, you can use:
66-
* `def jscFlavor = 'org.webkit:android-jsc-intl:+'`
66+
* `def jscFlavor = io.github.react-native-community:jsc-android-intl:2026004.+`
6767
*
6868
* The international variant includes ICU i18n library and necessary data
6969
* allowing to use e.g. `Date.toLocaleString` and `String.localeCompare` that
7070
* give correct results when using with locales other than en-US. Note that
7171
* this variant is about 6MiB larger per architecture than default.
7272
*/
73-
def jscFlavor = 'org.webkit:android-jsc:+'
73+
def jscFlavor = 'io.github.react-native-community:jsc-android:2026004.+'
7474

7575
/**
7676
* Whether to enable building a separate APK for each ABI.
@@ -222,7 +222,7 @@ dependencies {
222222
// The version of react-native is set by the React Native Gradle Plugin
223223
implementation("com.facebook.react:react-android")
224224

225-
androidTestImplementation('com.wix:detox:20.27.2')
225+
androidTestImplementation('com.wix:detox:20.34.4')
226226
implementation 'androidx.appcompat:appcompat:1.7.0'
227227

228228
implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0"
@@ -241,7 +241,7 @@ dependencies {
241241
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
242242
implementation "org.jetbrains.kotlinx:kotlinx-datetime:0.5.0"
243243

244-
def work_version = "2.9.1"
244+
def work_version = "2.10.0"
245245

246246
// (Java only)
247247
implementation "androidx.work:work-runtime:$work_version"
@@ -266,7 +266,7 @@ dependencies {
266266
androidTestImplementation "com.google.truth:truth:1.1.3"
267267

268268
// JSON parsing
269-
implementation "com.fasterxml.jackson.module:jackson-module-kotlin:2.14.3"
269+
implementation "com.fasterxml.jackson.module:jackson-module-kotlin:2.18.3"
270270

271271
// JUnit test runners
272272
androidTestImplementation 'androidx.test.ext:junit:1.2.1'
@@ -278,5 +278,5 @@ dependencies {
278278
implementation "net.java.dev.jna:jna:5.9.0@aar"
279279

280280
// back navigation implementation
281-
implementation "androidx.activity:activity:1.6.0-alpha05"
281+
implementation 'androidx.activity:activity:1.10.1'
282282
}

android/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ buildscript {
55
buildToolsVersion = "35.0.0"
66
minSdkVersion = 24
77
compileSdkVersion = 35
8-
targetSdkVersion = 34
8+
targetSdkVersion = 35
99
ndkVersion = "27.2.12479018"
1010
kotlinVersion = "2.0.21"
1111
}
@@ -14,7 +14,7 @@ buildscript {
1414
mavenCentral()
1515
}
1616
dependencies {
17-
classpath('com.android.tools.build:gradle:8.3.2')
17+
classpath('com.android.tools.build:gradle:8.8.0')
1818
classpath("com.facebook.react:react-native-gradle-plugin")
1919
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
2020
}
-15.3 KB
Binary file not shown.
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
#Fri Jan 24 19:05:10 MST 2025
21
distributionBase=GRADLE_USER_HOME
32
distributionPath=wrapper/dists
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
54
networkTimeout=10000
5+
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME
77
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)