Installations - new public header structure (#6174)

paulb777 · web-flow · commit ebe6365ceb06 · 2020-07-31T07:40:55.000-07:00
diff --git a/FirebaseInstallations.podspec b/FirebaseInstallations.podspec
@@ -33,7 +33,7 @@ Pod::Spec.new do |s|
     'GoogleUtilities/UserDefaults/Private/*.h',
   ]
   s.public_header_files = [
-    base_dir + 'Library/Public/*.h',
+    base_dir + 'Library/Public/FirebaseInstallations/*.h',
     base_dir + 'Library/Private/*.h',
   ]
   s.private_header_files = base_dir + 'Library/Private/*.h'
diff --git a/FirebaseInstallations/Source/Library/Errors/FIRInstallationsErrorUtil.h b/FirebaseInstallations/Source/Library/Errors/FIRInstallationsErrorUtil.h
@@ -16,7 +16,7 @@
 
 #import <Foundation/Foundation.h>
 
-#import "FirebaseInstallations/Source/Library/Public/FIRInstallationsErrors.h"
+#import "FirebaseInstallations/Source/Library/Public/FirebaseInstallations/FIRInstallationsErrors.h"
 
 @class FIRInstallationsHTTPError;
 
diff --git a/FirebaseInstallations/Source/Library/FIRInstallations.m b/FirebaseInstallations/Source/Library/FIRInstallations.m
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#import "FirebaseInstallations/Source/Library/Public/FIRInstallations.h"
+#import "FirebaseInstallations/Source/Library/Public/FirebaseInstallations/FIRInstallations.h"
 
 #if __has_include(<FBLPromises/FBLPromises.h>)
 #import <FBLPromises/FBLPromises.h>
@@ -31,7 +31,7 @@
 #import "FirebaseInstallations/Source/Library/FIRInstallationsLogger.h"
 #import "FirebaseInstallations/Source/Library/InstallationsIDController/FIRInstallationsIDController.h"
 #import "FirebaseInstallations/Source/Library/InstallationsStore/FIRInstallationsStoredAuthToken.h"
-#import "FirebaseInstallations/Source/Library/Public/FIRInstallationsVersion.h"
+#import "FirebaseInstallations/Source/Library/Public/FirebaseInstallations/FIRInstallationsVersion.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/FirebaseInstallations/Source/Library/FIRInstallationsAuthTokenResultInternal.h b/FirebaseInstallations/Source/Library/FIRInstallationsAuthTokenResultInternal.h
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#import "FirebaseInstallations/Source/Library/Public/FIRInstallationsAuthTokenResult.h"
+#import "FirebaseInstallations/Source/Library/Public/FirebaseInstallations/FIRInstallationsAuthTokenResult.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/FirebaseInstallations/Source/Library/FIRInstallationsVersion.m b/FirebaseInstallations/Source/Library/FIRInstallationsVersion.m
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#import "FirebaseInstallations/Source/Library/Public/FIRInstallationsVersion.h"
+#import "FirebaseInstallations/Source/Library/Public/FirebaseInstallations/FIRInstallationsVersion.h"
 
 // Convert the macro to a string
 #define STR(x) STR_EXPAND(x)
diff --git a/FirebaseInstallations/Source/Library/InstallationsAPI/FIRInstallationsAPIService.m b/FirebaseInstallations/Source/Library/InstallationsAPI/FIRInstallationsAPIService.m
@@ -16,7 +16,7 @@
 
 #import "FirebaseInstallations/Source/Library/InstallationsAPI/FIRInstallationsAPIService.h"
 
-#import "FirebaseInstallations/Source/Library/Public/FIRInstallationsVersion.h"
+#import "FirebaseInstallations/Source/Library/Public/FirebaseInstallations/FIRInstallationsVersion.h"
 
 #if __has_include(<FBLPromises/FBLPromises.h>)
 #import <FBLPromises/FBLPromises.h>
diff --git a/FirebaseInstallations/Source/Library/Private/FirebaseInstallationsInternal.h b/FirebaseInstallations/Source/Library/Private/FirebaseInstallationsInternal.h
@@ -16,8 +16,4 @@
 // Installations Public headers. Any package manager complexity should be
 // handled here.
 
-#if SWIFT_PACKAGE
-@import FirebaseInstallations;
-#else
 #import <FirebaseInstallations/FirebaseInstallations.h>
-#endif
diff --git a/FirebaseInstallations/Source/Library/Public/FirebaseInstallations/FIRInstallations.h b/FirebaseInstallations/Source/Library/Public/FirebaseInstallations/FIRInstallations.h
diff --git a/FirebaseInstallations/Source/Library/Public/FirebaseInstallations/FIRInstallationsAuthTokenResult.h b/FirebaseInstallations/Source/Library/Public/FirebaseInstallations/FIRInstallationsAuthTokenResult.h
diff --git a/FirebaseInstallations/Source/Library/Public/FirebaseInstallations/FIRInstallationsErrors.h b/FirebaseInstallations/Source/Library/Public/FirebaseInstallations/FIRInstallationsErrors.h
diff --git a/FirebaseInstallations/Source/Library/Public/FirebaseInstallations/FIRInstallationsVersion.h b/FirebaseInstallations/Source/Library/Public/FirebaseInstallations/FIRInstallationsVersion.h
diff --git a/FirebaseInstallations/Source/Library/Public/FirebaseInstallations/FirebaseInstallations.h b/FirebaseInstallations/Source/Library/Public/FirebaseInstallations/FirebaseInstallations.h
diff --git a/FirebaseInstallations/Source/Tests/Integration/FIRInstallationsIntegrationTests.m b/FirebaseInstallations/Source/Tests/Integration/FIRInstallationsIntegrationTests.m
@@ -30,8 +30,8 @@
 #import "FirebaseInstallations/Source/Tests/Utils/FIRInstallations+Tests.h"
 #import "FirebaseInstallations/Source/Tests/Utils/FIRInstallationsItem+Tests.h"
 
