[Vertex AI] Enable AccessLevelOnImport and InternalImportsByDefault

FirebaseVertexAI.podspec

@@ -49,6 +49,10 @@ Firebase SDK.
   s.dependency 'FirebaseCore', '~> 11.12.0'
   s.dependency 'FirebaseCoreExtension', '~> 11.12.0'
 
+  s.pod_target_xcconfig = {
+    'SWIFT_UPCOMING_FEATURE_INTERNAL_IMPORTS_BY_DEFAULT' => 'YES',
+  }
+
   s.test_spec 'unit' do |unit_tests|
     unit_tests_dir = 'FirebaseVertexAI/Tests/Unit/'
     unit_tests.scheme = { :code_coverage => true }

FirebaseVertexAI/Sources/GenerateContentResponse.swift

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import Foundation
+public import Foundation
 
 /// The model's response to a generate content request.
 @available(iOS 15.0, macOS 12.0, macCatalyst 15.0, tvOS 15.0, watchOS 8.0, *)

FirebaseVertexAI/Sources/GenerativeAIRequest.swift

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import Foundation
+public import Foundation
 
 @available(iOS 15.0, macOS 12.0, macCatalyst 15.0, tvOS 15.0, watchOS 8.0, *)
 protocol GenerativeAIRequest: Sendable, Encodable {

FirebaseVertexAI/Sources/PartsRepresentable+Image.swift

@@ -12,11 +12,17 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+import CoreGraphics
 import UniformTypeIdentifiers
+
 #if canImport(UIKit)
-  import UIKit // For UIImage extensions.
+  public import UIKit // For UIImage extensions.
 #elseif canImport(AppKit)
-  import AppKit // For NSImage extensions.
+  public import AppKit // For NSImage extensions.
+#endif
+
+#if canImport(CoreImage)
+  import CoreImage
 #endif
 
 private let imageCompressionQuality: CGFloat = 0.8

FirebaseVertexAI/Sources/Types/Public/Imagen/ImagenImagesBlockedError.swift

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import Foundation
+public import Foundation
 
 /// An error that occurs when image generation fails due to all generated images being blocked.
 ///

FirebaseVertexAI/Sources/Types/Public/Imagen/ImagenInlineImage.swift

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import Foundation
+public import Foundation
 
 /// An image generated by Imagen, represented as inline data.
 @available(iOS 15.0, macOS 12.0, macCatalyst 15.0, tvOS 15.0, watchOS 8.0, *)

FirebaseVertexAI/Sources/Types/Public/Part.swift

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import Foundation
+public import Foundation
 
 /// A discrete piece of data in a media format interpretable by an AI model.
 ///

FirebaseVertexAI/Sources/VertexAI.swift

@@ -14,11 +14,10 @@
 
 import FirebaseAppCheckInterop
 import FirebaseAuthInterop
-import FirebaseCore
+import FirebaseCoreExtension
 import Foundation
 
-// Avoids exposing internal FirebaseCore APIs to Swift users.
-@_implementationOnly import FirebaseCoreExtension
+public import FirebaseCore
 
 /// The Vertex AI for Firebase SDK provides access to Gemini models directly from your app.
 @available(iOS 15.0, macOS 12.0, macCatalyst 15.0, tvOS 15.0, watchOS 8.0, *)

FirebaseVertexAI/Sources/VertexLog.swift

@@ -12,11 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+import FirebaseCoreExtension
 import Foundation
 import os.log
 
-@_implementationOnly import FirebaseCoreExtension
-
 enum VertexLog {
   /// Log message codes for the Vertex AI SDK
   ///

FirebaseVertexAI/Tests/Unit/GenerativeModelTests.swift

@@ -15,9 +15,10 @@
 import FirebaseAppCheckInterop
 import FirebaseAuthInterop
 import FirebaseCore
+import FirebaseVertexAI
 import XCTest
 
-@testable import FirebaseVertexAI
+@testable import struct FirebaseVertexAI.APIConfig
 
 @available(iOS 15.0, macOS 12.0, macCatalyst 15.0, tvOS 15.0, watchOS 8.0, *)
 final class GenerativeModelTests: XCTestCase {
@@ -1689,9 +1690,8 @@
 struct AppCheckErrorFake: Error {}
 
 @available(iOS 15.0, macOS 12.0, macCatalyst 15.0, tvOS 15.0, watchOS 8.0, *)
 extension SafetyRating: Swift.Comparable {
-  public static func < (lhs: FirebaseVertexAI.SafetyRating,
-                        rhs: FirebaseVertexAI.SafetyRating) -> Bool {
+  public static func < (lhs: SafetyRating, rhs: SafetyRating) -> Bool {
     return lhs.category.rawValue < rhs.category.rawValue
   }
 }

FirebaseVertexAI/Tests/Unit/VertexComponentTests.swift

@@ -13,12 +13,12 @@
 // limitations under the License.
 
 @preconcurrency import FirebaseCore
+import FirebaseCoreExtension
+import FirebaseVertexAI
 import Foundation
 import XCTest
 
-@_implementationOnly import FirebaseCoreExtension
-
-@testable import FirebaseVertexAI
+@testable import struct FirebaseVertexAI.APIConfig
 
 @available(iOS 15.0, macOS 12.0, macCatalyst 15.0, tvOS 15.0, watchOS 8.0, *)
 class VertexComponentTests: XCTestCase {

Package.swift

@@ -1308,7 +1308,10 @@ let package = Package(
         "FirebaseCore",
         "FirebaseCoreExtension",
       ],
-      path: "FirebaseVertexAI/Sources"
+      path: "FirebaseVertexAI/Sources",
+      swiftSettings: [
+        .enableUpcomingFeature("InternalImportsByDefault"),
+      ]
     ),
     .testTarget(
       name: "FirebaseVertexAIUnit",
@@ -1323,6 +1326,9 @@ let package = Package(
       ],
       cSettings: [
         .headerSearchPath("../../../"),
+      ],
+      swiftSettings: [
+        .enableUpcomingFeature("InternalImportsByDefault"),
       ]
     ),
   ] + firestoreTargets(),

scripts/check_imports.swift

@@ -84,7 +84,11 @@ private func checkFile(_ file: String, logger: ErrorLogger, inRepo repoURL: URL,
     // Swift specific checks.
     fileContents.components(separatedBy: .newlines)
       .enumerated() // [(lineNum, line), ...]
-      .filter { $1.starts(with: "import FirebaseCoreExtension") }
+      .filter {
+        $1.starts(with: "import FirebaseCoreExtension")
+          /* FirebaseVertexAI is using `InternalImportsByDefault` so its files are not checked. */
+          && !file.contains("FirebaseVertexAI")
+      }
       .forEach { lineNum, line in
         logger
           .importLog(