Skip to content

Commit 6df4dea

Browse files
committed
react-native: upgrade to 0.75.3
This commit upgrades `react-native` to `v0.75.3` Following changes were also made : - `NDK` upgraded to `26.1.10909125` - `@react-native/gradle-plugin` is set up using `includeBuild` gradle mechanism which is a better way. - `reactjs` is upgraded to `18.3.1` - `react-native-config` is upgraded to `1.5.3` - `react-native-navigation` is upgraded to `7.40.1` - `react-native-reanimated` is upgraded to `3.16.6` - `react-native-gesture-handler` is upgraded to `2.22.0` - `react-native-keychain` is upgraded to `9.2.2` - patches for react-native-navigation are updated. PR in RNN repo -> wix/react-native-navigation#7913 - patched autolinking behaviour in `react-native` to prevent generating `autolinking.json` in a gradle step. We run gradle in a sandbox with `--offline` so this is not feasible for us. We do the same thing via a nix phase called `autolinkPhase`. - `AGP` is bumped to `8.5.0` and `aapt2` is bumped to `8.5.0-11315950` - we no longer need to patch out `-X` from `script_phases-patched.sh` - `gradle` deps were updated. - `pods` were updated. - `gems` were updated.
1 parent f27c569 commit 6df4dea

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

+7254
-4336
lines changed

android/app/build.gradle

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,9 @@ react {
5454
//
5555
// The list of flags to pass to the Hermes compiler. By default is "-O", "-output-source-map"
5656
// hermesFlags = ["-O", "-output-source-map"]
57+
58+
/* Autolinking */
59+
autolinkLibrariesWithApp()
5760
}
5861

