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

dep(react-native): version 0.72.5 update #13897

Closed
wants to merge 25 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
a8dfa06
dep(react-native): removed previous rn version patch and .buckconfig …
Calinteodor Sep 25, 2023
c8df8c4
dep(react-native): required dependency updates
Calinteodor Sep 25, 2023
2129809
dep(react-native/ios): fixed rebase conflict
Calinteodor Oct 3, 2023
6ec4ec2
dep(react-native/android): build.gradle updates
Calinteodor Sep 26, 2023
2de2335
dep(react-native/android): build.gradle and gradle related updates
Calinteodor Oct 2, 2023
25c70d6
dep(react-native/ios): Podfile updates
Calinteodor Oct 2, 2023
923e900
dep(react-native): changed metro configuration and added dependency
Calinteodor Oct 2, 2023
29431b5
dep(react-native): native tsconfig update
Calinteodor Oct 2, 2023
fee1dc8
dep(react-native/ios): fixed another rebase conflict
Calinteodor Oct 2, 2023
fab494c
dep(react-native): removed caret and npm install
Calinteodor Oct 2, 2023
48ec414
dep(react-native/android): removed namespace from build.gradle
Calinteodor Oct 2, 2023
8c12610
dep(react-native): patch updated for 0.72.5
Calinteodor Oct 2, 2023
b03b2e7
dep(react-native): patch updated for 0.72.5 fix
Calinteodor Oct 2, 2023
8b72e89
dep(react-native/ios): make platform depend on our own version
Calinteodor Oct 2, 2023
c5c0e9e
dep(react-native): react-native-gradle-plugin dep added
Calinteodor Oct 2, 2023
7cc0b74
dep(react-native/ios): fixed rebase conflict and updated Podfile.lock
Calinteodor Oct 3, 2023
d8e4ed3
dep(react-native): react-native-gradle-plugin removed
Calinteodor Oct 3, 2023
596cab7
dep(react-native): revert types/react dep update
Calinteodor Oct 3, 2023
664aa3a
ref(dependency/android): updates
Calinteodor Oct 30, 2023
077bbe3
ref(dependency/ios): podfile updates
Calinteodor Oct 30, 2023
f873a18
ref(dependency): rn patch update and other
Calinteodor Oct 30, 2023
8acdc89
ref(dependency/android): fixed some dep references
Calinteodor Oct 30, 2023
61cba60
ref(dependency/android): revert maven change
Calinteodor Oct 30, 2023
8c20910
ref(react-native): review remarks
Calinteodor Nov 6, 2023
f8a853e
ref(dependency): more rn-0.76 updates
Calinteodor Nov 7, 2023
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.

9 changes: 3 additions & 6 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ all.css
# CocoaPods
Pods/

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

# The following are automatically generated by the react-native command line
# utility (either with the init or upgrade option which pull in the latest
# template files recommended by Facebook for React Native).
Expand Down Expand Up @@ -53,12 +56,6 @@ node_modules/
npm-debug.log
yarn-error.log

# BUCK
#
buck-out/
\.buckd/
*.keystore

# fastlane
#
**/fastlane/report.xml
Expand Down
4 changes: 3 additions & 1 deletion android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,9 @@ android {
}

dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])

// The version of react-native is set by the React Native Gradle Plugin
implementation 'com.facebook.react:react-android'
implementation 'androidx.appcompat:appcompat:1.5.1'

debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.7'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
android:insetBottom="@dimen/abc_edit_text_inset_bottom_material">

<selector>
<!--
<!--
This file is a copy of abc_edit_text_material (https://bit.ly/3k8fX7I).
The item below with state_pressed="false" and state_focused="false" causes a NullPointerException.
NullPointerException:tempt to invoke virtual method 'android.graphics.drawable.Drawable android.graphics.drawable.Drawable$ConstantState.newDrawable(android.content.res.Resources)'
Expand Down
3 changes: 2 additions & 1 deletion android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ buildscript {
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:7.3.1'
classpath 'com.android.tools.build:gradle'
classpath 'com.facebook.react:react-native-gradle-plugin'
classpath 'com.google.gms:google-services:4.4.0'
classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.9'
}
Expand Down
1 change: 1 addition & 0 deletions android/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-all.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
2 changes: 1 addition & 1 deletion android/sdk/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ dependencies {
if (!rootProject.ext.libreBuild) {
implementation project(':react-native-amplitude')
implementation project(':react-native-giphy')
implementation(project(":react-native-google-signin")) {
implementation(project(':react-native-google-signin')) {
exclude group: 'com.google.android.gms'
exclude group: 'androidx'
}
Expand Down
4 changes: 2 additions & 2 deletions android/settings.gradle
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
rootProject.name = 'jitsi-meet'

include ':app', ':sdk'
includeBuild('../node_modules/react-native-gradle-plugin')
includeBuild('../node_modules/@react-native/gradle-plugin')

include ':react-native-amplitude'
project(':react-native-amplitude').projectDir = new File(rootProject.projectDir, '../node_modules/@amplitude/react-native//android')
project(':react-native-amplitude').projectDir = new File(rootProject.projectDir, '../node_modules/@amplitude/react-native/android')
include ':react-native-async-storage'
project(':react-native-async-storage').projectDir = new File(rootProject.projectDir, '../node_modules/@react-native-async-storage/async-storage/android')
include ':react-native-background-timer'
Expand Down
1 change: 1 addition & 0 deletions ios/.xcode.env
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export NODE_BINARY=$(command -v node)
17 changes: 11 additions & 6 deletions ios/Podfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,13 @@
require_relative '../node_modules/react-native/scripts/react_native_pods'
require_relative '../node_modules/@react-native-community/cli-platform-ios/native_modules'
# Resolve react_native_pods.rb with node to allow for hoisting
require Pod::Executable.execute_command('node', ['-p',
'require.resolve(
"react-native/scripts/react_native_pods.rb",
{paths: [process.argv[1]]},
)', __dir__]).strip

platform :ios, '12.4'
workspace 'jitsi-meet'
prepare_react_native_project!

install! 'cocoapods', :deterministic_uuids => false

saghul marked this conversation as resolved.
Show resolved Hide resolved
Expand Down Expand Up @@ -56,19 +61,19 @@ target 'JitsiMeetSDKLite' do

# React Native and its dependencies
#

config = use_native_modules!
use_react_native!(
:path => config["reactNativePath"],
:path => config[:reactNativePath],
Calinteodor marked this conversation as resolved.
Show resolved Hide resolved
:hermes_enabled => false,
:fabric_enabled => false,
# An absolute path to your application root.
:app_path => "#{Pod::Config.instance.installation_root}/.."
)

# Native pod dependencies
#

pod 'CocoaLumberjack', '3.7.2'
end

Expand Down
Loading
Loading