From be378720856c19909d9d3b764bde89b5029498ad Mon Sep 17 00:00:00 2001 From: Paul Beusterien Date: Fri, 12 Jun 2020 15:46:58 -0700 Subject: [PATCH 01/22] Update GoogleUtilities clients for repo-relative --- .../FIRCDLibrary/FIRCoreDiagnostics.m | 6 +++--- Firebase/InstanceID/FIRInstanceID.m | 4 ++-- .../FIRInstanceIDCheckinPreferences.m | 2 +- Firebase/InstanceID/FIRInstanceIDUtilities.m | 2 +- .../Sources/FIRAppDistribution.m | 2 +- FirebaseAuth/Sources/Auth/FIRAuth.m | 6 +++--- .../SystemService/FIRAuthAPNSTokenManager.m | 2 +- .../Utilities/FIRAuthDefaultUIDelegate.m | 2 +- FirebaseAuth/Tests/Unit/FIRAuthTests.m | 2 +- FirebaseCore/Sources/FIRApp.m | 2 +- FirebaseCore/Sources/FIRBundleUtil.m | 4 +++- FirebaseCore/Sources/FIRHeartbeatInfo.m | 4 ++-- FirebaseCore/Sources/FIRLogger.m | 4 ++-- FirebaseCore/Tests/Unit/FIRAppTest.m | 2 +- FirebaseCore/Tests/Unit/FIRBundleUtilTest.m | 2 +- FirebaseCore/Tests/Unit/FIRHeartbeatInfoTest.m | 2 +- FirebaseCore/Tests/Unit/FIRLoggerTest.m | 2 +- .../Tests/Unit/FIRDynamicLinkNetworkingTests.m | 4 ++-- .../Tests/Unit/FIRDynamicLinksTest.m | 4 ++-- .../Runtime/FIRInAppMessaging+Bootstrap.m | 2 +- .../FIRInstallationsIIDTokenStore.m | 2 +- .../FIRInstallationsIDController.m | 2 +- .../InstallationsStore/FIRInstallationsStore.m | 4 ++-- .../Tests/Unit/FIRInstallationsStoreTests.m | 4 ++-- FirebaseMessaging/Sources/FIRMessaging.m | 6 +++--- .../Sources/FIRMessagingAnalytics.m | 4 ++-- FirebaseMessaging/Sources/FIRMessagingClient.m | 2 +- .../FIRMessagingContextManagerService.m | 2 +- FirebaseMessaging/Sources/FIRMessagingPubSub.m | 4 ++-- .../FIRMessagingRemoteNotificationsProxy.m | 2 +- .../Sources/FIRMessagingUtilities.m | 2 +- .../Tests/UnitTests/FIRInstanceIDWithFCMTest.m | 2 +- .../Tests/UnitTests/FIRMessagingClientTest.m | 2 +- .../Tests/UnitTests/FIRMessagingHandlingTest.m | 2 +- .../UnitTests/FIRMessagingLinkHandlingTest.m | 2 +- .../Tests/UnitTests/FIRMessagingPubSubTest.m | 2 +- .../FIRMessagingRemoteNotificationsProxyTest.m | 2 +- .../Tests/UnitTests/FIRMessagingServiceTest.m | 2 +- .../Tests/UnitTests/FIRMessagingTest.m | 2 +- .../UnitTests/FIRMessagingTestUtilities.m | 2 +- .../Sources/RCNConfigSettings.m | 2 +- FirebaseRemoteConfig/Sources/RCNDevice.m | 2 +- FirebaseRemoteConfig/Sources/RCNFetch.m | 2 +- .../Tests/Unit/RCNInstanceIDTest.m | 2 +- .../Tests/Unit/RCNRemoteConfigTest.m | 2 +- .../third_party/GULAppEnvironmentUtil.h | 11 +++++++++++ scripts/change_headers.swift | 18 ++++++++++++++---- 47 files changed, 87 insertions(+), 64 deletions(-) diff --git a/Firebase/CoreDiagnostics/FIRCDLibrary/FIRCoreDiagnostics.m b/Firebase/CoreDiagnostics/FIRCDLibrary/FIRCoreDiagnostics.m index 2db7db83980..a7aaaf4a54b 100644 --- a/Firebase/CoreDiagnostics/FIRCDLibrary/FIRCoreDiagnostics.m +++ b/Firebase/CoreDiagnostics/FIRCDLibrary/FIRCoreDiagnostics.m @@ -22,9 +22,9 @@ #import #import -#import -#import -#import +#import "GoogleUtilities/Environment/third_party/GULAppEnvironmentUtil.h" +#import "GoogleUtilities/Environment/Public/GULHeartbeatDateStorage.h" +#import "GoogleUtilities/Logger/Private/GULLogger.h" #import "Interop/CoreDiagnostics/Public/FIRCoreDiagnosticsData.h" #import "Interop/CoreDiagnostics/Public/FIRCoreDiagnosticsInterop.h" diff --git a/Firebase/InstanceID/FIRInstanceID.m b/Firebase/InstanceID/FIRInstanceID.m index 1fcc4203c62..7dc4ad6ead6 100644 --- a/Firebase/InstanceID/FIRInstanceID.m +++ b/Firebase/InstanceID/FIRInstanceID.m @@ -18,8 +18,8 @@ #import -#import -#import +#import "GoogleUtilities/Environment/third_party/GULAppEnvironmentUtil.h" +#import "GoogleUtilities/UserDefaults/Private/GULUserDefaults.h" #import "FIRInstanceID+Private.h" #import "FIRInstanceIDAuthService.h" #import "FIRInstanceIDCheckinPreferences.h" diff --git a/Firebase/InstanceID/FIRInstanceIDCheckinPreferences.m b/Firebase/InstanceID/FIRInstanceIDCheckinPreferences.m index 2f3c55ee7fb..9bfd79ad9c0 100644 --- a/Firebase/InstanceID/FIRInstanceIDCheckinPreferences.m +++ b/Firebase/InstanceID/FIRInstanceIDCheckinPreferences.m @@ -16,7 +16,7 @@ #import "FIRInstanceIDCheckinPreferences.h" -#import +#import "GoogleUtilities/UserDefaults/Private/GULUserDefaults.h" #import "FIRInstanceIDCheckinService.h" #import "FIRInstanceIDUtilities.h" diff --git a/Firebase/InstanceID/FIRInstanceIDUtilities.m b/Firebase/InstanceID/FIRInstanceIDUtilities.m index d694ad8b252..f631fec48df 100644 --- a/Firebase/InstanceID/FIRInstanceIDUtilities.m +++ b/Firebase/InstanceID/FIRInstanceIDUtilities.m @@ -21,7 +21,7 @@ #endif #import -#import +#import "GoogleUtilities/UserDefaults/Private/GULUserDefaults.h" #import "FIRInstanceID.h" #import "FIRInstanceIDConstants.h" #import "FIRInstanceIDLogger.h" diff --git a/FirebaseAppDistribution/Sources/FIRAppDistribution.m b/FirebaseAppDistribution/Sources/FIRAppDistribution.m index 672cbbead70..e0ac32e8035 100644 --- a/FirebaseAppDistribution/Sources/FIRAppDistribution.m +++ b/FirebaseAppDistribution/Sources/FIRAppDistribution.m @@ -19,7 +19,7 @@ #import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" -#import +#import "GoogleUtilities/AppDelegateSwizzler/Private/GULAppDelegateSwizzler.h" #import "FIRAppDistributionAppDelegateInterceptor.h" /// Empty protocol to register with FirebaseCore's component system. diff --git a/FirebaseAuth/Sources/Auth/FIRAuth.m b/FirebaseAuth/Sources/Auth/FIRAuth.m index 577be48d35e..70c384ae8c1 100644 --- a/FirebaseAuth/Sources/Auth/FIRAuth.m +++ b/FirebaseAuth/Sources/Auth/FIRAuth.m @@ -23,9 +23,9 @@ #endif #import -#import -#import -#import +#import "GoogleUtilities/AppDelegateSwizzler/Private/GULAppDelegateSwizzler.h" +#import "GoogleUtilities/Environment/third_party/GULAppEnvironmentUtil.h" +#import "GoogleUtilities/SceneDelegateSwizzler/Private/GULSceneDelegateSwizzler.h" #import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" #import "FirebaseAuth/Sources/Auth/FIRAuthDataResult_Internal.h" diff --git a/FirebaseAuth/Sources/SystemService/FIRAuthAPNSTokenManager.m b/FirebaseAuth/Sources/SystemService/FIRAuthAPNSTokenManager.m index 967aace6faf..e37189c1807 100644 --- a/FirebaseAuth/Sources/SystemService/FIRAuthAPNSTokenManager.m +++ b/FirebaseAuth/Sources/SystemService/FIRAuthAPNSTokenManager.m @@ -17,7 +17,7 @@ #include #if !TARGET_OS_OSX -#import +#import "GoogleUtilities/Environment/third_party/GULAppEnvironmentUtil.h" #import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" #import "FirebaseAuth/Sources/Auth/FIRAuthGlobalWorkQueue.h" diff --git a/FirebaseAuth/Sources/Utilities/FIRAuthDefaultUIDelegate.m b/FirebaseAuth/Sources/Utilities/FIRAuthDefaultUIDelegate.m index 2ba27a5ab91..d149f9f9b61 100644 --- a/FirebaseAuth/Sources/Utilities/FIRAuthDefaultUIDelegate.m +++ b/FirebaseAuth/Sources/Utilities/FIRAuthDefaultUIDelegate.m @@ -17,7 +17,7 @@ #include #if !TARGET_OS_OSX -#import +#import "GoogleUtilities/Environment/third_party/GULAppEnvironmentUtil.h" #import #import "FirebaseAuth/Sources/Utilities/FIRAuthDefaultUIDelegate.h" diff --git a/FirebaseAuth/Tests/Unit/FIRAuthTests.m b/FirebaseAuth/Tests/Unit/FIRAuthTests.m index 968adbaf4f1..c9351bf4281 100644 --- a/FirebaseAuth/Tests/Unit/FIRAuthTests.m +++ b/FirebaseAuth/Tests/Unit/FIRAuthTests.m @@ -21,7 +21,7 @@ #import #import #import -#import +#import "GoogleUtilities/AppDelegateSwizzler/Private/GULAppDelegateSwizzler.h" #import #import #import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" diff --git a/FirebaseCore/Sources/FIRApp.m b/FirebaseCore/Sources/FIRApp.m index 4dfbfa83892..77d3f2608a2 100644 --- a/FirebaseCore/Sources/FIRApp.m +++ b/FirebaseCore/Sources/FIRApp.m @@ -35,7 +35,7 @@ #import "FirebaseCore/Sources/Private/FIRLogger.h" #import "FirebaseCore/Sources/Private/FIROptionsInternal.h" -#import +#import "GoogleUtilities/Environment/third_party/GULAppEnvironmentUtil.h" #import diff --git a/FirebaseCore/Sources/FIRBundleUtil.m b/FirebaseCore/Sources/FIRBundleUtil.m index de2c2954292..f2214339588 100644 --- a/FirebaseCore/Sources/FIRBundleUtil.m +++ b/FirebaseCore/Sources/FIRBundleUtil.m @@ -14,7 +14,9 @@ #import "FirebaseCore/Sources/FIRBundleUtil.h" -#import +#import "GoogleUtilities/Environment/third_party/GULAppEnvironmentUtil.h" +@import GoogleUtilities; + @implementation FIRBundleUtil diff --git a/FirebaseCore/Sources/FIRHeartbeatInfo.m b/FirebaseCore/Sources/FIRHeartbeatInfo.m index 277b0f712be..a4432e7eac2 100644 --- a/FirebaseCore/Sources/FIRHeartbeatInfo.m +++ b/FirebaseCore/Sources/FIRHeartbeatInfo.m @@ -13,8 +13,8 @@ // limitations under the License. #import "FirebaseCore/Sources/Private/FIRHeartbeatInfo.h" -#import -#import +#import "GoogleUtilities/Environment/Public/GULHeartbeatDateStorage.h" +#import "GoogleUtilities/Logger/Private/GULLogger.h" const static long secondsInDay = 86400; @implementation FIRHeartbeatInfo : NSObject diff --git a/FirebaseCore/Sources/FIRLogger.m b/FirebaseCore/Sources/FIRLogger.m index a749cbd94c5..26bf2ea45e1 100644 --- a/FirebaseCore/Sources/FIRLogger.m +++ b/FirebaseCore/Sources/FIRLogger.m @@ -14,8 +14,8 @@ #import "FirebaseCore/Sources/Private/FIRLogger.h" -#import -#import +#import "GoogleUtilities/Environment/third_party/GULAppEnvironmentUtil.h" +#import "GoogleUtilities/Logger/Private/GULLogger.h" #import "FirebaseCore/Sources/Public/FIRLoggerLevel.h" #import "FirebaseCore/Sources/FIRVersion.h" diff --git a/FirebaseCore/Tests/Unit/FIRAppTest.m b/FirebaseCore/Tests/Unit/FIRAppTest.m index 015d8fcd44c..08208adc45a 100644 --- a/FirebaseCore/Tests/Unit/FIRAppTest.m +++ b/FirebaseCore/Tests/Unit/FIRAppTest.m @@ -20,7 +20,7 @@ #import "FirebaseCore/Sources/Private/FIRCoreDiagnosticsConnector.h" #import "FirebaseCore/Sources/Private/FIROptionsInternal.h" -#import +#import "GoogleUtilities/Environment/third_party/GULAppEnvironmentUtil.h" NSString *const kFIRTestAppName1 = @"test_app_name_1"; NSString *const kFIRTestAppName2 = @"test-app-name-2"; diff --git a/FirebaseCore/Tests/Unit/FIRBundleUtilTest.m b/FirebaseCore/Tests/Unit/FIRBundleUtilTest.m index 867d6c49fbf..02f136eb563 100644 --- a/FirebaseCore/Tests/Unit/FIRBundleUtilTest.m +++ b/FirebaseCore/Tests/Unit/FIRBundleUtilTest.m @@ -14,7 +14,7 @@ #import "FirebaseCore/Tests/Unit/FIRTestCase.h" -#import +#import "GoogleUtilities/Environment/third_party/GULAppEnvironmentUtil.h" #import "FirebaseCore/Sources/FIRBundleUtil.h" static NSString *const kResultPath = @"resultPath"; diff --git a/FirebaseCore/Tests/Unit/FIRHeartbeatInfoTest.m b/FirebaseCore/Tests/Unit/FIRHeartbeatInfoTest.m index 4ef89c53c14..950157270b6 100644 --- a/FirebaseCore/Tests/Unit/FIRHeartbeatInfoTest.m +++ b/FirebaseCore/Tests/Unit/FIRHeartbeatInfoTest.m @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#import +#import "GoogleUtilities/Environment/Public/GULHeartbeatDateStorage.h" #import #import "FirebaseCore/Sources/Private/FIRHeartbeatInfo.h" diff --git a/FirebaseCore/Tests/Unit/FIRLoggerTest.m b/FirebaseCore/Tests/Unit/FIRLoggerTest.m index 414e4c484ba..1e046402f6c 100644 --- a/FirebaseCore/Tests/Unit/FIRLoggerTest.m +++ b/FirebaseCore/Tests/Unit/FIRLoggerTest.m @@ -19,7 +19,7 @@ // TODO - FIRLoggerTest should be split into a separate FIRLoggerTest and GULLoggerTest. // No test should include both includes. -#import +#import "GoogleUtilities/Logger/Private/GULLogger.h" #import "FirebaseCore/Sources/Private/FIRLogger.h" #import diff --git a/FirebaseDynamicLinks/Tests/Unit/FIRDynamicLinkNetworkingTests.m b/FirebaseDynamicLinks/Tests/Unit/FIRDynamicLinkNetworkingTests.m index 3e9c6880328..597b8a140e9 100644 --- a/FirebaseDynamicLinks/Tests/Unit/FIRDynamicLinkNetworkingTests.m +++ b/FirebaseDynamicLinks/Tests/Unit/FIRDynamicLinkNetworkingTests.m @@ -18,8 +18,8 @@ #import -#import -#import +#import "GoogleUtilities/SwizzlerTestHelpers/GULSwizzler+Unswizzle.h" +#import "GoogleUtilities/MethodSwizzler/Private/GULSwizzler.h" #import "FirebaseDynamicLinks/Sources/FIRDynamicLinkNetworking+Private.h" static NSString *const kAPIKey = @"myfakeapikey"; diff --git a/FirebaseDynamicLinks/Tests/Unit/FIRDynamicLinksTest.m b/FirebaseDynamicLinks/Tests/Unit/FIRDynamicLinksTest.m index 75d8fe4b0ab..c473e67e6a9 100644 --- a/FirebaseDynamicLinks/Tests/Unit/FIRDynamicLinksTest.m +++ b/FirebaseDynamicLinks/Tests/Unit/FIRDynamicLinksTest.m @@ -16,8 +16,8 @@ #import -#import -#import +#import "GoogleUtilities/SwizzlerTestHelpers/GULSwizzler+Unswizzle.h" +#import "GoogleUtilities/MethodSwizzler/Private/GULSwizzler.h" #import #import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" #import "FirebaseDynamicLinks/Sources/FIRDLDefaultRetrievalProcessV2.h" diff --git a/FirebaseInAppMessaging/Sources/Runtime/FIRInAppMessaging+Bootstrap.m b/FirebaseInAppMessaging/Sources/Runtime/FIRInAppMessaging+Bootstrap.m index 8373546f51a..448ca2d560b 100644 --- a/FirebaseInAppMessaging/Sources/Runtime/FIRInAppMessaging+Bootstrap.m +++ b/FirebaseInAppMessaging/Sources/Runtime/FIRInAppMessaging+Bootstrap.m @@ -16,7 +16,7 @@ #import "FIRInAppMessaging+Bootstrap.h" -#import +#import "GoogleUtilities/Environment/third_party/GULAppEnvironmentUtil.h" #import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" #import "Interop/Analytics/Public/FIRAnalyticsInterop.h" diff --git a/FirebaseInstallations/Source/Library/IIDMigration/FIRInstallationsIIDTokenStore.m b/FirebaseInstallations/Source/Library/IIDMigration/FIRInstallationsIIDTokenStore.m index b2b69313eb4..a60f39d7dc7 100644 --- a/FirebaseInstallations/Source/Library/IIDMigration/FIRInstallationsIIDTokenStore.m +++ b/FirebaseInstallations/Source/Library/IIDMigration/FIRInstallationsIIDTokenStore.m @@ -22,7 +22,7 @@ #import "FBLPromises.h" #endif -#import +#import "GoogleUtilities/Environment/Public/GULKeychainUtils.h" #import "FIRInstallationsErrorUtil.h" diff --git a/FirebaseInstallations/Source/Library/InstallationsIDController/FIRInstallationsIDController.m b/FirebaseInstallations/Source/Library/InstallationsIDController/FIRInstallationsIDController.m index 325b5bfd2fd..caea0448136 100644 --- a/FirebaseInstallations/Source/Library/InstallationsIDController/FIRInstallationsIDController.m +++ b/FirebaseInstallations/Source/Library/InstallationsIDController/FIRInstallationsIDController.m @@ -22,7 +22,7 @@ #import "FBLPromises.h" #endif -#import +#import "GoogleUtilities/Environment/Public/GULKeychainStorage.h" #import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" #import "FIRInstallationsAPIService.h" diff --git a/FirebaseInstallations/Source/Library/InstallationsStore/FIRInstallationsStore.m b/FirebaseInstallations/Source/Library/InstallationsStore/FIRInstallationsStore.m index 46f58dba788..c1bd967b632 100644 --- a/FirebaseInstallations/Source/Library/InstallationsStore/FIRInstallationsStore.m +++ b/FirebaseInstallations/Source/Library/InstallationsStore/FIRInstallationsStore.m @@ -16,7 +16,7 @@ #import "FIRInstallationsStore.h" -#import +#import "GoogleUtilities/UserDefaults/Private/GULUserDefaults.h" #if __has_include() #import @@ -24,7 +24,7 @@ #import "FBLPromises.h" #endif -#import +#import "GoogleUtilities/Environment/Public/GULKeychainStorage.h" #import "FIRInstallationsErrorUtil.h" #import "FIRInstallationsItem.h" diff --git a/FirebaseInstallations/Source/Tests/Unit/FIRInstallationsStoreTests.m b/FirebaseInstallations/Source/Tests/Unit/FIRInstallationsStoreTests.m index 750ec53d0a8..7f7c3a5d78d 100644 --- a/FirebaseInstallations/Source/Tests/Unit/FIRInstallationsStoreTests.m +++ b/FirebaseInstallations/Source/Tests/Unit/FIRInstallationsStoreTests.m @@ -18,8 +18,8 @@ #import -#import -#import +#import "GoogleUtilities/Environment/Public/GULKeychainStorage.h" +#import "GoogleUtilities/UserDefaults/Private/GULUserDefaults.h" #import "FBLPromise+Testing.h" #import "FIRInstallationsErrorUtil.h" diff --git a/FirebaseMessaging/Sources/FIRMessaging.m b/FirebaseMessaging/Sources/FIRMessaging.m index 0b7e481c2b9..81d6d83b204 100644 --- a/FirebaseMessaging/Sources/FIRMessaging.m +++ b/FirebaseMessaging/Sources/FIRMessaging.m @@ -22,9 +22,9 @@ #import #import #import -#import -#import -#import +#import "GoogleUtilities/AppDelegateSwizzler/Private/GULAppDelegateSwizzler.h" +#import "GoogleUtilities/Reachability/Private/GULReachabilityChecker.h" +#import "GoogleUtilities/UserDefaults/Private/GULUserDefaults.h" #import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" #import "Interop/Analytics/Public/FIRAnalyticsInterop.h" diff --git a/FirebaseMessaging/Sources/FIRMessagingAnalytics.m b/FirebaseMessaging/Sources/FIRMessagingAnalytics.m index 3ea513e3c24..ec8d1d1ae1e 100644 --- a/FirebaseMessaging/Sources/FIRMessagingAnalytics.m +++ b/FirebaseMessaging/Sources/FIRMessagingAnalytics.m @@ -16,8 +16,8 @@ #import "FirebaseMessaging/Sources/FIRMessagingAnalytics.h" -#import -#import +#import "GoogleUtilities/AppDelegateSwizzler/Private/GULAppDelegateSwizzler.h" +#import "GoogleUtilities/Environment/third_party/GULAppEnvironmentUtil.h" #import "Interop/Analytics/Public/FIRInteropEventNames.h" #import "Interop/Analytics/Public/FIRInteropParameterNames.h" diff --git a/FirebaseMessaging/Sources/FIRMessagingClient.m b/FirebaseMessaging/Sources/FIRMessagingClient.m index 7a691f79b6d..315248b7afe 100644 --- a/FirebaseMessaging/Sources/FIRMessagingClient.m +++ b/FirebaseMessaging/Sources/FIRMessagingClient.m @@ -20,7 +20,7 @@ #import #import -#import +#import "GoogleUtilities/Reachability/Private/GULReachabilityChecker.h" #import "FirebaseMessaging/Sources/FIRMessagingConnection.h" #import "FirebaseMessaging/Sources/FIRMessagingConstants.h" diff --git a/FirebaseMessaging/Sources/FIRMessagingContextManagerService.m b/FirebaseMessaging/Sources/FIRMessagingContextManagerService.m index 60925d3a3b4..e5b321b4e81 100644 --- a/FirebaseMessaging/Sources/FIRMessagingContextManagerService.m +++ b/FirebaseMessaging/Sources/FIRMessagingContextManagerService.m @@ -25,7 +25,7 @@ #import "FirebaseMessaging/Sources/FIRMessagingLogger.h" #import "FirebaseMessaging/Sources/FIRMessagingUtilities.h" -#import +#import "GoogleUtilities/AppDelegateSwizzler/Private/GULAppDelegateSwizzler.h" #define kFIRMessagingContextManagerPrefix @"gcm." #define kFIRMessagingContextManagerPrefixKey @"google.c.cm." diff --git a/FirebaseMessaging/Sources/FIRMessagingPubSub.m b/FirebaseMessaging/Sources/FIRMessagingPubSub.m index 37ce988f1f3..9098f616766 100644 --- a/FirebaseMessaging/Sources/FIRMessagingPubSub.m +++ b/FirebaseMessaging/Sources/FIRMessagingPubSub.m @@ -17,8 +17,8 @@ #import "FirebaseMessaging/Sources/FIRMessagingPubSub.h" #import -#import -#import +#import "GoogleUtilities/Environment/Public/GULSecureCoding.h" +#import "GoogleUtilities/UserDefaults/Private/GULUserDefaults.h" #import "FirebaseMessaging/Sources/FIRMessagingClient.h" #import "FirebaseMessaging/Sources/FIRMessagingDefines.h" diff --git a/FirebaseMessaging/Sources/FIRMessagingRemoteNotificationsProxy.m b/FirebaseMessaging/Sources/FIRMessagingRemoteNotificationsProxy.m index 1ebe92b8a35..47458b95c45 100644 --- a/FirebaseMessaging/Sources/FIRMessagingRemoteNotificationsProxy.m +++ b/FirebaseMessaging/Sources/FIRMessagingRemoteNotificationsProxy.m @@ -18,7 +18,7 @@ #import -#import +#import "GoogleUtilities/AppDelegateSwizzler/Private/GULAppDelegateSwizzler.h" #import "FirebaseMessaging/Sources/FIRMessagingConstants.h" #import "FirebaseMessaging/Sources/FIRMessagingLogger.h" #import "FirebaseMessaging/Sources/FIRMessagingUtilities.h" diff --git a/FirebaseMessaging/Sources/FIRMessagingUtilities.m b/FirebaseMessaging/Sources/FIRMessagingUtilities.m index 12620f3b7a6..df029b054cc 100644 --- a/FirebaseMessaging/Sources/FIRMessagingUtilities.m +++ b/FirebaseMessaging/Sources/FIRMessagingUtilities.m @@ -20,7 +20,7 @@ #import "FirebaseMessaging/Sources/FIRMessagingLogger.h" -#import +#import "GoogleUtilities/Environment/third_party/GULAppEnvironmentUtil.h" // Convert the macro to a string #define STR_EXPAND(x) #x diff --git a/FirebaseMessaging/Tests/UnitTests/FIRInstanceIDWithFCMTest.m b/FirebaseMessaging/Tests/UnitTests/FIRInstanceIDWithFCMTest.m index 90b01882d9e..d1ad8c889d8 100644 --- a/FirebaseMessaging/Tests/UnitTests/FIRInstanceIDWithFCMTest.m +++ b/FirebaseMessaging/Tests/UnitTests/FIRInstanceIDWithFCMTest.m @@ -18,7 +18,7 @@ #import #import -#import +#import "GoogleUtilities/UserDefaults/Private/GULUserDefaults.h" #import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" #import diff --git a/FirebaseMessaging/Tests/UnitTests/FIRMessagingClientTest.m b/FirebaseMessaging/Tests/UnitTests/FIRMessagingClientTest.m index a8bd6bdcefd..13868910a15 100644 --- a/FirebaseMessaging/Tests/UnitTests/FIRMessagingClientTest.m +++ b/FirebaseMessaging/Tests/UnitTests/FIRMessagingClientTest.m @@ -19,7 +19,7 @@ #import #import -#import +#import "GoogleUtilities/Reachability/Private/GULReachabilityChecker.h" #import "FirebaseMessaging/Sources/FIRMessagingClient.h" #import "FirebaseMessaging/Sources/FIRMessagingConnection.h" diff --git a/FirebaseMessaging/Tests/UnitTests/FIRMessagingHandlingTest.m b/FirebaseMessaging/Tests/UnitTests/FIRMessagingHandlingTest.m index 3ba405673f0..0262f544234 100644 --- a/FirebaseMessaging/Tests/UnitTests/FIRMessagingHandlingTest.m +++ b/FirebaseMessaging/Tests/UnitTests/FIRMessagingHandlingTest.m @@ -20,7 +20,7 @@ #import #import -#import +#import "GoogleUtilities/UserDefaults/Private/GULUserDefaults.h" #import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" #import "Interop/Analytics/Public/FIRAnalyticsInterop.h" diff --git a/FirebaseMessaging/Tests/UnitTests/FIRMessagingLinkHandlingTest.m b/FirebaseMessaging/Tests/UnitTests/FIRMessagingLinkHandlingTest.m index 06368e7f28b..5ba066de022 100644 --- a/FirebaseMessaging/Tests/UnitTests/FIRMessagingLinkHandlingTest.m +++ b/FirebaseMessaging/Tests/UnitTests/FIRMessagingLinkHandlingTest.m @@ -18,7 +18,7 @@ #import #import -#import +#import "GoogleUtilities/UserDefaults/Private/GULUserDefaults.h" #import diff --git a/FirebaseMessaging/Tests/UnitTests/FIRMessagingPubSubTest.m b/FirebaseMessaging/Tests/UnitTests/FIRMessagingPubSubTest.m index 10f1e3dcefd..4fbda42f66f 100644 --- a/FirebaseMessaging/Tests/UnitTests/FIRMessagingPubSubTest.m +++ b/FirebaseMessaging/Tests/UnitTests/FIRMessagingPubSubTest.m @@ -17,7 +17,7 @@ #import #import -#import +#import "GoogleUtilities/Reachability/Private/GULReachabilityChecker.h" #import "FirebaseMessaging/Sources/FIRMessagingClient.h" #import "FirebaseMessaging/Sources/FIRMessagingPendingTopicsList.h" diff --git a/FirebaseMessaging/Tests/UnitTests/FIRMessagingRemoteNotificationsProxyTest.m b/FirebaseMessaging/Tests/UnitTests/FIRMessagingRemoteNotificationsProxyTest.m index 57a5cc818f4..879f556a37f 100644 --- a/FirebaseMessaging/Tests/UnitTests/FIRMessagingRemoteNotificationsProxyTest.m +++ b/FirebaseMessaging/Tests/UnitTests/FIRMessagingRemoteNotificationsProxyTest.m @@ -22,7 +22,7 @@ #import #import -#import +#import "GoogleUtilities/AppDelegateSwizzler/Private/GULAppDelegateSwizzler.h" #import "FirebaseMessaging/Sources/FIRMessagingRemoteNotificationsProxy.h" diff --git a/FirebaseMessaging/Tests/UnitTests/FIRMessagingServiceTest.m b/FirebaseMessaging/Tests/UnitTests/FIRMessagingServiceTest.m index bd5d2bf89d0..0164c816dd1 100644 --- a/FirebaseMessaging/Tests/UnitTests/FIRMessagingServiceTest.m +++ b/FirebaseMessaging/Tests/UnitTests/FIRMessagingServiceTest.m @@ -18,7 +18,7 @@ #import #import -#import +#import "GoogleUtilities/UserDefaults/Private/GULUserDefaults.h" #import #import "FirebaseMessaging/Sources/FIRMessagingClient.h" diff --git a/FirebaseMessaging/Tests/UnitTests/FIRMessagingTest.m b/FirebaseMessaging/Tests/UnitTests/FIRMessagingTest.m index 32a17b894cc..7e9f192366c 100644 --- a/FirebaseMessaging/Tests/UnitTests/FIRMessagingTest.m +++ b/FirebaseMessaging/Tests/UnitTests/FIRMessagingTest.m @@ -19,7 +19,7 @@ #import #import -#import +#import "GoogleUtilities/UserDefaults/Private/GULUserDefaults.h" #import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" #import "Interop/Analytics/Public/FIRAnalyticsInterop.h" diff --git a/FirebaseMessaging/Tests/UnitTests/FIRMessagingTestUtilities.m b/FirebaseMessaging/Tests/UnitTests/FIRMessagingTestUtilities.m index d3ce168ddac..70d604b6e3b 100644 --- a/FirebaseMessaging/Tests/UnitTests/FIRMessagingTestUtilities.m +++ b/FirebaseMessaging/Tests/UnitTests/FIRMessagingTestUtilities.m @@ -22,7 +22,7 @@ #import #import -#import +#import "GoogleUtilities/UserDefaults/Private/GULUserDefaults.h" #import "Interop/Analytics/Public/FIRAnalyticsInterop.h" #import "FirebaseMessaging/Sources/FIRMessagingPubSub.h" diff --git a/FirebaseRemoteConfig/Sources/RCNConfigSettings.m b/FirebaseRemoteConfig/Sources/RCNConfigSettings.m index 2a4fbc404b0..3c1ada49adc 100644 --- a/FirebaseRemoteConfig/Sources/RCNConfigSettings.m +++ b/FirebaseRemoteConfig/Sources/RCNConfigSettings.m @@ -22,7 +22,7 @@ #import "FirebaseRemoteConfig/Sources/RCNDevice.h" #import "FirebaseRemoteConfig/Sources/RCNUserDefaultsManager.h" -#import +#import "GoogleUtilities/Environment/third_party/GULAppEnvironmentUtil.h" #import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" static NSString *const kRCNGroupPrefix = @"frc.group."; diff --git a/FirebaseRemoteConfig/Sources/RCNDevice.m b/FirebaseRemoteConfig/Sources/RCNDevice.m index 7caad4748cd..45593d24ca9 100644 --- a/FirebaseRemoteConfig/Sources/RCNDevice.m +++ b/FirebaseRemoteConfig/Sources/RCNDevice.m @@ -18,7 +18,7 @@ #import -#import +#import "GoogleUtilities/Environment/third_party/GULAppEnvironmentUtil.h" #import "FirebaseRemoteConfig/Sources/Private/RCNConfigSettings.h" #import "FirebaseRemoteConfig/Sources/RCNConfigConstants.h" diff --git a/FirebaseRemoteConfig/Sources/RCNFetch.m b/FirebaseRemoteConfig/Sources/RCNFetch.m index ebf8a86f362..92c91c89ffa 100644 --- a/FirebaseRemoteConfig/Sources/RCNFetch.m +++ b/FirebaseRemoteConfig/Sources/RCNFetch.m @@ -17,7 +17,7 @@ #import "FirebaseRemoteConfig/Sources/Private/RCNConfigFetch.h" #import -#import +#import "GoogleUtilities/NSData+zlib/GULNSData+zlib.h" #import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" #import "FirebaseRemoteConfig/Sources/Private/RCNConfigSettings.h" #import "FirebaseRemoteConfig/Sources/RCNConfigConstants.h" diff --git a/FirebaseRemoteConfig/Tests/Unit/RCNInstanceIDTest.m b/FirebaseRemoteConfig/Tests/Unit/RCNInstanceIDTest.m index 508837ba2b5..e5fd24fb25e 100644 --- a/FirebaseRemoteConfig/Tests/Unit/RCNInstanceIDTest.m +++ b/FirebaseRemoteConfig/Tests/Unit/RCNInstanceIDTest.m @@ -26,7 +26,7 @@ #import "FirebaseRemoteConfig/Tests/Unit/RCNTestUtilities.h" #import -#import +#import "GoogleUtilities/NSData+zlib/GULNSData+zlib.h" #import #import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" diff --git a/FirebaseRemoteConfig/Tests/Unit/RCNRemoteConfigTest.m b/FirebaseRemoteConfig/Tests/Unit/RCNRemoteConfigTest.m index b17326db3a7..9c2758ae4e6 100644 --- a/FirebaseRemoteConfig/Tests/Unit/RCNRemoteConfigTest.m +++ b/FirebaseRemoteConfig/Tests/Unit/RCNRemoteConfigTest.m @@ -25,7 +25,7 @@ #import "FirebaseRemoteConfig/Tests/Unit/RCNTestUtilities.h" -#import +#import "GoogleUtilities/NSData+zlib/GULNSData+zlib.h" #import #import #import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" diff --git a/GoogleUtilities/Environment/third_party/GULAppEnvironmentUtil.h b/GoogleUtilities/Environment/third_party/GULAppEnvironmentUtil.h index d5502647c20..c14f96e89c2 100644 --- a/GoogleUtilities/Environment/third_party/GULAppEnvironmentUtil.h +++ b/GoogleUtilities/Environment/third_party/GULAppEnvironmentUtil.h @@ -16,6 +16,17 @@ #import +typedef NS_ENUM(NSInteger, FIRRemoteConfigFetchStatus) { + /// Config has never been fetched. + FIRRemoteConfigFetchStatusNoFetchYet, + /// Config fetch succeeded. + FIRRemoteConfigFetchStatusSuccess, + /// Config fetch failed. + FIRRemoteConfigFetchStatusFailure, + /// Config fetch was throttled. + FIRRemoteConfigFetchStatusThrottled, +} NS_SWIFT_NAME(RemoteConfigFetchStatus); + @interface GULAppEnvironmentUtil : NSObject /// Indicates whether the app is from Apple Store or not. Returns NO if the app is on simulator, diff --git a/scripts/change_headers.swift b/scripts/change_headers.swift index 896e34b6038..bba0aca9295 100755 --- a/scripts/change_headers.swift +++ b/scripts/change_headers.swift @@ -19,8 +19,13 @@ import Foundation -let findHeaders: Set = ["GoogleUtilities"] -let changeImports: Set = ["GoogleUtilities"] +let findHeaders = ["GoogleUtilities"] +let changeImports = ["GoogleUtilities", "FirebaseAuth", "FirebaseCore", "Firebase", + "FirebaseDynamicLinks", "FirebaseInAppMessaging", "FirebaseMessaging", + "FirebaseRemoteConfig", "FirebaseInstallations", + "FirebaseAppDistribution"] +let skipDirPatterns = ["/Sample/", "FirebaseABTesting/Tests/Integration", + "FirebaseInAppMessaging/Tests/Integration/"] // Get a Dictionary mapping a simple header name to a repo-relative path. @@ -107,15 +112,20 @@ let headerMap = getHeaderMap(url) for root in changeImports { let rootURL = url.appendingPathComponent(root) let enumerator = FileManager.default.enumerator(atPath: rootURL.path) - while let file = enumerator?.nextObject() as? String { + whileLoop: while let file = enumerator?.nextObject() as? String { if let fType = enumerator?.fileAttributes?[FileAttributeKey.type] as? FileAttributeType, fType == .typeRegular { if file.starts(with: ".") { continue } - if file.rangeOfString("/Public/") != nil { + if file.range(of:"/Public/") != nil { continue } + for dirPattern in skipDirPatterns { + if file.range(of:dirPattern) != nil { + continue whileLoop + } + } transformFile(root + "/" + file) } } From 0d1aae3a763a740df96088ba0c2f213bd2b00cfc Mon Sep 17 00:00:00 2001 From: Paul Beusterien Date: Fri, 12 Jun 2020 17:45:32 -0700 Subject: [PATCH 02/22] checkpoint --- .../CoreDiagnostics/FIRCDLibrary/FIRCoreDiagnostics.m | 4 ++-- Firebase/InstanceID/FIRInstanceID.m | 2 +- FirebaseAuth/Sources/Auth/FIRAuth.m | 2 +- .../Sources/SystemService/FIRAuthAPNSTokenManager.m | 2 +- .../Sources/Utilities/FIRAuthDefaultUIDelegate.m | 2 +- FirebaseCore.podspec | 9 ++++++--- FirebaseCore/Sources/FIRApp.m | 2 +- FirebaseCore/Sources/FIRBundleUtil.m | 2 +- FirebaseCore/Sources/FIRHeartbeatInfo.m | 2 +- FirebaseCore/Sources/FIRLogger.m | 2 +- FirebaseCore/Tests/Unit/FIRAppTest.m | 2 +- FirebaseCore/Tests/Unit/FIRBundleUtilTest.m | 2 +- FirebaseCore/Tests/Unit/FIRHeartbeatInfoTest.m | 2 +- .../Sources/Runtime/FIRInAppMessaging+Bootstrap.m | 2 +- .../Library/IIDMigration/FIRInstallationsIIDTokenStore.m | 2 +- .../FIRInstallationsIDController.m | 2 +- .../Library/InstallationsStore/FIRInstallationsStore.m | 2 +- .../Source/Tests/Unit/FIRInstallationsStoreTests.m | 2 +- FirebaseMessaging/Sources/FIRMessagingAnalytics.m | 2 +- FirebaseMessaging/Sources/FIRMessagingPubSub.m | 2 +- FirebaseMessaging/Sources/FIRMessagingUtilities.m | 2 +- FirebaseRemoteConfig/Sources/RCNConfigSettings.m | 2 +- FirebaseRemoteConfig/Sources/RCNDevice.m | 2 +- GoogleUtilities.podspec | 6 +++--- .../AppDelegateSwizzler/GULAppDelegateSwizzler.m | 2 +- GoogleUtilities/Environment/GULHeartbeatDateStorage.m | 4 ++-- GoogleUtilities/Environment/GULSecureCoding.m | 2 +- .../{Public => Private}/GULHeartbeatDateStorage.h | 0 .../Environment/{Public => Private}/GULKeychainStorage.h | 0 .../Environment/{Public => Private}/GULKeychainUtils.h | 0 .../Environment/{Public => Private}/GULSecureCoding.h | 0 .../Environment/SecureStorage/GULKeychainStorage.m | 6 +++--- .../Environment/SecureStorage/GULKeychainUtils.m | 2 +- .../Environment/third_party/GULAppEnvironmentUtil.m | 2 +- .../third_party/{GULAppEnvironmentUtil.h => Public} | 0 .../Tests/Environment/GULAppEnvironmentUtilTest.m | 2 +- .../Tests/Environment/GULHeartbeatDateStorageTest.m | 2 +- .../Example/Tests/Environment/GULKeychainStorageTests.m | 2 +- .../Example/Tests/SecureCoding/GULSecureCodingTests.m | 2 +- GoogleUtilities/Logger/GULLogger.m | 2 +- .../SceneDelegateSwizzler/GULSceneDelegateSwizzler.m | 2 +- 41 files changed, 47 insertions(+), 44 deletions(-) rename GoogleUtilities/Environment/{Public => Private}/GULHeartbeatDateStorage.h (100%) rename GoogleUtilities/Environment/{Public => Private}/GULKeychainStorage.h (100%) rename GoogleUtilities/Environment/{Public => Private}/GULKeychainUtils.h (100%) rename GoogleUtilities/Environment/{Public => Private}/GULSecureCoding.h (100%) rename GoogleUtilities/Environment/third_party/{GULAppEnvironmentUtil.h => Public} (100%) diff --git a/Firebase/CoreDiagnostics/FIRCDLibrary/FIRCoreDiagnostics.m b/Firebase/CoreDiagnostics/FIRCDLibrary/FIRCoreDiagnostics.m index a7aaaf4a54b..50c7267d261 100644 --- a/Firebase/CoreDiagnostics/FIRCDLibrary/FIRCoreDiagnostics.m +++ b/Firebase/CoreDiagnostics/FIRCDLibrary/FIRCoreDiagnostics.m @@ -22,8 +22,8 @@ #import #import -#import "GoogleUtilities/Environment/third_party/GULAppEnvironmentUtil.h" -#import "GoogleUtilities/Environment/Public/GULHeartbeatDateStorage.h" +#import "GoogleUtilities/Environment/Private/GULAppEnvironmentUtil.h" +#import "GoogleUtilities/Environment/Private/GULHeartbeatDateStorage.h" #import "GoogleUtilities/Logger/Private/GULLogger.h" #import "Interop/CoreDiagnostics/Public/FIRCoreDiagnosticsData.h" diff --git a/Firebase/InstanceID/FIRInstanceID.m b/Firebase/InstanceID/FIRInstanceID.m index 7dc4ad6ead6..24421318a76 100644 --- a/Firebase/InstanceID/FIRInstanceID.m +++ b/Firebase/InstanceID/FIRInstanceID.m @@ -18,7 +18,7 @@ #import -#import "GoogleUtilities/Environment/third_party/GULAppEnvironmentUtil.h" +#import "GoogleUtilities/Environment/Private/GULAppEnvironmentUtil.h" #import "GoogleUtilities/UserDefaults/Private/GULUserDefaults.h" #import "FIRInstanceID+Private.h" #import "FIRInstanceIDAuthService.h" diff --git a/FirebaseAuth/Sources/Auth/FIRAuth.m b/FirebaseAuth/Sources/Auth/FIRAuth.m index 70c384ae8c1..df70e493350 100644 --- a/FirebaseAuth/Sources/Auth/FIRAuth.m +++ b/FirebaseAuth/Sources/Auth/FIRAuth.m @@ -24,7 +24,7 @@ #import #import "GoogleUtilities/AppDelegateSwizzler/Private/GULAppDelegateSwizzler.h" -#import "GoogleUtilities/Environment/third_party/GULAppEnvironmentUtil.h" +#import "GoogleUtilities/Environment/Private/GULAppEnvironmentUtil.h" #import "GoogleUtilities/SceneDelegateSwizzler/Private/GULSceneDelegateSwizzler.h" #import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" diff --git a/FirebaseAuth/Sources/SystemService/FIRAuthAPNSTokenManager.m b/FirebaseAuth/Sources/SystemService/FIRAuthAPNSTokenManager.m index e37189c1807..27d18fe31db 100644 --- a/FirebaseAuth/Sources/SystemService/FIRAuthAPNSTokenManager.m +++ b/FirebaseAuth/Sources/SystemService/FIRAuthAPNSTokenManager.m @@ -17,7 +17,7 @@ #include #if !TARGET_OS_OSX -#import "GoogleUtilities/Environment/third_party/GULAppEnvironmentUtil.h" +#import "GoogleUtilities/Environment/Private/GULAppEnvironmentUtil.h" #import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" #import "FirebaseAuth/Sources/Auth/FIRAuthGlobalWorkQueue.h" diff --git a/FirebaseAuth/Sources/Utilities/FIRAuthDefaultUIDelegate.m b/FirebaseAuth/Sources/Utilities/FIRAuthDefaultUIDelegate.m index d149f9f9b61..9d8161e891e 100644 --- a/FirebaseAuth/Sources/Utilities/FIRAuthDefaultUIDelegate.m +++ b/FirebaseAuth/Sources/Utilities/FIRAuthDefaultUIDelegate.m @@ -17,7 +17,7 @@ #include #if !TARGET_OS_OSX -#import "GoogleUtilities/Environment/third_party/GULAppEnvironmentUtil.h" +#import "GoogleUtilities/Environment/Private/GULAppEnvironmentUtil.h" #import #import "FirebaseAuth/Sources/Utilities/FIRAuthDefaultUIDelegate.h" diff --git a/FirebaseCore.podspec b/FirebaseCore.podspec index ed181141fe4..f0b38562aa1 100644 --- a/FirebaseCore.podspec +++ b/FirebaseCore.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'FirebaseCore' - s.version = '6.8.0' + s.version = '6.8.0-paul-test' s.summary = 'Firebase Core' s.description = <<-DESC @@ -27,6 +27,9 @@ Firebase Core includes FIRApp and FIROptions which provide central configuration s.source_files = [ 'FirebaseCore/Sources/**/*.[mh]', + 'GoogleUtilities/Environment/third_party/Public/*.h', + 'GoogleUtilities/Logger/Private/*.h', + 'GoogleUtilities/Logger/Public/*.h', 'Interop/CoreDiagnostics/Public/*.h', ] s.public_header_files = 'FirebaseCore/Sources/Public/*.h', 'FirebaseCore/Sources/Private/*.h' @@ -36,8 +39,8 @@ Firebase Core includes FIRApp and FIROptions which provide central configuration s.ios.framework = 'UIKit' s.osx.framework = 'AppKit' s.tvos.framework = 'UIKit' - s.dependency 'GoogleUtilities/Environment', '~> 6.5' - s.dependency 'GoogleUtilities/Logger', '~> 6.5' + s.dependency 'GoogleUtilities/Environment', '6.6.0-paul-test' + s.dependency 'GoogleUtilities/Logger', '6.6.0-paul-test' s.dependency 'FirebaseCoreDiagnostics', '~> 1.3' s.pod_target_xcconfig = { diff --git a/FirebaseCore/Sources/FIRApp.m b/FirebaseCore/Sources/FIRApp.m index 77d3f2608a2..3fbfd01c741 100644 --- a/FirebaseCore/Sources/FIRApp.m +++ b/FirebaseCore/Sources/FIRApp.m @@ -35,7 +35,7 @@ #import "FirebaseCore/Sources/Private/FIRLogger.h" #import "FirebaseCore/Sources/Private/FIROptionsInternal.h" -#import "GoogleUtilities/Environment/third_party/GULAppEnvironmentUtil.h" +#import "GoogleUtilities/Environment/Private/GULAppEnvironmentUtil.h" #import diff --git a/FirebaseCore/Sources/FIRBundleUtil.m b/FirebaseCore/Sources/FIRBundleUtil.m index f2214339588..7f90c498650 100644 --- a/FirebaseCore/Sources/FIRBundleUtil.m +++ b/FirebaseCore/Sources/FIRBundleUtil.m @@ -14,7 +14,7 @@ #import "FirebaseCore/Sources/FIRBundleUtil.h" -#import "GoogleUtilities/Environment/third_party/GULAppEnvironmentUtil.h" +#import "GoogleUtilities/Environment/Private/GULAppEnvironmentUtil.h" @import GoogleUtilities; diff --git a/FirebaseCore/Sources/FIRHeartbeatInfo.m b/FirebaseCore/Sources/FIRHeartbeatInfo.m index a4432e7eac2..be8b0513650 100644 --- a/FirebaseCore/Sources/FIRHeartbeatInfo.m +++ b/FirebaseCore/Sources/FIRHeartbeatInfo.m @@ -13,7 +13,7 @@ // limitations under the License. #import "FirebaseCore/Sources/Private/FIRHeartbeatInfo.h" -#import "GoogleUtilities/Environment/Public/GULHeartbeatDateStorage.h" +#import "GoogleUtilities/Environment/Private/GULHeartbeatDateStorage.h" #import "GoogleUtilities/Logger/Private/GULLogger.h" const static long secondsInDay = 86400; diff --git a/FirebaseCore/Sources/FIRLogger.m b/FirebaseCore/Sources/FIRLogger.m index 26bf2ea45e1..767c0f780c0 100644 --- a/FirebaseCore/Sources/FIRLogger.m +++ b/FirebaseCore/Sources/FIRLogger.m @@ -14,7 +14,7 @@ #import "FirebaseCore/Sources/Private/FIRLogger.h" -#import "GoogleUtilities/Environment/third_party/GULAppEnvironmentUtil.h" +#import "GoogleUtilities/Environment/Private/GULAppEnvironmentUtil.h" #import "GoogleUtilities/Logger/Private/GULLogger.h" #import "FirebaseCore/Sources/Public/FIRLoggerLevel.h" diff --git a/FirebaseCore/Tests/Unit/FIRAppTest.m b/FirebaseCore/Tests/Unit/FIRAppTest.m index 08208adc45a..4eabc584e78 100644 --- a/FirebaseCore/Tests/Unit/FIRAppTest.m +++ b/FirebaseCore/Tests/Unit/FIRAppTest.m @@ -20,7 +20,7 @@ #import "FirebaseCore/Sources/Private/FIRCoreDiagnosticsConnector.h" #import "FirebaseCore/Sources/Private/FIROptionsInternal.h" -#import "GoogleUtilities/Environment/third_party/GULAppEnvironmentUtil.h" +#import "GoogleUtilities/Environment/Private/GULAppEnvironmentUtil.h" NSString *const kFIRTestAppName1 = @"test_app_name_1"; NSString *const kFIRTestAppName2 = @"test-app-name-2"; diff --git a/FirebaseCore/Tests/Unit/FIRBundleUtilTest.m b/FirebaseCore/Tests/Unit/FIRBundleUtilTest.m index 02f136eb563..e35aa77a9ae 100644 --- a/FirebaseCore/Tests/Unit/FIRBundleUtilTest.m +++ b/FirebaseCore/Tests/Unit/FIRBundleUtilTest.m @@ -14,7 +14,7 @@ #import "FirebaseCore/Tests/Unit/FIRTestCase.h" -#import "GoogleUtilities/Environment/third_party/GULAppEnvironmentUtil.h" +#import "GoogleUtilities/Environment/Private/GULAppEnvironmentUtil.h" #import "FirebaseCore/Sources/FIRBundleUtil.h" static NSString *const kResultPath = @"resultPath"; diff --git a/FirebaseCore/Tests/Unit/FIRHeartbeatInfoTest.m b/FirebaseCore/Tests/Unit/FIRHeartbeatInfoTest.m index 950157270b6..89a83ba3e9d 100644 --- a/FirebaseCore/Tests/Unit/FIRHeartbeatInfoTest.m +++ b/FirebaseCore/Tests/Unit/FIRHeartbeatInfoTest.m @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#import "GoogleUtilities/Environment/Public/GULHeartbeatDateStorage.h" +#import "GoogleUtilities/Environment/Private/GULHeartbeatDateStorage.h" #import #import "FirebaseCore/Sources/Private/FIRHeartbeatInfo.h" diff --git a/FirebaseInAppMessaging/Sources/Runtime/FIRInAppMessaging+Bootstrap.m b/FirebaseInAppMessaging/Sources/Runtime/FIRInAppMessaging+Bootstrap.m index 448ca2d560b..25cc7503434 100644 --- a/FirebaseInAppMessaging/Sources/Runtime/FIRInAppMessaging+Bootstrap.m +++ b/FirebaseInAppMessaging/Sources/Runtime/FIRInAppMessaging+Bootstrap.m @@ -16,7 +16,7 @@ #import "FIRInAppMessaging+Bootstrap.h" -#import "GoogleUtilities/Environment/third_party/GULAppEnvironmentUtil.h" +#import "GoogleUtilities/Environment/Private/GULAppEnvironmentUtil.h" #import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" #import "Interop/Analytics/Public/FIRAnalyticsInterop.h" diff --git a/FirebaseInstallations/Source/Library/IIDMigration/FIRInstallationsIIDTokenStore.m b/FirebaseInstallations/Source/Library/IIDMigration/FIRInstallationsIIDTokenStore.m index a60f39d7dc7..891c437e156 100644 --- a/FirebaseInstallations/Source/Library/IIDMigration/FIRInstallationsIIDTokenStore.m +++ b/FirebaseInstallations/Source/Library/IIDMigration/FIRInstallationsIIDTokenStore.m @@ -22,7 +22,7 @@ #import "FBLPromises.h" #endif -#import "GoogleUtilities/Environment/Public/GULKeychainUtils.h" +#import "GoogleUtilities/Environment/Private/GULKeychainUtils.h" #import "FIRInstallationsErrorUtil.h" diff --git a/FirebaseInstallations/Source/Library/InstallationsIDController/FIRInstallationsIDController.m b/FirebaseInstallations/Source/Library/InstallationsIDController/FIRInstallationsIDController.m index caea0448136..f0bf4e8fd7f 100644 --- a/FirebaseInstallations/Source/Library/InstallationsIDController/FIRInstallationsIDController.m +++ b/FirebaseInstallations/Source/Library/InstallationsIDController/FIRInstallationsIDController.m @@ -22,7 +22,7 @@ #import "FBLPromises.h" #endif -#import "GoogleUtilities/Environment/Public/GULKeychainStorage.h" +#import "GoogleUtilities/Environment/Private/GULKeychainStorage.h" #import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" #import "FIRInstallationsAPIService.h" diff --git a/FirebaseInstallations/Source/Library/InstallationsStore/FIRInstallationsStore.m b/FirebaseInstallations/Source/Library/InstallationsStore/FIRInstallationsStore.m index c1bd967b632..6d09cd3b31a 100644 --- a/FirebaseInstallations/Source/Library/InstallationsStore/FIRInstallationsStore.m +++ b/FirebaseInstallations/Source/Library/InstallationsStore/FIRInstallationsStore.m @@ -24,7 +24,7 @@ #import "FBLPromises.h" #endif -#import "GoogleUtilities/Environment/Public/GULKeychainStorage.h" +#import "GoogleUtilities/Environment/Private/GULKeychainStorage.h" #import "FIRInstallationsErrorUtil.h" #import "FIRInstallationsItem.h" diff --git a/FirebaseInstallations/Source/Tests/Unit/FIRInstallationsStoreTests.m b/FirebaseInstallations/Source/Tests/Unit/FIRInstallationsStoreTests.m index 7f7c3a5d78d..841d5a0c9f5 100644 --- a/FirebaseInstallations/Source/Tests/Unit/FIRInstallationsStoreTests.m +++ b/FirebaseInstallations/Source/Tests/Unit/FIRInstallationsStoreTests.m @@ -18,7 +18,7 @@ #import -#import "GoogleUtilities/Environment/Public/GULKeychainStorage.h" +#import "GoogleUtilities/Environment/Private/GULKeychainStorage.h" #import "GoogleUtilities/UserDefaults/Private/GULUserDefaults.h" #import "FBLPromise+Testing.h" diff --git a/FirebaseMessaging/Sources/FIRMessagingAnalytics.m b/FirebaseMessaging/Sources/FIRMessagingAnalytics.m index ec8d1d1ae1e..185e683b4c9 100644 --- a/FirebaseMessaging/Sources/FIRMessagingAnalytics.m +++ b/FirebaseMessaging/Sources/FIRMessagingAnalytics.m @@ -17,7 +17,7 @@ #import "FirebaseMessaging/Sources/FIRMessagingAnalytics.h" #import "GoogleUtilities/AppDelegateSwizzler/Private/GULAppDelegateSwizzler.h" -#import "GoogleUtilities/Environment/third_party/GULAppEnvironmentUtil.h" +#import "GoogleUtilities/Environment/Private/GULAppEnvironmentUtil.h" #import "Interop/Analytics/Public/FIRInteropEventNames.h" #import "Interop/Analytics/Public/FIRInteropParameterNames.h" diff --git a/FirebaseMessaging/Sources/FIRMessagingPubSub.m b/FirebaseMessaging/Sources/FIRMessagingPubSub.m index 9098f616766..f38d437cd7b 100644 --- a/FirebaseMessaging/Sources/FIRMessagingPubSub.m +++ b/FirebaseMessaging/Sources/FIRMessagingPubSub.m @@ -17,7 +17,7 @@ #import "FirebaseMessaging/Sources/FIRMessagingPubSub.h" #import -#import "GoogleUtilities/Environment/Public/GULSecureCoding.h" +#import "GoogleUtilities/Environment/Private/GULSecureCoding.h" #import "GoogleUtilities/UserDefaults/Private/GULUserDefaults.h" #import "FirebaseMessaging/Sources/FIRMessagingClient.h" diff --git a/FirebaseMessaging/Sources/FIRMessagingUtilities.m b/FirebaseMessaging/Sources/FIRMessagingUtilities.m index df029b054cc..708c01a0214 100644 --- a/FirebaseMessaging/Sources/FIRMessagingUtilities.m +++ b/FirebaseMessaging/Sources/FIRMessagingUtilities.m @@ -20,7 +20,7 @@ #import "FirebaseMessaging/Sources/FIRMessagingLogger.h" -#import "GoogleUtilities/Environment/third_party/GULAppEnvironmentUtil.h" +#import "GoogleUtilities/Environment/Private/GULAppEnvironmentUtil.h" // Convert the macro to a string #define STR_EXPAND(x) #x diff --git a/FirebaseRemoteConfig/Sources/RCNConfigSettings.m b/FirebaseRemoteConfig/Sources/RCNConfigSettings.m index 3c1ada49adc..1e56ef64ceb 100644 --- a/FirebaseRemoteConfig/Sources/RCNConfigSettings.m +++ b/FirebaseRemoteConfig/Sources/RCNConfigSettings.m @@ -22,7 +22,7 @@ #import "FirebaseRemoteConfig/Sources/RCNDevice.h" #import "FirebaseRemoteConfig/Sources/RCNUserDefaultsManager.h" -#import "GoogleUtilities/Environment/third_party/GULAppEnvironmentUtil.h" +#import "GoogleUtilities/Environment/Private/GULAppEnvironmentUtil.h" #import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" static NSString *const kRCNGroupPrefix = @"frc.group."; diff --git a/FirebaseRemoteConfig/Sources/RCNDevice.m b/FirebaseRemoteConfig/Sources/RCNDevice.m index 45593d24ca9..4657e3bc449 100644 --- a/FirebaseRemoteConfig/Sources/RCNDevice.m +++ b/FirebaseRemoteConfig/Sources/RCNDevice.m @@ -18,7 +18,7 @@ #import -#import "GoogleUtilities/Environment/third_party/GULAppEnvironmentUtil.h" +#import "GoogleUtilities/Environment/Private/GULAppEnvironmentUtil.h" #import "FirebaseRemoteConfig/Sources/Private/RCNConfigSettings.h" #import "FirebaseRemoteConfig/Sources/RCNConfigConstants.h" diff --git a/GoogleUtilities.podspec b/GoogleUtilities.podspec index 3076be37549..549b71714b1 100644 --- a/GoogleUtilities.podspec +++ b/GoogleUtilities.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'GoogleUtilities' - s.version = '6.6.0' + s.version = '6.6.0-paul-test' s.summary = 'Google Utilities for iOS (plus community support for macOS and tvOS)' s.description = <<-DESC @@ -32,8 +32,8 @@ other Google CocoaPods. They're not intended for direct public usage. s.subspec 'Environment' do |es| es.source_files = 'GoogleUtilities/Environment/**/*.[mh]' - es.public_header_files = 'GoogleUtilities/Environment/**/*.h' - es.private_header_files = 'GoogleUtilities/Environment/**/*.h' + es.public_header_files = 'GoogleUtilities/Environment/Private/*.h' + es.private_header_files = 'GoogleUtilities/Environment/Private/*.h' es.dependency 'PromisesObjC', '~> 1.2' end diff --git a/GoogleUtilities/AppDelegateSwizzler/GULAppDelegateSwizzler.m b/GoogleUtilities/AppDelegateSwizzler/GULAppDelegateSwizzler.m index a9cb3bfd4fa..da9bebe220e 100644 --- a/GoogleUtilities/AppDelegateSwizzler/GULAppDelegateSwizzler.m +++ b/GoogleUtilities/AppDelegateSwizzler/GULAppDelegateSwizzler.m @@ -17,7 +17,7 @@ #import "GoogleUtilities/AppDelegateSwizzler/Internal/GULAppDelegateSwizzler_Private.h" #import "GoogleUtilities/AppDelegateSwizzler/Private/GULAppDelegateSwizzler.h" #import "GoogleUtilities/Common/GULLoggerCodes.h" -#import "GoogleUtilities/Environment/third_party/GULAppEnvironmentUtil.h" +#import "GoogleUtilities/Environment/Private/GULAppEnvironmentUtil.h" #import "GoogleUtilities/Logger/Private/GULLogger.h" #import "GoogleUtilities/Network/Private/GULMutableDictionary.h" diff --git a/GoogleUtilities/Environment/GULHeartbeatDateStorage.m b/GoogleUtilities/Environment/GULHeartbeatDateStorage.m index 0e115d31933..4df6e85fd79 100644 --- a/GoogleUtilities/Environment/GULHeartbeatDateStorage.m +++ b/GoogleUtilities/Environment/GULHeartbeatDateStorage.m @@ -14,8 +14,8 @@ * limitations under the License. */ -#import "GoogleUtilities/Environment/Public/GULHeartbeatDateStorage.h" -#import "GoogleUtilities/Environment/Public/GULSecureCoding.h" +#import "GoogleUtilities/Environment/Private/GULHeartbeatDateStorage.h" +#import "GoogleUtilities/Environment/Private/GULSecureCoding.h" @interface GULHeartbeatDateStorage () /** The storage to store the date of the last sent heartbeat. */ diff --git a/GoogleUtilities/Environment/GULSecureCoding.m b/GoogleUtilities/Environment/GULSecureCoding.m index 25d5d1998bd..91c4495f48d 100644 --- a/GoogleUtilities/Environment/GULSecureCoding.m +++ b/GoogleUtilities/Environment/GULSecureCoding.m @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#import "GoogleUtilities/Environment/Public/GULSecureCoding.h" +#import "GoogleUtilities/Environment/Private/GULSecureCoding.h" NSString *const kGULSecureCodingError = @"GULSecureCodingError"; diff --git a/GoogleUtilities/Environment/Public/GULHeartbeatDateStorage.h b/GoogleUtilities/Environment/Private/GULHeartbeatDateStorage.h similarity index 100% rename from GoogleUtilities/Environment/Public/GULHeartbeatDateStorage.h rename to GoogleUtilities/Environment/Private/GULHeartbeatDateStorage.h diff --git a/GoogleUtilities/Environment/Public/GULKeychainStorage.h b/GoogleUtilities/Environment/Private/GULKeychainStorage.h similarity index 100% rename from GoogleUtilities/Environment/Public/GULKeychainStorage.h rename to GoogleUtilities/Environment/Private/GULKeychainStorage.h diff --git a/GoogleUtilities/Environment/Public/GULKeychainUtils.h b/GoogleUtilities/Environment/Private/GULKeychainUtils.h similarity index 100% rename from GoogleUtilities/Environment/Public/GULKeychainUtils.h rename to GoogleUtilities/Environment/Private/GULKeychainUtils.h diff --git a/GoogleUtilities/Environment/Public/GULSecureCoding.h b/GoogleUtilities/Environment/Private/GULSecureCoding.h similarity index 100% rename from GoogleUtilities/Environment/Public/GULSecureCoding.h rename to GoogleUtilities/Environment/Private/GULSecureCoding.h diff --git a/GoogleUtilities/Environment/SecureStorage/GULKeychainStorage.m b/GoogleUtilities/Environment/SecureStorage/GULKeychainStorage.m index d20e872b1e6..b6ef0cbd6c5 100644 --- a/GoogleUtilities/Environment/SecureStorage/GULKeychainStorage.m +++ b/GoogleUtilities/Environment/SecureStorage/GULKeychainStorage.m @@ -14,7 +14,7 @@ * limitations under the License. */ -#import "GoogleUtilities/Environment/Public/GULKeychainStorage.h" +#import "GoogleUtilities/Environment/Private/GULKeychainStorage.h" #import #if __has_include() @@ -23,8 +23,8 @@ #import "FBLPromises.h" #endif -#import "GoogleUtilities/Environment/Public/GULKeychainUtils.h" -#import "GoogleUtilities/Environment/Public/GULSecureCoding.h" +#import "GoogleUtilities/Environment/Private/GULKeychainUtils.h" +#import "GoogleUtilities/Environment/Private/GULSecureCoding.h" @interface GULKeychainStorage () @property(nonatomic, readonly) dispatch_queue_t keychainQueue; diff --git a/GoogleUtilities/Environment/SecureStorage/GULKeychainUtils.m b/GoogleUtilities/Environment/SecureStorage/GULKeychainUtils.m index 15a087becd1..ba8731a57c9 100644 --- a/GoogleUtilities/Environment/SecureStorage/GULKeychainUtils.m +++ b/GoogleUtilities/Environment/SecureStorage/GULKeychainUtils.m @@ -14,7 +14,7 @@ * limitations under the License. */ -#import "GoogleUtilities/Environment/Public/GULKeychainUtils.h" +#import "GoogleUtilities/Environment/Private/GULKeychainUtils.h" NSString *const kGULKeychainUtilsErrorDomain = @"com.gul.keychain.ErrorDomain"; diff --git a/GoogleUtilities/Environment/third_party/GULAppEnvironmentUtil.m b/GoogleUtilities/Environment/third_party/GULAppEnvironmentUtil.m index 8b1ac6ab06d..a4f4525e261 100644 --- a/GoogleUtilities/Environment/third_party/GULAppEnvironmentUtil.m +++ b/GoogleUtilities/Environment/third_party/GULAppEnvironmentUtil.m @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#import "GoogleUtilities/Environment/third_party/GULAppEnvironmentUtil.h" +#import "GoogleUtilities/Environment/Private/GULAppEnvironmentUtil.h" #import #import diff --git a/GoogleUtilities/Environment/third_party/GULAppEnvironmentUtil.h b/GoogleUtilities/Environment/third_party/Public similarity index 100% rename from GoogleUtilities/Environment/third_party/GULAppEnvironmentUtil.h rename to GoogleUtilities/Environment/third_party/Public diff --git a/GoogleUtilities/Example/Tests/Environment/GULAppEnvironmentUtilTest.m b/GoogleUtilities/Example/Tests/Environment/GULAppEnvironmentUtilTest.m index 3dc9b3a7db4..4776d78edf2 100644 --- a/GoogleUtilities/Example/Tests/Environment/GULAppEnvironmentUtilTest.m +++ b/GoogleUtilities/Example/Tests/Environment/GULAppEnvironmentUtilTest.m @@ -16,7 +16,7 @@ #import #import -#import "GoogleUtilities/Environment/third_party/GULAppEnvironmentUtil.h" +#import "GoogleUtilities/Environment/Private/GULAppEnvironmentUtil.h" @interface GULAppEnvironmentUtilTest : XCTestCase diff --git a/GoogleUtilities/Example/Tests/Environment/GULHeartbeatDateStorageTest.m b/GoogleUtilities/Example/Tests/Environment/GULHeartbeatDateStorageTest.m index c4b34014a41..9f99b46a138 100644 --- a/GoogleUtilities/Example/Tests/Environment/GULHeartbeatDateStorageTest.m +++ b/GoogleUtilities/Example/Tests/Environment/GULHeartbeatDateStorageTest.m @@ -15,7 +15,7 @@ */ #import -#import "GoogleUtilities/Environment/Public/GULHeartbeatDateStorage.h" +#import "GoogleUtilities/Environment/Private/GULHeartbeatDateStorage.h" @interface GULHeartbeatDateStorageTest : XCTestCase @property(nonatomic) NSURL *fileURL; diff --git a/GoogleUtilities/Example/Tests/Environment/GULKeychainStorageTests.m b/GoogleUtilities/Example/Tests/Environment/GULKeychainStorageTests.m index bbe2fb0a55d..d6a5c7a8ba0 100644 --- a/GoogleUtilities/Example/Tests/Environment/GULKeychainStorageTests.m +++ b/GoogleUtilities/Example/Tests/Environment/GULKeychainStorageTests.m @@ -20,7 +20,7 @@ #import "FBLPromise+Testing.h" #import "GoogleUtilities/Example/Tests/Utils/GULTestKeychain.h" -#import "GoogleUtilities/Environment/Public/GULKeychainStorage.h" +#import "GoogleUtilities/Environment/Private/GULKeychainStorage.h" @interface GULKeychainStorage (Tests) - (instancetype)initWithService:(NSString *)service cache:(NSCache *)cache; diff --git a/GoogleUtilities/Example/Tests/SecureCoding/GULSecureCodingTests.m b/GoogleUtilities/Example/Tests/SecureCoding/GULSecureCodingTests.m index 279388600e5..0aeaeec2325 100644 --- a/GoogleUtilities/Example/Tests/SecureCoding/GULSecureCodingTests.m +++ b/GoogleUtilities/Example/Tests/SecureCoding/GULSecureCodingTests.m @@ -14,7 +14,7 @@ #import -#import "GoogleUtilities/Environment/Public/GULSecureCoding.h" +#import "GoogleUtilities/Environment/Private/GULSecureCoding.h" @interface SecureCodingIncompatibleObject : NSObject @end diff --git a/GoogleUtilities/Logger/GULLogger.m b/GoogleUtilities/Logger/GULLogger.m index 5daeff9b2f9..27cf8edbbb4 100644 --- a/GoogleUtilities/Logger/GULLogger.m +++ b/GoogleUtilities/Logger/GULLogger.m @@ -16,7 +16,7 @@ #include -#import "GoogleUtilities/Environment/third_party/GULAppEnvironmentUtil.h" +#import "GoogleUtilities/Environment/Private/GULAppEnvironmentUtil.h" #import "GoogleUtilities/Logger/Public/GULLoggerLevel.h" /// ASL client facility name used by GULLogger. diff --git a/GoogleUtilities/SceneDelegateSwizzler/GULSceneDelegateSwizzler.m b/GoogleUtilities/SceneDelegateSwizzler/GULSceneDelegateSwizzler.m index 3a04eb7b287..81b2d26aa07 100644 --- a/GoogleUtilities/SceneDelegateSwizzler/GULSceneDelegateSwizzler.m +++ b/GoogleUtilities/SceneDelegateSwizzler/GULSceneDelegateSwizzler.m @@ -16,7 +16,7 @@ #import "GoogleUtilities/AppDelegateSwizzler/Private/GULAppDelegateSwizzler.h" #import "GoogleUtilities/Common/GULLoggerCodes.h" -#import "GoogleUtilities/Environment/third_party/GULAppEnvironmentUtil.h" +#import "GoogleUtilities/Environment/Private/GULAppEnvironmentUtil.h" #import "GoogleUtilities/Logger/Private/GULLogger.h" #import "GoogleUtilities/Network/Private/GULMutableDictionary.h" #import "GoogleUtilities/SceneDelegateSwizzler/Internal/GULSceneDelegateSwizzler_Private.h" From 20dd314bd85dfbb5c1fd9963a270cae6285815b6 Mon Sep 17 00:00:00 2001 From: Paul Beusterien Date: Fri, 12 Jun 2020 17:53:44 -0700 Subject: [PATCH 03/22] Fixes --- Example/CoreDiagnostics/Tests/FIRCoreDiagnosticsTest.m | 4 ++-- .../Tests/FIRInstanceIDTokenOperationsTest.m | 2 +- FirebaseCore/Sources/FIRBundleUtil.m | 2 -- scripts/change_headers.swift | 10 ++++++---- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Example/CoreDiagnostics/Tests/FIRCoreDiagnosticsTest.m b/Example/CoreDiagnostics/Tests/FIRCoreDiagnosticsTest.m index 741bb4c46cc..f71d7cb2190 100644 --- a/Example/CoreDiagnostics/Tests/FIRCoreDiagnosticsTest.m +++ b/Example/CoreDiagnostics/Tests/FIRCoreDiagnosticsTest.m @@ -24,8 +24,8 @@ #import #import #import -#import -#import +#import "GoogleUtilities/Environment/Private/GULHeartbeatDateStorage.h" +#import "GoogleUtilities/UserDefaults/Private/GULUserDefaults.h" #import #import #import diff --git a/Example/InstanceID/Tests/FIRInstanceIDTokenOperationsTest.m b/Example/InstanceID/Tests/FIRInstanceIDTokenOperationsTest.m index 0bc8907622b..189128f045b 100644 --- a/Example/InstanceID/Tests/FIRInstanceIDTokenOperationsTest.m +++ b/Example/InstanceID/Tests/FIRInstanceIDTokenOperationsTest.m @@ -33,7 +33,7 @@ #import "Firebase/InstanceID/NSError+FIRInstanceID.h" #import -#import +#import "GoogleUtilities/Environment/Private/GULHeartbeatDateStorage.h" #import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" static NSString *kDeviceID = @"fakeDeviceID"; diff --git a/FirebaseCore/Sources/FIRBundleUtil.m b/FirebaseCore/Sources/FIRBundleUtil.m index 7f90c498650..d4b32cf163e 100644 --- a/FirebaseCore/Sources/FIRBundleUtil.m +++ b/FirebaseCore/Sources/FIRBundleUtil.m @@ -15,8 +15,6 @@ #import "FirebaseCore/Sources/FIRBundleUtil.h" #import "GoogleUtilities/Environment/Private/GULAppEnvironmentUtil.h" -@import GoogleUtilities; - @implementation FIRBundleUtil diff --git a/scripts/change_headers.swift b/scripts/change_headers.swift index bba0aca9295..1203836ae35 100755 --- a/scripts/change_headers.swift +++ b/scripts/change_headers.swift @@ -23,9 +23,10 @@ let findHeaders = ["GoogleUtilities"] let changeImports = ["GoogleUtilities", "FirebaseAuth", "FirebaseCore", "Firebase", "FirebaseDynamicLinks", "FirebaseInAppMessaging", "FirebaseMessaging", "FirebaseRemoteConfig", "FirebaseInstallations", - "FirebaseAppDistribution"] + "FirebaseAppDistribution", "Example"] let skipDirPatterns = ["/Sample/", "FirebaseABTesting/Tests/Integration", - "FirebaseInAppMessaging/Tests/Integration/"] + "FirebaseInAppMessaging/Tests/Integration/", "Example/Database/App", + "Example/InstanceID/App"] // Get a Dictionary mapping a simple header name to a repo-relative path. @@ -121,12 +122,13 @@ for root in changeImports { if file.range(of:"/Public/") != nil { continue } + let fullTransformPath = root + "/" + file for dirPattern in skipDirPatterns { - if file.range(of:dirPattern) != nil { + if fullTransformPath.range(of:dirPattern) != nil { continue whileLoop } } - transformFile(root + "/" + file) + transformFile(fullTransformPath) } } } From d503de1a367b9101aff2557d8a8fbcf9db7f7154 Mon Sep 17 00:00:00 2001 From: Paul Beusterien Date: Sat, 13 Jun 2020 07:04:14 -0700 Subject: [PATCH 04/22] logger import fixes --- FirebaseCore.podspec | 1 - GoogleUtilities/Logger/Private/GULLogger.h | 2 +- GoogleUtilities/Network/Private/GULNetworkLoggerProtocol.h | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/FirebaseCore.podspec b/FirebaseCore.podspec index f0b38562aa1..410e6e4a102 100644 --- a/FirebaseCore.podspec +++ b/FirebaseCore.podspec @@ -29,7 +29,6 @@ Firebase Core includes FIRApp and FIROptions which provide central configuration 'FirebaseCore/Sources/**/*.[mh]', 'GoogleUtilities/Environment/third_party/Public/*.h', 'GoogleUtilities/Logger/Private/*.h', - 'GoogleUtilities/Logger/Public/*.h', 'Interop/CoreDiagnostics/Public/*.h', ] s.public_header_files = 'FirebaseCore/Sources/Public/*.h', 'FirebaseCore/Sources/Private/*.h' diff --git a/GoogleUtilities/Logger/Private/GULLogger.h b/GoogleUtilities/Logger/Private/GULLogger.h index 27510657a75..ff425768681 100644 --- a/GoogleUtilities/Logger/Private/GULLogger.h +++ b/GoogleUtilities/Logger/Private/GULLogger.h @@ -16,7 +16,7 @@ #import -#import "GoogleUtilities/Logger/Public/GULLoggerLevel.h" +#import NS_ASSUME_NONNULL_BEGIN diff --git a/GoogleUtilities/Network/Private/GULNetworkLoggerProtocol.h b/GoogleUtilities/Network/Private/GULNetworkLoggerProtocol.h index bf9c9e577b7..b713e4a8f9f 100644 --- a/GoogleUtilities/Network/Private/GULNetworkLoggerProtocol.h +++ b/GoogleUtilities/Network/Private/GULNetworkLoggerProtocol.h @@ -16,7 +16,7 @@ #import -#import "GoogleUtilities/Logger/Public/GULLoggerLevel.h" +#import "GoogleUtilities/Logger/Private/GULLogger.h" #import "GoogleUtilities/Network/Private/GULNetworkMessageCode.h" From eb6f1b46baf0d47443da843878155b0875763492 Mon Sep 17 00:00:00 2001 From: Paul Beusterien Date: Sat, 13 Jun 2020 07:18:21 -0700 Subject: [PATCH 05/22] fix bad move --- .../{third_party/Public => Private/GULAppEnvironmentUtil.h} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename GoogleUtilities/Environment/{third_party/Public => Private/GULAppEnvironmentUtil.h} (100%) diff --git a/GoogleUtilities/Environment/third_party/Public b/GoogleUtilities/Environment/Private/GULAppEnvironmentUtil.h similarity index 100% rename from GoogleUtilities/Environment/third_party/Public rename to GoogleUtilities/Environment/Private/GULAppEnvironmentUtil.h From 3e2e24eae2688d4e15befa5b702e6429047b0fdc Mon Sep 17 00:00:00 2001 From: Paul Beusterien Date: Sun, 14 Jun 2020 09:44:22 -0700 Subject: [PATCH 06/22] NSData+zlib.h is public --- FirebaseRemoteConfig/Sources/RCNFetch.m | 2 +- FirebaseRemoteConfig/Tests/Unit/RCNInstanceIDTest.m | 2 +- FirebaseRemoteConfig/Tests/Unit/RCNRemoteConfigTest.m | 2 +- GoogleUtilities/Example/Tests/Network/GULNetworkTest.m | 2 +- GoogleUtilities/NSData+zlib/GULNSData+zlib.m | 2 +- GoogleUtilities/NSData+zlib/{ => Public}/GULNSData+zlib.h | 0 GoogleUtilities/Network/GULNetwork.m | 2 +- 7 files changed, 6 insertions(+), 6 deletions(-) rename GoogleUtilities/NSData+zlib/{ => Public}/GULNSData+zlib.h (100%) diff --git a/FirebaseRemoteConfig/Sources/RCNFetch.m b/FirebaseRemoteConfig/Sources/RCNFetch.m index 92c91c89ffa..eeb37834ffd 100644 --- a/FirebaseRemoteConfig/Sources/RCNFetch.m +++ b/FirebaseRemoteConfig/Sources/RCNFetch.m @@ -17,7 +17,7 @@ #import "FirebaseRemoteConfig/Sources/Private/RCNConfigFetch.h" #import -#import "GoogleUtilities/NSData+zlib/GULNSData+zlib.h" +#import "GoogleUtilities/NSData+zlib/Private/GULNSDataInternal.h" #import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" #import "FirebaseRemoteConfig/Sources/Private/RCNConfigSettings.h" #import "FirebaseRemoteConfig/Sources/RCNConfigConstants.h" diff --git a/FirebaseRemoteConfig/Tests/Unit/RCNInstanceIDTest.m b/FirebaseRemoteConfig/Tests/Unit/RCNInstanceIDTest.m index e5fd24fb25e..ddecb2a19aa 100644 --- a/FirebaseRemoteConfig/Tests/Unit/RCNInstanceIDTest.m +++ b/FirebaseRemoteConfig/Tests/Unit/RCNInstanceIDTest.m @@ -26,7 +26,7 @@ #import "FirebaseRemoteConfig/Tests/Unit/RCNTestUtilities.h" #import -#import "GoogleUtilities/NSData+zlib/GULNSData+zlib.h" +#import "GoogleUtilities/NSData+zlib/Private/GULNSDataInternal.h" #import #import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" diff --git a/FirebaseRemoteConfig/Tests/Unit/RCNRemoteConfigTest.m b/FirebaseRemoteConfig/Tests/Unit/RCNRemoteConfigTest.m index 9c2758ae4e6..b9d7cd7f8e3 100644 --- a/FirebaseRemoteConfig/Tests/Unit/RCNRemoteConfigTest.m +++ b/FirebaseRemoteConfig/Tests/Unit/RCNRemoteConfigTest.m @@ -25,7 +25,7 @@ #import "FirebaseRemoteConfig/Tests/Unit/RCNTestUtilities.h" -#import "GoogleUtilities/NSData+zlib/GULNSData+zlib.h" +#import "GoogleUtilities/NSData+zlib/Private/GULNSDataInternal.h" #import #import #import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" diff --git a/GoogleUtilities/Example/Tests/Network/GULNetworkTest.m b/GoogleUtilities/Example/Tests/Network/GULNetworkTest.m index 70b0b77fccf..41a18815d93 100644 --- a/GoogleUtilities/Example/Tests/Network/GULNetworkTest.m +++ b/GoogleUtilities/Example/Tests/Network/GULNetworkTest.m @@ -17,7 +17,7 @@ #import #import -#import "GoogleUtilities/NSData+zlib/GULNSData+zlib.h" +#import "GoogleUtilities/NSData+zlib/Private/GULNSDataInternal.h" #import "GoogleUtilities/Network/Private/GULNetwork.h" #import "GoogleUtilities/Reachability/Private/GULReachabilityChecker.h" diff --git a/GoogleUtilities/NSData+zlib/GULNSData+zlib.m b/GoogleUtilities/NSData+zlib/GULNSData+zlib.m index 5a77bb8f507..5eb638d6bca 100644 --- a/GoogleUtilities/NSData+zlib/GULNSData+zlib.m +++ b/GoogleUtilities/NSData+zlib/GULNSData+zlib.m @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#import "GoogleUtilities/NSData+zlib/GULNSData+zlib.h" +#import "GoogleUtilities/NSData+zlib/Public/GULNSData+zlib.h" #import diff --git a/GoogleUtilities/NSData+zlib/GULNSData+zlib.h b/GoogleUtilities/NSData+zlib/Public/GULNSData+zlib.h similarity index 100% rename from GoogleUtilities/NSData+zlib/GULNSData+zlib.h rename to GoogleUtilities/NSData+zlib/Public/GULNSData+zlib.h diff --git a/GoogleUtilities/Network/GULNetwork.m b/GoogleUtilities/Network/GULNetwork.m index 3076f49826e..5b7d7e37b13 100644 --- a/GoogleUtilities/Network/GULNetwork.m +++ b/GoogleUtilities/Network/GULNetwork.m @@ -16,7 +16,7 @@ #import "GoogleUtilities/Network/Private/GULNetworkMessageCode.h" #import "GoogleUtilities/Logger/Private/GULLogger.h" -#import "GoogleUtilities/NSData+zlib/GULNSData+zlib.h" +#import "GoogleUtilities/NSData+zlib/Private/GULNSDataInternal.h" #import "GoogleUtilities/Network/Private/GULMutableDictionary.h" #import "GoogleUtilities/Network/Private/GULNetworkConstants.h" #import "GoogleUtilities/Reachability/Private/GULReachabilityChecker.h" From 970a9e2cf0914b45bdfef6868195db4af1626417 Mon Sep 17 00:00:00 2001 From: Paul Beusterien Date: Mon, 15 Jun 2020 08:57:47 -0700 Subject: [PATCH 07/22] fix --- GoogleUtilities/NSData+zlib/GULNSData+zlib.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/GoogleUtilities/NSData+zlib/GULNSData+zlib.m b/GoogleUtilities/NSData+zlib/GULNSData+zlib.m index 5eb638d6bca..e502ac00b2b 100644 --- a/GoogleUtilities/NSData+zlib/GULNSData+zlib.m +++ b/GoogleUtilities/NSData+zlib/GULNSData+zlib.m @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#import "GoogleUtilities/NSData+zlib/Public/GULNSData+zlib.h" +#import "GoogleUtilities/NSData+zlib/Private/GULNSDataInternal.h" #import From 27e3b619bf519c3819af0901385889668c5213bb Mon Sep 17 00:00:00 2001 From: Paul Beusterien Date: Mon, 15 Jun 2020 09:06:04 -0700 Subject: [PATCH 08/22] Fix paths --- GoogleUtilities.podspec | 4 ++-- GoogleUtilities/NSData+zlib/GULNSData+zlib.m | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/GoogleUtilities.podspec b/GoogleUtilities.podspec index 549b71714b1..5bd150c7fb9 100644 --- a/GoogleUtilities.podspec +++ b/GoogleUtilities.podspec @@ -59,8 +59,8 @@ other Google CocoaPods. They're not intended for direct public usage. end s.subspec 'NSData+zlib' do |ns| - ns.source_files = 'GoogleUtilities/NSData+zlib/*.[mh]' - ns.public_header_files = 'GoogleUtilities/NSData+zlib/GULNSData+zlib.h' + ns.source_files = 'GoogleUtilities/NSData+zlib/**/*.[mh]' + ns.public_header_files = 'GoogleUtilities/NSData+zlib/Public/GULNSData+zlib.h' ns.libraries = [ 'z' ] diff --git a/GoogleUtilities/NSData+zlib/GULNSData+zlib.m b/GoogleUtilities/NSData+zlib/GULNSData+zlib.m index e502ac00b2b..5eb638d6bca 100644 --- a/GoogleUtilities/NSData+zlib/GULNSData+zlib.m +++ b/GoogleUtilities/NSData+zlib/GULNSData+zlib.m @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#import "GoogleUtilities/NSData+zlib/Private/GULNSDataInternal.h" +#import "GoogleUtilities/NSData+zlib/Public/GULNSData+zlib.h" #import From 2919cd163fc38fd69420ac8ea1c8721098e4c626 Mon Sep 17 00:00:00 2001 From: Paul Beusterien Date: Mon, 15 Jun 2020 09:34:20 -0700 Subject: [PATCH 09/22] Missing add file --- GoogleUtilities.podspec | 3 ++- .../NSData+zlib/Private/GULNSDataInternal.h | 23 +++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 GoogleUtilities/NSData+zlib/Private/GULNSDataInternal.h diff --git a/GoogleUtilities.podspec b/GoogleUtilities.podspec index 5bd150c7fb9..25ae6a2be14 100644 --- a/GoogleUtilities.podspec +++ b/GoogleUtilities.podspec @@ -60,7 +60,8 @@ other Google CocoaPods. They're not intended for direct public usage. s.subspec 'NSData+zlib' do |ns| ns.source_files = 'GoogleUtilities/NSData+zlib/**/*.[mh]' - ns.public_header_files = 'GoogleUtilities/NSData+zlib/Public/GULNSData+zlib.h' + ns.public_header_files = 'GoogleUtilities/NSData+zlib/Public/*.h', 'GoogleUtilities/NSData+zlib/Private/*.h' + ns.private_header_files = 'GoogleUtilities/NSData+zlib/Private/*.h' ns.libraries = [ 'z' ] diff --git a/GoogleUtilities/NSData+zlib/Private/GULNSDataInternal.h b/GoogleUtilities/NSData+zlib/Private/GULNSDataInternal.h new file mode 100644 index 00000000000..8767a57fb96 --- /dev/null +++ b/GoogleUtilities/NSData+zlib/Private/GULNSDataInternal.h @@ -0,0 +1,23 @@ +// Copyright 2020 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +// An umbrella header, for any other libraries in this repo to access Firebase Public and Private +// headers. Any package manager complexity should be handled here. + +#if SWIFT_PACKAGE +@import TBD; +#else +#import +#endif + From 55684bc413c59208ac3a8fdf38041cf710b5b7c3 Mon Sep 17 00:00:00 2001 From: Paul Beusterien Date: Mon, 15 Jun 2020 10:21:02 -0700 Subject: [PATCH 10/22] fix path --- FirebaseCore.podspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FirebaseCore.podspec b/FirebaseCore.podspec index 410e6e4a102..d45f813ec1b 100644 --- a/FirebaseCore.podspec +++ b/FirebaseCore.podspec @@ -27,7 +27,7 @@ Firebase Core includes FIRApp and FIROptions which provide central configuration s.source_files = [ 'FirebaseCore/Sources/**/*.[mh]', - 'GoogleUtilities/Environment/third_party/Public/*.h', + 'GoogleUtilities/Environment/Private/*.h', 'GoogleUtilities/Logger/Private/*.h', 'Interop/CoreDiagnostics/Public/*.h', ] From 7e4ec3ca42c57620c8dae99ca7a9a4bc3b600578 Mon Sep 17 00:00:00 2001 From: Paul Beusterien Date: Mon, 15 Jun 2020 10:49:04 -0700 Subject: [PATCH 11/22] podspec updates --- FirebaseAppDistribution.podspec | 3 ++- FirebaseAuth.podspec | 7 +++++-- FirebaseCore.podspec | 6 +++--- FirebaseCoreDiagnostics.podspec | 13 +++++++++---- FirebaseDynamicLinks.podspec | 10 +++++++--- FirebaseInAppMessaging.podspec | 3 ++- FirebaseInstallations.podspec | 8 +++++--- FirebaseInstanceID.podspec | 6 ++++-- FirebaseMessaging.podspec | 12 ++++++++---- FirebaseRemoteConfig.podspec | 6 ++++-- GoogleUtilities.podspec | 2 +- 11 files changed, 50 insertions(+), 26 deletions(-) diff --git a/FirebaseAppDistribution.podspec b/FirebaseAppDistribution.podspec index 4f0f268920e..83c281622a9 100644 --- a/FirebaseAppDistribution.podspec +++ b/FirebaseAppDistribution.podspec @@ -25,13 +25,14 @@ iOS SDK for App Distribution for Firebase. s.source_files = [ base_dir + '**/*.{c,h,m,mm}', 'FirebaseCore/Sources/Private/*.h', + 'GoogleUtilities/AppDelegateSwizzler/Private/*.h', ] s.public_header_files = base_dir + 'Public/*.h' s.private_header_files = base_dir + 'Private/*.h' s.dependency 'FirebaseCore', '~> 6.8' s.dependency 'AppAuth', '~> 1.2.0' - s.dependency 'GoogleUtilities/AppDelegateSwizzler', '~> 6.5' + s.dependency 'GoogleUtilities/AppDelegateSwizzler', '~> 6.7' s.pod_target_xcconfig = { 'GCC_C_LANGUAGE_STANDARD' => 'c99', diff --git a/FirebaseAuth.podspec b/FirebaseAuth.podspec index 3be70c3cde2..e644fbdba55 100644 --- a/FirebaseAuth.podspec +++ b/FirebaseAuth.podspec @@ -29,6 +29,9 @@ supports email and password accounts, as well as several 3rd party authenticatio s.source_files = [ source + '**/*.[mh]', 'FirebaseCore/Sources/Private/*.h', + 'GoogleUtilities/AppDelegateSwizzler/Private/*.h', + 'GoogleUtilities/Environment/Private/*.h', + 'GoogleUtilities/SceneDelegateSwizzler/Private/*.h', 'Interop/Auth/Public/*.h', ] s.public_header_files = source + 'Public/*.h' @@ -46,8 +49,8 @@ supports email and password accounts, as well as several 3rd party authenticatio s.framework = 'Security' s.ios.framework = 'SafariServices' s.dependency 'FirebaseCore', '~> 6.8' - s.dependency 'GoogleUtilities/AppDelegateSwizzler', '~> 6.5' - s.dependency 'GoogleUtilities/Environment', '~> 6.5' + s.dependency 'GoogleUtilities/AppDelegateSwizzler', '~> 6.7' + s.dependency 'GoogleUtilities/Environment', '~> 6.7' s.dependency 'GTMSessionFetcher/Core', '~> 1.1' s.test_spec 'unit' do |unit_tests| diff --git a/FirebaseCore.podspec b/FirebaseCore.podspec index d45f813ec1b..854960556eb 100644 --- a/FirebaseCore.podspec +++ b/FirebaseCore.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'FirebaseCore' - s.version = '6.8.0-paul-test' + s.version = '6.8.0' s.summary = 'Firebase Core' s.description = <<-DESC @@ -38,8 +38,8 @@ Firebase Core includes FIRApp and FIROptions which provide central configuration s.ios.framework = 'UIKit' s.osx.framework = 'AppKit' s.tvos.framework = 'UIKit' - s.dependency 'GoogleUtilities/Environment', '6.6.0-paul-test' - s.dependency 'GoogleUtilities/Logger', '6.6.0-paul-test' + s.dependency 'GoogleUtilities/Environment', '~> 6.7' + s.dependency 'GoogleUtilities/Logger', '~> 6.7' s.dependency 'FirebaseCoreDiagnostics', '~> 1.3' s.pod_target_xcconfig = { diff --git a/FirebaseCoreDiagnostics.podspec b/FirebaseCoreDiagnostics.podspec index 19ffcdd13fd..9cd52dd145e 100644 --- a/FirebaseCoreDiagnostics.podspec +++ b/FirebaseCoreDiagnostics.podspec @@ -45,22 +45,27 @@ non-Cocoapod integration. This library also respects the Firebase global data co s.source_files = [ 'Firebase/CoreDiagnostics/FIRCDLibrary/**/*.[cmh]', + 'GoogleUtilities/Environment/Private/*.h', + 'GoogleUtilities/Logger/Private/*.h', 'Interop/CoreDiagnostics/Public/*.h', ] s.framework = 'Foundation' s.dependency 'GoogleDataTransportCCTSupport', '~> 3.1' - s.dependency 'GoogleUtilities/Environment', '~> 6.5' - s.dependency 'GoogleUtilities/Logger', '~> 6.5' + s.dependency 'GoogleUtilities/Environment', '~> 6.7' + s.dependency 'GoogleUtilities/Logger', '~> 6.7' s.dependency 'nanopb', '~> 1.30905.0' s.test_spec 'unit' do |unit_tests| unit_tests.platforms = {:ios => '8.0', :osx => '10.11', :tvos => '10.0'} unit_tests.platforms = {:ios => '8.0', :osx => '10.11', :tvos => '10.0'} - unit_tests.dependency 'GoogleUtilities/UserDefaults', '~> 6.2' + unit_tests.dependency 'GoogleUtilities/UserDefaults', '~> 6.7' unit_tests.dependency 'OCMock' - unit_tests.source_files = 'Example/CoreDiagnostics/Tests/**/*.[mh]' + unit_tests.source_files = [ + 'Example/CoreDiagnostics/Tests/**/*.[mh]', + 'GoogleUtilities/UserDefaults/Private/*.h', + ] unit_tests.requires_app_host = false end end diff --git a/FirebaseDynamicLinks.podspec b/FirebaseDynamicLinks.podspec index 0f764a05e35..15a7e431727 100644 --- a/FirebaseDynamicLinks.podspec +++ b/FirebaseDynamicLinks.podspec @@ -40,13 +40,17 @@ Firebase Dynamic Links are deep links that enhance user experience and increase } s.test_spec 'unit' do |unit_tests| - unit_tests.source_files = 'FirebaseDynamicLinks/Tests/Unit/*.[mh]' + unit_tests.source_files = [ + 'FirebaseDynamicLinks/Tests/Unit/*.[mh]', + 'GoogleUtilities/SwizzlerTestHelpers/*.h', + 'GoogleUtilities/MethodSwizzler/Private/*.h', + ] unit_tests.requires_app_host = true unit_tests.resources = 'FirebaseDynamicLinks/Tests/Unit/GoogleService-Info.plist', # Supply plist for custom domain testing. 'FirebaseDynamicLinks/Tests/Unit/DL-Info.plist' unit_tests.dependency 'OCMock' - unit_tests.dependency 'GoogleUtilities/MethodSwizzler', '~> 6.2' - unit_tests.dependency 'GoogleUtilities/SwizzlerTestHelpers', '~> 6.2' + unit_tests.dependency 'GoogleUtilities/MethodSwizzler', '~> 6.7' + unit_tests.dependency 'GoogleUtilities/SwizzlerTestHelpers', '~> 6.7' end end diff --git a/FirebaseInAppMessaging.podspec b/FirebaseInAppMessaging.podspec index 8e58ccb55b1..22412d59d5b 100644 --- a/FirebaseInAppMessaging.podspec +++ b/FirebaseInAppMessaging.podspec @@ -28,6 +28,7 @@ See more product details at https://firebase.google.com/products/in-app-messagin base_dir + "Sources/**/*.[cmh]", 'Interop/Analytics/Public/*.h', 'FirebaseCore/Sources/Private/*.h', + 'GoogleUtilities/Environment/Private/*.h', ] s.public_header_files = base_dir + 'Sources/Public/*.h' s.private_header_files = base_dir + 'Sources/Private/**/*.h' @@ -51,7 +52,7 @@ See more product details at https://firebase.google.com/products/in-app-messagin s.dependency 'FirebaseInstallations', '~> 1.1' s.dependency 'GoogleDataTransportCCTSupport', '~> 3.1' s.dependency 'FirebaseABTesting', '~> 3.2' - s.dependency 'GoogleUtilities/Environment', '~> 6.5' + s.dependency 'GoogleUtilities/Environment', '~> 6.7' s.dependency 'nanopb', '~> 1.30905.0' s.test_spec 'unit' do |unit_tests| diff --git a/FirebaseInstallations.podspec b/FirebaseInstallations.podspec index fadcaf86ab8..fab81d7a314 100644 --- a/FirebaseInstallations.podspec +++ b/FirebaseInstallations.podspec @@ -28,15 +28,17 @@ Pod::Spec.new do |s| base_dir = "FirebaseInstallations/Source/" s.source_files = [ base_dir + 'Library/**/*.[mh]', - 'FirebaseCore/Sources/Private/*.h' + 'FirebaseCore/Sources/Private/*.h', + 'GoogleUtilities/Environment/Private/*.h', + 'GoogleUtilities/UserDefaults/Private/*.h', ] s.public_header_files = base_dir + 'Library/Public/*.h' s.framework = 'Security' s.dependency 'FirebaseCore', '~> 6.8' s.dependency 'PromisesObjC', '~> 1.2' - s.dependency 'GoogleUtilities/Environment', '~> 6.6' - s.dependency 'GoogleUtilities/UserDefaults', '~> 6.6' + s.dependency 'GoogleUtilities/Environment', '~> 6.7' + s.dependency 'GoogleUtilities/UserDefaults', '~> 6.7' preprocessor_definitions = 'FIRInstallations_LIB_VERSION=' + String(s.version) if ENV['FIS_ALLOWS_INCOMPATIBLE_IID_VERSION'] && ENV['FIS_ALLOWS_INCOMPATIBLE_IID_VERSION'] == '1' then diff --git a/FirebaseInstanceID.podspec b/FirebaseInstanceID.podspec index c97b1c62ea6..d549912b569 100644 --- a/FirebaseInstanceID.podspec +++ b/FirebaseInstanceID.podspec @@ -31,6 +31,8 @@ services. s.source_files = [ base_dir + '**/*.[mh]', 'FirebaseCore/Sources/Private/*.h', + 'GoogleUtilities/Environment/Private/*.h', + 'GoogleUtilities/UserDefaults/Private/*.h', ] s.requires_arc = base_dir + '*.m' s.public_header_files = base_dir + 'Public/*.h', base_dir + 'Private/*.h' @@ -43,8 +45,8 @@ services. s.framework = 'Security' s.dependency 'FirebaseCore', '~> 6.8' s.dependency 'FirebaseInstallations', '~> 1.0' - s.dependency 'GoogleUtilities/UserDefaults', '~> 6.5' - s.dependency 'GoogleUtilities/Environment', '~> 6.5' + s.dependency 'GoogleUtilities/UserDefaults', '~> 6.7' + s.dependency 'GoogleUtilities/Environment', '~> 6.7' s.test_spec 'unit' do |unit_tests| unit_tests.platforms = {:ios => '8.0', :osx => '10.11', :tvos => '10.0'} diff --git a/FirebaseMessaging.podspec b/FirebaseMessaging.podspec index 684b528229a..e84534cfbbb 100644 --- a/FirebaseMessaging.podspec +++ b/FirebaseMessaging.podspec @@ -33,6 +33,10 @@ device, and it is completely free. base_dir + 'Sources/**/*.[mh]', 'Interop/Analytics/Public/*.h', 'FirebaseCore/Sources/Private/*.h', + 'GoogleUtilities/AppDelegateSwizzler/Private/*.h', + 'GoogleUtilities/Environment/Private/*.h', + 'GoogleUtilities/Reachability/Private/*.h', + 'GoogleUtilities/UserDefaults/Private/*.h', ] s.requires_arc = base_dir + 'Sources/*.m' s.public_header_files = base_dir + 'Sources/Public/*.h' @@ -51,10 +55,10 @@ device, and it is completely free. s.weak_framework = 'UserNotifications' s.dependency 'FirebaseCore', '~> 6.8' s.dependency 'FirebaseInstanceID', '~> 4.3' - s.dependency 'GoogleUtilities/AppDelegateSwizzler', '~> 6.5' - s.dependency 'GoogleUtilities/Reachability', '~> 6.5' - s.dependency 'GoogleUtilities/Environment', '~> 6.5' - s.dependency 'GoogleUtilities/UserDefaults', '~> 6.5' + s.dependency 'GoogleUtilities/AppDelegateSwizzler', '~> 6.7' + s.dependency 'GoogleUtilities/Reachability', '~> 6.7' + s.dependency 'GoogleUtilities/Environment', '~> 6.7' + s.dependency 'GoogleUtilities/UserDefaults', '~> 6.7' s.dependency 'Protobuf', '~> 3.9', '>= 3.9.2' s.test_spec 'unit' do |unit_tests| diff --git a/FirebaseRemoteConfig.podspec b/FirebaseRemoteConfig.podspec index 7df39707dbe..34640142038 100644 --- a/FirebaseRemoteConfig.podspec +++ b/FirebaseRemoteConfig.podspec @@ -31,6 +31,8 @@ app update. base_dir + '**/*.[mh]', 'Interop/Analytics/Public/*.h', 'FirebaseCore/Sources/Private/*.h', + 'GoogleUtilities/Environment/Private/*.h', + 'GoogleUtilities/NSData+zlib/Private/*.h', ] s.public_header_files = base_dir + 'Public/*.h' s.private_header_files = base_dir + 'Private/*.h' @@ -44,8 +46,8 @@ app update. s.dependency 'FirebaseABTesting', '~> 3.1' s.dependency 'FirebaseCore', '~> 6.8' s.dependency 'FirebaseInstallations', '~> 1.1' - s.dependency 'GoogleUtilities/Environment', '~> 6.2' - s.dependency 'GoogleUtilities/NSData+zlib', '~> 6.2' + s.dependency 'GoogleUtilities/Environment', '~> 6.7' + s.dependency 'GoogleUtilities/NSData+zlib', '~> 6.7' s.test_spec 'unit' do |unit_tests| # TODO(dmandar) - Update or delete the commented files. diff --git a/GoogleUtilities.podspec b/GoogleUtilities.podspec index 25ae6a2be14..a1e824f6433 100644 --- a/GoogleUtilities.podspec +++ b/GoogleUtilities.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'GoogleUtilities' - s.version = '6.6.0-paul-test' + s.version = '6.7.0' s.summary = 'Google Utilities for iOS (plus community support for macOS and tvOS)' s.description = <<-DESC From aa63c87a42c4166cfca4479c6233d1a3835efe1e Mon Sep 17 00:00:00 2001 From: Paul Beusterien Date: Mon, 15 Jun 2020 10:55:59 -0700 Subject: [PATCH 12/22] style --- .../CoreDiagnostics/Tests/FIRCoreDiagnosticsTest.m | 4 ++-- .../Tests/FIRInstanceIDTokenOperationsTest.m | 2 +- Firebase/InstanceID/FIRInstanceID.m | 4 ++-- .../InstanceID/FIRInstanceIDCheckinPreferences.m | 2 +- Firebase/InstanceID/FIRInstanceIDUtilities.m | 2 +- .../Sources/FIRAppDistribution.m | 2 +- FirebaseAuth/Sources/Auth/FIRAuth.m | 2 +- .../SystemService/FIRAuthAPNSTokenManager.m | 2 +- .../Sources/Utilities/FIRAuthDefaultUIDelegate.m | 2 +- FirebaseAuth/Tests/Unit/FIRAuthTests.m | 2 +- FirebaseCore/Sources/FIRLogger.m | 2 +- FirebaseCore/Tests/Unit/FIRBundleUtilTest.m | 2 +- FirebaseCore/Tests/Unit/FIRHeartbeatInfoTest.m | 2 +- FirebaseCore/Tests/Unit/FIRLoggerTest.m | 2 +- .../Tests/Unit/FIRDynamicLinkNetworkingTests.m | 4 ++-- .../Tests/Unit/FIRDynamicLinksTest.m | 4 ++-- .../Sources/Runtime/FIRInAppMessaging+Bootstrap.m | 2 +- .../FIRInstallationsIDController.m | 2 +- FirebaseMessaging/Sources/FIRMessaging.m | 2 +- .../Sources/FIRMessagingRemoteNotificationsProxy.m | 2 +- .../Tests/UnitTests/FIRInstanceIDWithFCMTest.m | 2 +- .../Tests/UnitTests/FIRMessagingHandlingTest.m | 2 +- .../Tests/UnitTests/FIRMessagingTest.m | 2 +- FirebaseRemoteConfig/Sources/RCNConfigSettings.m | 2 +- FirebaseRemoteConfig/Sources/RCNDevice.m | 2 +- FirebaseRemoteConfig/Sources/RCNFetch.m | 2 +- .../Tests/Unit/RCNInstanceIDTest.m | 2 +- .../Tests/Unit/RCNRemoteConfigTest.m | 2 +- .../NSData+zlib/Private/GULNSDataInternal.h | 1 - scripts/change_headers.swift | 14 +++++++------- 30 files changed, 39 insertions(+), 40 deletions(-) diff --git a/Example/CoreDiagnostics/Tests/FIRCoreDiagnosticsTest.m b/Example/CoreDiagnostics/Tests/FIRCoreDiagnosticsTest.m index f71d7cb2190..a4ead78e870 100644 --- a/Example/CoreDiagnostics/Tests/FIRCoreDiagnosticsTest.m +++ b/Example/CoreDiagnostics/Tests/FIRCoreDiagnosticsTest.m @@ -24,11 +24,11 @@ #import #import #import -#import "GoogleUtilities/Environment/Private/GULHeartbeatDateStorage.h" -#import "GoogleUtilities/UserDefaults/Private/GULUserDefaults.h" #import #import #import +#import "GoogleUtilities/Environment/Private/GULHeartbeatDateStorage.h" +#import "GoogleUtilities/UserDefaults/Private/GULUserDefaults.h" #import "Interop/CoreDiagnostics/Public/FIRCoreDiagnosticsData.h" #import "Interop/CoreDiagnostics/Public/FIRCoreDiagnosticsInterop.h" diff --git a/Example/InstanceID/Tests/FIRInstanceIDTokenOperationsTest.m b/Example/InstanceID/Tests/FIRInstanceIDTokenOperationsTest.m index 189128f045b..95c194fbca4 100644 --- a/Example/InstanceID/Tests/FIRInstanceIDTokenOperationsTest.m +++ b/Example/InstanceID/Tests/FIRInstanceIDTokenOperationsTest.m @@ -33,8 +33,8 @@ #import "Firebase/InstanceID/NSError+FIRInstanceID.h" #import -#import "GoogleUtilities/Environment/Private/GULHeartbeatDateStorage.h" #import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "GoogleUtilities/Environment/Private/GULHeartbeatDateStorage.h" static NSString *kDeviceID = @"fakeDeviceID"; static NSString *kSecretToken = @"fakeSecretToken"; diff --git a/Firebase/InstanceID/FIRInstanceID.m b/Firebase/InstanceID/FIRInstanceID.m index 24421318a76..d2c950cb0d5 100644 --- a/Firebase/InstanceID/FIRInstanceID.m +++ b/Firebase/InstanceID/FIRInstanceID.m @@ -18,8 +18,6 @@ #import -#import "GoogleUtilities/Environment/Private/GULAppEnvironmentUtil.h" -#import "GoogleUtilities/UserDefaults/Private/GULUserDefaults.h" #import "FIRInstanceID+Private.h" #import "FIRInstanceIDAuthService.h" #import "FIRInstanceIDCheckinPreferences.h" @@ -33,6 +31,8 @@ #import "FIRInstanceIDUtilities.h" #import "FIRInstanceIDVersionUtilities.h" #import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "GoogleUtilities/Environment/Private/GULAppEnvironmentUtil.h" +#import "GoogleUtilities/UserDefaults/Private/GULUserDefaults.h" #import "NSError+FIRInstanceID.h" // Public constants diff --git a/Firebase/InstanceID/FIRInstanceIDCheckinPreferences.m b/Firebase/InstanceID/FIRInstanceIDCheckinPreferences.m index 9bfd79ad9c0..965f4641beb 100644 --- a/Firebase/InstanceID/FIRInstanceIDCheckinPreferences.m +++ b/Firebase/InstanceID/FIRInstanceIDCheckinPreferences.m @@ -16,9 +16,9 @@ #import "FIRInstanceIDCheckinPreferences.h" -#import "GoogleUtilities/UserDefaults/Private/GULUserDefaults.h" #import "FIRInstanceIDCheckinService.h" #import "FIRInstanceIDUtilities.h" +#import "GoogleUtilities/UserDefaults/Private/GULUserDefaults.h" const NSTimeInterval kFIRInstanceIDDefaultCheckinInterval = 7 * 24 * 60 * 60; // 7 days. diff --git a/Firebase/InstanceID/FIRInstanceIDUtilities.m b/Firebase/InstanceID/FIRInstanceIDUtilities.m index f631fec48df..25d1b97232e 100644 --- a/Firebase/InstanceID/FIRInstanceIDUtilities.m +++ b/Firebase/InstanceID/FIRInstanceIDUtilities.m @@ -21,11 +21,11 @@ #endif #import -#import "GoogleUtilities/UserDefaults/Private/GULUserDefaults.h" #import "FIRInstanceID.h" #import "FIRInstanceIDConstants.h" #import "FIRInstanceIDLogger.h" #import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "GoogleUtilities/UserDefaults/Private/GULUserDefaults.h" // Convert the macro to a string #define STR_EXPAND(x) #x diff --git a/FirebaseAppDistribution/Sources/FIRAppDistribution.m b/FirebaseAppDistribution/Sources/FIRAppDistribution.m index e0ac32e8035..b1e021a9f64 100644 --- a/FirebaseAppDistribution/Sources/FIRAppDistribution.m +++ b/FirebaseAppDistribution/Sources/FIRAppDistribution.m @@ -19,8 +19,8 @@ #import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" -#import "GoogleUtilities/AppDelegateSwizzler/Private/GULAppDelegateSwizzler.h" #import "FIRAppDistributionAppDelegateInterceptor.h" +#import "GoogleUtilities/AppDelegateSwizzler/Private/GULAppDelegateSwizzler.h" /// Empty protocol to register with FirebaseCore's component system. @protocol FIRAppDistributionInstanceProvider diff --git a/FirebaseAuth/Sources/Auth/FIRAuth.m b/FirebaseAuth/Sources/Auth/FIRAuth.m index df70e493350..555ec623772 100644 --- a/FirebaseAuth/Sources/Auth/FIRAuth.m +++ b/FirebaseAuth/Sources/Auth/FIRAuth.m @@ -23,10 +23,10 @@ #endif #import +#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" #import "GoogleUtilities/AppDelegateSwizzler/Private/GULAppDelegateSwizzler.h" #import "GoogleUtilities/Environment/Private/GULAppEnvironmentUtil.h" #import "GoogleUtilities/SceneDelegateSwizzler/Private/GULSceneDelegateSwizzler.h" -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" #import "FirebaseAuth/Sources/Auth/FIRAuthDataResult_Internal.h" #import "FirebaseAuth/Sources/Auth/FIRAuthDispatcher.h" diff --git a/FirebaseAuth/Sources/SystemService/FIRAuthAPNSTokenManager.m b/FirebaseAuth/Sources/SystemService/FIRAuthAPNSTokenManager.m index 27d18fe31db..4730d6f297d 100644 --- a/FirebaseAuth/Sources/SystemService/FIRAuthAPNSTokenManager.m +++ b/FirebaseAuth/Sources/SystemService/FIRAuthAPNSTokenManager.m @@ -17,8 +17,8 @@ #include #if !TARGET_OS_OSX -#import "GoogleUtilities/Environment/Private/GULAppEnvironmentUtil.h" #import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "GoogleUtilities/Environment/Private/GULAppEnvironmentUtil.h" #import "FirebaseAuth/Sources/Auth/FIRAuthGlobalWorkQueue.h" #import "FirebaseAuth/Sources/SystemService/FIRAuthAPNSToken.h" diff --git a/FirebaseAuth/Sources/Utilities/FIRAuthDefaultUIDelegate.m b/FirebaseAuth/Sources/Utilities/FIRAuthDefaultUIDelegate.m index 9d8161e891e..f3017beb2ca 100644 --- a/FirebaseAuth/Sources/Utilities/FIRAuthDefaultUIDelegate.m +++ b/FirebaseAuth/Sources/Utilities/FIRAuthDefaultUIDelegate.m @@ -17,8 +17,8 @@ #include #if !TARGET_OS_OSX -#import "GoogleUtilities/Environment/Private/GULAppEnvironmentUtil.h" #import +#import "GoogleUtilities/Environment/Private/GULAppEnvironmentUtil.h" #import "FirebaseAuth/Sources/Utilities/FIRAuthDefaultUIDelegate.h" diff --git a/FirebaseAuth/Tests/Unit/FIRAuthTests.m b/FirebaseAuth/Tests/Unit/FIRAuthTests.m index c9351bf4281..7f3a047c4e5 100644 --- a/FirebaseAuth/Tests/Unit/FIRAuthTests.m +++ b/FirebaseAuth/Tests/Unit/FIRAuthTests.m @@ -21,10 +21,10 @@ #import #import #import -#import "GoogleUtilities/AppDelegateSwizzler/Private/GULAppDelegateSwizzler.h" #import #import #import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "GoogleUtilities/AppDelegateSwizzler/Private/GULAppDelegateSwizzler.h" #import "Interop/Auth/Public/FIRAuthInterop.h" #import "FirebaseAuth/Sources/Auth/FIRAuthDispatcher.h" diff --git a/FirebaseCore/Sources/FIRLogger.m b/FirebaseCore/Sources/FIRLogger.m index 767c0f780c0..cf210ba8fb8 100644 --- a/FirebaseCore/Sources/FIRLogger.m +++ b/FirebaseCore/Sources/FIRLogger.m @@ -14,9 +14,9 @@ #import "FirebaseCore/Sources/Private/FIRLogger.h" +#import "FirebaseCore/Sources/Public/FIRLoggerLevel.h" #import "GoogleUtilities/Environment/Private/GULAppEnvironmentUtil.h" #import "GoogleUtilities/Logger/Private/GULLogger.h" -#import "FirebaseCore/Sources/Public/FIRLoggerLevel.h" #import "FirebaseCore/Sources/FIRVersion.h" diff --git a/FirebaseCore/Tests/Unit/FIRBundleUtilTest.m b/FirebaseCore/Tests/Unit/FIRBundleUtilTest.m index e35aa77a9ae..5b8c652ceb8 100644 --- a/FirebaseCore/Tests/Unit/FIRBundleUtilTest.m +++ b/FirebaseCore/Tests/Unit/FIRBundleUtilTest.m @@ -14,8 +14,8 @@ #import "FirebaseCore/Tests/Unit/FIRTestCase.h" -#import "GoogleUtilities/Environment/Private/GULAppEnvironmentUtil.h" #import "FirebaseCore/Sources/FIRBundleUtil.h" +#import "GoogleUtilities/Environment/Private/GULAppEnvironmentUtil.h" static NSString *const kResultPath = @"resultPath"; static NSString *const kResourceName = @"resourceName"; diff --git a/FirebaseCore/Tests/Unit/FIRHeartbeatInfoTest.m b/FirebaseCore/Tests/Unit/FIRHeartbeatInfoTest.m index 89a83ba3e9d..1003655f987 100644 --- a/FirebaseCore/Tests/Unit/FIRHeartbeatInfoTest.m +++ b/FirebaseCore/Tests/Unit/FIRHeartbeatInfoTest.m @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -#import "GoogleUtilities/Environment/Private/GULHeartbeatDateStorage.h" #import #import "FirebaseCore/Sources/Private/FIRHeartbeatInfo.h" +#import "GoogleUtilities/Environment/Private/GULHeartbeatDateStorage.h" @interface FIRHeartbeatInfoTest : XCTestCase diff --git a/FirebaseCore/Tests/Unit/FIRLoggerTest.m b/FirebaseCore/Tests/Unit/FIRLoggerTest.m index 1e046402f6c..8cf789544df 100644 --- a/FirebaseCore/Tests/Unit/FIRLoggerTest.m +++ b/FirebaseCore/Tests/Unit/FIRLoggerTest.m @@ -19,8 +19,8 @@ // TODO - FIRLoggerTest should be split into a separate FIRLoggerTest and GULLoggerTest. // No test should include both includes. -#import "GoogleUtilities/Logger/Private/GULLogger.h" #import "FirebaseCore/Sources/Private/FIRLogger.h" +#import "GoogleUtilities/Logger/Private/GULLogger.h" #import diff --git a/FirebaseDynamicLinks/Tests/Unit/FIRDynamicLinkNetworkingTests.m b/FirebaseDynamicLinks/Tests/Unit/FIRDynamicLinkNetworkingTests.m index 597b8a140e9..5e6ca02a982 100644 --- a/FirebaseDynamicLinks/Tests/Unit/FIRDynamicLinkNetworkingTests.m +++ b/FirebaseDynamicLinks/Tests/Unit/FIRDynamicLinkNetworkingTests.m @@ -18,9 +18,9 @@ #import -#import "GoogleUtilities/SwizzlerTestHelpers/GULSwizzler+Unswizzle.h" -#import "GoogleUtilities/MethodSwizzler/Private/GULSwizzler.h" #import "FirebaseDynamicLinks/Sources/FIRDynamicLinkNetworking+Private.h" +#import "GoogleUtilities/MethodSwizzler/Private/GULSwizzler.h" +#import "GoogleUtilities/SwizzlerTestHelpers/GULSwizzler+Unswizzle.h" static NSString *const kAPIKey = @"myfakeapikey"; static NSString *const kClientID = @"myfakeclientid"; diff --git a/FirebaseDynamicLinks/Tests/Unit/FIRDynamicLinksTest.m b/FirebaseDynamicLinks/Tests/Unit/FIRDynamicLinksTest.m index c473e67e6a9..3f0deef2d1d 100644 --- a/FirebaseDynamicLinks/Tests/Unit/FIRDynamicLinksTest.m +++ b/FirebaseDynamicLinks/Tests/Unit/FIRDynamicLinksTest.m @@ -16,8 +16,6 @@ #import -#import "GoogleUtilities/SwizzlerTestHelpers/GULSwizzler+Unswizzle.h" -#import "GoogleUtilities/MethodSwizzler/Private/GULSwizzler.h" #import #import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" #import "FirebaseDynamicLinks/Sources/FIRDLDefaultRetrievalProcessV2.h" @@ -28,6 +26,8 @@ #import "FirebaseDynamicLinks/Sources/FIRDynamicLinks+FirstParty.h" #import "FirebaseDynamicLinks/Sources/FIRDynamicLinks+Private.h" #import "FirebaseDynamicLinks/Sources/Utilities/FDLUtilities.h" +#import "GoogleUtilities/MethodSwizzler/Private/GULSwizzler.h" +#import "GoogleUtilities/SwizzlerTestHelpers/GULSwizzler+Unswizzle.h" #import "Interop/Analytics/Public/FIRAnalyticsInterop.h" static NSString *const kAPIKey = @"myAPIKey"; diff --git a/FirebaseInAppMessaging/Sources/Runtime/FIRInAppMessaging+Bootstrap.m b/FirebaseInAppMessaging/Sources/Runtime/FIRInAppMessaging+Bootstrap.m index 25cc7503434..2ef030d290e 100644 --- a/FirebaseInAppMessaging/Sources/Runtime/FIRInAppMessaging+Bootstrap.m +++ b/FirebaseInAppMessaging/Sources/Runtime/FIRInAppMessaging+Bootstrap.m @@ -16,8 +16,8 @@ #import "FIRInAppMessaging+Bootstrap.h" -#import "GoogleUtilities/Environment/Private/GULAppEnvironmentUtil.h" #import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "GoogleUtilities/Environment/Private/GULAppEnvironmentUtil.h" #import "Interop/Analytics/Public/FIRAnalyticsInterop.h" #import "FIRCore+InAppMessaging.h" diff --git a/FirebaseInstallations/Source/Library/InstallationsIDController/FIRInstallationsIDController.m b/FirebaseInstallations/Source/Library/InstallationsIDController/FIRInstallationsIDController.m index f0bf4e8fd7f..d3c6a39a89c 100644 --- a/FirebaseInstallations/Source/Library/InstallationsIDController/FIRInstallationsIDController.m +++ b/FirebaseInstallations/Source/Library/InstallationsIDController/FIRInstallationsIDController.m @@ -22,8 +22,8 @@ #import "FBLPromises.h" #endif -#import "GoogleUtilities/Environment/Private/GULKeychainStorage.h" #import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "GoogleUtilities/Environment/Private/GULKeychainStorage.h" #import "FIRInstallationsAPIService.h" #import "FIRInstallationsErrorUtil.h" diff --git a/FirebaseMessaging/Sources/FIRMessaging.m b/FirebaseMessaging/Sources/FIRMessaging.m index 81d6d83b204..4d14f92ffe4 100644 --- a/FirebaseMessaging/Sources/FIRMessaging.m +++ b/FirebaseMessaging/Sources/FIRMessaging.m @@ -22,10 +22,10 @@ #import #import #import +#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" #import "GoogleUtilities/AppDelegateSwizzler/Private/GULAppDelegateSwizzler.h" #import "GoogleUtilities/Reachability/Private/GULReachabilityChecker.h" #import "GoogleUtilities/UserDefaults/Private/GULUserDefaults.h" -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" #import "Interop/Analytics/Public/FIRAnalyticsInterop.h" #import "FirebaseMessaging/Sources/FIRMessagingAnalytics.h" diff --git a/FirebaseMessaging/Sources/FIRMessagingRemoteNotificationsProxy.m b/FirebaseMessaging/Sources/FIRMessagingRemoteNotificationsProxy.m index 47458b95c45..39f0a9201ca 100644 --- a/FirebaseMessaging/Sources/FIRMessagingRemoteNotificationsProxy.m +++ b/FirebaseMessaging/Sources/FIRMessagingRemoteNotificationsProxy.m @@ -18,11 +18,11 @@ #import -#import "GoogleUtilities/AppDelegateSwizzler/Private/GULAppDelegateSwizzler.h" #import "FirebaseMessaging/Sources/FIRMessagingConstants.h" #import "FirebaseMessaging/Sources/FIRMessagingLogger.h" #import "FirebaseMessaging/Sources/FIRMessagingUtilities.h" #import "FirebaseMessaging/Sources/FIRMessaging_Private.h" +#import "GoogleUtilities/AppDelegateSwizzler/Private/GULAppDelegateSwizzler.h" static void *UserNotificationObserverContext = &UserNotificationObserverContext; diff --git a/FirebaseMessaging/Tests/UnitTests/FIRInstanceIDWithFCMTest.m b/FirebaseMessaging/Tests/UnitTests/FIRInstanceIDWithFCMTest.m index d1ad8c889d8..b4e3ebfce5e 100644 --- a/FirebaseMessaging/Tests/UnitTests/FIRInstanceIDWithFCMTest.m +++ b/FirebaseMessaging/Tests/UnitTests/FIRInstanceIDWithFCMTest.m @@ -18,8 +18,8 @@ #import #import -#import "GoogleUtilities/UserDefaults/Private/GULUserDefaults.h" #import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "GoogleUtilities/UserDefaults/Private/GULUserDefaults.h" #import diff --git a/FirebaseMessaging/Tests/UnitTests/FIRMessagingHandlingTest.m b/FirebaseMessaging/Tests/UnitTests/FIRMessagingHandlingTest.m index 0262f544234..c94d38b4012 100644 --- a/FirebaseMessaging/Tests/UnitTests/FIRMessagingHandlingTest.m +++ b/FirebaseMessaging/Tests/UnitTests/FIRMessagingHandlingTest.m @@ -20,8 +20,8 @@ #import #import -#import "GoogleUtilities/UserDefaults/Private/GULUserDefaults.h" #import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "GoogleUtilities/UserDefaults/Private/GULUserDefaults.h" #import "Interop/Analytics/Public/FIRAnalyticsInterop.h" #import "FirebaseMessaging/Sources/FIRMessagingAnalytics.h" diff --git a/FirebaseMessaging/Tests/UnitTests/FIRMessagingTest.m b/FirebaseMessaging/Tests/UnitTests/FIRMessagingTest.m index 7e9f192366c..1c0a99da1f8 100644 --- a/FirebaseMessaging/Tests/UnitTests/FIRMessagingTest.m +++ b/FirebaseMessaging/Tests/UnitTests/FIRMessagingTest.m @@ -19,8 +19,8 @@ #import #import -#import "GoogleUtilities/UserDefaults/Private/GULUserDefaults.h" #import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "GoogleUtilities/UserDefaults/Private/GULUserDefaults.h" #import "Interop/Analytics/Public/FIRAnalyticsInterop.h" #import diff --git a/FirebaseRemoteConfig/Sources/RCNConfigSettings.m b/FirebaseRemoteConfig/Sources/RCNConfigSettings.m index 1e56ef64ceb..46ca22bd80f 100644 --- a/FirebaseRemoteConfig/Sources/RCNConfigSettings.m +++ b/FirebaseRemoteConfig/Sources/RCNConfigSettings.m @@ -22,8 +22,8 @@ #import "FirebaseRemoteConfig/Sources/RCNDevice.h" #import "FirebaseRemoteConfig/Sources/RCNUserDefaultsManager.h" -#import "GoogleUtilities/Environment/Private/GULAppEnvironmentUtil.h" #import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "GoogleUtilities/Environment/Private/GULAppEnvironmentUtil.h" static NSString *const kRCNGroupPrefix = @"frc.group."; static NSString *const kRCNUserDefaultsKeyNamelastETag = @"lastETag"; diff --git a/FirebaseRemoteConfig/Sources/RCNDevice.m b/FirebaseRemoteConfig/Sources/RCNDevice.m index 4657e3bc449..47e4443bd89 100644 --- a/FirebaseRemoteConfig/Sources/RCNDevice.m +++ b/FirebaseRemoteConfig/Sources/RCNDevice.m @@ -18,9 +18,9 @@ #import -#import "GoogleUtilities/Environment/Private/GULAppEnvironmentUtil.h" #import "FirebaseRemoteConfig/Sources/Private/RCNConfigSettings.h" #import "FirebaseRemoteConfig/Sources/RCNConfigConstants.h" +#import "GoogleUtilities/Environment/Private/GULAppEnvironmentUtil.h" #define STR(x) STR_EXPAND(x) #define STR_EXPAND(x) #x diff --git a/FirebaseRemoteConfig/Sources/RCNFetch.m b/FirebaseRemoteConfig/Sources/RCNFetch.m index eeb37834ffd..ace0873fbca 100644 --- a/FirebaseRemoteConfig/Sources/RCNFetch.m +++ b/FirebaseRemoteConfig/Sources/RCNFetch.m @@ -17,13 +17,13 @@ #import "FirebaseRemoteConfig/Sources/Private/RCNConfigFetch.h" #import -#import "GoogleUtilities/NSData+zlib/Private/GULNSDataInternal.h" #import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" #import "FirebaseRemoteConfig/Sources/Private/RCNConfigSettings.h" #import "FirebaseRemoteConfig/Sources/RCNConfigConstants.h" #import "FirebaseRemoteConfig/Sources/RCNConfigContent.h" #import "FirebaseRemoteConfig/Sources/RCNConfigExperiment.h" #import "FirebaseRemoteConfig/Sources/RCNDevice.h" +#import "GoogleUtilities/NSData+zlib/Private/GULNSDataInternal.h" #ifdef RCN_STAGING_SERVER static NSString *const kServerURLDomain = diff --git a/FirebaseRemoteConfig/Tests/Unit/RCNInstanceIDTest.m b/FirebaseRemoteConfig/Tests/Unit/RCNInstanceIDTest.m index ddecb2a19aa..2473d080c58 100644 --- a/FirebaseRemoteConfig/Tests/Unit/RCNInstanceIDTest.m +++ b/FirebaseRemoteConfig/Tests/Unit/RCNInstanceIDTest.m @@ -26,9 +26,9 @@ #import "FirebaseRemoteConfig/Tests/Unit/RCNTestUtilities.h" #import -#import "GoogleUtilities/NSData+zlib/Private/GULNSDataInternal.h" #import #import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "GoogleUtilities/NSData+zlib/Private/GULNSDataInternal.h" @interface RCNConfigFetch (ForTest) - (instancetype)initWithContent:(RCNConfigContent *)content diff --git a/FirebaseRemoteConfig/Tests/Unit/RCNRemoteConfigTest.m b/FirebaseRemoteConfig/Tests/Unit/RCNRemoteConfigTest.m index b9d7cd7f8e3..690040055ac 100644 --- a/FirebaseRemoteConfig/Tests/Unit/RCNRemoteConfigTest.m +++ b/FirebaseRemoteConfig/Tests/Unit/RCNRemoteConfigTest.m @@ -25,10 +25,10 @@ #import "FirebaseRemoteConfig/Tests/Unit/RCNTestUtilities.h" -#import "GoogleUtilities/NSData+zlib/Private/GULNSDataInternal.h" #import #import #import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "GoogleUtilities/NSData+zlib/Private/GULNSDataInternal.h" @interface RCNConfigFetch (ForTest) - (instancetype)initWithContent:(RCNConfigContent *)content diff --git a/GoogleUtilities/NSData+zlib/Private/GULNSDataInternal.h b/GoogleUtilities/NSData+zlib/Private/GULNSDataInternal.h index 8767a57fb96..93adeb57cb6 100644 --- a/GoogleUtilities/NSData+zlib/Private/GULNSDataInternal.h +++ b/GoogleUtilities/NSData+zlib/Private/GULNSDataInternal.h @@ -20,4 +20,3 @@ #else #import #endif - diff --git a/scripts/change_headers.swift b/scripts/change_headers.swift index 1203836ae35..1c3b62341c7 100755 --- a/scripts/change_headers.swift +++ b/scripts/change_headers.swift @@ -21,12 +21,12 @@ import Foundation let findHeaders = ["GoogleUtilities"] let changeImports = ["GoogleUtilities", "FirebaseAuth", "FirebaseCore", "Firebase", - "FirebaseDynamicLinks", "FirebaseInAppMessaging", "FirebaseMessaging", - "FirebaseRemoteConfig", "FirebaseInstallations", - "FirebaseAppDistribution", "Example"] + "FirebaseDynamicLinks", "FirebaseInAppMessaging", "FirebaseMessaging", + "FirebaseRemoteConfig", "FirebaseInstallations", + "FirebaseAppDistribution", "Example"] let skipDirPatterns = ["/Sample/", "FirebaseABTesting/Tests/Integration", - "FirebaseInAppMessaging/Tests/Integration/", "Example/Database/App", - "Example/InstanceID/App"] + "FirebaseInAppMessaging/Tests/Integration/", "Example/Database/App", + "Example/InstanceID/App"] // Get a Dictionary mapping a simple header name to a repo-relative path. @@ -119,12 +119,12 @@ for root in changeImports { if file.starts(with: ".") { continue } - if file.range(of:"/Public/") != nil { + if file.range(of: "/Public/") != nil { continue } let fullTransformPath = root + "/" + file for dirPattern in skipDirPatterns { - if fullTransformPath.range(of:dirPattern) != nil { + if fullTransformPath.range(of: dirPattern) != nil { continue whileLoop } } From 5e1ea591d7b2ce149981e41c50d33a1655097e6d Mon Sep 17 00:00:00 2001 From: Paul Beusterien Date: Mon, 15 Jun 2020 11:10:14 -0700 Subject: [PATCH 13/22] Remove test code --- .../Environment/Private/GULAppEnvironmentUtil.h | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/GoogleUtilities/Environment/Private/GULAppEnvironmentUtil.h b/GoogleUtilities/Environment/Private/GULAppEnvironmentUtil.h index c14f96e89c2..d5502647c20 100644 --- a/GoogleUtilities/Environment/Private/GULAppEnvironmentUtil.h +++ b/GoogleUtilities/Environment/Private/GULAppEnvironmentUtil.h @@ -16,17 +16,6 @@ #import -typedef NS_ENUM(NSInteger, FIRRemoteConfigFetchStatus) { - /// Config has never been fetched. - FIRRemoteConfigFetchStatusNoFetchYet, - /// Config fetch succeeded. - FIRRemoteConfigFetchStatusSuccess, - /// Config fetch failed. - FIRRemoteConfigFetchStatusFailure, - /// Config fetch was throttled. - FIRRemoteConfigFetchStatusThrottled, -} NS_SWIFT_NAME(RemoteConfigFetchStatus); - @interface GULAppEnvironmentUtil : NSObject /// Indicates whether the app is from Apple Store or not. Returns NO if the app is on simulator, From ebed32b5be51fd9b92c08c90a8cdbba4eb7672c0 Mon Sep 17 00:00:00 2001 From: Paul Beusterien Date: Mon, 15 Jun 2020 11:10:43 -0700 Subject: [PATCH 14/22] Turn on travis --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index d164be816ac..2984c6c0b35 100644 --- a/.travis.yml +++ b/.travis.yml @@ -294,3 +294,4 @@ jobs: branches: only: - master + - pb-gu-rr-clients From 52ec54d9138adb7f82d462355e7ade3881347474 Mon Sep 17 00:00:00 2001 From: Paul Beusterien Date: Mon, 15 Jun 2020 11:26:36 -0700 Subject: [PATCH 15/22] Fix module check --- scripts/check_no_module_imports.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/check_no_module_imports.sh b/scripts/check_no_module_imports.sh index 68f8722e21b..bc2ded30aa6 100755 --- a/scripts/check_no_module_imports.sh +++ b/scripts/check_no_module_imports.sh @@ -30,6 +30,7 @@ function exit_with_error { git grep "${options[@]}" \ -- ':(exclude,glob)**/Example/**' ':(exclude,glob)**/Sample/**' \ ':(exclude)FirebaseCore/Sources/Private/FirebaseCoreInternal.h' \ + ':(exclude)GoogleUtilities/NSData+zlib/Private/GULNSDataInternal.h' \ ':(exclude)HeadersImports.md' && exit_with_error # Tests are under the Example directory, so we have to separately grep them for From 710829efa3edb570e3128545368b8cb3bd0e8476 Mon Sep 17 00:00:00 2001 From: Paul Beusterien Date: Mon, 15 Jun 2020 13:30:53 -0700 Subject: [PATCH 16/22] Swift Package CI --- .github/workflows/spm.yml | 21 ++ GoogleUtilities/Logger/GULLogger.m | 6 + GoogleUtilities/Logger/Private/GULLogger.h | 4 + .../NSData+zlib/Private/GULNSDataInternal.h | 2 +- Package.swift | 268 ++++++++++++++++++ Sources/firebase-test/main.swift | 41 +++ scripts/check_no_module_imports.sh | 1 + 7 files changed, 342 insertions(+), 1 deletion(-) create mode 100644 .github/workflows/spm.yml create mode 100644 Package.swift create mode 100644 Sources/firebase-test/main.swift diff --git a/.github/workflows/spm.yml b/.github/workflows/spm.yml new file mode 100644 index 00000000000..a1beb2f4531 --- /dev/null +++ b/.github/workflows/spm.yml @@ -0,0 +1,21 @@ +name: spm + +on: + pull_request: + paths: + - '.github/workflows/spm.yml' + - 'Package.swift' + - 'Firebase**' + schedule: + # Run every day at 11pm (PST) - cron uses UTC times + - cron: '0 7 * * *' + +jobs: + swift-build-run: + runs-on: macOS-latest + steps: + - uses: actions/checkout@v2 + - name: Build + run: swift build + - name: Run + run: swift run diff --git a/GoogleUtilities/Logger/GULLogger.m b/GoogleUtilities/Logger/GULLogger.m index 27cf8edbbb4..832435352cd 100644 --- a/GoogleUtilities/Logger/GULLogger.m +++ b/GoogleUtilities/Logger/GULLogger.m @@ -12,6 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. +#if SWIFT_PACKAGE +// Need to import the public header here, since the module won't exist yet. +// Restructure the GULLogger headers for Firebase 7. +#import "GoogleUtilities/Logger/Public/GULLoggerLevel.h" +#endif + #import "GoogleUtilities/Logger/Private/GULLogger.h" #include diff --git a/GoogleUtilities/Logger/Private/GULLogger.h b/GoogleUtilities/Logger/Private/GULLogger.h index ff425768681..1146ee238d1 100644 --- a/GoogleUtilities/Logger/Private/GULLogger.h +++ b/GoogleUtilities/Logger/Private/GULLogger.h @@ -16,7 +16,11 @@ #import +#if SWIFT_PACKAGE +@import GoogleUtilities_Logger; +#else #import +#endif NS_ASSUME_NONNULL_BEGIN diff --git a/GoogleUtilities/NSData+zlib/Private/GULNSDataInternal.h b/GoogleUtilities/NSData+zlib/Private/GULNSDataInternal.h index 93adeb57cb6..903589d5eb0 100644 --- a/GoogleUtilities/NSData+zlib/Private/GULNSDataInternal.h +++ b/GoogleUtilities/NSData+zlib/Private/GULNSDataInternal.h @@ -16,7 +16,7 @@ // headers. Any package manager complexity should be handled here. #if SWIFT_PACKAGE -@import TBD; +@import GoogleUtilities_NSData; #else #import #endif diff --git a/Package.swift b/Package.swift new file mode 100644 index 00000000000..9321cba47ac --- /dev/null +++ b/Package.swift @@ -0,0 +1,268 @@ +// swift-tools-version:5.0 +// The swift-tools-version declares the minimum version of Swift required to build this package. + +// Copyright 2020 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +import PackageDescription + +let package = Package( + name: "Firebase", + platforms: [.iOS(.v9), .macOS(.v10_11), .tvOS(.v10)], + products: [ + // Products define the executables and libraries produced by a package, and make them visible to + // other packages. + // This is a test-only executable for us to try `swift run` and use all imported modules from a + // Swift target. + .executable(name: "firebase-test", targets: ["firebase-test"]), + // + // .library( + // name: "Firebase", + // targets: ["Firebase"] + // ), + .library( + name: "FirebaseCore", + targets: ["FirebaseCore"] + ), + // .library( + // name: "FirebaseAuth", + // targets: ["FirebaseAuth"] + // ), + // .library( + // name: "FirebaseCrashlytics", + // targets: ["FirebaseCrashlytics"] + // ), + // .library( + // name: "FirebaseFunctions", + // targets: ["FirebaseFunctions"]), + // .library( + // name: "FirebaseInstallations", + // targets: ["FirebaseInstallations"] + // ), + // .library( + // name: "FirebaseInstanceID", + // targets: ["FirebaseInstanceID"] + // ), + // .library( + // name: "FirebaseStorage", + // targets: ["FirebaseStorage"] + // ), + // .library( + // name: "FirebaseStorageSwift", + // targets: ["FirebaseStorageSwift"] + // ), + ], + dependencies: [ + .package(url: "https://github.com/google/promises.git", "1.2.8" ..< "1.3.0"), + .package(url: "https://github.com/google/gtm-session-fetcher.git", "1.4.0" ..< "2.0.0"), + .package(url: "https://github.com/paulb777/nanopb.git", .branch("swift-package-manager")), + // Branches need a force update with a run with the revision set like below. + // .package(url: "https://github.com/paulb777/nanopb.git", .revision("564392bd87bd093c308a3aaed3997466efb95f74")) + ], + targets: [ + // Targets are the basic building blocks of a package. A target can define a module or a test suite. + // Targets can depend on other targets in this package, and on products in packages which this package depends on. + .target( + name: "firebase-test", + dependencies: [ + // "FirebaseAuth", "FirebaseFunctions", + // "Firebase", + "FirebaseCore", + // "FirebaseInstallations", "FirebaseInstanceID", + // "FirebaseStorage", + // "FirebaseStorageSwift", + "GoogleUtilities_Environment", "GoogleUtilities_Logger", + ] + ), + .target( + name: "GoogleUtilities_AppDelegateSwizzler", + dependencies: ["GoogleUtilities_Environment", "GoogleUtilities_Logger", + "GoogleUtilities_Network"], + path: "GoogleUtilities", + sources: [ + "AppDelegateSwizzler/", + "SceneDelegateSwizzler/", + "Common/*.h", + ], + cSettings: [ + .headerSearchPath("../"), + ] + ), + .target( + name: "GoogleUtilities_Environment", + dependencies: ["FBLPromises"], + path: "GoogleUtilities/Environment", + cSettings: [ + .headerSearchPath("../../"), + ] + ), + + // Tests need OCMock and resource support. + + .target( + name: "GoogleUtilities_Logger", + dependencies: ["GoogleUtilities_Environment"], + path: "GoogleUtilities/Logger", + publicHeadersPath: "Public", + cSettings: [ + .headerSearchPath("../../"), + ] + ), + .target( + name: "GoogleUtilities_Network", + dependencies: ["GoogleUtilities_Logger", "GoogleUtilities_NSData", + "GoogleUtilities_Reachability"], + path: "GoogleUtilities/Network", + cSettings: [ + .headerSearchPath("../.."), + ] + // linkerSettings: [ + // .linkedFramework("Security"), + // ] + ), + .target( + name: "GoogleUtilities_NSData", + path: "GoogleUtilities/NSData+zlib", + publicHeadersPath: "Public", + cSettings: [ + .headerSearchPath("../.."), + ], + linkerSettings: [ + .linkedLibrary("z"), + ] + ), + .target( + name: "GoogleUtilities_Reachability", + dependencies: ["GoogleUtilities_Logger"], + path: "GoogleUtilities/Reachability", + cSettings: [ + .headerSearchPath("../../"), + ] + ), + .target( + name: "GoogleUtilities_UserDefaults", + dependencies: ["GoogleUtilities_Logger"], + path: "GoogleUtilities/UserDefaults", + cSettings: [ + .headerSearchPath("../../"), + ] + ), + // .target( + // name: "Firebase", + // path: "Firebase/Sources", + // publicHeadersPath: "Public" + // ), + .target( + name: "FirebaseCore", + dependencies: ["GoogleUtilities_Environment", "GoogleUtilities_Logger"], + path: "FirebaseCore/Sources", + publicHeadersPath: "Public", + cSettings: [ + .headerSearchPath("../.."), + .define("FIRCore_VERSION", to: "0.0.1"), // TODO: Fix version + .define("Firebase_VERSION", to: "0.0.1"), // TODO: Fix version + // TODO: - Add support for cflags cSetting so that we can set the -fno-autolink option + ] + ), +// .target( +// name: "FirebaseAuth", +// dependencies: ["FirebaseCore", "GoogleUtilities_Environment", +// "GoogleUtilities_AppDelegateSwizzler", +// "GTMSessionFetcherCore"], +// path: "FirebaseAuth/Sources", +// publicHeadersPath: "Public", +// cSettings: [ +// .headerSearchPath("../../"), +// .define("FIRAuth_VERSION", to: "0.0.1"), // TODO: Fix version +// .define("FIRAuth_MINOR_VERSION", to: "1.1"), // TODO: Fix version +// // .define("DEBUG", .when(configuration: .debug)), // TODO - destroys other settings in DEBUG config +// // linkerSettings: [ +// // .linkedFramework("Security"), +// // .linkedFramework("SafariServices", .when(platforms: [.iOS])), +// ] +// ), +// .target( +// name: "FirebaseFunctions", +// dependencies: ["FirebaseCore", "GTMSessionFetcher_Core"], +// path: "Functions/FirebaseFunctions", +// publicHeadersPath: "Public", +// cSettings: [ +// // SPM doesn't support interface frameworks or private headers +// .headerSearchPath("../../"), +// .define("FIRFunctions_VERSION", to: "0.0.1"), // TODO Fix version +// .define("SWIFT_PACKAGE", to: "1"), // SPM loses defaults if other cSettings +// ]), + // .target( + // name: "FirebaseInstanceID", + // dependencies: ["FirebaseCore", "FirebaseInstallations", + // "GoogleUtilities_Environment", "GoogleUtilities_UserDefaults"], + // path: "Firebase/InstanceID", + // publicHeadersPath: "Public", + // cSettings: [ + // .headerSearchPath("../../"), + // .define("FIRInstanceID_LIB_VERSION", to: "0.0.1"), // TODO: Fix version + // ] + // ), + // .target( + // name: "FirebaseInstallations", + // dependencies: ["FirebaseCore", "FBLPromises", + // "GoogleUtilities_Environment", "GoogleUtilities_UserDefaults"], + // path: "FirebaseInstallations/Source/Library", + // publicHeadersPath: "Public", + // cSettings: [ + // .headerSearchPath("../../../"), + // ] + // ), + // .target( + // name: "FirebaseStorage", + // dependencies: ["FirebaseCore", "GTMSessionFetcherCore"], + // path: "FirebaseStorage/Sources", + // publicHeadersPath: "Public", + // cSettings: [ + // .headerSearchPath("../../"), + // .define("FIRStorage_VERSION", to: "0.0.1"), // TODO: Fix version + // ] + // ), + // .target( + // name: "FirebaseStorageSwift", + // dependencies: ["FirebaseStorage"], + // path: "FirebaseStorageSwift/Sources" + // ), + // .target( + // name: "GoogleDataTransport", + // path: "GoogleDataTransport/GDTCORLibrary", + // publicHeadersPath: "Public", + // cSettings: [ + // .headerSearchPath("../"), + // .define("GDTCOR_VERSION", to: "0.0.1"), + // ] + // ), + // .target( + // name: "GoogleDataTransportCCTSupport", + // dependencies: ["GoogleDataTransport", "nanopb"], + // path: "GoogleDataTransportCCTSupport/GDTCCTLibrary", + // cSettings: [ + // .headerSearchPath("../"), + // .define("PB_FIELD_32BIT", to: "1"), + // .define("PB_NO_PACKED_STRUCTS", to: "1"), + // .define("PB_ENABLE_MALLOC", to: "1"), + // ] + // ), +// linkerSettings: [ +// .linkedFramework("CoreServices", .when(platforms: [.macOS])), +// .linkedFramework("MobileCoreServices", .when(platforms: [.iOS, .tvOS])), +// ]), + ], + cLanguageStandard: .c99 +) diff --git a/Sources/firebase-test/main.swift b/Sources/firebase-test/main.swift new file mode 100644 index 00000000000..1bc7cdd14ac --- /dev/null +++ b/Sources/firebase-test/main.swift @@ -0,0 +1,41 @@ +// Copyright 2020 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +import Foundation +// import Firebase +import FirebaseCore +// import FirebaseAuth +// import FirebaseFunctions +// import FirebaseInstallations +// import FirebaseInstanceID +// import FirebaseStorage +// import FirebaseStorageSwift +// import GoogleDataTransport +// import GoogleDataTransportCCTSupport +import GoogleUtilities_Environment +import GoogleUtilities_Logger + +print("Hello world!") +print("Is app store receipt sandbox? Answer: \(GULAppEnvironmentUtil.isAppStoreReceiptSandbox())") +print("Is from app store? Answer: \(GULAppEnvironmentUtil.isFromAppStore())") +print("Is this the simulator? Answer: \(GULAppEnvironmentUtil.isSimulator())") +print("Device model? Answer: \(GULAppEnvironmentUtil.deviceModel() ?? "NONE")") +print("System version? Answer: \(GULAppEnvironmentUtil.systemVersion() ?? "NONE")") +print("Is App extension? Answer: \(GULAppEnvironmentUtil.isAppExtension())") +print("Is iOS 7 or higher? Answer: \(GULAppEnvironmentUtil.isIOS7OrHigher())") + +print("Is there a default app? Answer: \(FirebaseApp.app() != nil)") +//print("Storage Version String? Answer: \(String(cString: StorageVersionString))") + +// print("InstanceIDScopeFirebaseMessaging? Answer: \(InstanceIDScopeFirebaseMessaging)") diff --git a/scripts/check_no_module_imports.sh b/scripts/check_no_module_imports.sh index bc2ded30aa6..3c4748b0fce 100755 --- a/scripts/check_no_module_imports.sh +++ b/scripts/check_no_module_imports.sh @@ -31,6 +31,7 @@ git grep "${options[@]}" \ -- ':(exclude,glob)**/Example/**' ':(exclude,glob)**/Sample/**' \ ':(exclude)FirebaseCore/Sources/Private/FirebaseCoreInternal.h' \ ':(exclude)GoogleUtilities/NSData+zlib/Private/GULNSDataInternal.h' \ + ':(exclude)GoogleUtilities/Logger/Private/GULLogger.h' \ ':(exclude)HeadersImports.md' && exit_with_error # Tests are under the Example directory, so we have to separately grep them for From bf5207e555f09b7323918422427e24b1757fda39 Mon Sep 17 00:00:00 2001 From: Paul Beusterien Date: Mon, 15 Jun 2020 15:40:12 -0700 Subject: [PATCH 17/22] Swift PM fixes --- GoogleUtilities.podspec | 10 ++++- .../AppDelegateSwizzler/Public/dummy.h | 2 + GoogleUtilities/Network/Public/dummy.h | 2 + Package.swift | 37 ++++++++++++++++--- Sources/firebase-test/main.swift | 8 +++- 5 files changed, 50 insertions(+), 9 deletions(-) create mode 100644 GoogleUtilities/AppDelegateSwizzler/Public/dummy.h create mode 100644 GoogleUtilities/Network/Public/dummy.h diff --git a/GoogleUtilities.podspec b/GoogleUtilities.podspec index a1e824f6433..71ed4162bb3 100644 --- a/GoogleUtilities.podspec +++ b/GoogleUtilities.podspec @@ -47,7 +47,7 @@ other Google CocoaPods. They're not intended for direct public usage. s.subspec 'Network' do |ns| - ns.source_files = 'GoogleUtilities/Network/**/*.[mh]' + ns.source_files = 'GoogleUtilities/Network/*.m', 'GoogleUtilities/Network/Private/*.h' ns.public_header_files = 'GoogleUtilities/Network/Private/*.h' ns.private_header_files = 'GoogleUtilities/Network/Private/*.h' ns.dependency 'GoogleUtilities/NSData+zlib' @@ -84,7 +84,13 @@ other Google CocoaPods. They're not intended for direct public usage. end s.subspec 'AppDelegateSwizzler' do |adss| - adss.source_files = 'GoogleUtilities/AppDelegateSwizzler/**/*.[mh]', 'GoogleUtilities/SceneDelegateSwizzler/**/*.[mh]', 'GoogleUtilities/Common/*.h' + adss.source_files = [ + 'GoogleUtilities/AppDelegateSwizzler/Internal/*.h', + 'GoogleUtilities/AppDelegateSwizzler/Private/*.h' + 'GoogleUtilities/AppDelegateSwizzler/*.m', + 'GoogleUtilities/SceneDelegateSwizzler/**/*.[mh]', + 'GoogleUtilities/Common/*.h', + ] adss.public_header_files = 'GoogleUtilities/AppDelegateSwizzler/Private/*.h', 'GoogleUtilities/SceneDelegateSwizzler/Private/*.h' adss.private_header_files = 'GoogleUtilities/AppDelegateSwizzler/Private/*.h', 'GoogleUtilities/SceneDelegateSwizzler/Private/*.h' adss.dependency 'GoogleUtilities/Logger' diff --git a/GoogleUtilities/AppDelegateSwizzler/Public/dummy.h b/GoogleUtilities/AppDelegateSwizzler/Public/dummy.h new file mode 100644 index 00000000000..058168ed309 --- /dev/null +++ b/GoogleUtilities/AppDelegateSwizzler/Public/dummy.h @@ -0,0 +1,2 @@ +// Dummy public header to satisfy Swift Package Manager since Private cannot be +// used because of its self-references. diff --git a/GoogleUtilities/Network/Public/dummy.h b/GoogleUtilities/Network/Public/dummy.h new file mode 100644 index 00000000000..058168ed309 --- /dev/null +++ b/GoogleUtilities/Network/Public/dummy.h @@ -0,0 +1,2 @@ +// Dummy public header to satisfy Swift Package Manager since Private cannot be +// used because of its self-references. diff --git a/Package.swift b/Package.swift index 9321cba47ac..5a979231ddd 100644 --- a/Package.swift +++ b/Package.swift @@ -75,14 +75,22 @@ let package = Package( // Targets can depend on other targets in this package, and on products in packages which this package depends on. .target( name: "firebase-test", - dependencies: [ - // "FirebaseAuth", "FirebaseFunctions", - // "Firebase", + dependencies: [ + // "FirebaseAuth", "FirebaseFunctions", + // "Firebase", "FirebaseCore", - // "FirebaseInstallations", "FirebaseInstanceID", + // "FirebaseInstallations", "FirebaseInstanceID", // "FirebaseStorage", // "FirebaseStorageSwift", - "GoogleUtilities_Environment", "GoogleUtilities_Logger", + "GoogleUtilities_AppDelegateSwizzler", + "GoogleUtilities_Environment", + // "GoogleUtilities_ISASwizzler", // Build needs to disable ARC. + "GoogleUtilities_Logger", + "GoogleUtilities_MethodSwizzler", + "GoogleUtilities_Network", + "GoogleUtilities_NSData", + "GoogleUtilities_Reachability", + "GoogleUtilities_UserDefaults", ] ), .target( @@ -95,6 +103,7 @@ let package = Package( "SceneDelegateSwizzler/", "Common/*.h", ], + publicHeadersPath: "AppDelegateSwizzler/Public", cSettings: [ .headerSearchPath("../"), ] @@ -103,6 +112,7 @@ let package = Package( name: "GoogleUtilities_Environment", dependencies: ["FBLPromises"], path: "GoogleUtilities/Environment", + publicHeadersPath: "Private", cSettings: [ .headerSearchPath("../../"), ] @@ -119,11 +129,24 @@ let package = Package( .headerSearchPath("../../"), ] ), + + // TODO: ISA_Swizzler requires building without ARC. + + .target( + name: "GoogleUtilities_MethodSwizzler", + dependencies: ["GoogleUtilities_Logger"], + path: "GoogleUtilities/MethodSwizzler", + publicHeadersPath: "Private", + cSettings: [ + .headerSearchPath("../../"), + ] + ), .target( name: "GoogleUtilities_Network", dependencies: ["GoogleUtilities_Logger", "GoogleUtilities_NSData", "GoogleUtilities_Reachability"], path: "GoogleUtilities/Network", + publicHeadersPath: "Public", cSettings: [ .headerSearchPath("../.."), ] @@ -146,6 +169,7 @@ let package = Package( name: "GoogleUtilities_Reachability", dependencies: ["GoogleUtilities_Logger"], path: "GoogleUtilities/Reachability", + publicHeadersPath: "Private", cSettings: [ .headerSearchPath("../../"), ] @@ -154,6 +178,7 @@ let package = Package( name: "GoogleUtilities_UserDefaults", dependencies: ["GoogleUtilities_Logger"], path: "GoogleUtilities/UserDefaults", + publicHeadersPath: "Private", cSettings: [ .headerSearchPath("../../"), ] @@ -186,7 +211,7 @@ let package = Package( // .headerSearchPath("../../"), // .define("FIRAuth_VERSION", to: "0.0.1"), // TODO: Fix version // .define("FIRAuth_MINOR_VERSION", to: "1.1"), // TODO: Fix version -// // .define("DEBUG", .when(configuration: .debug)), // TODO - destroys other settings in DEBUG config + // // .define("DEBUG", .when(configuration: .debug)), // TODO - destroys other settings in DEBUG config // // linkerSettings: [ // // .linkedFramework("Security"), // // .linkedFramework("SafariServices", .when(platforms: [.iOS])), diff --git a/Sources/firebase-test/main.swift b/Sources/firebase-test/main.swift index 1bc7cdd14ac..428e71d97f6 100644 --- a/Sources/firebase-test/main.swift +++ b/Sources/firebase-test/main.swift @@ -23,8 +23,14 @@ import FirebaseCore // import FirebaseStorageSwift // import GoogleDataTransport // import GoogleDataTransportCCTSupport +import GoogleUtilities_AppDelegateSwizzler import GoogleUtilities_Environment import GoogleUtilities_Logger +import GoogleUtilities_MethodSwizzler +import GoogleUtilities_Network +import GoogleUtilities_NSData +import GoogleUtilities_Reachability +import GoogleUtilities_UserDefaults print("Hello world!") print("Is app store receipt sandbox? Answer: \(GULAppEnvironmentUtil.isAppStoreReceiptSandbox())") @@ -36,6 +42,6 @@ print("Is App extension? Answer: \(GULAppEnvironmentUtil.isAppExtension())") print("Is iOS 7 or higher? Answer: \(GULAppEnvironmentUtil.isIOS7OrHigher())") print("Is there a default app? Answer: \(FirebaseApp.app() != nil)") -//print("Storage Version String? Answer: \(String(cString: StorageVersionString))") +// print("Storage Version String? Answer: \(String(cString: StorageVersionString))") // print("InstanceIDScopeFirebaseMessaging? Answer: \(InstanceIDScopeFirebaseMessaging)") From 1491fb0ea04a02c403bd165f940554ace30825ac Mon Sep 17 00:00:00 2001 From: Paul Beusterien Date: Mon, 15 Jun 2020 15:49:45 -0700 Subject: [PATCH 18/22] missing comma --- GoogleUtilities.podspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/GoogleUtilities.podspec b/GoogleUtilities.podspec index 71ed4162bb3..6dff77f481c 100644 --- a/GoogleUtilities.podspec +++ b/GoogleUtilities.podspec @@ -86,7 +86,7 @@ other Google CocoaPods. They're not intended for direct public usage. s.subspec 'AppDelegateSwizzler' do |adss| adss.source_files = [ 'GoogleUtilities/AppDelegateSwizzler/Internal/*.h', - 'GoogleUtilities/AppDelegateSwizzler/Private/*.h' + 'GoogleUtilities/AppDelegateSwizzler/Private/*.h', 'GoogleUtilities/AppDelegateSwizzler/*.m', 'GoogleUtilities/SceneDelegateSwizzler/**/*.[mh]', 'GoogleUtilities/Common/*.h', From 6932f301424da3c28091301fefa884f3d0338705 Mon Sep 17 00:00:00 2001 From: Paul Beusterien Date: Mon, 15 Jun 2020 16:00:06 -0700 Subject: [PATCH 19/22] copyrights --- GoogleUtilities/AppDelegateSwizzler/Public/dummy.h | 14 ++++++++++++++ GoogleUtilities/Network/Public/dummy.h | 14 ++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/GoogleUtilities/AppDelegateSwizzler/Public/dummy.h b/GoogleUtilities/AppDelegateSwizzler/Public/dummy.h index 058168ed309..4df40ad43d7 100644 --- a/GoogleUtilities/AppDelegateSwizzler/Public/dummy.h +++ b/GoogleUtilities/AppDelegateSwizzler/Public/dummy.h @@ -1,2 +1,16 @@ +// Copyright 2020 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + // Dummy public header to satisfy Swift Package Manager since Private cannot be // used because of its self-references. diff --git a/GoogleUtilities/Network/Public/dummy.h b/GoogleUtilities/Network/Public/dummy.h index 058168ed309..4df40ad43d7 100644 --- a/GoogleUtilities/Network/Public/dummy.h +++ b/GoogleUtilities/Network/Public/dummy.h @@ -1,2 +1,16 @@ +// Copyright 2020 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + // Dummy public header to satisfy Swift Package Manager since Private cannot be // used because of its self-references. From 714e3913697f3541920ec015b18989751ce57f93 Mon Sep 17 00:00:00 2001 From: Paul Beusterien Date: Mon, 15 Jun 2020 16:31:01 -0700 Subject: [PATCH 20/22] Restore Gemfile and travis --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 2984c6c0b35..d164be816ac 100644 --- a/.travis.yml +++ b/.travis.yml @@ -294,4 +294,3 @@ jobs: branches: only: - master - - pb-gu-rr-clients From 929c0685ad49c9a5146bf388ad294b3b4932fcb6 Mon Sep 17 00:00:00 2001 From: Paul Beusterien Date: Tue, 16 Jun 2020 07:41:24 -0700 Subject: [PATCH 21/22] Add comment to Package.swift --- Package.swift | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Package.swift b/Package.swift index 5a979231ddd..aa4cd8d579b 100644 --- a/Package.swift +++ b/Package.swift @@ -15,6 +15,10 @@ // See the License for the specific language governing permissions and // limitations under the License. +// This Package.swift is a Work in Progress, primarily for CI at this point. +// Those interested in experimenting with Swift Package Manager should use the +// spm-master2020 branch for now. + import PackageDescription let package = Package( From 3937529aeed9ea0841f242d8d1bbfc1953d4ae6c Mon Sep 17 00:00:00 2001 From: Paul Beusterien Date: Tue, 16 Jun 2020 07:43:19 -0700 Subject: [PATCH 22/22] Verify GoogleUtilities regression is fixed --- scripts/if_changed.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/if_changed.sh b/scripts/if_changed.sh index c58eee94913..b55172ceb7a 100755 --- a/scripts/if_changed.sh +++ b/scripts/if_changed.sh @@ -100,7 +100,7 @@ else ;; GoogleUtilitiesComponents-*) - check_changes '^(GoogleUtilitiesComponents|GoogleUtilitiesComponents.podspec)' + check_changes '^(GoogleUtilities|GoogleUtilitiesComponents|GoogleUtilitiesComponents.podspec)' ;; InAppMessaging-*)