Skip to content

Commit b9b05e0

Browse files
committed
chore: upgrade RN version to v82
1 parent fe09726 commit b9b05e0

File tree

22 files changed

+1650
-888
lines changed

22 files changed

+1650
-888
lines changed

bun.lock

Lines changed: 113 additions & 225 deletions
Large diffs are not rendered by default.

config/tsconfig.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
{
22
"extends": "@tsconfig/react-native/tsconfig.json",
3+
"include": ["**/*.ts", "**/*.tsx"],
34
"exclude": [
45
"**/node_modules",
6+
"**/Pods",
57
"**/lib",
68
"**/.eslintrc.js",
79
"**/.prettierrc.js",

example/Gemfile

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,16 @@
11
source 'https://rubygems.org'
2+
23
# You may use http://rbenv.org/ or https://rvm.io/ to install and use this version
3-
ruby '3.3.0'
4+
ruby ">= 2.6.10"
45

56
# Exclude problematic versions of cocoapods and activesupport that causes build failures.
67
gem 'cocoapods', '>= 1.13', '!= 1.15.0', '!= 1.15.1'
78
gem 'activesupport', '>= 6.1.7.5', '!= 7.1.0'
89
gem 'xcodeproj', '< 1.26.0'
910
gem 'concurrent-ruby', '< 1.3.4'
11+
12+
# Ruby 3.4.0 has removed some libraries from the standard library.
13+
gem 'bigdecimal'
14+
gem 'logger'
15+
gem 'benchmark'
16+
gem 'mutex_m'

example/Gemfile.lock

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,21 @@ GEM
55
base64
66
nkf
77
rexml
8-
activesupport (7.1.3.3)
9-
base64
10-
bigdecimal
8+
activesupport (6.1.7.10)
119
concurrent-ruby (~> 1.0, >= 1.0.2)
12-
connection_pool (>= 2.2.5)
13-
drb
1410
i18n (>= 1.6, < 2)
1511
minitest (>= 5.1)
16-
mutex_m
1712
tzinfo (~> 2.0)
18-
addressable (2.8.6)
19-
public_suffix (>= 2.0.2, < 6.0)
13+
zeitwerk (~> 2.3)
14+
addressable (2.8.7)
15+
public_suffix (>= 2.0.2, < 7.0)
2016
algoliasearch (1.27.5)
2117
httpclient (~> 2.8, >= 2.8.3)
2218
json (>= 1.5.1)
2319
atomos (0.1.3)
24-
base64 (0.2.0)
25-
bigdecimal (3.1.8)
20+
base64 (0.3.0)
21+
benchmark (0.5.0)
22+
bigdecimal (3.3.1)
2623
claide (1.1.0)
2724
cocoapods (1.15.2)
2825
addressable (~> 2.8)
@@ -62,55 +59,58 @@ GEM
6259
netrc (~> 0.11)
6360
cocoapods-try (1.2.0)
6461
colored2 (3.1.2)
65-
concurrent-ruby (1.2.3)
66-
connection_pool (2.4.1)
67-
drb (2.2.1)
62+
concurrent-ruby (1.3.3)
6863
escape (0.0.4)
69-
ethon (0.16.0)
64+
ethon (0.15.0)
7065
ffi (>= 1.15.0)
71-
ffi (1.16.3)
66+
ffi (1.17.2)
7267
fourflusher (2.3.1)
7368
fuzzy_match (2.0.4)
7469
gh_inspector (1.1.3)
75-
httpclient (2.8.3)
76-
i18n (1.14.5)
70+
httpclient (2.9.0)
71+
mutex_m
72+
i18n (1.14.7)
7773
concurrent-ruby (~> 1.0)
78-
json (2.7.2)
79-
minitest (5.23.1)
74+
json (2.7.6)
75+
logger (1.7.0)
76+
minitest (5.25.4)
8077
molinillo (0.8.0)
81-
mutex_m (0.2.0)
78+
mutex_m (0.3.0)
8279
nanaimo (0.3.0)
8380
nap (1.1.0)
8481
netrc (0.11.0)
8582
nkf (0.2.0)
8683
public_suffix (4.0.7)
87-
rexml (3.2.8)
88-
strscan (>= 3.0.9)
84+
rexml (3.4.4)
8985
ruby-macho (2.5.1)
90-
strscan (3.1.0)
91-
typhoeus (1.4.1)
92-
ethon (>= 0.9.0)
86+
typhoeus (1.5.0)
87+
ethon (>= 0.9.0, < 0.16.0)
9388
tzinfo (2.0.6)
9489
concurrent-ruby (~> 1.0)
95-
xcodeproj (1.24.0)
90+
xcodeproj (1.25.1)
9691
CFPropertyList (>= 2.3.3, < 4.0)
9792
atomos (~> 0.1.3)
9893
claide (>= 1.0.2, < 2.0)
9994
colored2 (~> 3.1)
10095
nanaimo (~> 0.3.0)
101-
rexml (~> 3.2.4)
96+
rexml (>= 3.3.6, < 4.0)
97+
zeitwerk (2.6.18)
10298

10399
PLATFORMS
104100
ruby
105101

106102
DEPENDENCIES
107103
activesupport (>= 6.1.7.5, != 7.1.0)
104+
benchmark
105+
bigdecimal
108106
cocoapods (>= 1.13, != 1.15.1, != 1.15.0)
109107
concurrent-ruby (< 1.3.4)
108+
logger
109+
mutex_m
110110
xcodeproj (< 1.26.0)
111111

112112
RUBY VERSION
113-
ruby 3.3.0p0
113+
ruby 2.6.10p210
114114

115115
BUNDLED WITH
116-
2.5.10
116+
1.17.2

example/android/app/src/debug/AndroidManifest.xml

Lines changed: 0 additions & 9 deletions
This file was deleted.

example/android/app/src/main/AndroidManifest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
android:roundIcon="@mipmap/ic_launcher_round"
1010
android:allowBackup="false"
1111
android:theme="@style/AppTheme"
12+
android:usesCleartextTraffic="${usesCleartextTraffic}"
1213
android:supportsRtl="true">
1314
<activity
1415
android:name=".MainActivity"
Lines changed: 13 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,27 @@
1-
package com.margelo.rnnitrosqlite.example;
1+
package com.margelo.rnnitrosqliteexample
22

33
import android.app.Application
44
import com.facebook.react.PackageList
55
import com.facebook.react.ReactApplication
66
import com.facebook.react.ReactHost
7-
import com.facebook.react.ReactNativeHost
8-
import com.facebook.react.ReactPackage
9-
import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint.load
7+
import com.facebook.react.ReactNativeApplicationEntryPoint.loadReactNative
108
import com.facebook.react.defaults.DefaultReactHost.getDefaultReactHost
11-
import com.facebook.react.defaults.DefaultReactNativeHost
12-
import com.facebook.react.soloader.OpenSourceMergedSoMapping
13-
import com.facebook.soloader.SoLoader
149

1510
class MainApplication : Application(), ReactApplication {
1611

17-
override val reactNativeHost: ReactNativeHost =
18-
object : DefaultReactNativeHost(this) {
19-
override fun getPackages(): List<ReactPackage> =
20-
PackageList(this).packages.apply {
21-
// Packages that cannot be autolinked yet can be added manually here, for example:
22-
// add(MyReactNativePackage())
23-
}
24-
25-
override fun getJSMainModuleName(): String = "index"
26-
27-
override fun getUseDeveloperSupport(): Boolean = BuildConfig.DEBUG
28-
29-
override val isNewArchEnabled: Boolean = BuildConfig.IS_NEW_ARCHITECTURE_ENABLED
30-
override val isHermesEnabled: Boolean = BuildConfig.IS_HERMES_ENABLED
31-
}
32-
33-
override val reactHost: ReactHost
34-
get() = getDefaultReactHost(applicationContext, reactNativeHost)
12+
override val reactHost: ReactHost by lazy {
13+
getDefaultReactHost(
14+
context = applicationContext,
15+
packageList =
16+
PackageList(this).packages.apply {
17+
// Packages that cannot be autolinked yet can be added manually here, for example:
18+
// add(MyReactNativePackage())
19+
},
20+
)
21+
}
3522

3623
override fun onCreate() {
3724
super.onCreate()
38-
SoLoader.init(this, OpenSourceMergedSoMapping)
39-
if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
40-
// If you opted-in for the New Architecture, we load the native entry point for this app.
41-
load()
42-
}
25+
loadReactNative(this)
4326
}
4427
}

example/android/build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
buildscript {
22
ext {
3-
buildToolsVersion = "35.0.0"
3+
buildToolsVersion = "36.0.0"
44
minSdkVersion = 24
5-
compileSdkVersion = 35
6-
targetSdkVersion = 35
5+
compileSdkVersion = 36
6+
targetSdkVersion = 36
77
ndkVersion = "27.1.12297006"
8-
kotlinVersion = "2.0.21"
8+
kotlinVersion = "2.1.20"
99
}
1010

1111
repositories {

example/android/gradle.properties

Lines changed: 13 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -7,27 +7,20 @@
77
# For more details on how to configure your build environment visit
88
# http://www.gradle.org/docs/current/userguide/build_environment.html
99

10-
# Specifies the JVM arguments used for the Gradle Daemon. The setting is
11-
# particularly useful for configuring JVM memory settings for build performance.
12-
# This does not affect the JVM settings for the Gradle client VM.
13-
# The default is `-Xmx512m -XX:MaxMetaspaceSize=256m`.
14-
org.gradle.jvmargs=-Xmx2g -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
15-
16-
# When configured, Gradle will fork up to org.gradle.workers.max JVMs to execute
17-
# projects in parallel. To learn more about parallel task execution, see the
18-
# section on Gradle build performance:
19-
# https://docs.gradle.org/current/userguide/performance.html#parallel_execution.
20-
# Default is `false`.
21-
#org.gradle.parallel=true
10+
# Specifies the JVM arguments used for the daemon process.
11+
# The setting is particularly useful for tweaking memory settings.
12+
# Default value: -Xmx512m -XX:MaxMetaspaceSize=256m
13+
org.gradle.jvmargs=-Xmx2048m -XX:MaxMetaspaceSize=512m
14+
15+
# When configured, Gradle will run in incubating parallel mode.
16+
# This option should only be used with decoupled projects. More details, visit
17+
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
18+
# org.gradle.parallel=true
2219

2320
# AndroidX package structure to make it clearer which packages are bundled with the
2421
# Android operating system, and which are packaged with your app's APK
2522
# https://developer.android.com/topic/libraries/support-library/androidx-rn
2623
android.useAndroidX=true
27-
# Automatically convert third-party libraries to use AndroidX
28-
android.enableJetifier=false
29-
# Jetifier randomly fails on these libraries
30-
android.jetifier.ignorelist=hermes-android,react-android
3124

3225
# Use this property to specify which architecture you want to build.
3326
# You can also override it from the CLI using
@@ -39,20 +32,13 @@ reactNativeArchitectures=armeabi-v7a,arm64-v8a,x86,x86_64
3932
# your application. You should enable this flag either if you want
4033
# to write custom TurboModules/Fabric components OR use libraries that
4134
# are providing them.
42-
# Note that this is incompatible with web debugging.
4335
newArchEnabled=true
44-
bridgelessEnabled=true
4536

4637
# Use this property to enable or disable the Hermes JS engine.
4738
# If set to false, you will be using JSC instead.
4839
hermesEnabled=true
4940

50-
51-
# Uncomment the line below to build React Native from source.
52-
#react.buildFromSource=true
53-
54-
# Version of Android NDK to build against.
55-
#ANDROID_NDK_VERSION=26.1.10909125
56-
57-
# Version of Kotlin to build against.
58-
#KOTLIN_VERSION=1.8.22
41+
# Use this property to enable edge-to-edge display support.
42+
# This allows your app to draw behind system bars for an immersive UI.
43+
# Note: Only works with ReactActivity and should not be used with custom Activity.
44+
edgeToEdgeEnabled=false
1.83 KB
Binary file not shown.

0 commit comments

Comments
 (0)