-#import "FirebaseInstallations/Source/Library/Public/FIRInstallations.h"
-#import "FirebaseInstallations/Source/Library/Public/FIRInstallationsAuthTokenResult.h"
+#import "FirebaseInstallations/Source/Library/Public/FirebaseInstallations/FIRInstallations.h"
+#import "FirebaseInstallations/Source/Library/Public/FirebaseInstallations/FIRInstallationsAuthTokenResult.h"
 
 static BOOL sFIRInstallationsFirebaseDefaultAppConfigured = NO;
 
diff --git a/FirebaseInstallations/Source/Tests/Unit/FIRInstallationsAPIServiceTests.m b/FirebaseInstallations/Source/Tests/Unit/FIRInstallationsAPIServiceTests.m
@@ -24,7 +24,7 @@
 #import "FirebaseInstallations/Source/Library/Errors/FIRInstallationsHTTPError.h"
 #import "FirebaseInstallations/Source/Library/InstallationsAPI/FIRInstallationsAPIService.h"
 #import "FirebaseInstallations/Source/Library/InstallationsStore/FIRInstallationsStoredAuthToken.h"
-#import "FirebaseInstallations/Source/Library/Public/FIRInstallationsVersion.h"
+#import "FirebaseInstallations/Source/Library/Public/FirebaseInstallations/FIRInstallationsVersion.h"
 
 #import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h"
 
diff --git a/FirebaseInstallations/Source/Tests/Unit/FIRInstallationsIDControllerTests.m b/FirebaseInstallations/Source/Tests/Unit/FIRInstallationsIDControllerTests.m
@@ -32,7 +32,7 @@
 #import "FirebaseInstallations/Source/Library/InstallationsAPI/FIRInstallationsAPIService.h"
 #import "FirebaseInstallations/Source/Library/InstallationsIDController/FIRInstallationsIDController.h"
 #import "FirebaseInstallations/Source/Library/InstallationsStore/FIRInstallationsStore.h"
-#import "FirebaseInstallations/Source/Library/Public/FIRInstallations.h"
+#import "FirebaseInstallations/Source/Library/Public/FirebaseInstallations/FIRInstallations.h"
 
 #import "FirebaseInstallations/Source/Library/InstallationsStore/FIRInstallationsStoredAuthToken.h"
 
diff --git a/FirebaseInstallations/Source/Tests/Unit/FIRInstallationsTests.m b/FirebaseInstallations/Source/Tests/Unit/FIRInstallationsTests.m
@@ -29,7 +29,7 @@
 #import "FirebaseInstallations/Source/Library/FIRInstallationsAuthTokenResultInternal.h"
 #import "FirebaseInstallations/Source/Library/InstallationsIDController/FIRInstallationsIDController.h"
 #import "FirebaseInstallations/Source/Library/InstallationsStore/FIRInstallationsStoredAuthToken.h"
-#import "FirebaseInstallations/Source/Library/Public/FIRInstallations.h"
+#import "FirebaseInstallations/Source/Library/Public/FirebaseInstallations/FIRInstallations.h"
 
 @interface FIRInstallationsTests : XCTestCase
 @property(nonatomic) FIRInstallations *installations;
diff --git a/FirebaseInstallations/Source/Tests/Utils/FIRInstallations+Tests.h b/FirebaseInstallations/Source/Tests/Utils/FIRInstallations+Tests.h
@@ -15,7 +15,7 @@
  */
 
 #import <Foundation/Foundation.h>
-#import "FirebaseInstallations/Source/Library/Public/FIRInstallations.h"
+#import "FirebaseInstallations/Source/Library/Public/FirebaseInstallations/FIRInstallations.h"
 
 @class FIRInstallationsIDController;
 @class FIROptions;
diff --git a/scripts/check_imports.swift b/scripts/check_imports.swift
@@ -79,7 +79,9 @@ private func checkFile(_ file: String, logger: ErrorLogger, inRepo repoURL: URL)
   let isPublic = file.range(of: "/Public/") != nil &&
     // TODO: Skip legacy GDTCCTLibrary file that isn't Public and should be moved.
     file.range(of: "GDTCCTLibrary/Public/GDTCOREvent+GDTCCTSupport.h") == nil
-  let isPrivate = file.range(of: "/Sources/Private/") != nil
+  let isPrivate = file.range(of: "/Sources/Private/") != nil ||
+    // Delete when FirebaseInstallations fixes directory structure.
+    file.range(of: "Source/Library/Private/") != nil
   var inSwiftPackage = false
   var inSwiftPackageElse = false
   let lines = fileContents.components(separatedBy: .newlines)

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ Pod::Spec.new do \|s\|`
`33`	`33`	`'GoogleUtilities/UserDefaults/Private/*.h',`
`34`	`34`	`]`
`35`	`35`	`s.public_header_files = [`
`36`		`- base_dir + 'Library/Public/*.h',`
	`36`	`+ base_dir + 'Library/Public/FirebaseInstallations/*.h',`
`37`	`37`	`base_dir + 'Library/Private/*.h',`
`38`	`38`	`]`
`39`	`39`	`s.private_header_files = base_dir + 'Library/Private/*.h'`