Skip to content

[Infra] Enable internal imports by default for SPM #15094

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 15 commits into
base: main
Choose a base branch
from
2 changes: 1 addition & 1 deletion FirebaseAI/Sources/AILog.swift
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
import Foundation
import os.log

internal import FirebaseCoreExtension
import FirebaseCoreExtension

enum AILog {
/// Log message codes for the Firebase AI SDK
Expand Down
5 changes: 2 additions & 3 deletions FirebaseAI/Sources/FirebaseAI.swift
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,10 @@

import FirebaseAppCheckInterop
import FirebaseAuthInterop
import FirebaseCore
import FirebaseCoreExtension
import Foundation

// Avoids exposing internal FirebaseCore APIs to Swift users.
internal import FirebaseCoreExtension
public import FirebaseCore

/// The Firebase AI 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, *)
Expand Down
2 changes: 1 addition & 1 deletion FirebaseAI/Sources/GenerateContentResponse.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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, *)
Expand Down
2 changes: 1 addition & 1 deletion FirebaseAI/Sources/GenerativeAIRequest.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
9 changes: 7 additions & 2 deletions FirebaseAI/Sources/PartsRepresentable+Image.swift
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,16 @@
// 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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.
///
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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, *)
Expand Down
2 changes: 1 addition & 1 deletion FirebaseAI/Sources/Types/Public/Part.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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.
///
Expand Down
2 changes: 1 addition & 1 deletion FirebaseAI/Tests/Unit/VertexComponentTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
// limitations under the License.

@preconcurrency import FirebaseCore
internal import FirebaseCoreExtension
import FirebaseCoreExtension
import Foundation
import XCTest

Expand Down
2 changes: 1 addition & 1 deletion FirebaseAppDistributionInternal/Sources/ApiService.swift
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import FirebaseInstallations
import Foundation
import UIKit

internal import FirebaseCoreInternal
import FirebaseCoreInternal

enum Strings {
static let errorDomain = "com.firebase.appdistribution.api"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

import Foundation

internal import FirebaseCoreExtension
import FirebaseCoreExtension

///
/// Logger is responsible for printing console logs
Expand Down
2 changes: 1 addition & 1 deletion FirebaseAuth/Sources/Swift/ActionCode/ActionCodeInfo.swift
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

import Foundation
public import Foundation

// TODO(Swift 6 Breaking): This type is immutable. Consider removing `open` at
// breaking change so checked Sendable can be used.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
// limitations under the License.

import FirebaseCoreInternal
import Foundation
public import Foundation

// TODO(Swift 6 Breaking): Consider breaking up into a checked Sendable Swift
// type and unchecked Sendable ObjC wrapper class.
Expand Down
2 changes: 1 addition & 1 deletion FirebaseAuth/Sources/Swift/ActionCode/ActionCodeURL.swift
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

import Foundation
public import Foundation

// TODO(Swift 6 Breaking): This type is immutable. Consider removing `open` at
// breaking change so checked Sendable can be used.
Expand Down
14 changes: 7 additions & 7 deletions FirebaseAuth/Sources/Swift/Auth/Auth.swift
Original file line number Diff line number Diff line change
Expand Up @@ -15,23 +15,23 @@
import Foundation

import FirebaseAppCheckInterop
import FirebaseAuthInterop
import FirebaseCore
public import FirebaseAuthInterop
public import FirebaseCore
import FirebaseCoreExtension
#if COCOAPODS
internal import GoogleUtilities
import GoogleUtilities
#else
internal import GoogleUtilities_AppDelegateSwizzler
internal import GoogleUtilities_Environment
import GoogleUtilities_AppDelegateSwizzler
import GoogleUtilities_Environment
#endif

#if os(iOS) || os(tvOS) || targetEnvironment(macCatalyst)
import UIKit
public import UIKit

Check warning on line 29 in FirebaseAuth/Sources/Swift/Auth/Auth.swift

View workflow job for this annotation

GitHub Actions / spm / spm (macos-15, Xcode_16.4, tvOS)

public import of 'UIKit' was not used in public declarations or inlinable code

Check warning on line 29 in FirebaseAuth/Sources/Swift/Auth/Auth.swift

View workflow job for this annotation

GitHub Actions / spm / spm (macos-15, Xcode_16.4, tvOS)

public import of 'UIKit' was not used in public declarations or inlinable code

Check warning on line 29 in FirebaseAuth/Sources/Swift/Auth/Auth.swift

View workflow job for this annotation

GitHub Actions / spm / spm (macos-15, Xcode_16.4, tvOS)

public import of 'UIKit' was not used in public declarations or inlinable code

Check warning on line 29 in FirebaseAuth/Sources/Swift/Auth/Auth.swift

View workflow job for this annotation

GitHub Actions / spm / spm (macos-15, Xcode_16.4, tvOS)

public import of 'UIKit' was not used in public declarations or inlinable code

Check warning on line 29 in FirebaseAuth/Sources/Swift/Auth/Auth.swift

View workflow job for this annotation

GitHub Actions / spm / spm (macos-15, Xcode_16.4, tvOS)

public import of 'UIKit' was not used in public declarations or inlinable code

Check warning on line 29 in FirebaseAuth/Sources/Swift/Auth/Auth.swift

View workflow job for this annotation

GitHub Actions / spm / spm (macos-15, Xcode_16.4, tvOS)

public import of 'UIKit' was not used in public declarations or inlinable code

Check warning on line 29 in FirebaseAuth/Sources/Swift/Auth/Auth.swift

View workflow job for this annotation

GitHub Actions / spm / spm (macos-15, Xcode_16.4, tvOS)

public import of 'UIKit' was not used in public declarations or inlinable code

Check warning on line 29 in FirebaseAuth/Sources/Swift/Auth/Auth.swift

View workflow job for this annotation

GitHub Actions / spm / spm (macos-15, Xcode_16.4, tvOS)

public import of 'UIKit' was not used in public declarations or inlinable code

Check warning on line 29 in FirebaseAuth/Sources/Swift/Auth/Auth.swift

View workflow job for this annotation

GitHub Actions / spm / spm (macos-15, Xcode_16.4, tvOS)

public import of 'UIKit' was not used in public declarations or inlinable code

Check warning on line 29 in FirebaseAuth/Sources/Swift/Auth/Auth.swift

View workflow job for this annotation

GitHub Actions / spm / spm (macos-15, Xcode_16.4, tvOS)

public import of 'UIKit' was not used in public declarations or inlinable code
#endif

// Export the deprecated Objective-C defined globals and typedefs.
#if SWIFT_PACKAGE
@_exported import FirebaseAuthInternal
@_exported public import FirebaseAuthInternal
#endif // SWIFT_PACKAGE

#if os(iOS)
Expand Down
2 changes: 1 addition & 1 deletion FirebaseAuth/Sources/Swift/Auth/AuthDataResult.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *)
extension AuthDataResult: NSSecureCoding {}
Expand Down
2 changes: 1 addition & 1 deletion FirebaseAuth/Sources/Swift/Auth/AuthSettings.swift
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

