Skip to content

Commit b5b707d

Browse files
committed
wrok
1 parent 5ae55cd commit b5b707d

File tree

5 files changed

+29
-46
lines changed

5 files changed

+29
-46
lines changed

example/ios/GoogleAuthExample/PrivacyInfo.xcprivacy

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
<key>NSPrivacyAccessedAPITypeReasons</key>
1111
<array>
1212
<string>CA92.1</string>
13-
<string>1C8F.1</string>
1413
<string>C56D.1</string>
14+
<string>1C8F.1</string>
1515
</array>
1616
</dict>
1717
<dict>

example/ios/Podfile

+1-7
Original file line numberDiff line numberDiff line change
@@ -16,18 +16,12 @@ end
1616

1717
target 'GoogleAuthExample' do
1818
config = use_native_modules!
19-
20-
pod 'AppCheckCore', '>= 10.19.1', '< 11.0', :modular_headers => true
21-
pod 'AppAuth', '>= 1.7.3', '< 2.0', :modular_headers => true
22-
pod 'GTMAppAuth', '>= 4.1.1', '< 5.0', :modular_headers => true
23-
pod 'GTMSessionFetcher/Core', '~> 3.3', :modular_headers => true
24-
19+
2520
use_react_native!(
2621
:path => config[:reactNativePath],
2722
# An absolute path to your application root.
2823
:app_path => "#{Pod::Config.instance.installation_root}/.."
2924
)
30-
3125

3226
target 'GoogleAuthExampleTests' do
3327
inherit! :complete

example/ios/Podfile.lock

+27-17
Original file line numberDiff line numberDiff line change
@@ -5,23 +5,27 @@ PODS:
55
- AppAuth/Core (1.7.5)
66
- AppAuth/ExternalUserAgent (1.7.5):
77
- AppAuth/Core
8-
- AppCheckCore (10.19.2):
9-
- GoogleUtilities/Environment (~> 7.13)
10-
- GoogleUtilities/UserDefaults (~> 7.13)
11-
- PromisesObjC (~> 2.3)
8+
- AppCheckCore (11.0.0):
9+
- GoogleUtilities/Environment (~> 8.0)
10+
- GoogleUtilities/UserDefaults (~> 8.0)
11+
- PromisesObjC (~> 2.4)
1212
- boost (1.83.0)
1313
- DoubleConversion (1.1.6)
1414
- FBLazyVector (0.74.2)
1515
- fmt (9.1.0)
1616
- glog (0.3.5)
17-
- GoogleUtilities/Environment (7.13.3):
17+
- GoogleSignIn (8.0.0):
18+
- AppAuth (< 2.0, >= 1.7.3)
19+
- AppCheckCore (~> 11.0)
20+
- GTMAppAuth (< 5.0, >= 4.1.1)
21+
- GTMSessionFetcher/Core (~> 3.3)
22+
- GoogleUtilities/Environment (8.0.0):
1823
- GoogleUtilities/Privacy
19-
- PromisesObjC (< 3.0, >= 1.2)
20-
- GoogleUtilities/Logger (7.13.3):
24+
- GoogleUtilities/Logger (8.0.0):
2125
- GoogleUtilities/Environment
2226
- GoogleUtilities/Privacy
23-
- GoogleUtilities/Privacy (7.13.3)
24-
- GoogleUtilities/UserDefaults (7.13.3):
27+
- GoogleUtilities/Privacy (8.0.0)
28+
- GoogleUtilities/UserDefaults (8.0.0):
2529
- GoogleUtilities/Logger
2630
- GoogleUtilities/Privacy
2731
- GTMAppAuth (4.1.1):
@@ -1214,15 +1218,12 @@ PODS:
12141218
- Yoga (0.0.0)
12151219

12161220
DEPENDENCIES:
1217-
- AppAuth (< 2.0, >= 1.7.3)
1218-
- AppCheckCore (< 11.0, >= 10.19.1)
12191221
- boost (from `../node_modules/react-native/third-party-podspecs/boost.podspec`)
12201222
- DoubleConversion (from `../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec`)
12211223
- FBLazyVector (from `../node_modules/react-native/Libraries/FBLazyVector`)
12221224
- fmt (from `../node_modules/react-native/third-party-podspecs/fmt.podspec`)
12231225
- glog (from `../node_modules/react-native/third-party-podspecs/glog.podspec`)
1224-
- GTMAppAuth (< 5.0, >= 4.1.1)
1225-
- GTMSessionFetcher/Core (~> 3.3)
1226+
- GoogleSignIn (from `https://github.com/vonovak/GoogleSignIn-iOS`, branch `feat/custom-nonce`)
12261227
- hermes-engine (from `../node_modules/react-native/sdks/hermes-engine/hermes-engine.podspec`)
12271228
- RCT-Folly (from `../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec`)
12281229
- RCT-Folly/Fabric (from `../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec`)
@@ -1297,6 +1298,9 @@ EXTERNAL SOURCES:
12971298
:podspec: "../node_modules/react-native/third-party-podspecs/fmt.podspec"
12981299
glog:
12991300
:podspec: "../node_modules/react-native/third-party-podspecs/glog.podspec"
1301+
GoogleSignIn:
1302+
:branch: feat/custom-nonce
1303+
:git: https://github.com/vonovak/GoogleSignIn-iOS
13001304
hermes-engine:
13011305
:podspec: "../node_modules/react-native/sdks/hermes-engine/hermes-engine.podspec"
13021306
:tag: hermes-2024-06-03-RNv0.74.2-bb1e74fe1e95c2b5a2f4f9311152da052badc2bc
@@ -1399,15 +1403,21 @@ EXTERNAL SOURCES:
13991403
Yoga:
14001404
:path: "../node_modules/react-native/ReactCommon/yoga"
14011405

