Skip to content

Commit 8aaf745

Browse files
authored
refactor: update react-native to 77 version (#7)
1 parent 86e3d14 commit 8aaf745

File tree

23 files changed

+3116
-1478
lines changed

23 files changed

+3116
-1478
lines changed

example/.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,3 +64,5 @@ android/keystores/debug.keystore
6464

6565
# Expo
6666
.expo/*
67+
68+
vendor/*

example/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'

example/Gemfile.lock

Lines changed: 120 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,120 @@
1+
GEM
2+
remote: https://rubygems.org/
3+
specs:
4+
CFPropertyList (3.0.7)
5+
base64
6+
nkf
7+
rexml
8+
activesupport (7.1.5.1)
9+
base64
10+
benchmark (>= 0.3)
11+
bigdecimal
12+
concurrent-ruby (~> 1.0, >= 1.0.2)
13+
connection_pool (>= 2.2.5)
14+
drb
15+
i18n (>= 1.6, < 2)
16+
logger (>= 1.4.2)
17+
minitest (>= 5.1)
18+
mutex_m
19+
securerandom (>= 0.3)
20+
tzinfo (~> 2.0)
21+
addressable (2.8.7)
22+
public_suffix (>= 2.0.2, < 7.0)
23+
algoliasearch (1.27.5)
24+
httpclient (~> 2.8, >= 2.8.3)
25+
json (>= 1.5.1)
26+
atomos (0.1.3)
27+
base64 (0.2.0)
28+
benchmark (0.4.0)
29+
bigdecimal (3.1.9)
30+
claide (1.1.0)
31+
cocoapods (1.15.2)
32+
addressable (~> 2.8)
33+
claide (>= 1.0.2, < 2.0)
34+
cocoapods-core (= 1.15.2)
35+
cocoapods-deintegrate (>= 1.0.3, < 2.0)
36+
cocoapods-downloader (>= 2.1, < 3.0)
37+
cocoapods-plugins (>= 1.0.0, < 2.0)
38+
cocoapods-search (>= 1.0.0, < 2.0)
39+
cocoapods-trunk (>= 1.6.0, < 2.0)
40+
cocoapods-try (>= 1.1.0, < 2.0)
41+
colored2 (~> 3.1)
42+
escape (~> 0.0.4)
43+
fourflusher (>= 2.3.0, < 3.0)
44+
gh_inspector (~> 1.0)
45+
molinillo (~> 0.8.0)
46+
nap (~> 1.0)
47+
ruby-macho (>= 2.3.0, < 3.0)
48+
xcodeproj (>= 1.23.0, < 2.0)
49+
cocoapods-core (1.15.2)
50+
activesupport (>= 5.0, < 8)
51+
addressable (~> 2.8)
52+
algoliasearch (~> 1.0)
53+
concurrent-ruby (~> 1.1)
54+
fuzzy_match (~> 2.0.4)
55+
nap (~> 1.0)
56+
netrc (~> 0.11)
57+
public_suffix (~> 4.0)
58+
typhoeus (~> 1.0)
59+
cocoapods-deintegrate (1.0.5)
60+
cocoapods-downloader (2.1)
61+
cocoapods-plugins (1.0.0)
62+
nap
63+
cocoapods-search (1.0.1)
64+
cocoapods-trunk (1.6.0)
65+
nap (>= 0.8, < 2.0)
66+
netrc (~> 0.11)
67+
cocoapods-try (1.2.0)
68+
colored2 (3.1.2)
69+
concurrent-ruby (1.3.3)
70+
connection_pool (2.5.0)
71+
drb (2.2.1)
72+
escape (0.0.4)
73+
ethon (0.16.0)
74+
ffi (>= 1.15.0)
75+
ffi (1.17.1)
76+
fourflusher (2.3.1)
77+
fuzzy_match (2.0.4)
78+
gh_inspector (1.1.3)
79+
httpclient (2.8.3)
80+
i18n (1.14.7)
81+
concurrent-ruby (~> 1.0)
82+
json (2.9.1)
83+
logger (1.6.5)
84+
minitest (5.25.4)
85+
molinillo (0.8.0)
86+
mutex_m (0.3.0)
87+
nanaimo (0.3.0)
88+
nap (1.1.0)
89+
netrc (0.11.0)
90+
nkf (0.2.0)
91+
public_suffix (4.0.7)
92+
rexml (3.4.0)
93+
ruby-macho (2.5.1)
94+
securerandom (0.3.2)
95+
typhoeus (1.4.1)
96+
ethon (>= 0.9.0)
97+
tzinfo (2.0.6)
98+
concurrent-ruby (~> 1.0)
99+
xcodeproj (1.25.1)
100+
CFPropertyList (>= 2.3.3, < 4.0)
101+
atomos (~> 0.1.3)
102+
claide (>= 1.0.2, < 2.0)
103+
colored2 (~> 3.1)
104+
nanaimo (~> 0.3.0)
105+
rexml (>= 3.3.6, < 4.0)
106+
107+
PLATFORMS
108+
ruby
109+
110+
DEPENDENCIES
111+
activesupport (>= 6.1.7.5, != 7.1.0)
112+
cocoapods (>= 1.13, != 1.15.1, != 1.15.0)
113+
concurrent-ruby (< 1.3.4)
114+
xcodeproj (< 1.26.0)
115+
116+
RUBY VERSION
117+
ruby 3.0.3p157
118+
119+
BUNDLED WITH
120+
2.3.26

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

Lines changed: 2 additions & 1 deletion
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

1415
class MainApplication : Application(), ReactApplication {
@@ -34,7 +35,7 @@ class MainApplication : Application(), ReactApplication {
3435

3536
override fun onCreate() {
3637
super.onCreate()
37-
SoLoader.init(this, false)
38+
SoLoader.init(this, OpenSourceMergedSoMapping)
3839
if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
3940
// If you opted-in for the New Architecture, we load the native entry point for this app.
4041
load()

example/android/build.gradle

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
buildscript {
22
ext {
3-
buildToolsVersion = "34.0.0"
4-
minSdkVersion = 23
5-
compileSdkVersion = 34
3+
buildToolsVersion = "35.0.0"
4+
minSdkVersion = 24
5+
compileSdkVersion = 35
66
targetSdkVersion = 34
7-
ndkVersion = "26.1.10909125"
8-
kotlinVersion = "1.9.24"
7+
ndkVersion = "27.1.12297006"
8+
kotlinVersion = "2.0.21"
99
}
1010
repositories {
1111
google()
130 Bytes
Binary file not shown.

example/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

example/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

example/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 ##########################################################################

example/ios/AppDelegate.swift

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
import UIKit
2+
import React
3+
import React_RCTAppDelegate
4+
import ReactAppDependencyProvider
5+
6+
@main
7+
class AppDelegate: RCTAppDelegate {
8+
override func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey : Any]? = nil) -> Bool {
9+
self.moduleName = "example"
10+
self.dependencyProvider = RCTAppDependencyProvider()
11+
12+
// You can add your custom initial props in the dictionary below.
13+
// They will be passed down to the ViewController used by React Native.
14+
self.initialProps = [:]
15+
16+
return super.application(application, didFinishLaunchingWithOptions: launchOptions)
17+
}
18+
19+
override func sourceURL(for bridge: RCTBridge) -> URL? {
20+
self.bundleURL()
21+
}
22+
23+
override func bundleURL() -> URL? {
24+
#if DEBUG
25+
RCTBundleURLProvider.sharedSettings().jsBundleURL(forBundleRoot: "index")
26+
#else
27+
Bundle.main.url(forResource: "main", withExtension: "jsbundle")
28+
#endif
29+
}
30+
}

0 commit comments

Comments
 (0)