ABT Path fixes and RC Maltese bug fix (#5980)

Author: paulb777

FirebaseABTesting/Sources/ABTConditionalUserPropertyController.h

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#import <FirebaseABTesting/ABTExperimentPayload.h>
 #import <Foundation/Foundation.h>
+#import "FirebaseABTesting/Sources/Private/ABTExperimentPayload.h"
 
 #import "Interop/Analytics/Public/FIRAnalyticsInterop.h"
 

FirebaseABTesting/Sources/ABTExperimentPayload.m

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#import "ABTExperimentPayload.h"
+#import "FirebaseABTesting/Sources/Private/ABTExperimentPayload.h"
 
 static NSString *const kExperimentPayloadKeyExperimentID = @"experimentId";
 static NSString *const kExperimentPayloadKeyVariantID = @"variantId";

FirebaseABTesting/Sources/FIRExperimentController.m

@@ -14,10 +14,10 @@
 
 #import <FirebaseABTesting/FIRExperimentController.h>
 
-#import <FirebaseABTesting/ABTExperimentPayload.h>
 #import <FirebaseABTesting/FIRLifecycleEvents.h>
 #import "FirebaseABTesting/Sources/ABTConditionalUserPropertyController.h"
 #import "FirebaseABTesting/Sources/ABTConstants.h"
+#import "FirebaseABTesting/Sources/Private/ABTExperimentPayload.h"
 #import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h"
 
 #import "Interop/Analytics/Public/FIRAnalyticsInterop.h"

FirebaseABTesting/Tests/Unit/ABTConditionalUserPropertyControllerTest.m

@@ -14,12 +14,12 @@
 
 #import <XCTest/XCTest.h>
 
-#import <FirebaseABTesting/ABTExperimentPayload.h>
 #import <FirebaseABTesting/FIRExperimentController.h>
 #import <FirebaseABTesting/FIRLifecycleEvents.h>
 #import <OCMock/OCMock.h>
 #import "FirebaseABTesting/Sources/ABTConditionalUserPropertyController.h"
 #import "FirebaseABTesting/Sources/ABTConstants.h"
+#import "FirebaseABTesting/Sources/Private/ABTExperimentPayload.h"
 #import "FirebaseABTesting/Tests/Unit/ABTFakeFIRAConditionalUserPropertyController.h"
 #import "FirebaseABTesting/Tests/Unit/ABTTestUniversalConstants.h"
 #import "FirebaseABTesting/Tests/Unit/Utilities/ABTTestUtilities.h"

FirebaseABTesting/Tests/Unit/ABTExperimentPayloadTest.m

@@ -14,9 +14,9 @@
 
 #import <XCTest/XCTest.h>
 
-#import <FirebaseABTesting/ABTExperimentPayload.h>
-#import "ABTConstants.h"
-#import "ABTTestUtilities.h"
+#import "FirebaseABTesting/Sources/ABTConstants.h"
+#import "FirebaseABTesting/Sources/Private/ABTExperimentPayload.h"
+#import "FirebaseABTesting/Tests/Unit/Utilities/ABTTestUtilities.h"
 
 @interface ABTExperimentPayload (ClassTesting)
 

FirebaseABTesting/Tests/Unit/FIRExperimentControllerTest.m

@@ -14,12 +14,12 @@
 
 #import <XCTest/XCTest.h>
 
-#import <FirebaseABTesting/ABTExperimentPayload.h>
 #import <FirebaseABTesting/FIRExperimentController.h>
 #import <FirebaseABTesting/FIRLifecycleEvents.h>
 #import <OCMock/OCMock.h>
 #import "FirebaseABTesting/Sources/ABTConditionalUserPropertyController.h"
 #import "FirebaseABTesting/Sources/ABTConstants.h"
+#import "FirebaseABTesting/Sources/Private/ABTExperimentPayload.h"
 #import "FirebaseABTesting/Tests/Unit/ABTFakeFIRAConditionalUserPropertyController.h"
 #import "FirebaseABTesting/Tests/Unit/ABTTestUniversalConstants.h"
 #import "FirebaseABTesting/Tests/Unit/Utilities/ABTTestUtilities.h"

FirebaseABTesting/Tests/Unit/Utilities/ABTTestUtilities.m

@@ -14,7 +14,7 @@
 
 #import "ABTTestUtilities.h"
 
-#import <FirebaseABTesting/ABTExperimentPayload.h>
+#import "FirebaseABTesting/Sources/Private/ABTExperimentPayload.h"
 
 NS_ASSUME_NONNULL_BEGIN
 

FirebaseRemoteConfig/Sources/RCNDevice.m

@@ -102,7 +102,7 @@ RCNDeviceModel FIRRemoteConfigDeviceSubtype() {
     // Malay
     @"ms" : @[ @"ms_MY" ],
     // Maltese
-    @"ms" : @[ @"mt_MT" ],
+    @"mt" : @[ @"mt_MT" ],
     // Polish
     @"pl" : @[ @"pl", @"pl_PL", @"pl-PL" ],
     // Romanian