1406+
CHECKOUT OPTIONS:
1407+
GoogleSignIn:
1408+
:commit: 34d9a65bf94bf5cd7df9d36d8c448f4991bd7f53
1409+
:git: https://github.com/vonovak/GoogleSignIn-iOS
1410+
14021411
SPEC CHECKSUMS:
14031412
AppAuth: 501c04eda8a8d11f179dbe8637b7a91bb7e5d2fa
1404-
AppCheckCore: 9feb4300caa596a36416cde10674dc5bec1e022e
1413+
AppCheckCore: e25aaaac234b333320b0bebb8fc21ed3576819ba
14051414
boost: d3f49c53809116a5d38da093a8aa78bf551aed09
14061415
DoubleConversion: 76ab83afb40bddeeee456813d9c04f67f78771b5
14071416
FBLazyVector: 4bc164e5b5e6cfc288d2b5ff28643ea15fa1a589
14081417
fmt: 4c2741a687cc09f0634a2e2c72a838b99f1ff120
14091418
glog: fdfdfe5479092de0c4bdbebedd9056951f092c4f
1410-
GoogleUtilities: ea963c370a38a8069cc5f7ba4ca849a60b6d7d15
1419+
GoogleSignIn: ce8c89bb9b37fb624b92e7514cc67335d1e277e4
1420+
GoogleUtilities: 7831653f2e95842f52d920c5bf2ede6316370129
14111421
GTMAppAuth: f69bd07d68cd3b766125f7e072c45d7340dea0de
14121422
GTMSessionFetcher: 5aea5ba6bd522a239e236100971f10cb71b96ab6
14131423
hermes-engine: 01d3e052018c2a13937aca1860fbedbccd4a41b7
@@ -1436,7 +1446,7 @@ SPEC CHECKSUMS:
14361446
React-jsitracing: 0fa7f78d8fdda794667cb2e6f19c874c1cf31d7e
14371447
React-logger: 29fa3e048f5f67fe396bc08af7606426d9bd7b5d
14381448
React-Mapbuffer: bf56147c9775491e53122a94c423ac201417e326
1439-
react-native-google-auth: d6bd1cd9b2d717ec58a8952d45c1cb92e86b44c4
1449+
react-native-google-auth: 6506b5ccb2c7b7f1447a1457e0ebe0554a994fc7
14401450
React-nativeconfig: 9f223cd321823afdecf59ed00861ab2d69ee0fc1
14411451
React-NativeModulesApple: ff7efaff7098639db5631236cfd91d60abff04c0
14421452
React-perflogger: 32ed45d9cee02cf6639acae34251590dccd30994
@@ -1463,6 +1473,6 @@ SPEC CHECKSUMS:
14631473
SocketRocket: abac6f5de4d4d62d24e11868d7a2f427e0ef940d
14641474
Yoga: ae3c32c514802d30f687a04a6a35b348506d411f
14651475

1466-
PODFILE CHECKSUM: 39631cf5d748bf34ee7d13f58bbc5af907f97f6c
1476+
PODFILE CHECKSUM: 801091e8d7f5fc540f948b7158afd82e4570bc2f
14671477

14681478
COCOAPODS: 1.15.2

ios/GoogleAuth-Bridging-Header.h

-9
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,2 @@
11
#import <React/RCTBridgeModule.h>
22
#import <React/RCTViewManager.h>
3-
#import "GIDAppCheckError.h"
4-
#import "GIDConfiguration.h"
5-
#import "GIDGoogleUser.h"
6-
#import "GIDProfileData.h"
7-
#import "GIDSignIn.h"
8-
#import "GIDSignInButton.h"
9-
#import "GIDSignInResult.h"
10-
#import "GIDToken.h"
11-
#import "GoogleSignIn.h"

react-native-google-auth.podspec

-12
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,6 @@ Pod::Spec.new do |s|
1313

1414
s.platforms = { :ios => "10.0" }
1515
s.source = { :git => "https://github.com/GNUGradyn/react-native-google-auth.git" }
16-
17-
s.source_files = "GoogleSignIn-iOS/GoogleSignIn/Sources/**/*.{h,m,mm,swift}"
18-
s.public_header_files = "GoogleSignIn-iOS/GoogleSignIn/Sources/Public/GoogleSignIn/*.h"
19-
s.private_header_files = "GoogleSignIn-iOS/GoogleSignIn/Sources/**/*.h"
20-
21-
s.pod_target_xcconfig = {
22-
'HEADER_SEARCH_PATHS' => '"$(inherited)" "$(SRCROOT)/GoogleSignIn-iOS/GoogleSignIn/Sources/Public/GoogleSignIn" "$(SRCROOT)/GoogleSignIn-iOS/GoogleSignIn/Sources"'
23-
}
24-
25-
s.user_target_xcconfig = {
26-
'HEADER_SEARCH_PATHS' => '"$(inherited)" "$(SRCROOT)/GoogleSignIn-iOS/GoogleSignIn/Sources/Public/GoogleSignIn" "$(SRCROOT)/GoogleSignIn-iOS/GoogleSignIn/Sources"'
27-
}
2816
# Use install_modules_dependencies helper to install the dependencies if React Native version >=0.71.0.
2917
# See https://github.com/facebook/react-native/blob/febf6b7f33fdb4904669f99d795eba4c0f95d7bf/scripts/cocoapods/new_architecture.rb#L79.
3018
if respond_to?(:install_modules_dependencies, true)

0 commit comments

Comments
 (0)