Skip to content

Commit d17b490

Browse files
committed
migrate iam, installations, functions again, storage
1 parent 9838353 commit d17b490

File tree

17 files changed

+257
-569
lines changed

17 files changed

+257
-569
lines changed

inappmessaging/FIAMReference/FIAMReference.xcodeproj/project.pbxproj

Lines changed: 41 additions & 162 deletions
Large diffs are not rendered by default.

inappmessaging/FIAMReference/FIAMReference/AppDelegate.m

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
#import "AppDelegate.h"
1818

19+
@import FirebaseCore;
1920
@import FirebaseInAppMessaging;
2021

2122
#import "CardActionFiamDelegate.h"

inappmessaging/FIAMReference/FIAMReference/CardActionFiamDelegate.m

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,16 @@ - (void)messageDismissed:(nonnull FIRInAppMessagingDisplayMessage *)inAppMessage
4040
@end
4141
// [END fiam_card_action_delegate]
4242

43+
@interface ExampleCardActionDelegate: NSObject <FIRInAppMessagingDisplayDelegate>
44+
@end
45+
4346

4447
// [START fiam_card_action_delegate_bundles]
45-
@implementation CardActionFiamDelegate
48+
@implementation ExampleCardActionDelegate
4649

4750
- (void)messageClicked:(nonnull FIRInAppMessagingDisplayMessage *)inAppMessage {
48-
appData = inAppMessage.appData
51+
NSDictionary *appData = inAppMessage.appData;
52+
NSLog(@"Message data: %@", appData);
4953
// ...
5054
}
5155

inappmessaging/FIAMReference/FIAMReferenceSwift/CardActionFiamDelegate.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class CardActionFiamDelegate : NSObject, InAppMessagingDisplayDelegate {
2424
}
2525

2626
func messageDismissed(_ inAppMessage: InAppMessagingDisplayMessage,
27-
dismissType: FIRInAppMessagingDismissType) {
27+
dismissType: InAppMessagingDismissType) {
2828
// ...
2929
}
3030

