Merge branch 'main' into dependabot/bundler/bundler-6d4d941ed1

Author: w-goog

GoogleSignIn/Sources/GIDSignInStrings.m

@@ -31,6 +31,9 @@ @implementation GIDSignInStrings
 
 + (nullable NSString *)localizedStringForKey:(NSString *)key text:(NSString *)text {
   NSBundle *frameworkBundle = [NSBundle gid_frameworkBundle];
+  if (frameworkBundle == nil) {
+    return text;
+  }
   return [frameworkBundle localizedStringForKey:key value:text table:kStringsTableName];
 }
 

GoogleSignIn/Sources/Public/GoogleSignIn/GoogleSignIn.h

@@ -13,11 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#import <TargetConditionals.h>
-
-#if TARGET_OS_IOS && !TARGET_OS_MACCATALYST
 #import "GIDAppCheckError.h"
-#endif
 #import "GIDConfiguration.h"
 #import "GIDGoogleUser.h"
 #import "GIDProfileData.h"