From 8fd353f5f1dd39eb53e7d2b29b4a470fbfb4a47d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sa=C3=BAl=20Ibarra=20Corretg=C3=A9?= Date: Wed, 5 Jan 2022 14:45:14 +0100 Subject: [PATCH] chore(deps) @react-native-google-signin/google-signin @ 7.0.4 --- android/settings.gradle | 2 +- ios/Podfile | 2 +- ios/Podfile.lock | 20 ++++++------ ios/sdk/sdk.xcodeproj/project.pbxproj | 2 +- package-lock.json | 32 +++++++++---------- package.json | 2 +- react/features/google-api/googleApi.native.js | 4 +-- 7 files changed, 31 insertions(+), 33 deletions(-) diff --git a/android/settings.gradle b/android/settings.gradle index a6aa74e994..376b9d1c83 100644 --- a/android/settings.gradle +++ b/android/settings.gradle @@ -22,7 +22,7 @@ project(':react-native-gesture-handler').projectDir = new File(rootProject.proje include ':react-native-get-random-values' project(':react-native-get-random-values').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-get-random-values/android') include ':react-native-google-signin' -project(':react-native-google-signin').projectDir = new File(rootProject.projectDir, '../node_modules/@react-native-community/google-signin/android') +project(':react-native-google-signin').projectDir = new File(rootProject.projectDir, '../node_modules/@react-native-google-signin/google-signin/android') include ':react-native-immersive' project(':react-native-immersive').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-immersive/android') include ':react-native-keep-awake' diff --git a/ios/Podfile b/ios/Podfile index 9a67203e10..d333a2853f 100644 --- a/ios/Podfile +++ b/ios/Podfile @@ -73,7 +73,7 @@ target 'JitsiMeetSDK' do pod 'RNDefaultPreference', :path => '../node_modules/react-native-default-preference' pod 'RNDeviceInfo', :path => '../node_modules/react-native-device-info' pod 'RNGestureHandler', :path => '../node_modules/react-native-gesture-handler' - pod 'RNGoogleSignin', :path => '../node_modules/@react-native-community/google-signin' + pod 'RNGoogleSignin', :path => '../node_modules/@react-native-google-signin/google-signin' pod 'RNReanimated', :path => '../node_modules/react-native-reanimated' pod 'RNScreens', :path => '../node_modules/react-native-screens' pod 'RNSound', :path => '../node_modules/react-native-sound' diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 35e1941602..79349bc558 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -83,8 +83,8 @@ PODS: - nanopb (~> 1.30906.0) - GoogleDataTransport (7.5.1): - nanopb (~> 1.30906.0) - - GoogleSignIn (5.0.2): - - AppAuth (~> 1.2) + - GoogleSignIn (6.0.2): + - AppAuth (~> 1.4) - GTMAppAuth (~> 1.0) - GTMSessionFetcher/Core (~> 1.1) - GoogleUtilities/AppDelegateSwizzler (6.7.2): @@ -373,9 +373,9 @@ PODS: - React-Core - RNGestureHandler (1.10.3): - React-Core - - RNGoogleSignin (3.0.1): - - GoogleSignIn (~> 5.0.0) - - React + - RNGoogleSignin (7.0.4): + - GoogleSignIn (~> 6.0.0) + - React-Core - RNReanimated (1.13.3): - React-Core - RNScreens (2.18.1): @@ -442,7 +442,7 @@ DEPENDENCIES: - RNDefaultPreference (from `../node_modules/react-native-default-preference`) - RNDeviceInfo (from `../node_modules/react-native-device-info`) - RNGestureHandler (from `../node_modules/react-native-gesture-handler`) - - "RNGoogleSignin (from `../node_modules/@react-native-community/google-signin`)" + - "RNGoogleSignin (from `../node_modules/@react-native-google-signin/google-signin`)" - RNReanimated (from `../node_modules/react-native-reanimated`) - RNScreens (from `../node_modules/react-native-screens`) - RNSound (from `../node_modules/react-native-sound`) @@ -561,7 +561,7 @@ EXTERNAL SOURCES: RNGestureHandler: :path: "../node_modules/react-native-gesture-handler" RNGoogleSignin: - :path: "../node_modules/@react-native-community/google-signin" + :path: "../node_modules/@react-native-google-signin/google-signin" RNReanimated: :path: "../node_modules/react-native-reanimated" RNScreens: @@ -595,7 +595,7 @@ SPEC CHECKSUMS: glog: 1f3da668190260b06b429bb211bfbee5cd790c28 GoogleAppMeasurement: 966e88df9d19c15715137bb2ddaf52373f111436 GoogleDataTransport: f56af7caa4ed338dc8e138a5d7c5973e66440833 - GoogleSignIn: 7137d297ddc022a7e0aa4619c86d72c909fa7213 + GoogleSignIn: fd381840dbe7c1137aa6dc30849a5c3e070c034a GoogleUtilities: 7f2f5a07f888cdb145101d6042bc4422f57e70b3 GTMAppAuth: ad5c2b70b9a8689e1a04033c9369c4915bfcbe89 GTMSessionFetcher: 43748f93435c2aa068b1cbe39655aaf600652e91 @@ -639,7 +639,7 @@ SPEC CHECKSUMS: RNDefaultPreference: 1f8133ec0bc0f9453cdada578564ba1ef551fb44 RNDeviceInfo: 87d2d175c760f6bcf58acd036f887e8b2392802c RNGestureHandler: a479ebd5ed4221a810967000735517df0d2db211 - RNGoogleSignin: 39336070b35fc4cea6a98cf111e00480317be0ae + RNGoogleSignin: c4381751eefd73c552b923ba347a9bfc6f18771c RNReanimated: 514a11da3a2bcc6c3dfd9de32b38e2b9bf101926 RNScreens: f7ad633b2e0190b77b6a7aab7f914fad6f198d8d RNSound: da030221e6ac7e8290c6b43f2b5f2133a8e225b0 @@ -647,6 +647,6 @@ SPEC CHECKSUMS: RNWatch: a5320c959c75e72845c07985f3e935e58998f1d3 Yoga: 96b469c5e81ff51b917b92e8c3390642d4ded30c -PODFILE CHECKSUM: 0cfc1f35e2872ceb0a86252e14e226bd489a2602 +PODFILE CHECKSUM: c199ad2ae940ea667c3bda71afa858301694e9b9 COCOAPODS: 1.11.2 diff --git a/ios/sdk/sdk.xcodeproj/project.pbxproj b/ios/sdk/sdk.xcodeproj/project.pbxproj index 3fc9f08e99..89d82d3f9c 100644 --- a/ios/sdk/sdk.xcodeproj/project.pbxproj +++ b/ios/sdk/sdk.xcodeproj/project.pbxproj @@ -408,7 +408,7 @@ inputPaths = ( "${PODS_ROOT}/Target Support Files/Pods-JitsiMeetSDK/Pods-JitsiMeetSDK-resources.sh", "${PODS_ROOT}/Amplitude/Sources/Resources/ComodoRsaDomainValidationCA.der", - "${PODS_ROOT}/GoogleSignIn/Resources/GoogleSignIn.bundle", + "${PODS_CONFIGURATION_BUILD_DIR}/GoogleSignIn/GoogleSignIn.bundle", ); name = "[CP] Copy Pods Resources"; outputPaths = ( diff --git a/package-lock.json b/package-lock.json index 4e6ba4c465..df6e3c6a21 100644 --- a/package-lock.json +++ b/package-lock.json @@ -37,9 +37,9 @@ "@microsoft/microsoft-graph-client": "1.1.0", "@react-native-async-storage/async-storage": "1.15.14", "@react-native-community/clipboard": "1.5.1", - "@react-native-community/google-signin": "3.0.1", "@react-native-community/netinfo": "4.1.5", "@react-native-community/slider": "3.0.3", + "@react-native-google-signin/google-signin": "7.0.4", "@react-native-masked-view/masked-view": "0.2.6", "@react-navigation/bottom-tabs": "5.11.15", "@react-navigation/drawer": "5.12.9", @@ -4107,17 +4107,6 @@ "react-native": ">=0.57.0" } }, - "node_modules/@react-native-community/google-signin": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/@react-native-community/google-signin/-/google-signin-3.0.1.tgz", - "integrity": "sha512-RC9c7ATGdq5IKFqw/h4d8eVTDve8FZxMtsarBHKfP09SrQfEgvOebzVr7YNC+4qs7dFqR+0E2vD7nle1s/dQ3A==", - "deprecated": "please install @react-native-google-signin/google-signin instead", - "peerDependencies": { - "prop-types": "*", - "react": "*", - "react-native": "*" - } - }, "node_modules/@react-native-community/netinfo": { "version": "4.1.5", "resolved": "https://registry.npmjs.org/@react-native-community/netinfo/-/netinfo-4.1.5.tgz", @@ -4135,6 +4124,15 @@ "react-native": "*" } }, + "node_modules/@react-native-google-signin/google-signin": { + "version": "7.0.4", + "resolved": "https://registry.npmjs.org/@react-native-google-signin/google-signin/-/google-signin-7.0.4.tgz", + "integrity": "sha512-N5uVDlTp/mgpa5gFr6VIr8pldt68jlmHOlqcTSnSwBuZXusXMiK53DCIOWuYk4OJ1rlb8Esa9J4FJwUB0psU9Q==", + "peerDependencies": { + "react": "*", + "react-native": "*" + } + }, "node_modules/@react-native-masked-view/masked-view": { "version": "0.2.6", "resolved": "https://registry.npmjs.org/@react-native-masked-view/masked-view/-/masked-view-0.2.6.tgz", @@ -23402,11 +23400,6 @@ "resolved": "https://registry.npmjs.org/@react-native-community/clipboard/-/clipboard-1.5.1.tgz", "integrity": "sha512-AHAmrkLEH5UtPaDiRqoULERHh3oNv7Dgs0bTC0hO5Z2GdNokAMPT5w8ci8aMcRemcwbtdHjxChgtjbeA38GBdA==" }, - "@react-native-community/google-signin": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/@react-native-community/google-signin/-/google-signin-3.0.1.tgz", - "integrity": "sha512-RC9c7ATGdq5IKFqw/h4d8eVTDve8FZxMtsarBHKfP09SrQfEgvOebzVr7YNC+4qs7dFqR+0E2vD7nle1s/dQ3A==" - }, "@react-native-community/netinfo": { "version": "4.1.5", "resolved": "https://registry.npmjs.org/@react-native-community/netinfo/-/netinfo-4.1.5.tgz", @@ -23417,6 +23410,11 @@ "resolved": "https://registry.npmjs.org/@react-native-community/slider/-/slider-3.0.3.tgz", "integrity": "sha512-8IeHfDwJ9/CTUwFs6x90VlobV3BfuPgNLjTgC6dRZovfCWigaZwVNIFFJnHBakK3pW2xErAPwhdvNR4JeNoYbw==" }, + "@react-native-google-signin/google-signin": { + "version": "7.0.4", + "resolved": "https://registry.npmjs.org/@react-native-google-signin/google-signin/-/google-signin-7.0.4.tgz", + "integrity": "sha512-N5uVDlTp/mgpa5gFr6VIr8pldt68jlmHOlqcTSnSwBuZXusXMiK53DCIOWuYk4OJ1rlb8Esa9J4FJwUB0psU9Q==" + }, "@react-native-masked-view/masked-view": { "version": "0.2.6", "resolved": "https://registry.npmjs.org/@react-native-masked-view/masked-view/-/masked-view-0.2.6.tgz", diff --git a/package.json b/package.json index 2ba4b4c08d..7617be391b 100644 --- a/package.json +++ b/package.json @@ -42,9 +42,9 @@ "@microsoft/microsoft-graph-client": "1.1.0", "@react-native-async-storage/async-storage": "1.15.14", "@react-native-community/clipboard": "1.5.1", - "@react-native-community/google-signin": "3.0.1", "@react-native-community/netinfo": "4.1.5", "@react-native-community/slider": "3.0.3", + "@react-native-google-signin/google-signin": "7.0.4", "@react-native-masked-view/masked-view": "0.2.6", "@react-navigation/bottom-tabs": "5.11.15", "@react-navigation/drawer": "5.12.9", diff --git a/react/features/google-api/googleApi.native.js b/react/features/google-api/googleApi.native.js index 97b4e5aa31..5de48c197a 100644 --- a/react/features/google-api/googleApi.native.js +++ b/react/features/google-api/googleApi.native.js @@ -5,7 +5,7 @@ import { NativeModules } from 'react-native'; let GoogleSignin; if (NativeModules.RNGoogleSignin) { - GoogleSignin = require('@react-native-community/google-signin').GoogleSignin; + GoogleSignin = require('@react-native-google-signin/google-signin').GoogleSignin; } import { @@ -19,7 +19,7 @@ import { * the export object is similar so no need for different export logic. * * For more detailed documentation of the {@code GoogleSignin} API, please visit - * https://github.com/react-native-community/react-native-google-signin. + * https://github.com/@react-native-google-signin/google-signin. */ class GoogleApi { /**