@@ -41,7 +41,7 @@ class CardActionFiamDelegate : NSObject, InAppMessagingDisplayDelegate {
4141

4242

4343
// [START fiam_card_action_delegate_bundles]
44-
class CardActionFiamDelegate : NSObject, InAppMessagingDisplayDelegate {
44+
class CardActionDelegate : NSObject, InAppMessagingDisplayDelegate {
4545

4646
func messageClicked(_ inAppMessage: InAppMessagingDisplayMessage) {
4747
// Get data bundle from the inapp message

inappmessaging/Podfile

Lines changed: 0 additions & 14 deletions
This file was deleted.

inappmessaging/Podfile.lock

Lines changed: 0 additions & 89 deletions
This file was deleted.

installations/InstallationsSnippets.xcodeproj/project.pbxproj

Lines changed: 34 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,11 @@
33
archiveVersion = 1;
44
classes = {
55
};
6-
objectVersion = 51;
6+
objectVersion = 54;
77
objects = {
88

99
/* Begin PBXBuildFile section */
10+
8D7951C62D2C8A15000FD694 /* FirebaseInstallations in Frameworks */ = {isa = PBXBuildFile; productRef = 8D7951C52D2C8A15000FD694 /* FirebaseInstallations */; };
1011
8DC74B6624A3DABF004C5F44 /* ObjCSnippets.m in Sources */ = {isa = PBXBuildFile; fileRef = 8DC74B6524A3DABF004C5F44 /* ObjCSnippets.m */; };
1112
8DF2A72824A3D78300737F46 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8DF2A72724A3D78300737F46 /* AppDelegate.swift */; };
1213
8DF2A72A24A3D78300737F46 /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8DF2A72924A3D78300737F46 /* SceneDelegate.swift */; };
@@ -49,6 +50,7 @@
4950
isa = PBXFrameworksBuildPhase;
5051
buildActionMask = 2147483647;
5152
files = (
53+
8D7951C62D2C8A15000FD694 /* FirebaseInstallations in Frameworks */,
5254
);
5355
runOnlyForDeploymentPostprocessing = 0;
5456
};
@@ -62,20 +64,20 @@
6264
/* End PBXFrameworksBuildPhase section */
6365

6466
/* Begin PBXGroup section */
65-
8AD735E937155091CB79F9CC /* Pods */ = {
67+
8D7951C42D2C8A15000FD694 /* Frameworks */ = {
6668
isa = PBXGroup;
6769
children = (
6870
);
69-
path = Pods;
71+
name = Frameworks;
7072
sourceTree = "<group>";
7173
};
7274
8DF2A71B24A3D78300737F46 = {
7375
isa = PBXGroup;
7476
children = (
7577
8DF2A72624A3D78300737F46 /* InstallationsSnippets */,
7678
8DF2A73D24A3D78300737F46 /* InstallationsSnippetsTests */,
79+
8D7951C42D2C8A15000FD694 /* Frameworks */,
7780
8DF2A72524A3D78300737F46 /* Products */,
78-
8AD735E937155091CB79F9CC /* Pods */,
7981
);
8082
sourceTree = "<group>";
8183
};
@@ -166,8 +168,9 @@
166168
8DF2A71C24A3D78300737F46 /* Project object */ = {
167169
isa = PBXProject;
168170
attributes = {
171+
BuildIndependentTargetsInParallel = YES;
169172
LastSwiftUpdateCheck = 1140;
170-
LastUpgradeCheck = 1140;
173+
LastUpgradeCheck = 1610;
171174
ORGANIZATIONNAME = Firebase;
172175
TargetAttributes = {
173176
8DF2A72324A3D78300737F46 = {
@@ -189,6 +192,9 @@
189192
Base,
190193
);
191194
mainGroup = 8DF2A71B24A3D78300737F46;
195+
packageReferences = (
196+
8D7951C32D2C89F0000FD694 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */,
197+
);
192198
productRefGroup = 8DF2A72524A3D78300737F46 /* Products */;
193199
projectDirPath = "";
194200
projectRoot = "";
@@ -287,6 +293,7 @@
287293
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
288294
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
289295
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
296+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
290297
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
291298
CLANG_WARN_STRICT_PROTOTYPES = YES;
292299
CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -297,6 +304,7 @@
297304
DEBUG_INFORMATION_FORMAT = dwarf;
298305
ENABLE_STRICT_OBJC_MSGSEND = YES;
299306
ENABLE_TESTABILITY = YES;
307+
ENABLE_USER_SCRIPT_SANDBOXING = YES;
300308
GCC_C_LANGUAGE_STANDARD = gnu11;
301309
GCC_DYNAMIC_NO_PIC = NO;
302310
GCC_NO_COMMON_BLOCKS = YES;
@@ -347,6 +355,7 @@
347355
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
348356
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
349357
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
358+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
350359
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
351360
CLANG_WARN_STRICT_PROTOTYPES = YES;
352361
CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -357,6 +366,7 @@
357366
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
358367
ENABLE_NS_ASSERTIONS = NO;
359368
ENABLE_STRICT_OBJC_MSGSEND = YES;
369+
ENABLE_USER_SCRIPT_SANDBOXING = YES;
360370
GCC_C_LANGUAGE_STANDARD = gnu11;
361371
GCC_NO_COMMON_BLOCKS = YES;
362372
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@@ -421,7 +431,6 @@
421431
8DF2A74724A3D78300737F46 /* Debug */ = {
422432
isa = XCBuildConfiguration;
423433
buildSettings = {
424-
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
425434
BUNDLE_LOADER = "$(TEST_HOST)";
426435
CODE_SIGN_STYLE = Automatic;
427436
INFOPLIST_FILE = InstallationsSnippetsTests/Info.plist;
@@ -442,7 +451,6 @@
442451
8DF2A74824A3D78300737F46 /* Release */ = {
443452
isa = XCBuildConfiguration;
444453
buildSettings = {
445-
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
446454
BUNDLE_LOADER = "$(TEST_HOST)";
447455
CODE_SIGN_STYLE = Automatic;
448456
INFOPLIST_FILE = InstallationsSnippetsTests/Info.plist;
@@ -491,6 +499,25 @@
491499
defaultConfigurationName = Release;
492500
};
493501
/* End XCConfigurationList section */
502+
503+
/* Begin XCRemoteSwiftPackageReference section */
504+
8D7951C32D2C89F0000FD694 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */ = {
505+
isa = XCRemoteSwiftPackageReference;
506+
repositoryURL = "https://github.com/firebase/firebase-ios-sdk";
507+
requirement = {
508+
kind = upToNextMajorVersion;
509+
minimumVersion = 11.6.0;
510+
};
511+
};
512+
/* End XCRemoteSwiftPackageReference section */
513+
514+
/* Begin XCSwiftPackageProductDependency section */
515+
8D7951C52D2C8A15000FD694 /* FirebaseInstallations */ = {
516+
isa = XCSwiftPackageProductDependency;
517+
package = 8D7951C32D2C89F0000FD694 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */;
518+
productName = FirebaseInstallations;
519+
};
520+
/* End XCSwiftPackageProductDependency section */
494521
};
495522
rootObject = 8DF2A71C24A3D78300737F46 /* Project object */;
496523
}

installations/InstallationsSnippets/AppDelegate.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
// limitations under the License.
1515
//
1616

17+
import UIKit
1718
import FirebaseCore
1819
import FirebaseInstallations
1920

installations/Podfile

Lines changed: 0 additions & 15 deletions
This file was deleted.

installations/Podfile.lock

Lines changed: 0 additions & 47 deletions
This file was deleted.

0 commit comments

Comments
 (0)