Skip to content

Commit 2092279

Browse files
authored
chore: upgrade to react-native 0.76 (#2380)
1 parent c24c4da commit 2092279

File tree

19 files changed

+2056
-2203
lines changed

19 files changed

+2056
-2203
lines changed

Gemfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,5 @@ ruby ">= 2.6.10"
66
# Exclude problematic versions of cocoapods and activesupport that causes build failures.
77
gem 'cocoapods', '>= 1.13', '!= 1.15.0', '!= 1.15.1'
88
gem 'activesupport', '>= 6.1.7.5', '!= 7.1.0'
9+
gem 'xcodeproj', '< 1.26.0'
10+
gem 'concurrent-ruby', '< 1.3.4'

Gemfile.lock

Lines changed: 39 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,36 @@
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)
7-
concurrent-ruby (~> 1.0, >= 1.0.2)
8+
activesupport (7.2.2.1)
9+
base64
10+
benchmark (>= 0.3)
11+
bigdecimal
12+
concurrent-ruby (~> 1.0, >= 1.3.1)
13+
connection_pool (>= 2.2.5)
14+
drb
815
i18n (>= 1.6, < 2)
16+
logger (>= 1.4.2)
917
minitest (>= 5.1)
10-
tzinfo (~> 2.0)
11-
addressable (2.8.6)
12-
public_suffix (>= 2.0.2, < 6.0)
18+
securerandom (>= 0.3)
19+
tzinfo (~> 2.0, >= 2.0.5)
20+
addressable (2.8.7)
21+
public_suffix (>= 2.0.2, < 7.0)
1322
algoliasearch (1.27.5)
1423
httpclient (~> 2.8, >= 2.8.3)
1524
json (>= 1.5.1)
1625
atomos (0.1.3)
26+
base64 (0.2.0)
27+
benchmark (0.4.0)
28+
bigdecimal (3.1.9)
1729
claide (1.1.0)
18-
cocoapods (1.14.3)
30+
cocoapods (1.15.2)
1931
addressable (~> 2.8)
2032
claide (>= 1.0.2, < 2.0)
21-
cocoapods-core (= 1.14.3)
33+
cocoapods-core (= 1.15.2)
2234
cocoapods-deintegrate (>= 1.0.3, < 2.0)
2335
cocoapods-downloader (>= 2.1, < 3.0)
2436
cocoapods-plugins (>= 1.0.0, < 2.0)
@@ -33,7 +45,7 @@ GEM
3345
nap (~> 1.0)
3446
ruby-macho (>= 2.3.0, < 3.0)
3547
xcodeproj (>= 1.23.0, < 2.0)
36-
cocoapods-core (1.14.3)
48+
cocoapods-core (1.15.2)
3749
activesupport (>= 5.0, < 8)
3850
addressable (~> 2.8)
3951
algoliasearch (~> 1.0)
@@ -53,47 +65,54 @@ GEM
5365
netrc (~> 0.11)
5466
cocoapods-try (1.2.0)
5567
colored2 (3.1.2)
56-
concurrent-ruby (1.2.2)
68+
concurrent-ruby (1.3.3)
69+
connection_pool (2.5.0)
70+
drb (2.2.1)
5771
escape (0.0.4)
5872
ethon (0.16.0)
5973
ffi (>= 1.15.0)
60-
ffi (1.16.3)
74+
ffi (1.17.1)
6175
fourflusher (2.3.1)
6276
fuzzy_match (2.0.4)
6377
gh_inspector (1.1.3)
6478
httpclient (2.8.3)
65-
i18n (1.14.1)
79+
i18n (1.14.7)
6680
concurrent-ruby (~> 1.0)
67-
json (2.7.1)
68-
minitest (5.20.0)
81+
json (2.10.1)
82+
logger (1.6.6)
83+
minitest (5.25.4)
6984
molinillo (0.8.0)
7085
nanaimo (0.3.0)
7186
nap (1.1.0)
7287
netrc (0.11.0)
88+
nkf (0.2.0)
7389
public_suffix (4.0.7)
74-
rexml (3.2.6)
90+
rexml (3.4.1)
7591
ruby-macho (2.5.1)
92+
securerandom (0.4.1)
7693
typhoeus (1.4.1)
7794
ethon (>= 0.9.0)
7895
tzinfo (2.0.6)
7996
concurrent-ruby (~> 1.0)
80-
xcodeproj (1.23.0)
97+
xcodeproj (1.25.1)
8198
CFPropertyList (>= 2.3.3, < 4.0)
8299
atomos (~> 0.1.3)
83100
claide (>= 1.0.2, < 2.0)
84101
colored2 (~> 3.1)
85102
nanaimo (~> 0.3.0)
86-
rexml (~> 3.2.4)
103+
rexml (>= 3.3.6, < 4.0)
87104