import Foundation
public import Foundation

/// Determines settings related to an auth object.
@objc(FIRAuthSettings) open class AuthSettings: NSObject, NSCopying {
Expand Down
2 changes: 1 addition & 1 deletion FirebaseAuth/Sources/Swift/Auth/AuthTokenResult.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *)
extension AuthTokenResult: NSSecureCoding {}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

import Foundation
public import Foundation

/// Public representation of a credential.
@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

import Foundation
public import Foundation

/// A concrete implementation of `AuthProvider` for Email & Password Sign In.
@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

import Foundation
public import Foundation

/// Utility class for constructing Facebook Sign In credentials.
@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

import Foundation
public import Foundation

/// Utility type for constructing federated auth provider credentials.
@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
// limitations under the License.

#if !os(watchOS)
import Foundation
public import Foundation
import GameKit

// TODO: Delete this when minimum iOS version passes 13.5.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

import Foundation
public import Foundation

/// Utility class for constructing GitHub Sign In credentials.
@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

import Foundation
public import Foundation

/// Utility class for constructing Google Sign In credentials.
@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

import Foundation
public import Foundation

/// Internal implementation of `AuthCredential` for generic credentials.
@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
// limitations under the License.

import CommonCrypto
import Foundation
public import Foundation

/// Utility class for constructing OAuth Sign In credentials.
@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

import Foundation
public import Foundation

/// Implementation of AuthCredential for Phone Auth credentials.
///
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
// limitations under the License.

import FirebaseCore
import Foundation

// TODO(Swift 6 Breaking): Make checked Sendable.

