Merge remote-tracking branch 'origin/main' into JesusRojass/#10220

Author: JesusRojass

.github/workflows/crashlytics.yml

@@ -18,8 +18,8 @@ on:
     - 'Interop/Analytics/Public/*.h'
     - 'Gemfile*'
   schedule:
-    # Run every day at 7pm (PDT) / 10pm (EDT) - cron uses UTC times
-    - cron:  '0 2 * * *'
+    # Run every day at 11pm (PDT) / 2am (EDT) - cron uses UTC times
+    - cron:  '0 6 * * *'
 
 concurrency:
     group: ${{ github.workflow }}-${{ github.head_ref || github.ref }}

Carthage.md

@@ -31,7 +31,7 @@ Firebase components that you want to include in your app. Note that
 
 ```
 binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseABTestingBinary.json"
-binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseAIBinary.json"
+binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseAILogicBinary.json"
 binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseAdMobBinary.json"
 binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseAnalyticsBinary.json"
 binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseAppCheckBinary.json"

Crashlytics/Shared/FIRCLSMachO/FIRCLSMachOBinary.m

@@ -14,13 +14,11 @@
 
 #import "Crashlytics/Shared/FIRCLSMachO/FIRCLSMachOBinary.h"
 
-#import "Crashlytics/Shared/FIRCLSMachO/FIRCLSMachOSlice.h"
-
 #import <CommonCrypto/CommonHMAC.h>
+#import "Crashlytics/Crashlytics/Helpers/FIRCLSUtility.h"
+#import "Crashlytics/Shared/FIRCLSByteUtility.h"
+#import "Crashlytics/Shared/FIRCLSMachO/FIRCLSMachOSlice.h"
 
-static void FIRCLSSafeHexToString(const uint8_t* value, size_t length, char* outputBuffer);
-static NSString* FIRCLSNSDataToNSString(NSData* data);
-static NSString* FIRCLSHashBytes(const void* bytes, size_t length);
 static NSString* FIRCLSHashNSString(NSString* value);
 
 @interface FIRCLSMachOBinary ()
@@ -116,58 +114,6 @@ + (NSString*)hashNSString:(NSString*)value {
 
 @end
 
-// TODO: Functions copied from the SDK.  We should figure out a way to share this.
-static void FIRCLSSafeHexToString(const uint8_t* value, size_t length, char* outputBuffer) {
-  const char hex[] = "0123456789abcdef";
-
-  if (!value) {
-    outputBuffer[0] = '\0';
-    return;
-  }
-
-  for (size_t i = 0; i < length; ++i) {
-    unsigned char c = value[i];
-    outputBuffer[i * 2] = hex[c >> 4];
-    outputBuffer[i * 2 + 1] = hex[c & 0x0F];
-  }
-
-  outputBuffer[length * 2] = '\0';  // null terminate
-}
-
-static NSString* FIRCLSNSDataToNSString(NSData* data) {
-  NSString* string;
-  char* buffer;
-  size_t size;
-  NSUInteger length;
-
-  // we need 2 hex char for every byte of data, plus one more spot for a
-  // null terminator
-  length = [data length];
-  size = (length * 2) + 1;
-  buffer = calloc(1, sizeof(char) * size);
-
-  if (!buffer) {
-    return nil;
-  }
-
-  FIRCLSSafeHexToString([data bytes], length, buffer);
-
-  string = [NSString stringWithUTF8String:buffer];
-
-  free(buffer);
-
-  return string;
-}
-
-static NSString* FIRCLSHashBytes(const void* bytes, size_t length) {
-  uint8_t digest[CC_SHA1_DIGEST_LENGTH] = {0};
-  CC_SHA1(bytes, (CC_LONG)length, digest);
-
-  NSData* result = [NSData dataWithBytes:digest length:CC_SHA1_DIGEST_LENGTH];
-
-  return FIRCLSNSDataToNSString(result);
-}
-
 static NSString* FIRCLSHashNSString(NSString* value) {
   const char* s = [value cStringUsingEncoding:NSUTF8StringEncoding];
 

Firebase.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'Firebase'
-  s.version          = '12.5.0'
+  s.version          = '12.6.0'
   s.summary          = 'Firebase'
 
   s.description      = <<-DESC
@@ -36,14 +36,14 @@ Simplify your app development, grow your user base, and monetize more effectivel
     ss.ios.deployment_target = '15.0'
     ss.osx.deployment_target = '10.15'
     ss.tvos.deployment_target = '15.0'
-    ss.ios.dependency 'FirebaseAnalytics', '~> 12.5.0'
-    ss.osx.dependency 'FirebaseAnalytics', '~> 12.5.0'
-    ss.tvos.dependency 'FirebaseAnalytics', '~> 12.5.0'
+    ss.ios.dependency 'FirebaseAnalytics', '~> 12.6.0'
+    ss.osx.dependency 'FirebaseAnalytics', '~> 12.6.0'
+    ss.tvos.dependency 'FirebaseAnalytics', '~> 12.6.0'
     ss.dependency 'Firebase/CoreOnly'
   end
 
   s.subspec 'CoreOnly' do |ss|
-    ss.dependency 'FirebaseCore', '~> 12.5.0'
+    ss.dependency 'FirebaseCore', '~> 12.6.0'
     ss.source_files = 'CoreOnly/Sources/Firebase.h'
     ss.preserve_paths = 'CoreOnly/Sources/module.modulemap'
     if ENV['FIREBASE_POD_REPO_FOR_DEV_POD'] then
@@ -70,7 +70,7 @@ Simplify your app development, grow your user base, and monetize more effectivel
 
   s.subspec 'ABTesting' do |ss|
     ss.dependency 'Firebase/CoreOnly'
-    ss.dependency 'FirebaseABTesting', '~> 12.5.0'
+    ss.dependency 'FirebaseABTesting', '~> 12.6.0'
     # Standard platforms PLUS watchOS.
     ss.ios.deployment_target = '15.0'
     ss.osx.deployment_target = '10.15'
@@ -80,13 +80,13 @@ Simplify your app development, grow your user base, and monetize more effectivel
 
   s.subspec 'AppDistribution' do |ss|
     ss.dependency 'Firebase/CoreOnly'
-    ss.ios.dependency 'FirebaseAppDistribution', '~> 12.5.0-beta'
+    ss.ios.dependency 'FirebaseAppDistribution', '~> 12.6.0-beta'
     ss.ios.deployment_target = '15.0'
   end
 
   s.subspec 'AppCheck' do |ss|
     ss.dependency 'Firebase/CoreOnly'
-    ss.dependency 'FirebaseAppCheck', '~> 12.5.0'
+    ss.dependency 'FirebaseAppCheck', '~> 12.6.0'
     ss.ios.deployment_target = '15.0'
     ss.osx.deployment_target = '10.15'
     ss.tvos.deployment_target = '15.0'
@@ -95,7 +95,7 @@ Simplify your app development, grow your user base, and monetize more effectivel
 
   s.subspec 'Auth' do |ss|
     ss.dependency 'Firebase/CoreOnly'
-    ss.dependency 'FirebaseAuth', '~> 12.5.0'
+    ss.dependency 'FirebaseAuth', '~> 12.6.0'
     # Standard platforms PLUS watchOS.
     ss.ios.deployment_target = '15.0'
     ss.osx.deployment_target = '10.15'
@@ -105,7 +105,7 @@ Simplify your app development, grow your user base, and monetize more effectivel
 
   s.subspec 'Crashlytics' do |ss|
     ss.dependency 'Firebase/CoreOnly'
-    ss.dependency 'FirebaseCrashlytics', '~> 12.5.0'
+    ss.dependency 'FirebaseCrashlytics', '~> 12.6.0'
     # Standard platforms PLUS watchOS.
     ss.ios.deployment_target = '15.0'
     ss.osx.deployment_target = '10.15'
@@ -115,7 +115,7 @@ Simplify your app development, grow your user base, and monetize more effectivel
 
   s.subspec 'Database' do |ss|
     ss.dependency 'Firebase/CoreOnly'
-    ss.dependency 'FirebaseDatabase', '~> 12.5.0'
+    ss.dependency 'FirebaseDatabase', '~> 12.6.0'
     # Standard platforms PLUS watchOS 7.
     ss.ios.deployment_target = '15.0'
     ss.osx.deployment_target = '10.15'
@@ -125,15 +125,15 @@ Simplify your app development, grow your user base, and monetize more effectivel
 
   s.subspec 'Firestore' do |ss|
     ss.dependency 'Firebase/CoreOnly'
-    ss.dependency 'FirebaseFirestore', '~> 12.5.0'
+    ss.dependency 'FirebaseFirestore', '~> 12.6.0'
     ss.ios.deployment_target = '15.0'
     ss.osx.deployment_target = '10.15'
     ss.tvos.deployment_target = '15.0'
   end
 
   s.subspec 'Functions' do |ss|
     ss.dependency 'Firebase/CoreOnly'
-    ss.dependency 'FirebaseFunctions', '~> 12.5.0'
+    ss.dependency 'FirebaseFunctions', '~> 12.6.0'
     # Standard platforms PLUS watchOS.
     ss.ios.deployment_target = '15.0'
     ss.osx.deployment_target = '10.15'
@@ -143,20 +143,20 @@ Simplify your app development, grow your user base, and monetize more effectivel
 
   s.subspec 'InAppMessaging' do |ss|
     ss.dependency 'Firebase/CoreOnly'
-    ss.ios.dependency 'FirebaseInAppMessaging', '~> 12.5.0-beta'
-    ss.tvos.dependency 'FirebaseInAppMessaging', '~> 12.5.0-beta'
+    ss.ios.dependency 'FirebaseInAppMessaging', '~> 12.6.0-beta'
+    ss.tvos.dependency 'FirebaseInAppMessaging', '~> 12.6.0-beta'
     ss.ios.deployment_target = '15.0'
     ss.tvos.deployment_target = '15.0'
   end
 
   s.subspec 'Installations' do |ss|
     ss.dependency 'Firebase/CoreOnly'
-    ss.dependency 'FirebaseInstallations', '~> 12.5.0'
+    ss.dependency 'FirebaseInstallations', '~> 12.6.0'
   end
 
   s.subspec 'Messaging' do |ss|
     ss.dependency 'Firebase/CoreOnly'
-    ss.dependency 'FirebaseMessaging', '~> 12.5.0'
+    ss.dependency 'FirebaseMessaging', '~> 12.6.0'
     # Standard platforms PLUS watchOS.
     ss.ios.deployment_target = '15.0'
     ss.osx.deployment_target = '10.15'
@@ -166,7 +166,7 @@ Simplify your app development, grow your user base, and monetize more effectivel
 
   s.subspec 'MLModelDownloader' do |ss|
     ss.dependency 'Firebase/CoreOnly'
-    ss.dependency 'FirebaseMLModelDownloader', '~> 12.5.0-beta'
+    ss.dependency 'FirebaseMLModelDownloader', '~> 12.6.0-beta'
     # Standard platforms PLUS watchOS.
     ss.ios.deployment_target = '15.0'
     ss.osx.deployment_target = '10.15'
@@ -176,15 +176,15 @@ Simplify your app development, grow your user base, and monetize more effectivel
 
   s.subspec 'Performance' do |ss|
     ss.dependency 'Firebase/CoreOnly'
-    ss.ios.dependency 'FirebasePerformance', '~> 12.5.0'
-    ss.tvos.dependency 'FirebasePerformance', '~> 12.5.0'
+    ss.ios.dependency 'FirebasePerformance', '~> 12.6.0'
+    ss.tvos.dependency 'FirebasePerformance', '~> 12.6.0'
     ss.ios.deployment_target = '15.0'
     ss.tvos.deployment_target = '15.0'
   end
 
   s.subspec 'RemoteConfig' do |ss|
     ss.dependency 'Firebase/CoreOnly'
-    ss.dependency 'FirebaseRemoteConfig', '~> 12.5.0'
+    ss.dependency 'FirebaseRemoteConfig', '~> 12.6.0'
     # Standard platforms PLUS watchOS.
     ss.ios.deployment_target = '15.0'
     ss.osx.deployment_target = '10.15'
@@ -194,7 +194,7 @@ Simplify your app development, grow your user base, and monetize more effectivel
 
   s.subspec 'Storage' do |ss|
     ss.dependency 'Firebase/CoreOnly'
-    ss.dependency 'FirebaseStorage', '~> 12.5.0'
+    ss.dependency 'FirebaseStorage', '~> 12.6.0'
     # Standard platforms PLUS watchOS.
     ss.ios.deployment_target = '15.0'
     ss.osx.deployment_target = '10.15'

FirebaseABTesting.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'FirebaseABTesting'
-  s.version          = '12.5.0'
+  s.version          = '12.6.0'
   s.summary          = 'Firebase ABTesting'
 
   s.description      = <<-DESC
@@ -51,7 +51,7 @@ Firebase Cloud Messaging and Firebase Remote Config in your app.
   s.pod_target_xcconfig = {
     'HEADER_SEARCH_PATHS' => '"${PODS_TARGET_SRCROOT}"'
   }
-  s.dependency 'FirebaseCore', '~> 12.5.0'
+  s.dependency 'FirebaseCore', '~> 12.6.0'
 
   s.test_spec 'unit' do |unit_tests|
     unit_tests.scheme = { :code_coverage => true }

FirebaseAI.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'FirebaseAI'
-  s.version          = '12.5.0'
+  s.version          = '12.6.0'
   s.summary          = 'Firebase AI SDK'
 
   s.description      = <<-DESC
@@ -43,8 +43,8 @@ Build AI-powered apps and features with the Gemini API using the Firebase AI SDK
   s.tvos.framework = 'UIKit'
   s.watchos.framework = 'WatchKit'
 
-  s.dependency 'FirebaseAILogic', '12.5.0'
-  s.dependency 'FirebaseCore', '~> 12.5.0'
+  s.dependency 'FirebaseAILogic', '12.6.0'
+  s.dependency 'FirebaseCore', '~> 12.6.0'
 
   s.test_spec 'unit' do |unit_tests|
     unit_tests_dir = 'FirebaseAI/Wrapper/Tests/'

FirebaseAI/Sources/AILog.swift

@@ -87,6 +87,7 @@ enum AILog {
     case generateContentResponseEmptyCandidates = 4003
     case invalidWebsocketURL = 4004
     case duplicateLiveSessionSetupComplete = 4005
+    case malformedURL = 4006
 
     // SDK Debugging
     case loadRequestStreamResponseLine = 5000
@@ -138,6 +139,17 @@ enum AILog {
     log(level: .debug, code: code, message)
   }
 
+  @available(iOS 15.0, macOS 12.0, macCatalyst 15.0, tvOS 15.0, watchOS 8.0, *)
+  static func makeInternalError(message: String, code: MessageCode) -> GenerateContentError {
+    let error = GenerateContentError.internalError(underlying: NSError(
+      domain: "\(Constants.baseErrorDomain).Internal",
+      code: code.rawValue,
+      userInfo: [NSLocalizedDescriptionKey: message]
+    ))
+    AILog.error(code: code, message)
+    return error
+  }
+
   /// Returns `true` if additional logging has been enabled via a launch argument.
   static func additionalLoggingEnabled() -> Bool {
     return ProcessInfo.processInfo.arguments.contains(enableArgumentKey)