stuff

GNUGradyn · Jul 9, 2024 · b499402 · b499402
1 parent 558439d
commit b499402
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 12 deletions.
diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock
@@ -1440,7 +1440,7 @@ SPEC CHECKSUMS:
   React-jsitracing: 0fa7f78d8fdda794667cb2e6f19c874c1cf31d7e
   React-logger: 29fa3e048f5f67fe396bc08af7606426d9bd7b5d
   React-Mapbuffer: bf56147c9775491e53122a94c423ac201417e326
-  react-native-google-auth: 0e0d211e08a3dda76f60abc940b1abb670f53269
+  react-native-google-auth: 7f87015972e32121b7b11b968ecb1c3090ac2490
   React-nativeconfig: 9f223cd321823afdecf59ed00861ab2d69ee0fc1
   React-NativeModulesApple: ff7efaff7098639db5631236cfd91d60abff04c0
   React-perflogger: 32ed45d9cee02cf6639acae34251590dccd30994

diff --git a/ios/GoogleAuth-Bridging-Header.h b/ios/GoogleAuth-Bridging-Header.h
@@ -1,3 +1,3 @@
 #import <React/RCTBridgeModule.h>
 #import <React/RCTViewManager.h>
-#import "GoogleSignIn.h"
+
diff --git a/ios/GoogleAuth.swift b/ios/GoogleAuth.swift
@@ -1,5 +1,4 @@
 import Foundation
-import GoogleSignIn
 import React
 
 @objc(GoogleAuth)
@@ -16,7 +15,7 @@ class GoogleAuth: NSObject {
 
         let signInConfig = GIDConfiguration(clientID: clientID, serverClientID: nil, hostedDomain: hostedDomainFilter, openIDRealm: nil)
         GIDSignIn.sharedInstance.configuration = signInConfig
-        GIDSignIn.sharedInstance.signIn(withPresenting: presentingVC, hint: nil, additionalScopes: nil, nonce: <#T##String?#>)
+        GIDSignIn.sharedInstance.signIn(withPresenting: presentingVC, hint: nil, additionalScopes: nil, nonce: nonce)
     }
 
     private func getCurrentViewController() -> UIViewController? {

diff --git a/ios/GoogleSignInAppDelegate.swift b/ios/GoogleSignInAppDelegate.swift
@@ -6,7 +6,6 @@
 //
 import Foundation
 import UIKit
-import GoogleSignIn
 
 
 @objc(GoogleSignInAppDelegate)

diff --git a/react-native-google-auth.podspec b/react-native-google-auth.podspec
@@ -14,12 +14,16 @@ Pod::Spec.new do |s|
   s.platforms    = { :ios => min_ios_version_supported }
   s.source       = { :git => "https://github.com/GNUGradyn/react-native-google-auth.git", :tag => "#{s.version}" }
 
-  s.source_files = "ios/**/*.{h,m,mm,swift}", "GoogleSignIn-iOS/GoogleSignIn/Sources/**/*.{h,m,mm,swift}", "GoogleSignIn-iOS/GoogleSignInSwift/Sources/**/*.{h,m,mm,swift}"
+  s.source_files = "ios/**/*.{h,m,mm,swift}", "GoogleSignIn-iOS/GoogleSignIn/Sources/**/*.{h,m,mm,swift}"
+
+  s.public_header_files = "GoogleSignIn-iOS/GoogleSignIn/Sources/Public/GoogleSignIn/*.h"
+  s.resource_bundle = {
+    'GoogleSignIn' => ['GoogleSignIn-iOS/GoogleSignIn/Sources/{Resources,Strings}/*']
+  }
+
+  # dependencies for GoogleSignIn pod. will be replaced when the fork we use is merged into Google's repo
+  s.dependency 'AppCheckCore', '>= 10.19.1', '< 11.0'
 
-  # dependencies for GoogleSignIn pod. will be replaced when the fork we use is merged into googles repo
-  s.dependency 'AppCheckCore', '>= 10.19.1', '< 11.0' do |ds|
-    ds.modular_headers = true
-  end
   s.dependency 'AppAuth', '>= 1.7.3', '< 2.0'
   s.dependency 'GTMAppAuth', '>= 4.1.1', '< 5.0'
   s.dependency 'GTMSessionFetcher/Core', '~> 3.3'
@@ -30,8 +34,7 @@ Pod::Spec.new do |s|
     install_modules_dependencies(s)
   else
     s.dependency "React-Core"
-
-
+
     # Don't install the dependencies when we run `pod install` in the old architecture.
     if ENV['RCT_NEW_ARCH_ENABLED'] == '1' then
       s.compiler_flags = folly_compiler_flags + " -DRCT_NEW_ARCH_ENABLED=1"