ABT - new public header structure (#6168)

paulb777 · web-flow · commit 781f214a66b8 · 2020-07-31T07:21:21.000-07:00
diff --git a/FirebaseABTesting.podspec b/FirebaseABTesting.podspec
@@ -35,7 +35,7 @@ Firebase Cloud Messaging and Firebase Remote Config in your app.
    'FirebaseCore/Sources/Private/*.h',
   ]
   s.requires_arc = base_dir + '*.m'
-  s.public_header_files = base_dir + 'Public/*.h', base_dir + 'Private/*.h'
+  s.public_header_files = base_dir + 'Public/FirebaseABTesting/*.h', base_dir + 'Private/*.h'
   s.private_header_files = base_dir + 'Private/*.h'
   s.pod_target_xcconfig = {
     'GCC_C_LANGUAGE_STANDARD' => 'c99',
diff --git a/FirebaseABTesting/Sources/ABTConditionalUserPropertyController.m b/FirebaseABTesting/Sources/ABTConditionalUserPropertyController.m
@@ -15,7 +15,7 @@
 #import "FirebaseABTesting/Sources/ABTConditionalUserPropertyController.h"
 
 #import "FirebaseABTesting/Sources/ABTConstants.h"
-#import "FirebaseABTesting/Sources/Public/FIRLifecycleEvents.h"
+#import "FirebaseABTesting/Sources/Public/FirebaseABTesting/FIRLifecycleEvents.h"
 #import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h"
 #import "Interop/Analytics/Public/FIRAnalyticsInterop.h"
 
diff --git a/FirebaseABTesting/Sources/FIRExperimentController.m b/FirebaseABTesting/Sources/FIRExperimentController.m
@@ -12,12 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#import "FirebaseABTesting/Sources/Public/FIRExperimentController.h"
+#import "FirebaseABTesting/Sources/Public/FirebaseABTesting/FIRExperimentController.h"
 
 #import "FirebaseABTesting/Sources/ABTConditionalUserPropertyController.h"
 #import "FirebaseABTesting/Sources/ABTConstants.h"
 #import "FirebaseABTesting/Sources/Private/ABTExperimentPayload.h"
-#import "FirebaseABTesting/Sources/Public/FIRLifecycleEvents.h"
+#import "FirebaseABTesting/Sources/Public/FirebaseABTesting/FIRLifecycleEvents.h"
 #import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h"
 
 #import "Interop/Analytics/Public/FIRAnalyticsInterop.h"
diff --git a/FirebaseABTesting/Sources/FIRLifecycleEvents.m b/FirebaseABTesting/Sources/FIRLifecycleEvents.m
@@ -12,9 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#import "FirebaseABTesting/Sources/Public/FIRLifecycleEvents.h"
+#import "FirebaseABTesting/Sources/Public/FirebaseABTesting/FIRLifecycleEvents.h"
 
-#import "FirebaseABTesting/Sources/Public/FIRExperimentController.h"
+#import "FirebaseABTesting/Sources/Public/FirebaseABTesting/FIRExperimentController.h"
 
 /// Default name of the analytics event to be logged when an experiment is set.
 NSString *const FIRSetExperimentEventName = @"_exp_set";
diff --git a/FirebaseABTesting/Sources/Private/FirebaseABTestingInternal.h b/FirebaseABTesting/Sources/Private/FirebaseABTestingInternal.h
@@ -15,10 +15,6 @@
 // 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 FirebaseABTesting;
-#else
 #import <FirebaseABTesting/FirebaseABTesting.h>
-#endif
 
 #import "FirebaseABTesting/Sources/Private/ABTExperimentPayload.h"
diff --git a/FirebaseABTesting/Sources/Public/FirebaseABTesting/FIRExperimentController.h b/FirebaseABTesting/Sources/Public/FirebaseABTesting/FIRExperimentController.h
diff --git a/FirebaseABTesting/Sources/Public/FirebaseABTesting/FIRLifecycleEvents.h b/FirebaseABTesting/Sources/Public/FirebaseABTesting/FIRLifecycleEvents.h
diff --git a/FirebaseABTesting/Sources/Public/FirebaseABTesting/FirebaseABTesting.h b/FirebaseABTesting/Sources/Public/FirebaseABTesting/FirebaseABTesting.h
diff --git a/FirebaseABTesting/Tests/Unit/ABTConditionalUserPropertyControllerTest.m b/FirebaseABTesting/Tests/Unit/ABTConditionalUserPropertyControllerTest.m
@@ -18,8 +18,8 @@
 #import "FirebaseABTesting/Sources/ABTConditionalUserPropertyController.h"
 #import "FirebaseABTesting/Sources/ABTConstants.h"
 #import "FirebaseABTesting/Sources/Private/ABTExperimentPayload.h"
-#import "FirebaseABTesting/Sources/Public/FIRExperimentController.h"
-#import "FirebaseABTesting/Sources/Public/FIRLifecycleEvents.h"
+#import "FirebaseABTesting/Sources/Public/FirebaseABTesting/FIRExperimentController.h"
+#import "FirebaseABTesting/Sources/Public/FirebaseABTesting/FIRLifecycleEvents.h"
 #import "FirebaseABTesting/Tests/Unit/ABTFakeFIRAConditionalUserPropertyController.h"
 #import "FirebaseABTesting/Tests/Unit/ABTTestUniversalConstants.h"
 #import "FirebaseABTesting/Tests/Unit/Utilities/ABTTestUtilities.h"
diff --git a/FirebaseABTesting/Tests/Unit/FIRExperimentControllerTest.m b/FirebaseABTesting/Tests/Unit/FIRExperimentControllerTest.m
@@ -18,8 +18,8 @@
 #import "FirebaseABTesting/Sources/ABTConditionalUserPropertyController.h"
 #import "FirebaseABTesting/Sources/ABTConstants.h"
 #import "FirebaseABTesting/Sources/Private/ABTExperimentPayload.h"
-#import "FirebaseABTesting/Sources/Public/FIRExperimentController.h"
-#import "FirebaseABTesting/Sources/Public/FIRLifecycleEvents.h"
+#import "FirebaseABTesting/Sources/Public/FirebaseABTesting/FIRExperimentController.h"
+#import "FirebaseABTesting/Sources/Public/FirebaseABTesting/FIRLifecycleEvents.h"
 #import "FirebaseABTesting/Tests/Unit/ABTFakeFIRAConditionalUserPropertyController.h"
 #import "FirebaseABTesting/Tests/Unit/ABTTestUniversalConstants.h"
 #import "FirebaseABTesting/Tests/Unit/Utilities/ABTTestUtilities.h"

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ Firebase Cloud Messaging and Firebase Remote Config in your app.`
`35`	`35`	`'FirebaseCore/Sources/Private/*.h',`
`36`	`36`	`]`
`37`	`37`	`s.requires_arc = base_dir + '*.m'`
`38`		`- s.public_header_files = base_dir + 'Public/.h', base_dir + 'Private/.h'`
	`38`	`+ s.public_header_files = base_dir + 'Public/FirebaseABTesting/.h', base_dir + 'Private/.h'`
`39`	`39`	`s.private_header_files = base_dir + 'Private/*.h'`
`40`	`40`	`s.pod_target_xcconfig = {`
`41`	`41`	`'GCC_C_LANGUAGE_STANDARD' => 'c99',`