Skip to content

Commit af5b0c8

Browse files
morganchen12morganchen12
committed
migrate to spm and remove fdl
1 parent a0dd61d commit af5b0c8

File tree

5 files changed

+60
-230
lines changed

5 files changed

+60
-230
lines changed

‎inappmessaging/InAppMessagingExample.xcodeproj/project.pbxproj

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

99
/* Begin PBXBuildFile section */
@@ -16,6 +16,10 @@
1616
8DB25F9420BE0C29000ABEE2 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 8DB25F9220BE0C29000ABEE2 /* Main.storyboard */; };
1717
8DB25F9620BE0C2A000ABEE2 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 8DB25F9520BE0C2A000ABEE2 /* Assets.xcassets */; };
1818
8DB25F9920BE0C2A000ABEE2 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 8DB25F9720BE0C2A000ABEE2 /* LaunchScreen.storyboard */; };
19+
8DC73D7A2D41A90B0092B6EE /* FirebaseInAppMessaging-Beta in Frameworks */ = {isa = PBXBuildFile; productRef = 8DC73D792D41A90B0092B6EE /* FirebaseInAppMessaging-Beta */; };
20+
8DC73D7C2D41A9130092B6EE /* FirebaseInAppMessaging-Beta in Frameworks */ = {isa = PBXBuildFile; productRef = 8DC73D7B2D41A9130092B6EE /* FirebaseInAppMessaging-Beta */; };
21+
8DC73D7E2D41AA540092B6EE /* FirebaseAnalytics in Frameworks */ = {isa = PBXBuildFile; productRef = 8DC73D7D2D41AA540092B6EE /* FirebaseAnalytics */; };
22+
8DC73D802D41AA5A0092B6EE /* FirebaseAnalytics in Frameworks */ = {isa = PBXBuildFile; productRef = 8DC73D7F2D41AA5A0092B6EE /* FirebaseAnalytics */; };
1923
8DECFE4E211CC14500DC99BD /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 8DECFE4D211CC14500DC99BD /* AppDelegate.m */; };
2024
8DECFE51211CC14600DC99BD /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8DECFE50211CC14600DC99BD /* ViewController.m */; };
2125
8DECFE54211CC14600DC99BD /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 8DECFE52211CC14600DC99BD /* Main.storyboard */; };
@@ -99,13 +103,17 @@
99103
isa = PBXFrameworksBuildPhase;
100104
buildActionMask = 2147483647;
101105
files = (
106+
8DC73D7E2D41AA540092B6EE /* FirebaseAnalytics in Frameworks */,
107+
8DC73D7A2D41A90B0092B6EE /* FirebaseInAppMessaging-Beta in Frameworks */,
102108
);
103109
runOnlyForDeploymentPostprocessing = 0;
104110
};
105111
8DECFE47211CC14500DC99BD /* Frameworks */ = {
106112
isa = PBXFrameworksBuildPhase;
107113
buildActionMask = 2147483647;
108114
files = (
115+
8DC73D802D41AA5A0092B6EE /* FirebaseAnalytics in Frameworks */,
116+
8DC73D7C2D41A9130092B6EE /* FirebaseInAppMessaging-Beta in Frameworks */,
109117
);
110118
runOnlyForDeploymentPostprocessing = 0;
111119
};
@@ -151,6 +159,7 @@
151159
8DECFE8F211CC16F00DC99BD /* InAppMessagingExampleSwiftUITests */,
152160
8DB25F8C20BE0C29000ABEE2 /* Products */,
153161
81A2FB070295F56CC0B2D523 /* GoogleService-Info.plist */,
162+
8DC73D782D41A90B0092B6EE /* Frameworks */,
154163
);
155164
sourceTree = "<group>";
156165
};
@@ -180,6 +189,13 @@
180189
path = InAppMessagingExampleSwift;
181190
sourceTree = "<group>";
182191
};
192+
8DC73D782D41A90B0092B6EE /* Frameworks */ = {
193+
isa = PBXGroup;
194+
children = (
195+
);
196+
name = Frameworks;
197+
sourceTree = "<group>";
198+
};
183199
8DECFE4B211CC14500DC99BD /* InAppMessagingExample */ = {
184200
isa = PBXGroup;
185201
children = (
@@ -347,8 +363,9 @@
347363
8DB25F8320BE0C29000ABEE2 /* Project object */ = {
348364
isa = PBXProject;
349365
attributes = {
366+
BuildIndependentTargetsInParallel = YES;
350367
LastSwiftUpdateCheck = 0930;
351-
LastUpgradeCheck = 0930;
368+
LastUpgradeCheck = 1610;
352369
ORGANIZATIONNAME = Firebase;
353370
TargetAttributes = {
354371
8DB25F8A20BE0C29000ABEE2 = {
@@ -385,6 +402,9 @@
385402
Base,
386403
);
387404
mainGroup = 8DB25F8220BE0C29000ABEE2;
405+
packageReferences = (
406+
8DC73D772D41A89A0092B6EE /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */,
407+
);
388408
productRefGroup = 8DB25F8C20BE0C29000ABEE2 /* Products */;
389409
projectDirPath = "";
390410
projectRoot = "";
@@ -595,6 +615,7 @@
595615
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
596616
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
597617
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
618+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
598619
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
599620
CLANG_WARN_STRICT_PROTOTYPES = YES;
600621
CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -606,6 +627,7 @@
606627
DEBUG_INFORMATION_FORMAT = dwarf;
607628
ENABLE_STRICT_OBJC_MSGSEND = YES;
608629
ENABLE_TESTABILITY = YES;
630+
ENABLE_USER_SCRIPT_SANDBOXING = YES;
609631
GCC_C_LANGUAGE_STANDARD = gnu11;
610632
GCC_DYNAMIC_NO_PIC = NO;
611633
GCC_NO_COMMON_BLOCKS = YES;
@@ -655,6 +677,7 @@
655677
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
656678
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
657679
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
680+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
658681
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
659682
CLANG_WARN_STRICT_PROTOTYPES = YES;
660683
CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -666,6 +689,7 @@
666689
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
667690
ENABLE_NS_ASSERTIONS = NO;
668691
ENABLE_STRICT_OBJC_MSGSEND = YES;
692+
ENABLE_USER_SCRIPT_SANDBOXING = YES;
669693
GCC_C_LANGUAGE_STANDARD = gnu11;
670694
GCC_NO_COMMON_BLOCKS = YES;
671695
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@@ -828,7 +852,6 @@
828852
8DECFE88211CC15F00DC99BD /* Debug */ = {
829853
isa = XCBuildConfiguration;
830854
buildSettings = {
831-
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
832855
BUNDLE_LOADER = "$(TEST_HOST)";
833856
CODE_SIGN_STYLE = Automatic;
834857
INFOPLIST_FILE = InAppMessagingExampleSwiftTests/Info.plist;
@@ -848,7 +871,6 @@
848871
8DECFE89211CC15F00DC99BD /* Release */ = {
849872
isa = XCBuildConfiguration;
850873
buildSettings = {
851-
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
852874
BUNDLE_LOADER = "$(TEST_HOST)";
853875
CODE_SIGN_STYLE = Automatic;
854876
INFOPLIST_FILE = InAppMessagingExampleSwiftTests/Info.plist;
@@ -868,7 +890,6 @@
868890
8DECFE96211CC16F00DC99BD /* Debug */ = {
869891
isa = XCBuildConfiguration;
870892
buildSettings = {
871-
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
872893
CODE_SIGN_STYLE = Automatic;
873894
INFOPLIST_FILE = InAppMessagingExampleSwiftUITests/Info.plist;
874895
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
@@ -887,7 +908,6 @@
887908
8DECFE97211CC16F00DC99BD /* Release */ = {
888909
isa = XCBuildConfiguration;
889910
buildSettings = {
890-
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
891911
CODE_SIGN_STYLE = Automatic;
892912
INFOPLIST_FILE = InAppMessagingExampleSwiftUITests/Info.plist;
893913
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
@@ -970,6 +990,40 @@
970990
defaultConfigurationName = Release;
971991
};
972992
/* End XCConfigurationList section */
993+
994+
/* Begin XCRemoteSwiftPackageReference section */
995+
8DC73D772D41A89A0092B6EE /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */ = {
996+
isa = XCRemoteSwiftPackageReference;
997+
repositoryURL = "https://github.com/firebase/firebase-ios-sdk";
998+
requirement = {
999+
kind = upToNextMajorVersion;
1000+
minimumVersion = 11.7.0;
1001+
};
1002+
};
1003+
/* End XCRemoteSwiftPackageReference section */
1004+
1005+
/* Begin XCSwiftPackageProductDependency section */
1006+
8DC73D792D41A90B0092B6EE /* FirebaseInAppMessaging-Beta */ = {
1007+
isa = XCSwiftPackageProductDependency;
1008+
package = 8DC73D772D41A89A0092B6EE /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */;
1009+
productName = "FirebaseInAppMessaging-Beta";
1010+
};
1011+
8DC73D7B2D41A9130092B6EE /* FirebaseInAppMessaging-Beta */ = {
1012+
isa = XCSwiftPackageProductDependency;
1013+
package = 8DC73D772D41A89A0092B6EE /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */;
1014+
productName = "FirebaseInAppMessaging-Beta";
1015+
};
1016+
8DC73D7D2D41AA540092B6EE /* FirebaseAnalytics */ = {
1017+
isa = XCSwiftPackageProductDependency;
1018+
package = 8DC73D772D41A89A0092B6EE /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */;
1019+
productName = FirebaseAnalytics;
1020+
};
1021+
8DC73D7F2D41AA5A0092B6EE /* FirebaseAnalytics */ = {
1022+
isa = XCSwiftPackageProductDependency;
1023+
package = 8DC73D772D41A89A0092B6EE /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */;
1024+
productName = FirebaseAnalytics;
1025+
};
1026+
/* End XCSwiftPackageProductDependency section */
9731027
};
9741028
rootObject = 8DB25F8320BE0C29000ABEE2 /* Project object */;
9751029
}

‎inappmessaging/InAppMessagingExample/AppDelegate.m

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

1717
@import FirebaseCore;
1818
@import FirebaseInAppMessaging;
19-
@import FirebaseDynamicLinks;
2019

2120
@interface AppDelegate ()
2221

@@ -29,42 +28,8 @@ - (BOOL)application:(UIApplication *)application
2928
// Uncomment the following line to disable In-App Messaging auto-startup.
3029
// [FIRInAppMessaging inAppMessaging].automaticDataCollectionEnabled = NO;
3130

32-
[FIROptions defaultOptions].deepLinkURLScheme = @"com.google.InAppMessagingExampleiOS";
3331
[FIRApp configure];
3432
return YES;
3533
}
3634

37-
- (BOOL)application:(UIApplication *)app
38-
openURL:(NSURL *)url
39-
options:(NSDictionary<NSString *, id> *)options {
40-
return [self application:app
41-
openURL:url
42-
sourceApplication:options[UIApplicationOpenURLOptionsSourceApplicationKey]
43-
annotation:options[UIApplicationOpenURLOptionsAnnotationKey]];
44-
}
45-
46-
- (BOOL)application:(UIApplication *)application
47-
openURL:(NSURL *)url
48-
sourceApplication:(NSString *)sourceApplication
49-
annotation:(id)annotation {
50-
FIRDynamicLink *dynamicLink = [[FIRDynamicLinks dynamicLinks] dynamicLinkFromCustomSchemeURL:url];
51-
52-
NSLog(@"called here with %@", dynamicLink);
53-
if (dynamicLink) {
54-
if (dynamicLink.url) {
55-
// Handle the deep link. For example, show the deep-linked content,
56-
// apply a promotional offer to the user's account or show customized onboarding view.
57-
// ...
58-
59-
} else {
60-
// Dynamic link has empty deep link. This situation will happens if
61-
// Firebase Dynamic Links iOS SDK tried to retrieve pending dynamic link,
62-
// but pending link is not available for this device/App combination.
63-
// At this point you may display default onboarding view.
64-
}
65-
return YES;
66-
}
67-
return NO;
68-
}
69-
7035
@end

‎inappmessaging/InAppMessagingExampleSwift/AppDelegate.swift

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ import UIKit
1818

1919
import FirebaseCore
2020
import FirebaseInAppMessaging
21-
import FirebaseDynamicLinks
2221

2322
@UIApplicationMain
2423
class AppDelegate: UIResponder, UIApplicationDelegate {
@@ -30,39 +29,9 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
3029
// Uncomment the following line to disable In-App Messaging auto-startup.
3130
// InAppMessaging.inAppMessaging().automaticDataCollectionEnabled = false
3231

33-
FirebaseOptions.defaultOptions()?.deepLinkURLScheme = "com.google.InAppMessagingExampleSwiftiOS"
3432
FirebaseApp.configure()
3533
return true
3634
}
3735

38-
func application(_ app: UIApplication,
39-
open url: URL,
40-
options: [UIApplication.OpenURLOptionsKey: Any] = [:]) -> Bool {
41-
return application(app,
42-
open: url,
43-
sourceApplication: options[.sourceApplication] as? String,
44-
annotation: options[.annotation] as Any)
45-
}
46-
47-
func application(_ application: UIApplication,
48-
open url: URL,
49-
sourceApplication: String?,
50-
annotation: Any) -> Bool {
51-
let dynamicLink = DynamicLinks.dynamicLinks().dynamicLink(fromCustomSchemeURL: url)
5236

53-
if dynamicLink != nil {
54-
if dynamicLink?.url != nil {
55-
// Handle the deep link. For example, show the deep-linked content,
56-
// apply a promotional offer to the user's account or show customized onboarding view.
57-
// ...
58-
} else {
59-
// Dynamic link has empty deep link. This situation will happens if
60-
// Firebase Dynamic Links iOS SDK tried to retrieve pending dynamic link,
61-
// but pending link is not available for this device/App combination.
62-
// At this point you may display default onboarding view.
63-
}
64-
return true
65-
}
66-
return false
67-
}
6837
}

‎inappmessaging/Podfile

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

0 commit comments

Comments
 (0)