5962
/**
@@ -301,7 +304,7 @@ dependencies {
301304
implementation("com.facebook.fresco:fresco:2.5.0")
302305
implementation("com.facebook.fresco:animated-gif:2.5.0")
303306
implementation("com.squareup.okhttp3:okhttp-tls:4.11.0")
304-
implementation("com.google.prefab:cli:2.0.0")
307+
implementation("com.google.prefab:cli:2.1.0")
305308
implementation("com.android.tools.build:aapt2:8.1.1-10154469")
306309
}
307310

android/app/jni/Android.mk

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ LOCAL_MODULE := status-logs
66
LOCAL_SRC_FILES := Log.c
77

88
LOCAL_CPPFLAGS := -std=c++11 -fexceptions -I$(LOCAL_PATH)/include
9+
# Fix for : ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]
10+
LOCAL_CFLAGS := '-Wno-error=implicit-function-declaration'
911
LOCAL_LDFLAGS := -llog
1012

1113
include $(BUILD_SHARED_LIBRARY)

android/app/src/debug/AndroidManifest.xml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,10 @@
77
<!-- Remove licensing permission since we don't license our app and it blocks F-Droid submissions. -->
88
<uses-permission tools:node="remove" android:name="com.android.vending.CHECK_LICENSE"/>
99

10-
<application tools:targetApi="28" tools:ignore="GoogleAppIndexingWarning" android:usesCleartextTraffic="true" />
10+
<application
11+
tools:targetApi="28"
12+
tools:ignore="GoogleAppIndexingWarning"
13+
android:usesCleartextTraffic="true"
14+
tools:replace="android:appComponentFactory"
15+
android:appComponentFactory="androidx.core.app.CoreComponentFactory" />
1116
</manifest>

android/app/src/main/AndroidManifest.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,8 @@
4242
android:largeHeap="true"
4343
android:usesCleartextTraffic="true"
4444
android:extractNativeLibs="true"
45-
android:requestLegacyExternalStorage="true">
45+
android:requestLegacyExternalStorage="true"
46+
android:supportsRtl="true">
4647
<!-- After upgrading Android Gradle Plugin to 4.2.0 and above we must get rid of `extractNativeLibs="true"`
4748
and use`useLegacyPackaging` flag in our app's `build.gradle`-->
4849
<meta-data android:name="commitHash" android:value="${commitHash}"/>

android/app/src/main/java/im/status/ethereum/MainApplication.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import com.facebook.react.PackageList
66
import com.facebook.react.ReactApplication
77
import com.facebook.react.ReactNativeHost
88
import com.facebook.react.ReactPackage
9-
import com.facebook.react.bridge.JSIModulePackage
109
import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint
1110
import com.facebook.react.modules.network.OkHttpClientProvider
1211
import com.reactnativenavigation.NavigationApplication

android/build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ ext {
1717
kotlinVersion = project.kotlinPluginVersion
1818
kotlinPluginVersion = project.kotlinPluginVersion
1919
kotlinToolsVersion = project.kotlinPluginVersion
20-
ndkVersion = "25.2.9519653"
20+
// This version must match ndkVersion version inside nix/pkgs/android-sdk/compose.nix
21+
ndkVersion = "26.1.10909125"
2122
}
2223

2324
buildscript {

android/gradle.properties

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ targetSdkVersion=34
2727
buildToolsVersion=34.0.0
2828
supportLibVersion=28.0.0
2929
# This should match version from nix/pkgs/aapt2/default.nix
30-
gradlePluginVersion=7.4.2
31-
kotlinPluginVersion=1.9.0
30+
gradlePluginVersion=8.5.0
31+
kotlinPluginVersion=1.9.24
3232

3333
android.useAndroidX=true
3434
android.enableJetifier=true
@@ -54,7 +54,6 @@ commitHash=unknown
5454
# to write custom TurboModules/Fabric components OR use libraries that
5555
# are providing them.
5656
newArchEnabled=false
57-
5857
# Use this property to enable or disable the Hermes JS engine.
5958
# If set to false, you will be using JSC instead.
6059
# Disabled for debug builds to avoid 'maximum call stack exceeded' errors.

android/settings.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,11 @@ includeBuild('../node_modules/@react-native/gradle-plugin')
55
gradlePluginPortal()
66
}
77
}
8+
plugins { id("com.facebook.react.settings") }
9+
extensions.configure(com.facebook.react.ReactSettingsExtension){ ex -> ex.autolinkLibrariesFromCommand() }
810
include ':react-native-share'
911
project(':react-native-share').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-share/android')
1012
rootProject.name = 'StatusIm'
11-
apply from: file("../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesSettingsGradle(settings)
1213
include ':react-native-nfc-manager'
1314
project(':react-native-nfc-manager').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-nfc-manager/android')
1415
include ':app'

fastlane/Gemfile.lock

Lines changed: 76 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,51 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
CFPropertyList (3.0.6)
4+
CFPropertyList (3.0.7)
5+
base64
6+
nkf
57
rexml
6-
activesupport (7.0.8)
8+
activesupport (7.0.8.7)
79
concurrent-ruby (~> 1.0, >= 1.0.2)
810
i18n (>= 1.6, < 2)
911
minitest (>= 5.1)
1012
tzinfo (~> 2.0)
11-
addressable (2.8.6)
12-
public_suffix (>= 2.0.2, < 6.0)
13-
artifactory (3.0.15)
13+
addressable (2.8.7)
14+
public_suffix (>= 2.0.2, < 7.0)
15+
artifactory (3.0.17)
1416
atomos (0.1.3)
1517
aws-eventstream (1.3.0)
16-
aws-partitions (1.872.0)
17-
aws-sdk-core (3.190.1)
18+
aws-partitions (1.1032.0)
19+
aws-sdk-core (3.214.1)
1820
aws-eventstream (~> 1, >= 1.3.0)
19-
aws-partitions (~> 1, >= 1.651.0)
20-
aws-sigv4 (~> 1.8)
21+
aws-partitions (~> 1, >= 1.992.0)
22+
aws-sigv4 (~> 1.9)
2123
jmespath (~> 1, >= 1.6.1)
22-
aws-sdk-kms (1.75.0)
23-
aws-sdk-core (~> 3, >= 3.188.0)
24-
aws-sigv4 (~> 1.1)
25-
aws-sdk-s3 (1.141.0)
26-
aws-sdk-core (~> 3, >= 3.189.0)
24+
aws-sdk-kms (1.96.0)
25+
aws-sdk-core (~> 3, >= 3.210.0)
26+
aws-sigv4 (~> 1.5)
27+
aws-sdk-s3 (1.177.0)
28+
aws-sdk-core (~> 3, >= 3.210.0)
2729
aws-sdk-kms (~> 1)
28-
aws-sigv4 (~> 1.8)
29-
aws-sigv4 (1.8.0)
30+
aws-sigv4 (~> 1.5)
31+
aws-sigv4 (1.10.1)
3032
aws-eventstream (~> 1, >= 1.0.2)
3133
babosa (1.0.4)
34+
base64 (0.2.0)
3235
claide (1.1.0)
3336
colored (1.2)
3437
colored2 (3.1.2)
3538
commander (4.6.0)
3639
highline (~> 2.0.0)
37-
concurrent-ruby (1.2.2)
40+
concurrent-ruby (1.3.4)
3841
declarative (0.0.20)
3942
digest-crc (0.6.5)
4043
rake (>= 12.0.0, < 14.0.0)
41-
domain_name (0.6.20231109)
44+
domain_name (0.6.20240107)
4245
dotenv (2.8.1)
4346
emoji_regex (3.2.3)
44-
excon (0.108.0)
45-
faraday (1.10.3)
47+
excon (0.112.0)
48+
faraday (1.10.4)
4649
faraday-em_http (~> 1.0)
4750
faraday-em_synchrony (~> 1.0)
4851
faraday-excon (~> 1.1)
@@ -61,24 +64,24 @@ GEM
6164
faraday-em_synchrony (1.0.0)
6265
faraday-excon (1.1.0)
6366
faraday-httpclient (1.0.1)
64-
faraday-multipart (1.0.4)
65-
multipart-post (~> 2)
66-
faraday-net_http (1.0.1)
67+
faraday-multipart (1.1.0)
68+
multipart-post (~> 2.0)
69+
faraday-net_http (1.0.2)
6770
faraday-net_http_persistent (1.2.0)
6871
faraday-patron (1.0.0)
6972
faraday-rack (1.0.0)
7073
faraday-retry (1.0.3)
71-
faraday_middleware (1.2.0)
74+
faraday_middleware (1.2.1)
7275
faraday (~> 1.0)
73-
fastimage (2.2.7)
74-
fastlane (2.217.0)
76+
fastimage (2.4.0)
77+
fastlane (2.226.0)
7578
CFPropertyList (>= 2.3, < 4.0.0)
7679
addressable (>= 2.8, < 3.0.0)
7780
artifactory (~> 3.0)
7881
aws-sdk-s3 (~> 1.0)
7982
babosa (>= 1.0.3, < 2.0.0)
8083
bundler (>= 1.12.0, < 3.0.0)
81-
colored
84+
colored (~> 1.2)
8285
commander (~> 4.6)
8386
dotenv (>= 2.1.1, < 3.0.0)
8487
emoji_regex (>= 0.1, < 4.0)
@@ -87,9 +90,11 @@ GEM
8790
faraday-cookie_jar (~> 0.0.6)
8891
faraday_middleware (~> 1.0)
8992
fastimage (>= 2.1.0, < 3.0.0)
93+
fastlane-sirp (>= 1.0.0)
9094
gh_inspector (>= 1.1.2, < 2.0.0)
9195
google-apis-androidpublisher_v3 (~> 0.3)
9296
google-apis-playcustomapp_v1 (~> 0.1)
97+
google-cloud-env (>= 1.6.0, < 2.0.0)
9398
google-cloud-storage (~> 1.31)
9499
highline (~> 2.0)
95100
http-cookie (~> 1.0.5)
@@ -98,97 +103,100 @@ GEM
98103
mini_magick (>= 4.9.4, < 5.0.0)
99104
multipart-post (>= 2.0.0, < 3.0.0)
100105
naturally (~> 2.2)
101-
optparse (~> 0.1.1)
106+
optparse (>= 0.1.1, < 1.0.0)
102107
plist (>= 3.1.0, < 4.0.0)
103108
rubyzip (>= 2.0.0, < 3.0.0)
104-
security (= 0.1.3)
109+
security (= 0.1.5)
105110
simctl (~> 1.6.3)
106111
terminal-notifier (>= 2.0.0, < 3.0.0)
107112
terminal-table (~> 3)
108113
tty-screen (>= 0.6.3, < 1.0.0)
109114
tty-spinner (>= 0.8.0, < 1.0.0)
110115
word_wrap (~> 1.0.0)
111116
xcodeproj (>= 1.13.0, < 2.0.0)
112-
xcpretty (~> 0.3.0)
113-
xcpretty-travis-formatter (>= 0.0.3)
117+
xcpretty (~> 0.4.0)
118+
xcpretty-travis-formatter (>= 0.0.3, < 2.0.0)
119+
fastlane-sirp (1.0.0)
120+
sysrandom (~> 1.0)
114121
gh_inspector (1.1.3)
115122
google-apis-androidpublisher_v3 (0.54.0)
116123
google-apis-core (>= 0.11.0, < 2.a)
117-
google-apis-core (0.11.2)
124+
google-apis-core (0.11.3)
118125
addressable (~> 2.5, >= 2.5.1)
119126
googleauth (>= 0.16.2, < 2.a)
120127
httpclient (>= 2.8.1, < 3.a)
121128
mini_mime (~> 1.0)
122129
representable (~> 3.0)
123130
retriable (>= 2.0, < 4.a)
124131
rexml
125-
webrick
126132
google-apis-iamcredentials_v1 (0.17.0)
127133
google-apis-core (>= 0.11.0, < 2.a)
128134
google-apis-playcustomapp_v1 (0.13.0)
129135
google-apis-core (>= 0.11.0, < 2.a)
130-
google-apis-storage_v1 (0.29.0)
136+
google-apis-storage_v1 (0.31.0)
131137
google-apis-core (>= 0.11.0, < 2.a)
132-
google-cloud-core (1.6.1)
138+
google-cloud-core (1.7.1)
133139
google-cloud-env (>= 1.0, < 3.a)
134140
google-cloud-errors (~> 1.0)
135-
google-cloud-env (2.1.0)
136-
faraday (>= 1.0, < 3.a)
137-
google-cloud-errors (1.3.1)
138-
google-cloud-storage (1.45.0)
141+
google-cloud-env (1.6.0)
142+
faraday (>= 0.17.3, < 3.0)
143+
google-cloud-errors (1.4.0)
144+
google-cloud-storage (1.47.0)
139145
addressable (~> 2.8)
140146
digest-crc (~> 0.4)
141147
google-apis-iamcredentials_v1 (~> 0.1)
142-
google-apis-storage_v1 (~> 0.29.0)
148+
google-apis-storage_v1 (~> 0.31.0)
143149
google-cloud-core (~> 1.6)
144150
googleauth (>= 0.16.2, < 2.a)
145151
mini_mime (~> 1.0)
146-
googleauth (1.9.1)
147-
faraday (>= 1.0, < 3.a)
148-
google-cloud-env (~> 2.1)
152+
googleauth (1.8.1)
153+
faraday (>= 0.17.3, < 3.a)
149154
jwt (>= 1.4, < 3.0)
150155
multi_json (~> 1.11)
151156
os (>= 0.9, < 2.0)
152157
signet (>= 0.16, < 2.a)
153158
highline (2.0.3)
154-
http-cookie (1.0.5)
159+
http-cookie (1.0.8)
155160
domain_name (~> 0.5)
156161
httpclient (2.8.3)
157-
i18n (1.14.1)
162+
i18n (1.14.6)
158163
concurrent-ruby (~> 1.0)
159164
jmespath (1.6.2)
160-
json (2.7.1)
161-
jwt (2.7.1)
162-
mini_magick (4.12.0)
165+
json (2.9.1)
166+
jwt (2.10.1)
167+
base64
168+
mini_magick (4.13.2)
163169
mini_mime (1.1.5)
164-
minitest (5.20.0)
170+
minitest (5.25.4)
165171
multi_json (1.15.0)
166-
multipart-post (2.3.0)
167-
nanaimo (0.3.0)
172+
multipart-post (2.4.1)
173+
nanaimo (0.4.0)
168174
naturally (2.2.1)
169-
optparse (0.1.1)
175+
nkf (0.2.0)
176+
optparse (0.6.0)
170177
os (1.1.4)
171-
plist (3.7.0)
172-
public_suffix (5.0.4)
173-
rake (13.1.0)
178+
plist (3.7.2)
179+
public_suffix (6.0.1)
180+
rake (13.2.1)
174181
representable (3.2.0)
175182
declarative (< 0.1.0)
176183
trailblazer-option (>= 0.1.1, < 0.2.0)
177184
uber (< 0.2.0)
178185
retriable (3.1.2)
179-
rexml (3.2.6)
180-
rouge (2.0.7)
186+
rexml (3.4.0)
187+
rouge (3.28.0)
181188
ruby2_keywords (0.0.5)
182-
rubyzip (2.3.2)
183-
security (0.1.3)
184-
signet (0.18.0)
189+
rubyzip (2.4.1)
190+
security (0.1.5)
191+
signet (0.19.0)
185192
addressable (~> 2.8)
186193
faraday (>= 0.17.5, < 3.a)
187194
jwt (>= 1.5, < 3.0)
188195
multi_json (~> 1.10)
189196
simctl (1.6.10)
190197
CFPropertyList
191198
naturally
199+
sysrandom (1.0.5)
192200
terminal-notifier (2.0.0)
193201
terminal-table (3.0.2)
194202
unicode-display_width (>= 1.1.1, < 3)
@@ -200,29 +208,27 @@ GEM
200208
tzinfo (2.0.6)
201209
concurrent-ruby (~> 1.0)
202210
uber (0.1.0)
203-
unicode-display_width (2.5.0)
204-
webrick (1.8.1)
211+
unicode-display_width (2.6.0)
205212
word_wrap (1.0.0)
206-
xcodeproj (1.23.0)
213+
xcodeproj (1.27.0)
207214
CFPropertyList (>= 2.3.3, < 4.0)
208215
atomos (~> 0.1.3)
209216
claide (>= 1.0.2, < 2.0)
210217
colored2 (~> 3.1)
211-
nanaimo (~> 0.3.0)
212-
rexml (~> 3.2.4)
213-
xcpretty (0.3.0)
214-
rouge (~> 2.0.7)
218+
nanaimo (~> 0.4.0)
219+
rexml (>= 3.3.6, < 4.0)
220+
xcpretty (0.4.0)
221+
rouge (~> 3.28.0)
215222
xcpretty-travis-formatter (1.0.1)
216223
xcpretty (~> 0.2, >= 0.0.7)
217224

218225
PLATFORMS
219-
arm64-darwin-22
220226
arm64-darwin-23
221-
x86_64-darwin-22
227+
ruby
222228

223229
DEPENDENCIES
224230
activesupport (>= 6.1.7.3, < 7.1.0)
225231
fastlane (>= 2.131.0)
226232

227233
BUNDLED WITH
228-
2.4.13
234+
2.5.16

0 commit comments

Comments
 (0)