Skip to content

Commit 44b1f43

Browse files
chore: update deps and rn 0.74
1 parent ab10a80 commit 44b1f43

File tree

20 files changed

+4544
-4630
lines changed

20 files changed

+4544
-4630
lines changed

.eslintrc.js

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,8 @@
11
module.exports = {
2-
extends: ['@react-native-community'],
2+
extends: ['@react-native'],
33
plugins: ['@react-native/eslint-plugin-specs'],
44
rules: {
55
'react-native/no-inline-styles': 'off',
66
'@react-native/specs/react-native-modules': 'error',
77
},
8-
overrides: [
9-
{
10-
files: ['src/specs/**/*.js'],
11-
rules: {
12-
'@react-native/specs/react-native-modules': 'error',
13-
},
14-
},
15-
],
168
};

example/.gitignore

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ DerivedData
2020
*.hmap
2121
*.ipa
2222
*.xcuserstate
23-
ios/.xcode.env.local
23+
**/.xcode.env.local
2424

2525
# Android/IntelliJ
2626
#
@@ -56,11 +56,19 @@ yarn-error.log
5656
*.jsbundle
5757

5858
# Ruby / CocoaPods
59-
/ios/Pods/
59+
**/Pods/
6060
/vendor/bundle/
6161

6262
# Temporary files created by Metro to check the health of the file watcher
6363
.metro-health-check*
6464