Expand All @@ -21,7 +20,7 @@
///
/// This class is available on iOS only.
@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *)
@objc(FIRPhoneAuthProvider) open class PhoneAuthProvider: NSObject, @unchecked Sendable {

Check failure on line 23 in FirebaseAuth/Sources/Swift/AuthProvider/PhoneAuthProvider.swift

View workflow job for this annotation

GitHub Actions / client-app-spm (iOS, ClientApp, macos-14)

class cannot be declared open because its superclass is internal

Check failure on line 23 in FirebaseAuth/Sources/Swift/AuthProvider/PhoneAuthProvider.swift

View workflow job for this annotation

GitHub Actions / client-app-spm (iOS, ClientApp, macos-14)

class cannot be declared open because its superclass is internal

Check failure on line 23 in FirebaseAuth/Sources/Swift/AuthProvider/PhoneAuthProvider.swift

View workflow job for this annotation

GitHub Actions / iOS-Device (macos-14, Xcode_16.2)

class cannot be declared open because its superclass is internal

Check failure on line 23 in FirebaseAuth/Sources/Swift/AuthProvider/PhoneAuthProvider.swift

View workflow job for this annotation

GitHub Actions / iOS-Device (macos-14, Xcode_16.2)

class cannot be declared open because its superclass is internal

Check failure on line 23 in FirebaseAuth/Sources/Swift/AuthProvider/PhoneAuthProvider.swift

View workflow job for this annotation

GitHub Actions / platforms (tvOS)

class cannot be declared open because its superclass is internal

Check failure on line 23 in FirebaseAuth/Sources/Swift/AuthProvider/PhoneAuthProvider.swift

View workflow job for this annotation

GitHub Actions / platforms (tvOS)

class cannot be declared open because its superclass is internal

Check failure on line 23 in FirebaseAuth/Sources/Swift/AuthProvider/PhoneAuthProvider.swift

View workflow job for this annotation

GitHub Actions / platforms (macOS)

class cannot be declared open because its superclass is internal

Check failure on line 23 in FirebaseAuth/Sources/Swift/AuthProvider/PhoneAuthProvider.swift

View workflow job for this annotation

GitHub Actions / platforms (macOS)

class cannot be declared open because its superclass is internal

Check failure on line 23 in FirebaseAuth/Sources/Swift/AuthProvider/PhoneAuthProvider.swift

View workflow job for this annotation

GitHub Actions / client-app-spm-source-firestore (iOS, ClientApp, macos-15)

class cannot be declared open because its superclass is internal

Check failure on line 23 in FirebaseAuth/Sources/Swift/AuthProvider/PhoneAuthProvider.swift

View workflow job for this annotation

GitHub Actions / client-app-spm-source-firestore (iOS, ClientApp, macos-15)

class cannot be declared open because its superclass is internal

Check failure on line 23 in FirebaseAuth/Sources/Swift/AuthProvider/PhoneAuthProvider.swift

View workflow job for this annotation

GitHub Actions / spm / spm (macos-14, Xcode_16.2, iOS)

class cannot be declared open because its superclass is internal

Check failure on line 23 in FirebaseAuth/Sources/Swift/AuthProvider/PhoneAuthProvider.swift

View workflow job for this annotation

GitHub Actions / spm / spm (macos-14, Xcode_16.2, iOS)

class cannot be declared open because its superclass is internal

Check failure on line 23 in FirebaseAuth/Sources/Swift/AuthProvider/PhoneAuthProvider.swift

View workflow job for this annotation

GitHub Actions / spm / spm (macos-14, Xcode_16.2, iOS)

class cannot be declared open because its superclass is internal

Check failure on line 23 in FirebaseAuth/Sources/Swift/AuthProvider/PhoneAuthProvider.swift

View workflow job for this annotation

GitHub Actions / swift-build-run (macos-14, Xcode_16.2, spm)

class cannot be declared open because its superclass is internal

Check failure on line 23 in FirebaseAuth/Sources/Swift/AuthProvider/PhoneAuthProvider.swift

View workflow job for this annotation

GitHub Actions / swift-build-run (macos-14, Xcode_16.2, spm)

class cannot be declared open because its superclass is internal
/// A string constant identifying the phone identity provider.
@objc public static let id = "phone"
private static let recaptchaVersion = "RECAPTCHA_ENTERPRISE"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

import Foundation
public import Foundation

/// Utility class for constructing Twitter Sign In credentials.
@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *)
Expand Down
2 changes: 1 addition & 1 deletion FirebaseAuth/Sources/Swift/MultiFactor/MultiFactor.swift
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.

import Foundation

#if os(iOS)
public import Foundation

@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *)
extension MultiFactor: NSSecureCoding {}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.

import Foundation

#if os(iOS)
public import Foundation

/// The base class for asserting ownership of a second factor. This is equivalent to the
/// AuthCredential class.
Expand Down
4 changes: 2 additions & 2 deletions FirebaseAuth/Sources/Swift/MultiFactor/MultiFactorInfo.swift
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.

import Foundation

// TODO(Swift 6 Breaking): Make checked Sendable.

#if os(iOS)
public import Foundation

extension MultiFactorInfo: NSSecureCoding {}

/// Safe public structure used to represent a second factor entity from a client perspective.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.

import Foundation

#if os(iOS)
public import Foundation

/// The subclass of base class `MultiFactorAssertion`, used to assert ownership of a phone
/// second factor.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.

import Foundation

#if os(iOS)
public import Foundation

/// Opaque object that identifies the current session to enroll a second factor or to
/// complete sign in when previously enrolled.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.

import Foundation

#if os(iOS)
public import Foundation

/// The data structure used to help initialize an assertion for a second factor entity to the
/// Firebase Auth/CICP server.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.

import Foundation

// TODO(Swift 6 Breaking): Make checked Sendable.

#if os(iOS)
public import Foundation

/// Extends the MultiFactorInfo class for phone number second factors.
///
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.

import Foundation

#if os(iOS)
public import Foundation

/// The data structure used to help initialize an assertion for a second factor entity to the
/// Firebase Auth/CICP server. Depending on the type of second factor, this will help generate
Expand Down
Loading
Loading