Skip to content

Commit d693b61

Browse files
committed
rn update
1 parent e65b1a1 commit d693b61

9 files changed

+65
-30
lines changed

.buckconfig

-6
This file was deleted.

.bundle/config

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
BUNDLE_PATH: "vendor/bundle"
2+
BUNDLE_FORCE_RUBY_PLATFORM: 1

.eslintrc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"root": true,
33
"extends": [
4-
"@react-native-community",
4+
"@react-native",
55
"plugin:prettier/recommended",
66
"prettier"
77
],

.gitignore

+26-5
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ DerivedData
2121
*.ipa
2222
*.xcuserstate
2323
project.xcworkspace
24+
**/.xcode.env.local
2425

2526
# Android/IntelliJ
2627
#
@@ -32,6 +33,10 @@ local.properties
3233
android/gradle
3334
android/gradlew
3435
android/gradlew.bat
36+
*.hprof
37+
.cxx/
38+
*.keystore
39+
!debug.keystore
3540

3641
# Visual Studio Code
3742
#
@@ -56,15 +61,31 @@ buck-out/
5661
# For more information about the recommended setup visit:
5762
# https://docs.fastlane.tools/best-practices/source-control/
5863

59-
*/fastlane/report.xml
60-
*/fastlane/Preview.html
61-
*/fastlane/screenshots
64+
**/fastlane/report.xml
65+
**/fastlane/Preview.html
66+
**/fastlane/screenshots
67+
**/fastlane/test_output
6268

6369
# Bundle artifact
6470
*.jsbundle
6571

66-
# CocoaPods
67-
/ios/Pods/
72+
# Ruby / CocoaPods
73+
**/Pods/
74+
/vendor/bundle/
75+
76+
# Temporary files created by Metro to check the health of the file watcher
77+
.metro-health-check*
78+
79+
# testing
80+
/coverage
81+
82+
# Yarn
83+
.yarn/*
84+
!.yarn/patches
85+
!.yarn/plugins
86+
!.yarn/releases
87+
!.yarn/sdks
88+
!.yarn/versions
6889
/example/ios/Pods/
6990

7091
dist/

.prettierrc.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
module.exports = {
22
bracketSpacing: true,
3-
jsxBracketSameLine: true,
43
singleQuote: true,
54
trailingComma: 'all',
65
semi: false,
6+
arrowParens: 'avoid',
7+
bracketSameLine: true,
78
}

Gemfile

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
source 'https://rubygems.org'
2+
3+
# You may use http://rbenv.org/ or https://rvm.io/ to install and use this version
4+
ruby ">= 2.6.10"
5+
6+
# Exclude problematic versions of cocoapods and activesupport that causes build failures.
7+
gem 'cocoapods', '>= 1.13', '!= 1.15.0', '!= 1.15.1'
8+
gem 'activesupport', '>= 6.1.7.5', '!= 7.1.0'
9+
gem 'xcodeproj', '< 1.26.0'

android/build.gradle

+6-3
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,19 @@
11
buildscript {
22
//Buildscript is evaluated before everything else so we can't use getExtOrDefault
33
ext {
4-
kotlinVersion = '1.7.21'
4+
kotlinVersion = '1.9.24'
5+
ndkVersion = "26.1.10909125"
56
}
67
repositories {
78
google()
89
mavenCentral()
910
}
1011

1112
dependencies {
12-
classpath "com.android.tools.build:gradle:7.0.4"
13+
classpath "com.android.tools.build:gradle"
1314
//noinspection DifferentKotlinGradleVersion
14-
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
15+
classpath("com.facebook.react:react-native-gradle-plugin")
16+
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin")
1517
}
1618
}
1719

@@ -22,6 +24,7 @@ repositories {
2224

2325
apply plugin: "com.android.library"
2426
apply plugin: "kotlin-android"
27+
apply plugin: "com.facebook.react.rootproject"
2528

2629
def safeExtGet(prop, fallback) {
2730
rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback

android/gradle.properties

+2
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
11
android.useAndroidX=true
2+
3+
hermesEnabled=true

package.json

+17-14
Original file line numberDiff line numberDiff line change
@@ -34,21 +34,21 @@
3434
"test:ts": "tsc --noEmit"
3535
},
3636
"peerDependencies": {
37-
"react": "^16.0",
38-
"react-native": ">=0.61.1"
37+
"react": "^18.3.1",
38+
"react-native": ">=0.76.3"
3939
},
4040
"devDependencies": {
41-
"@react-native-community/eslint-config": "0.0.5",
42-
"@types/react-native": "0.60.25",
43-
"@typescript-eslint/eslint-plugin": "2.12.0",
44-
"@typescript-eslint/parser": "2.12.0",
45-
"eslint": "6.5.1",
46-
"eslint-config-prettier": "6.10.0",
47-
"eslint-plugin-prettier": "3.1.2",
48-
"eslint-plugin-simple-import-sort": "5.0.1",
49-
"eslint-plugin-sort-keys-fix": "1.1.0",
50-
"prettier": "1.19.1",
51-
"typescript": "3.9.6"
41+
"@react-native/eslint-config": "0.76.3",
42+
"@types/react-native": "0.73.0",
43+
"@typescript-eslint/eslint-plugin": "8.17.0",
44+
"@typescript-eslint/parser": "8.17.0",
45+
"eslint": "9.16.0",
46+
"eslint-config-prettier": "9.1.0",
47+
"eslint-plugin-prettier": "5.2.1",
48+
"eslint-plugin-simple-import-sort": "12.1.1",
49+
"eslint-plugin-sort-keys-fix": "1.1.2",
50+
"prettier": "2.8.8",
51+
"typescript": "5.0.4"
5252
},
5353
"repository": {
5454
"type": "git",
@@ -61,5 +61,8 @@
6161
"ios",
6262
"RNLine.podspec",
6363
"README.md"
64-
]
64+
],
65+
"engines": {
66+
"node": ">=18"
67+
}
6568
}

0 commit comments

Comments
 (0)