6565
# testing
6666
/coverage
67+
68+
# Yarn
69+
.yarn/*
70+
!.yarn/patches
71+
!.yarn/plugins
72+
!.yarn/releases
73+
!.yarn/sdks
74+
!.yarn/versions

example/Gemfile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,7 @@ source 'https://rubygems.org'
33
# You may use http://rbenv.org/ or https://rvm.io/ to install and use this version
44
ruby ">= 2.6.10"
55

6-
gem 'cocoapods', '~> 1.12'
6+
# Cocoapods 1.15 introduced a bug which break the build. We will remove the upper
7+
# bound in the template on Cocoapods with next React Native release.
8+
gem 'cocoapods', '>= 1.13', '< 1.15'
9+
gem 'activesupport', '>= 6.1.7.5', '< 7.1.0'

example/Gemfile.lock

Lines changed: 22 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,29 @@
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
68
activesupport (7.0.6)
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.4)
12-
public_suffix (>= 2.0.2, < 6.0)
13+
addressable (2.8.7)
14+
public_suffix (>= 2.0.2, < 7.0)
1315
algoliasearch (1.27.5)
1416
httpclient (~> 2.8, >= 2.8.3)
1517
json (>= 1.5.1)
1618
atomos (0.1.3)
19+
base64 (0.2.0)
1720
claide (1.1.0)
18-
cocoapods (1.12.1)
21+
cocoapods (1.14.3)
1922
addressable (~> 2.8)
2023
claide (>= 1.0.2, < 2.0)
21-
cocoapods-core (= 1.12.1)
24+
cocoapods-core (= 1.14.3)
2225
cocoapods-deintegrate (>= 1.0.3, < 2.0)
23-
cocoapods-downloader (>= 1.6.0, < 2.0)
26+
cocoapods-downloader (>= 2.1, < 3.0)
2427
cocoapods-plugins (>= 1.0.0, < 2.0)
2528
cocoapods-search (>= 1.0.0, < 2.0)
2629
cocoapods-trunk (>= 1.6.0, < 2.0)
@@ -32,8 +35,8 @@ GEM
3235
molinillo (~> 0.8.0)
3336
nap (~> 1.0)
3437
ruby-macho (>= 2.3.0, < 3.0)
35-
xcodeproj (>= 1.21.0, < 2.0)
36-
cocoapods-core (1.12.1)
38+
xcodeproj (>= 1.23.0, < 2.0)
39+
cocoapods-core (1.14.3)
3740
activesupport (>= 5.0, < 8)
3841
addressable (~> 2.8)
3942
algoliasearch (~> 1.0)
@@ -44,7 +47,7 @@ GEM
4447
public_suffix (~> 4.0)
4548
typhoeus (~> 1.0)
4649
cocoapods-deintegrate (1.0.5)
47-
cocoapods-downloader (1.6.3)
50+
cocoapods-downloader (2.1)
4851
cocoapods-plugins (1.0.0)
4952
nap
5053
cocoapods-search (1.0.1)
@@ -57,27 +60,30 @@ GEM
5760
escape (0.0.4)
5861
ethon (0.16.0)
5962
ffi (>= 1.15.0)
60-
ffi (1.15.5)
63+
ffi (1.17.0)
6164
fourflusher (2.3.1)
6265
fuzzy_match (2.0.4)
6366
gh_inspector (1.1.3)
6467
httpclient (2.8.3)
6568
i18n (1.14.1)
6669
concurrent-ruby (~> 1.0)
67-
json (2.6.3)
70+
json (2.7.2)
6871
minitest (5.18.1)
6972
molinillo (0.8.0)
7073
nanaimo (0.3.0)
7174
nap (1.1.0)
7275
netrc (0.11.0)
76+
nkf (0.2.0)
7377
public_suffix (4.0.7)
74-
rexml (3.2.5)
78+
rexml (3.2.9)
79+
strscan
7580
ruby-macho (2.5.1)
76-
typhoeus (1.4.0)
81+
strscan (3.1.0)
82+
typhoeus (1.4.1)
7783
ethon (>= 0.9.0)
7884
tzinfo (2.0.6)
7985
concurrent-ruby (~> 1.0)
80-
xcodeproj (1.22.0)
86+
xcodeproj (1.24.0)
8187
CFPropertyList (>= 2.3.3, < 4.0)
8288
atomos (~> 0.1.3)
8389
claide (>= 1.0.2, < 2.0)
@@ -89,7 +95,8 @@ PLATFORMS
8995
ruby
9096

9197
DEPENDENCIES
92-
cocoapods (~> 1.12)
98+
activesupport (>= 6.1.7.5, < 7.1.0)
99+
cocoapods (>= 1.13, < 1.15)
93100

94101
RUBY VERSION
95102
ruby 2.7.4p191

example/android/app/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,6 @@ android {
153153
dependencies {
154154
// The version of react-native is set by the React Native Gradle Plugin
155155
implementation("com.facebook.react:react-android")
156-
implementation("com.facebook.react:flipper-integration")
157156

158157
if (hermesEnabled.toBoolean()) {
159158
implementation("com.facebook.react:hermes-android")

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

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,17 @@ 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.flipper.ReactNativeFlipper
1312
import com.facebook.soloader.SoLoader
1413

1514
class MainApplication : Application(), ReactApplication {
1615

1716
override val reactNativeHost: ReactNativeHost =
1817
object : DefaultReactNativeHost(this) {
19-
override fun getPackages(): List<ReactPackage> {
20-
// Packages that cannot be autolinked yet can be added manually here, for example:
21-
// packages.add(new MyReactNativePackage());
22-
return PackageList(this).packages
23-
}
18+
override fun getPackages(): List<ReactPackage> =
19+
PackageList(this).packages.apply {
20+
// Packages that cannot be autolinked yet can be added manually here, for example:
21+
// add(MyReactNativePackage())
22+
}
2423

2524
override fun getJSMainModuleName(): String = "index"
2625

@@ -31,7 +30,7 @@ class MainApplication : Application(), ReactApplication {
3130
}
3231

3332
override val reactHost: ReactHost
34-
get() = getDefaultReactHost(this.applicationContext, reactNativeHost)
33+
get() = getDefaultReactHost(applicationContext, reactNativeHost)
3534

3635
override fun onCreate() {
3736
super.onCreate()
@@ -40,6 +39,5 @@ class MainApplication : Application(), ReactApplication {
4039
// If you opted-in for the New Architecture, we load the native entry point for this app.
4140
load()
4241
}
43-
ReactNativeFlipper.initializeFlipper(this, reactNativeHost.reactInstanceManager)
4442
}
4543
}

example/android/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
buildscript {
22
ext {
33
buildToolsVersion = "34.0.0"
4-
minSdkVersion = 21
4+
minSdkVersion = 23
55
compileSdkVersion = 34
66
targetSdkVersion = 34
7-
ndkVersion = "25.1.8937393"
8-
kotlinVersion = "1.8.0"
7+
ndkVersion = "26.1.10909125"
8+
kotlinVersion = "1.9.22"
99
}
1010
repositories {
1111
google()

example/android/gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ reactNativeArchitectures=armeabi-v7a,arm64-v8a,x86,x86_64
3434
# your application. You should enable this flag either if you want
3535
# to write custom TurboModules/Fabric components OR use libraries that
3636
# are providing them.
37-
newArchEnabled=true
37+
newArchEnabled=false
3838

3939
# Use this property to enable or disable the Hermes JS engine.
4040
# If set to false, you will be using JSC instead.

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

example/ios/Podfile

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@ require Pod::Executable.execute_command('node', ['-p',
88
platform :ios, min_ios_version_supported
99
prepare_react_native_project!
1010

11-
flipper_config = ENV['NO_FLIPPER'] == "1" ? FlipperConfiguration.disabled : FlipperConfiguration.enabled
12-
1311
linkage = ENV['USE_FRAMEWORKS']
1412
if linkage != nil
1513
Pod::UI.puts "Configuring Pod with #{linkage}ally linked Frameworks".green
@@ -21,11 +19,6 @@ target 'RNSACExample' do
2119

2220
use_react_native!(
2321
:path => config[:reactNativePath],
24-
# Enables Flipper.
25-
#
26-
# Note that if you have use_frameworks! enabled, Flipper will not work and
27-
# you should disable the next line.
28-
:flipper_configuration => flipper_config,
2922
# An absolute path to your application root.
3023
:app_path => "#{Pod::Config.instance.installation_root}/.."
3124
)
@@ -35,7 +28,8 @@ target 'RNSACExample' do
3528
react_native_post_install(
3629
installer,
3730
config[:reactNativePath],
38-
:mac_catalyst_enabled => false
31+
:mac_catalyst_enabled => false,
32+
# :ccache_enabled => true
3933
)
4034
end
4135
end

0 commit comments

Comments
 (0)