diff --git a/android/settings.gradle b/android/settings.gradle index 3afe34e33..7a01488f9 100644 --- a/android/settings.gradle +++ b/android/settings.gradle @@ -10,7 +10,7 @@ project(':react-native-community-async-storage').projectDir = new File(rootProje include ':react-native-community_netinfo' project(':react-native-community_netinfo').projectDir = new File(rootProject.projectDir, '../node_modules/@react-native-community/netinfo/android') include ':react-native-google-signin' -project(':react-native-google-signin').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-google-signin/android') +project(':react-native-google-signin').projectDir = new File(rootProject.projectDir, '../node_modules/@react-native-community/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 e7c02b933..7e09cb3fd 100644 --- a/ios/Podfile +++ b/ios/Podfile @@ -62,7 +62,7 @@ target 'JitsiMeet' do pod 'react-native-webrtc', :path => '../node_modules/react-native-webrtc' pod 'BVLinearGradient', :path => '../node_modules/react-native-linear-gradient' pod 'RNCAsyncStorage', :path => '../node_modules/@react-native-community/async-storage' - pod 'RNGoogleSignin', :path => '../node_modules/react-native-google-signin' + pod 'RNGoogleSignin', :path => '../node_modules/@react-native-community/google-signin' pod 'RNSound', :path => '../node_modules/react-native-sound' pod 'RNSVG', :path => '../node_modules/react-native-svg' pod 'RNWatch', :path => '../node_modules/react-native-watch-connectivity' diff --git a/ios/Podfile.lock b/ios/Podfile.lock index fe46712f3..43bd870d7 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -1,5 +1,10 @@ PODS: - Amplitude-iOS (4.0.4) + - AppAuth (1.2.0): + - AppAuth/Core (= 1.2.0) + - AppAuth/ExternalUserAgent (= 1.2.0) + - AppAuth/Core (1.2.0) + - AppAuth/ExternalUserAgent (1.2.0) - boost-for-react-native (1.63.0) - BVLinearGradient (2.5.6): - React @@ -62,18 +67,10 @@ PODS: - GoogleUtilities/Network (~> 5.2) - "GoogleUtilities/NSData+zlib (~> 5.2)" - nanopb (~> 0.3) - - GoogleSignIn (4.4.0): - - "GoogleToolboxForMac/NSDictionary+URLArguments (~> 2.1)" - - "GoogleToolboxForMac/NSString+URLArguments (~> 2.1)" + - GoogleSignIn (5.0.1): + - AppAuth (~> 1.2) + - GTMAppAuth (~> 1.0) - GTMSessionFetcher/Core (~> 1.1) - - GoogleToolboxForMac/DebugUtils (2.2.0): - - GoogleToolboxForMac/Defines (= 2.2.0) - - GoogleToolboxForMac/Defines (2.2.0) - - "GoogleToolboxForMac/NSDictionary+URLArguments (2.2.0)": - - GoogleToolboxForMac/DebugUtils (= 2.2.0) - - GoogleToolboxForMac/Defines (= 2.2.0) - - "GoogleToolboxForMac/NSString+URLArguments (= 2.2.0)" - - "GoogleToolboxForMac/NSString+URLArguments (2.2.0)" - GoogleUtilities/AppDelegateSwizzler (5.4.1): - GoogleUtilities/Environment - GoogleUtilities/Logger @@ -92,7 +89,14 @@ PODS: - GoogleUtilities/Logger - GoogleUtilities/UserDefaults (5.4.1): - GoogleUtilities/Logger - - GTMSessionFetcher/Core (1.2.1) + - GTMAppAuth (1.0.0): + - AppAuth/Core (~> 1.0) + - GTMSessionFetcher (~> 1.1) + - GTMSessionFetcher (1.2.2): + - GTMSessionFetcher/Full (= 1.2.2) + - GTMSessionFetcher/Core (1.2.2) + - GTMSessionFetcher/Full (1.2.2): + - GTMSessionFetcher/Core (= 1.2.2) - nanopb (0.3.901): - nanopb/decode (= 0.3.901) - nanopb/encode (= 0.3.901) @@ -330,8 +334,8 @@ PODS: - ReactCommon/turbomodule/core (= 0.61.1) - RNCAsyncStorage (1.3.4): - React - - RNGoogleSignin (2.0.0): - - GoogleSignIn (~> 4.4.0) + - RNGoogleSignin (3.0.1): + - GoogleSignIn (~> 5.0.0) - React - RNSound (0.11.0): - React @@ -386,7 +390,7 @@ DEPENDENCIES: - React-RCTVibration (from `../node_modules/react-native/Libraries/Vibration`) - ReactCommon/turbomodule (from `../node_modules/react-native/ReactCommon`) - "RNCAsyncStorage (from `../node_modules/@react-native-community/async-storage`)" - - RNGoogleSignin (from `../node_modules/react-native-google-signin`) + - "RNGoogleSignin (from `../node_modules/@react-native-community/google-signin`)" - RNSound (from `../node_modules/react-native-sound`) - RNSVG (from `../node_modules/react-native-svg`) - RNWatch (from `../node_modules/react-native-watch-connectivity`) @@ -406,12 +410,14 @@ SPEC REPOS: - FirebaseDynamicLinks - FirebaseInstanceID - GoogleAppMeasurement - - GoogleSignIn - - GoogleToolboxForMac - GoogleUtilities - - GTMSessionFetcher - nanopb - ObjectiveDropboxOfficial + trunk: + - AppAuth + - GoogleSignIn + - GTMAppAuth + - GTMSessionFetcher EXTERNAL SOURCES: BVLinearGradient: @@ -479,7 +485,7 @@ EXTERNAL SOURCES: RNCAsyncStorage: :path: "../node_modules/@react-native-community/async-storage" RNGoogleSignin: - :path: "../node_modules/react-native-google-signin" + :path: "../node_modules/@react-native-community/google-signin" RNSound: :path: "../node_modules/react-native-sound" RNSVG: @@ -491,6 +497,7 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: Amplitude-iOS: 2ad4d7270c99186236c1272a3a9425463b1ae1a7 + AppAuth: bce82c76043657c99d91e7882e8a9e1a93650cd4 boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c BVLinearGradient: e3aad03778a456d77928f594a649e96995f1c872 CocoaLumberjack: 2f44e60eb91c176d471fdba43b9e3eae6a721947 @@ -508,10 +515,10 @@ SPEC CHECKSUMS: Folly: 30e7936e1c45c08d884aa59369ed951a8e68cf51 glog: 1f3da668190260b06b429bb211bfbee5cd790c28 GoogleAppMeasurement: 6cf307834da065863f9faf4c0de0a936d81dd832 - GoogleSignIn: 7ff245e1a7b26d379099d3243a562f5747e23d39 - GoogleToolboxForMac: ff31605b7d66400dcec09bed5861689aebadda4d + GoogleSignIn: 3a51b9bb8e48b635fd7f4272cee06ca260345b86 GoogleUtilities: 1e25823cbf46540b4284f6ef8e17b3a68ee12bbc - GTMSessionFetcher: 32aeca0aa144acea523e1c8e053089dec2cb98ca + GTMAppAuth: 4deac854479704f348309e7b66189e604cf5e01e + GTMSessionFetcher: 61bb0f61a4cb560030f1222021178008a5727a23 nanopb: 2901f78ea1b7b4015c860c2fdd1ea2fee1a18d48 ObjectiveDropboxOfficial: a5afefc83f6467c42c45f2253f583f2ad1ffc701 RCTRequired: 53825815218847d3e9c7b6d92ad2d197a926d51e @@ -540,12 +547,12 @@ SPEC CHECKSUMS: React-RCTVibration: 8be61459e3749d1fb02cf414edd05b3007622882 ReactCommon: 4fba5be89efdf0b5720e0adb3d8d7edf6e532db0 RNCAsyncStorage: 8e31405a9f12fbf42c2bb330e4560bfd79c18323 - RNGoogleSignin: d030c6c6591db24c3cee649f64c7babf0a1699a0 + RNGoogleSignin: 39336070b35fc4cea6a98cf111e00480317be0ae RNSound: c980916b596cc15c8dcd2f6ecd3b13c4881dbe20 RNSVG: aac12785382e8fd4f28d072fe640612e34914631 RNWatch: 09738b339eceb66e4d80a2371633ca5fb380fa42 Yoga: d8c572ddec8d05b7dba08e4e5f1924004a177078 -PODFILE CHECKSUM: 0ac392c47cc78d9db03eea7b58950184336d6cf4 +PODFILE CHECKSUM: cb84b325b724c6ef7c8b24aa52ca7b6f681a095c COCOAPODS: 1.8.1 diff --git a/ios/sdk/src/JitsiMeet.m b/ios/sdk/src/JitsiMeet.m index 3c941a882..5a307dc10 100644 --- a/ios/sdk/src/JitsiMeet.m +++ b/ios/sdk/src/JitsiMeet.m @@ -90,8 +90,7 @@ if ([RNGoogleSignin application:app openURL:url - sourceApplication:options[UIApplicationOpenURLOptionsSourceApplicationKey] - annotation:options[UIApplicationOpenURLOptionsAnnotationKey]]) { + options:options]) { return YES; } diff --git a/package-lock.json b/package-lock.json index f191b6baf..7f2afe2cf 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3062,6 +3062,11 @@ } } }, + "@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", @@ -15441,11 +15446,6 @@ "jssha": "^2.2.0" } }, - "react-native-google-signin": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/react-native-google-signin/-/react-native-google-signin-2.0.0.tgz", - "integrity": "sha512-9loM4lcCIdbco5BnmNio7yGaXQKCpCaY1VRmYiTSvC5NjuSf6Ui6jZRee46p/YdaU4yRnS3u5Vct6Psrvr0HNg==" - }, "react-native-immersive": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/react-native-immersive/-/react-native-immersive-2.0.0.tgz", diff --git a/package.json b/package.json index 3d3fd4b5c..cae7e9397 100644 --- a/package.json +++ b/package.json @@ -35,6 +35,7 @@ "@atlaskit/tooltip": "12.1.13", "@microsoft/microsoft-graph-client": "1.1.0", "@react-native-community/async-storage": "1.3.4", + "@react-native-community/google-signin": "3.0.1", "@react-native-community/netinfo": "4.1.5", "@svgr/webpack": "4.3.2", "@tensorflow-models/body-pix": "1.1.2", @@ -71,7 +72,6 @@ "react-native-background-timer": "2.1.1", "react-native-calendar-events": "github:jitsi/react-native-calendar-events#902e6e92d6bae450a6052f76ba4d02f977ffd8f2", "react-native-callstats": "3.61.0", - "react-native-google-signin": "2.0.0", "react-native-immersive": "2.0.0", "react-native-keep-awake": "4.0.0", "react-native-linear-gradient": "2.5.6", diff --git a/react/features/google-api/googleApi.native.js b/react/features/google-api/googleApi.native.js index 06b25f2f7..35aaf9688 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-google-signin').GoogleSignin; + GoogleSignin = require('@react-native-community/google-signin').GoogleSignin; } import {