Skip to content
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.

Sign up for GitHub

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

[Infra] Fix-up import tests #11804

Merged
merged 3 commits into from
Sep 13, 2023
Merged

[Infra] Fix-up import tests #11804

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
57525f4
[Infra] Fix-up import tests
ncooke3 Sep 13, 2023
b25835f
Style
ncooke3 Sep 13, 2023
61c7ef8
Broaden client_app workflow trigger
ncooke3 Sep 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/client_app.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
- "*.podspec"
- "scripts/install_prereqs.sh"
- "scripts/build.sh"
- "ClientApp/*"
- "ClientApp/**"
- "Gemfile*"
schedule:
# Run every day at 12am (PST) - cron uses UTC times
Expand Down
8 changes: 3 additions & 5 deletions ClientApp/Shared/objc-header-import-test.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,17 +42,15 @@
#import "FirebaseDynamicLinks/FirebaseDynamicLinks.h"
#endif
#import <FirebaseFirestore/FirebaseFirestore.h>
#import "FirebaseFirestore/FirebaseFirestore.h"
#if (TARGET_OS_IOS || TARGET_OS_TV) && !TARGET_OS_MACCATALYST
#import <FirebaseInAppMessaging/FirebaseInAppMessaging.h>
#import "FirebaseInAppMessaging/FirebaseInAppMessaging.h"
#endif
#import <FirebaseInstallations/FirebaseInstallations.h>
#import <FirebaseMessaging/FirebaseMessaging.h>
#import "FirebaseFirestore/FirebaseFirestore.h"
#import "FirebaseInstallations/FirebaseInstallations.h"
#import "FirebaseMessaging/FirebaseMessaging.h"
#if (TARGET_OS_IOS && !TARGET_OS_MACCATALYST) || TARGET_OS_TV
#import <FirebaseInAppMessaging/FirebaseInAppMessaging.h>
#import <FirebasePerformance/FirebasePerformance.h>
#import "FirebaseInAppMessaging/FirebaseInAppMessaging.h"
#import "FirebasePerformance/FirebasePerformance.h"
#endif
#import <FirebaseRemoteConfig/FirebaseRemoteConfig.h>
Expand Down
4 changes: 1 addition & 3 deletions ClientApp/Shared/objc-module-import-test.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,11 @@
#endif
@import FirebaseFirestore;
@import FirebaseFunctions;
#if (TARGET_OS_IOS || TARGET_OS_TV) && !TARGET_OS_MACCATALYST
@import FirebaseInAppMessaging;
#endif
@import FirebaseInstallations;
@import FirebaseMessaging;
#if (TARGET_OS_IOS && !TARGET_OS_MACCATALYST) || TARGET_OS_TV
@import FirebasePerformance;
@import FirebaseInAppMessaging;
#endif
@import FirebaseRemoteConfig;
@import FirebaseStorage;
6 changes: 2 additions & 4 deletions ClientApp/Shared/objcxx-header-import-test.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,17 +44,15 @@
// #endif
// #import <FirebaseFirestore/FirebaseFirestore.h>
// #import "FirebaseFirestore/FirebaseFirestore.h"
// #if (TARGET_OS_IOS || TARGET_OS_TV) && !TARGET_OS_MACCATALYST
// #import <FirebaseInAppMessaging/FirebaseInAppMessaging.h>
// #import "FirebaseInAppMessaging/FirebaseInAppMessaging.h"
// #endif
// #import <FirebaseInstallations/FirebaseInstallations.h>
// #import <FirebaseMessaging/FirebaseMessaging.h>
// #import "FirebaseInstallations/FirebaseInstallations.h"
// #import "FirebaseMessaging/FirebaseMessaging.h"
// #if (TARGET_OS_IOS && !TARGET_OS_MACCATALYST) || TARGET_OS_TV
// #import <FirebasePerformance/FirebasePerformance.h>
// #import "FirebasePerformance/FirebasePerformance.h"
// #import <FirebaseInAppMessaging/FirebaseInAppMessaging.h>
// #import "FirebaseInAppMessaging/FirebaseInAppMessaging.h"
// #endif
// #import <FirebaseRemoteConfig/FirebaseRemoteConfig.h>
// #import "FirebaseRemoteConfig/FirebaseRemoteConfig.h"
4 changes: 1 addition & 3 deletions ClientApp/Shared/objcxx-module-import-test.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,11 @@
// #endif
// @import FirebaseFirestore;
// @import FirebaseFunctions;
// #if (TARGET_OS_IOS || TARGET_OS_TV) && !TARGET_OS_MACCATALYST
// @import FirebaseInAppMessaging;
// #endif
// @import FirebaseInstallations;
// @import FirebaseMessaging;
// #if (TARGET_OS_IOS && !TARGET_OS_MACCATALYST) || TARGET_OS_TV
// @import FirebasePerformance;
// @import FirebaseInAppMessaging;
// #endif
// @import FirebaseRemoteConfig;
// @import FirebaseStorage;
6 changes: 2 additions & 4 deletions ClientApp/Shared/swift-import-test.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,15 +46,13 @@ import FirebaseFunctions
#if SWIFT_PACKAGE
import FirebaseFunctionsCombineSwift
#endif // SWIFT_PACKAGE
#if (os(iOS) || os(tvOS)) && !targetEnvironment(macCatalyst)
import FirebaseInAppMessaging
import FirebaseInAppMessagingSwift
#endif
import FirebaseInstallations
import FirebaseMessaging
import FirebaseMLModelDownloader
#if (os(iOS) && !targetEnvironment(macCatalyst)) || os(tvOS)
import FirebasePerformance
import FirebaseInAppMessaging
import FirebaseInAppMessagingSwift
#endif
import FirebaseRemoteConfig
import FirebaseRemoteConfigSwift
Expand Down
4 changes: 1 addition & 3 deletions SwiftPMTests/objc-import-test/objc-header.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,10 @@
#import "FirebaseDatabase/FirebaseDatabase.h"
#import "FirebaseDynamicLinks/FirebaseDynamicLinks.h"
#import "FirebaseFirestore/FirebaseFirestore.h"
#if TARGET_OS_IOS || TARGET_OS_TV
#import "FirebaseInAppMessaging/FirebaseInAppMessaging.h"
#endif
#import "FirebaseInstallations/FirebaseInstallations.h"
#import "FirebaseMessaging/FirebaseMessaging.h"
#if (TARGET_OS_IOS && !TARGET_OS_MACCATALYST) || TARGET_OS_TV
#import "FirebaseInAppMessaging/FirebaseInAppMessaging.h"
#import "FirebasePerformance/FirebasePerformance.h"
#endif
#import "FirebaseRemoteConfig/FirebaseRemoteConfig.h"
Expand Down
4 changes: 1 addition & 3 deletions SwiftPMTests/objc-import-test/objc-module.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,10 @@
@import FirebaseDynamicLinks;
@import FirebaseFirestore;
@import FirebaseFunctions;
#if TARGET_OS_IOS || TARGET_OS_TV
@import FirebaseInAppMessaging;
#endif
@import FirebaseInstallations;
@import FirebaseMessaging;
#if (TARGET_OS_IOS && !TARGET_OS_MACCATALYST) || TARGET_OS_TV
@import FirebaseInAppMessaging;
@import FirebasePerformance;
#endif
@import FirebaseRemoteConfig;
Expand Down
9 changes: 4 additions & 5 deletions SwiftPMTests/swift-test/all-imports.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,14 @@ import FirebaseDynamicLinks
import FirebaseFirestore
import FirebaseFirestoreSwift
import FirebaseFunctions
#if (os(iOS) || os(tvOS)) && !targetEnvironment(macCatalyst)
import FirebaseInAppMessaging
@testable import FirebaseInAppMessagingSwift
import SwiftUI
#endif
import FirebaseInstallations
import FirebaseMessaging
#if (os(iOS) && !targetEnvironment(macCatalyst)) || os(tvOS)
import FirebasePerformance

import FirebaseInAppMessaging
@testable import FirebaseInAppMessagingSwift
import SwiftUI
#endif
import FirebaseRemoteConfig
import FirebaseSessions
Expand Down
Loading