Fix build on Xcode 15

andrewheard · andrewheard · commit 06e19aae25ab · 2025-12-10T14:15:13.000-05:00
diff --git a/FirebaseAI/Sources/GenerativeModel.swift b/FirebaseAI/Sources/GenerativeModel.swift
@@ -366,49 +366,51 @@ public final class GenerativeModel: Sendable {
     return try await generativeAIService.loadRequest(request: countTokensRequest)
   }
 
-  /// Produces a generable object as a response to a prompt.
-  ///
-  /// - Parameters:
-  ///   - prompt: A prompt for the model to respond to.
-  ///   - type: A type to produce as the response.
-  /// - Returns: ``GeneratedContent`` containing the fields and values defined in the schema.
-  @available(iOS 26.0, macOS 26.0, *)
-  @available(tvOS, unavailable)
-  @available(watchOS, unavailable)
-  public final func generateObject<Content>(_ type: Content.Type = Content.self,
-                                            parts: any PartsRepresentable...) async throws
-    -> Response<Content>
-    where Content: FoundationModels.Generable {
-    let jsonSchema = try type.generationSchema.asGeminiJSONSchema()
-
-    let generationConfig = {
-      var generationConfig = self.generationConfig ?? GenerationConfig()
-      if generationConfig.candidateCount != nil {
-        generationConfig.candidateCount = nil
-      }
-      generationConfig.responseMIMEType = "application/json"
-      if generationConfig.responseSchema != nil {
-        generationConfig.responseSchema = nil
-      }
-      generationConfig.responseJSONSchema = jsonSchema
-      if generationConfig.responseModalities != nil {
-        generationConfig.responseModalities = nil
-      }
+  #if canImport(FoundationModels)
+    /// Produces a generable object as a response to a prompt.
+    ///
+    /// - Parameters:
+    ///   - prompt: A prompt for the model to respond to.
+    ///   - type: A type to produce as the response.
+    /// - Returns: ``GeneratedContent`` containing the fields and values defined in the schema.
+    @available(iOS 26.0, macOS 26.0, *)
+    @available(tvOS, unavailable)
+    @available(watchOS, unavailable)
+    public final func generateObject<Content>(_ type: Content.Type = Content.self,
+                                              parts: any PartsRepresentable...) async throws
+      -> Response<Content>
+      where Content: FoundationModels.Generable {
+      let jsonSchema = try type.generationSchema.asGeminiJSONSchema()
+
+      let generationConfig = {
+        var generationConfig = self.generationConfig ?? GenerationConfig()
+        if generationConfig.candidateCount != nil {
+          generationConfig.candidateCount = nil
+        }
+        generationConfig.responseMIMEType = "application/json"
+        if generationConfig.responseSchema != nil {
+          generationConfig.responseSchema = nil
+        }
+        generationConfig.responseJSONSchema = jsonSchema
+        if generationConfig.responseModalities != nil {
+          generationConfig.responseModalities = nil
+        }
 
-      return generationConfig
-    }()
+        return generationConfig
+      }()
 
-    let response = try await generateContent(
-      [ModelContent(parts: parts)],
-      generationConfig: generationConfig
-    )
+      let response = try await generateContent(
+        [ModelContent(parts: parts)],
+        generationConfig: generationConfig
+      )
 
-    let generatedContent = try GeneratedContent(json: response.text ?? "")
-    let content = try Content(generatedContent)
-    let rawContent = try ModelOutput(generatedContent)
+      let generatedContent = try GeneratedContent(json: response.text ?? "")
+      let content = try Content(generatedContent)
+      let rawContent = try ModelOutput(generatedContent)
 
-    return Response(content: content, rawContent: rawContent)
-  }
+      return Response(content: content, rawContent: rawContent)
+    }
+  #endif // canImport(FoundationModels)
 
   /// Returns a `GenerateContentError` (for public consumption) from an internal error.
   ///
@@ -421,9 +423,7 @@ public final class GenerativeModel: Sendable {
   }
 
   /// A structure that stores the output of a response call.
