Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Chore] Updates RN to 0.76.3 #127

Merged
merged 3 commits into from
Jan 9, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions .buckconfig

This file was deleted.

2 changes: 2 additions & 0 deletions .bundle/config
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
BUNDLE_PATH: "vendor/bundle"
BUNDLE_FORCE_RUBY_PLATFORM: 1
2 changes: 1 addition & 1 deletion .eslintrc
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"root": true,
"extends": [
"@react-native-community",
"@react-native",
"plugin:prettier/recommended",
"prettier"
],
Expand Down
31 changes: 26 additions & 5 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ DerivedData
*.ipa
*.xcuserstate
project.xcworkspace
**/.xcode.env.local

# Android/IntelliJ
#
Expand All @@ -32,6 +33,10 @@ local.properties
android/gradle
android/gradlew
android/gradlew.bat
*.hprof
.cxx/
*.keystore
!debug.keystore

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

*/fastlane/report.xml
*/fastlane/Preview.html
*/fastlane/screenshots
**/fastlane/report.xml
**/fastlane/Preview.html
**/fastlane/screenshots
**/fastlane/test_output

# Bundle artifact
*.jsbundle

# CocoaPods
/ios/Pods/
# Ruby / CocoaPods
**/Pods/
/vendor/bundle/

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

# testing
/coverage

# Yarn
.yarn/*
!.yarn/patches
!.yarn/plugins
!.yarn/releases
!.yarn/sdks
!.yarn/versions
/example/ios/Pods/

dist/
3 changes: 2 additions & 1 deletion .prettierrc.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
module.exports = {
bracketSpacing: true,
jsxBracketSameLine: true,
singleQuote: true,
trailingComma: 'all',
semi: false,
arrowParens: 'avoid',
bracketSameLine: true,
}
1 change: 1 addition & 0 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
nodeLinker: node-modules
9 changes: 9 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
source 'https://rubygems.org'

# You may use http://rbenv.org/ or https://rvm.io/ to install and use this version
ruby ">= 2.6.10"

# Exclude problematic versions of cocoapods and activesupport that causes build failures.
gem 'cocoapods', '>= 1.13', '!= 1.15.0', '!= 1.15.1'
gem 'activesupport', '>= 6.1.7.5', '!= 7.1.0'
gem 'xcodeproj', '< 1.26.0'
9 changes: 6 additions & 3 deletions android/build.gradle
Original file line number Diff line number Diff line change
@@ -1,17 +1,19 @@
buildscript {
//Buildscript is evaluated before everything else so we can't use getExtOrDefault
ext {
kotlinVersion = '1.7.21'
kotlinVersion = '1.9.24'
ndkVersion = "26.1.10909125"
}
repositories {
google()
mavenCentral()
}

dependencies {
classpath "com.android.tools.build:gradle:7.0.4"
classpath "com.android.tools.build:gradle"
//noinspection DifferentKotlinGradleVersion
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
classpath("com.facebook.react:react-native-gradle-plugin")
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin")
}
}

Expand All @@ -22,6 +24,7 @@ repositories {

apply plugin: "com.android.library"
apply plugin: "kotlin-android"
apply plugin: "com.facebook.react.rootproject"

def safeExtGet(prop, fallback) {
rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
Expand Down
2 changes: 2 additions & 0 deletions android/gradle.properties
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
android.useAndroidX=true

hermesEnabled=true
31 changes: 17 additions & 14 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"Nicolás Hernández <[email protected]>",
"Marco Fiorito <[email protected]>"
],
"main": "dist/index.js",
"main": "src/index.ts",
"types": "dist/index.d.ts",
"version": "2.2.1",
"homepage": "https://github.com/xmartlabs/react-native-line#readme",
Expand All @@ -22,7 +22,6 @@
"auth"
],
"license": "MIT",
"private": false,
"scripts": {
"prepare": "yarn run build",
"android": "react-native run-android",
Expand All @@ -40,17 +39,17 @@
},
"devDependencies": {
"@expo/config-plugins": "^8.0.10",
"@react-native-community/eslint-config": "0.0.5",
"@types/react-native": "0.60.25",
"@typescript-eslint/eslint-plugin": "2.12.0",
"@typescript-eslint/parser": "2.12.0",
"eslint": "6.5.1",
"eslint-config-prettier": "6.10.0",
"eslint-plugin-prettier": "3.1.2",
"eslint-plugin-simple-import-sort": "5.0.1",
"eslint-plugin-sort-keys-fix": "1.1.0",
"prettier": "1.19.1",
"typescript": "3.9.6"
"@react-native/eslint-config": "0.76.3",
"@types/react-native": "0.73.0",
"@typescript-eslint/eslint-plugin": "8.17.0",
"@typescript-eslint/parser": "8.17.0",
"eslint": "9.16.0",
"eslint-config-prettier": "9.1.0",
"eslint-plugin-prettier": "5.2.1",
"eslint-plugin-simple-import-sort": "12.1.1",
"eslint-plugin-sort-keys-fix": "1.1.2",
"prettier": "2.8.8",
"typescript": "5.0.4"
},
"repository": {
"type": "git",
Expand All @@ -63,5 +62,9 @@
"ios",
"RNLine.podspec",
"README.md"
]
],
"engines": {
"node": ">=18"
},
"packageManager": "[email protected]"
}
Loading