88105
PLATFORMS
89106
ruby
90107

91108
DEPENDENCIES
92-
activesupport (>= 6.1.7.3, < 7.1.0)
93-
cocoapods (~> 1.13)
109+
activesupport (>= 6.1.7.5, != 7.1.0)
110+
cocoapods (>= 1.13, != 1.15.1, != 1.15.0)
111+
concurrent-ruby (< 1.3.4)
112+
xcodeproj (< 1.26.0)
94113

95114
RUBY VERSION
96115
ruby 2.7.4p191
97116

98117
BUNDLED WITH
99-
2.2.27
118+
2.6.4

android/app/src/main/java/com/bitkit/MainApplication.kt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import com.facebook.react.ReactPackage
99
import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint.load
1010
import com.facebook.react.defaults.DefaultReactHost.getDefaultReactHost
1111
import com.facebook.react.defaults.DefaultReactNativeHost
12+
import com.facebook.react.soloader.OpenSourceMergedSoMapping
1213
import com.facebook.soloader.SoLoader
1314
import com.bitkit.modules.SplashScreen.SplashScreenPackage;
1415

@@ -36,10 +37,10 @@ class MainApplication : Application(), ReactApplication {
3637

3738
override fun onCreate() {
3839
super.onCreate()
39-
SoLoader.init(this, false)
40+
SoLoader.init(this, OpenSourceMergedSoMapping)
4041
if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
4142
// If you opted-in for the New Architecture, we load the native entry point for this app.
42-
load()
43+
load(bridgelessEnabled = false)
4344
}
4445
}
4546
}

android/build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22

33
buildscript {
44
ext {
5-
buildToolsVersion = "34.0.0"
5+
buildToolsVersion = "35.0.0"
66
minSdkVersion = 28
7-
compileSdkVersion = 34
7+
compileSdkVersion = 35
88
targetSdkVersion = 34
99
ndkVersion = "26.1.10909125"
10-
kotlin_version = "1.9.24"
11-
kotlinVersion = "1.9.24"
10+
kotlin_version = "1.9.25"
11+
kotlinVersion = "1.9.25"
1212
}
1313
repositories {
1414
google()

android/gradle/wrapper/gradle-wrapper.properties

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.8-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

android/gradlew

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
# See the License for the specific language governing permissions and
1616
# limitations under the License.
1717
#
18+
# SPDX-License-Identifier: Apache-2.0
19+
#
1820

1921
##############################################################################
2022
#
@@ -84,7 +86,8 @@ done
8486
# shellcheck disable=SC2034
8587
APP_BASE_NAME=${0##*/}
8688
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
87-
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
89+
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
90+
' "$PWD" ) || exit
8891

8992
# Use the maximum available, or set MAX_FD != -1 to use that value.
9093
MAX_FD=maximum

android/gradlew.bat

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
@rem See the License for the specific language governing permissions and
1414
@rem limitations under the License.
1515
@rem
16+
@rem SPDX-License-Identifier: Apache-2.0
17+
@rem
1618

1719
@if "%DEBUG%"=="" @echo off
1820
@rem ##########################################################################

ios/Podfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ def node_require(script)
77
)", __dir__]).strip
88
end
99

10+
# Disable New Architecture
11+
ENV['RCT_NEW_ARCH_ENABLED'] = '0'
12+
1013
node_require('react-native/scripts/react_native_pods.rb')
1114
node_require('react-native-permissions/scripts/setup.rb')
1215

0 commit comments

Comments
 (0)