-  @available(iOS 26.0, macOS 26.0, *)
-  @available(tvOS, unavailable)
-  @available(watchOS, unavailable)
+  @available(iOS 15.0, macOS 12.0, macCatalyst 15.0, tvOS 15.0, watchOS 8.0, *)
   public struct Response<Content> {
     /// The response content.
     public let content: Content
diff --git a/FirebaseAI/Sources/Types/Public/Generable/ConvertibleFromModelOutput.swift b/FirebaseAI/Sources/Types/Public/Generable/ConvertibleFromModelOutput.swift
@@ -46,17 +46,21 @@ public protocol ConvertibleFromModelOutput: SendableMetatype {
   init(_ content: ModelOutput) throws
 }
 
-@available(iOS 26.0, macOS 26.0, *)
-@available(tvOS, unavailable)
-@available(watchOS, unavailable)
-extension FoundationModels.GeneratedContent: ConvertibleFromModelOutput {}
+#if canImport(FoundationModels)
+  @available(iOS 26.0, macOS 26.0, *)
+  @available(tvOS, unavailable)
+  @available(watchOS, unavailable)
+  extension FoundationModels.GeneratedContent: ConvertibleFromModelOutput {}
+#endif // canImport(FoundationModels)
 
-@available(iOS 26.0, macOS 26.0, *)
-@available(tvOS, unavailable)
-@available(watchOS, unavailable)
-public extension FoundationModels.ConvertibleFromGeneratedContent
-  where Self: ConvertibleFromModelOutput {
-  init(_ content: ModelOutput) throws {
-    try self.init(content.generatedContent)
+#if canImport(FoundationModels)
+  @available(iOS 26.0, macOS 26.0, *)
+  @available(tvOS, unavailable)
+  @available(watchOS, unavailable)
+  public extension FoundationModels.ConvertibleFromGeneratedContent
+    where Self: ConvertibleFromModelOutput {
+    init(_ content: ModelOutput) throws {
+      try self.init(content.generatedContent)
+    }
   }
-}
+#endif // canImport(FoundationModels)
diff --git a/FirebaseAI/Sources/Types/Public/Generable/ConvertibleToModelOutput.swift b/FirebaseAI/Sources/Types/Public/Generable/ConvertibleToModelOutput.swift
@@ -46,48 +46,54 @@ public protocol ConvertibleToModelOutput {
   var modelOutput: ModelOutput { get }
 }
 
-@available(iOS 26.0, macOS 26.0, *)
-@available(tvOS, unavailable)
-@available(watchOS, unavailable)
-extension FoundationModels.GeneratedContent: ConvertibleToModelOutput {
-  public var modelOutput: ModelOutput {
-    switch kind {
-    case .null:
-      return ModelOutput(kind: .null)
-    case let .bool(value):
-      return ModelOutput(kind: .bool(value))
-    case let .number(value):
-      return ModelOutput(kind: .number(value))
-    case let .string(value):
-      return ModelOutput(kind: .string(value))
-    case let .array(values):
-      return ModelOutput(kind: .array(values.map { $0.modelOutput }))
-    case let .structure(properties: properties, orderedKeys: orderedKeys):
-      return ModelOutput(kind: .structure(
-        properties: properties.mapValues { $0.modelOutput }, orderedKeys: orderedKeys
-      ))
-    @unknown default:
-      fatalError("Unsupported GeneratedContent kind: \(kind)")
+#if canImport(FoundationModels)
+  @available(iOS 26.0, macOS 26.0, *)
+  @available(tvOS, unavailable)
+  @available(watchOS, unavailable)
+  extension FoundationModels.GeneratedContent: ConvertibleToModelOutput {
+    public var modelOutput: ModelOutput {
+      switch kind {
+      case .null:
+        return ModelOutput(kind: .null)
+      case let .bool(value):
+        return ModelOutput(kind: .bool(value))
+      case let .number(value):
+        return ModelOutput(kind: .number(value))
+      case let .string(value):
+        return ModelOutput(kind: .string(value))
+      case let .array(values):
+        return ModelOutput(kind: .array(values.map { $0.modelOutput }))
+      case let .structure(properties: properties, orderedKeys: orderedKeys):
+        return ModelOutput(kind: .structure(
+          properties: properties.mapValues { $0.modelOutput }, orderedKeys: orderedKeys
+        ))
+      @unknown default:
+        fatalError("Unsupported GeneratedContent kind: \(kind)")
+      }
     }
   }
-}
+#endif // canImport(FoundationModels)
 
-@available(iOS 26.0, macOS 26.0, *)
-@available(tvOS, unavailable)
-@available(watchOS, unavailable)
-public extension FoundationModels.ConvertibleToGeneratedContent
-  where Self: ConvertibleToModelOutput {
-  var generatedContent: GeneratedContent {
-    modelOutput.generatedContent
+#if canImport(FoundationModels)
+  @available(iOS 26.0, macOS 26.0, *)
+  @available(tvOS, unavailable)
+  @available(watchOS, unavailable)
+  public extension FoundationModels.ConvertibleToGeneratedContent
+    where Self: ConvertibleToModelOutput {
+    var generatedContent: GeneratedContent {
+      modelOutput.generatedContent
+    }
   }
-}
+#endif // canImport(FoundationModels)
 
-@available(iOS 26.0, macOS 26.0, *)
-@available(tvOS, unavailable)
-@available(watchOS, unavailable)
-public extension ConvertibleToModelOutput
-  where Self: FoundationModels.ConvertibleToGeneratedContent {
-  var modelOutput: ModelOutput {
-    generatedContent.modelOutput
+#if canImport(FoundationModels)
+  @available(iOS 26.0, macOS 26.0, *)
+  @available(tvOS, unavailable)
+  @available(watchOS, unavailable)
+  public extension ConvertibleToModelOutput
+    where Self: FoundationModels.ConvertibleToGeneratedContent {
+    var modelOutput: ModelOutput {
+      generatedContent.modelOutput
+    }
   }
-}
+#endif // canImport(FoundationModels)
diff --git a/FirebaseAI/Sources/Types/Public/Generable/ModelOutput.swift b/FirebaseAI/Sources/Types/Public/Generable/ModelOutput.swift
@@ -257,52 +257,56 @@ public extension ModelOutput {
   }
 }
 
-@available(iOS 26.0, macOS 26.0, *)
-@available(tvOS, unavailable)
-@available(watchOS, unavailable)
-extension ModelOutput: FoundationModels.ConvertibleFromGeneratedContent {
-  public init(_ content: GeneratedContent) throws {
-    switch content.kind {
-    case .null:
-      self.init(kind: .null)
-    case let .bool(value):
-      self.init(kind: .bool(value))
-    case let .number(value):
-      self.init(kind: .number(value))
-    case let .string(value):
-      self.init(kind: .string(value))
-    case let .array(values):
-      self.init(kind: .array(values.map { $0.modelOutput }))
-    case let .structure(properties: properties, orderedKeys: orderedKeys):
-      self.init(kind: .structure(
-        properties: properties.mapValues { $0.modelOutput }, orderedKeys: orderedKeys
-      ))
-    @unknown default:
-      fatalError("Unsupported GeneratedContent kind: \(content.kind)")
+#if canImport(FoundationModels)
+  @available(iOS 26.0, macOS 26.0, *)
+  @available(tvOS, unavailable)
+  @available(watchOS, unavailable)
+  extension ModelOutput: FoundationModels.ConvertibleFromGeneratedContent {
+    public init(_ content: GeneratedContent) throws {
+      switch content.kind {
+      case .null:
+        self.init(kind: .null)
+      case let .bool(value):
+        self.init(kind: .bool(value))
+      case let .number(value):
+        self.init(kind: .number(value))
+      case let .string(value):
+        self.init(kind: .string(value))
+      case let .array(values):
+        self.init(kind: .array(values.map { $0.modelOutput }))
+      case let .structure(properties: properties, orderedKeys: orderedKeys):
+        self.init(kind: .structure(
+          properties: properties.mapValues { $0.modelOutput }, orderedKeys: orderedKeys
+        ))
+      @unknown default:
+        fatalError("Unsupported GeneratedContent kind: \(content.kind)")
+      }
     }
   }
-}
+#endif // canImport(FoundationModels)
 
-@available(iOS 26.0, macOS 26.0, *)
-@available(tvOS, unavailable)
-@available(watchOS, unavailable)
-extension ModelOutput: FoundationModels.ConvertibleToGeneratedContent {
-  public var generatedContent: GeneratedContent {
-    switch modelOutput.kind {
-    case .null:
-      return GeneratedContent(kind: .null)
-    case let .bool(value):
-      return GeneratedContent(kind: .bool(value))
-    case let .number(value):
-      return GeneratedContent(kind: .number(value))
-    case let .string(value):
-      return GeneratedContent(kind: .string(value))
-    case let .array(values):
-      return GeneratedContent(kind: .array(values.map { $0.generatedContent }))
-    case let .structure(properties: properties, orderedKeys: orderedKeys):
-      return GeneratedContent(kind: .structure(
-        properties: properties.mapValues { $0.generatedContent }, orderedKeys: orderedKeys
-      ))
+#if canImport(FoundationModels)
+  @available(iOS 26.0, macOS 26.0, *)
+  @available(tvOS, unavailable)
+  @available(watchOS, unavailable)
+  extension ModelOutput: FoundationModels.ConvertibleToGeneratedContent {
+    public var generatedContent: GeneratedContent {
+      switch modelOutput.kind {
+      case .null:
+        return GeneratedContent(kind: .null)
+      case let .bool(value):
+        return GeneratedContent(kind: .bool(value))
+      case let .number(value):
+        return GeneratedContent(kind: .number(value))
+      case let .string(value):
+        return GeneratedContent(kind: .string(value))
+      case let .array(values):
+        return GeneratedContent(kind: .array(values.map { $0.generatedContent }))
+      case let .structure(properties: properties, orderedKeys: orderedKeys):
+        return GeneratedContent(kind: .structure(
+          properties: properties.mapValues { $0.generatedContent }, orderedKeys: orderedKeys
+        ))
+      }
     }
   }
-}
+#endif // canImport(FoundationModels)
diff --git a/FirebaseAI/Tests/Unit/Types/Generable/GenerableTests.swift b/FirebaseAI/Tests/Unit/Types/Generable/GenerableTests.swift
