From 03b5dcf59f1f97ffa7a4c8a051f83b9b2cdd97ad Mon Sep 17 00:00:00 2001 From: Andrew Heard Date: Tue, 6 Feb 2024 12:32:05 -0500 Subject: [PATCH] Fix build in Xcode 14 / Swift 5.7.1 (#104) --- Sources/GoogleAI/GenerateContentRequest.swift | 4 ++-- Tests/GoogleAITests/ChatTests.swift | 2 +- Tests/GoogleAITests/GenerativeModelTests.swift | 2 +- Tests/GoogleAITests/MockURLProtocol.swift | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Sources/GoogleAI/GenerateContentRequest.swift b/Sources/GoogleAI/GenerateContentRequest.swift index 4421eb8..fa63f82 100644 --- a/Sources/GoogleAI/GenerateContentRequest.swift +++ b/Sources/GoogleAI/GenerateContentRequest.swift @@ -40,9 +40,9 @@ extension GenerateContentRequest: GenerativeAIRequest { var url: URL { if isStreaming { - URL(string: "\(GenerativeAISwift.baseURL)/\(model):streamGenerateContent?alt=sse")! + return URL(string: "\(GenerativeAISwift.baseURL)/\(model):streamGenerateContent?alt=sse")! } else { - URL(string: "\(GenerativeAISwift.baseURL)/\(model):generateContent")! + return URL(string: "\(GenerativeAISwift.baseURL)/\(model):generateContent")! } } } diff --git a/Tests/GoogleAITests/ChatTests.swift b/Tests/GoogleAITests/ChatTests.swift index 4020d4b..668e370 100644 --- a/Tests/GoogleAITests/ChatTests.swift +++ b/Tests/GoogleAITests/ChatTests.swift @@ -16,7 +16,7 @@ import Foundation @testable import GoogleGenerativeAI import XCTest -@available(iOS 15.0, tvOS 15.0, *) +@available(iOS 15.0, macOS 12.0, macCatalyst 15.0, *) final class ChatTests: XCTestCase { var urlSession: URLSession! diff --git a/Tests/GoogleAITests/GenerativeModelTests.swift b/Tests/GoogleAITests/GenerativeModelTests.swift index 142341b..6a91f52 100644 --- a/Tests/GoogleAITests/GenerativeModelTests.swift +++ b/Tests/GoogleAITests/GenerativeModelTests.swift @@ -15,7 +15,7 @@ @testable import GoogleGenerativeAI import XCTest -@available(iOS 15.0, tvOS 15.0, *) +@available(iOS 15.0, macOS 12.0, macCatalyst 15.0, *) final class GenerativeModelTests: XCTestCase { let testPrompt = "What sorts of questions can I ask you?" let safetyRatingsNegligible: [SafetyRating] = [ diff --git a/Tests/GoogleAITests/MockURLProtocol.swift b/Tests/GoogleAITests/MockURLProtocol.swift index 515fd98..30528cd 100644 --- a/Tests/GoogleAITests/MockURLProtocol.swift +++ b/Tests/GoogleAITests/MockURLProtocol.swift @@ -15,7 +15,7 @@ import Foundation import XCTest -@available(iOS 15.0, tvOS 15.0, *) +@available(iOS 15.0, macOS 12.0, macCatalyst 15.0, *) class MockURLProtocol: URLProtocol { static var requestHandler: ((URLRequest) throws -> ( URLResponse,