Skip to content
This repository was archived by the owner on Nov 2, 2019. It is now read-only.

Commit 1fa8368

Browse files
authored
Rename ApplicationDelegate to SDKApplicationDelegate to avoid name clashes. (#36)
1 parent 0f03274 commit 1fa8368

3 files changed

Lines changed: 13 additions & 13 deletions

File tree

FacebookSwift.xcodeproj/project.pbxproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
810192B21D01305400B9E881 /* AppEventsLogger.FlushBehavior.swift in Sources */ = {isa = PBXBuildFile; fileRef = 810192A71D01305400B9E881 /* AppEventsLogger.FlushBehavior.swift */; };
1515
810192B31D01305400B9E881 /* AppEventsLogger.swift in Sources */ = {isa = PBXBuildFile; fileRef = 810192A81D01305400B9E881 /* AppEventsLogger.swift */; };
1616
810192B41D01305400B9E881 /* AccessToken.swift in Sources */ = {isa = PBXBuildFile; fileRef = 810192AA1D01305400B9E881 /* AccessToken.swift */; };
17-
810192B51D01305400B9E881 /* ApplicationDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 810192AB1D01305400B9E881 /* ApplicationDelegate.swift */; };
17+
810192B51D01305400B9E881 /* SDKApplicationDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 810192AB1D01305400B9E881 /* SDKApplicationDelegate.swift */; };
1818
810192B61D01305400B9E881 /* SDKLoggingBehavior.swift in Sources */ = {isa = PBXBuildFile; fileRef = 810192AC1D01305400B9E881 /* SDKLoggingBehavior.swift */; };
1919
810192B71D01305400B9E881 /* SDKSettings.swift in Sources */ = {isa = PBXBuildFile; fileRef = 810192AD1D01305400B9E881 /* SDKSettings.swift */; };
2020
810192C41D0130C500B9E881 /* GraphRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 810192C31D0130C500B9E881 /* GraphRequest.swift */; };
@@ -348,7 +348,7 @@
348348
810192A71D01305400B9E881 /* AppEventsLogger.FlushBehavior.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppEventsLogger.FlushBehavior.swift; sourceTree = "<group>"; };
349349
810192A81D01305400B9E881 /* AppEventsLogger.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppEventsLogger.swift; sourceTree = "<group>"; };
350350
810192AA1D01305400B9E881 /* AccessToken.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AccessToken.swift; sourceTree = "<group>"; };
351-
810192AB1D01305400B9E881 /* ApplicationDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ApplicationDelegate.swift; sourceTree = "<group>"; };
351+
810192AB1D01305400B9E881 /* SDKApplicationDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SDKApplicationDelegate.swift; sourceTree = "<group>"; };
352352
810192AC1D01305400B9E881 /* SDKLoggingBehavior.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SDKLoggingBehavior.swift; sourceTree = "<group>"; };
353353
810192AD1D01305400B9E881 /* SDKSettings.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SDKSettings.swift; sourceTree = "<group>"; };
354354
810192C31D0130C500B9E881 /* GraphRequest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GraphRequest.swift; sourceTree = "<group>"; };
@@ -499,7 +499,7 @@
499499
isa = PBXGroup;
500500
children = (
501501
810192AA1D01305400B9E881 /* AccessToken.swift */,
502-
810192AB1D01305400B9E881 /* ApplicationDelegate.swift */,
502+
810192AB1D01305400B9E881 /* SDKApplicationDelegate.swift */,
503503
810192AC1D01305400B9E881 /* SDKLoggingBehavior.swift */,
504504
810192AD1D01305400B9E881 /* SDKSettings.swift */,
505505
);
@@ -1279,7 +1279,7 @@
12791279
817021AE1D18DE1500ECE7AC /* UserProfile.PictureView.swift in Sources */,
12801280
810192B61D01305400B9E881 /* SDKLoggingBehavior.swift in Sources */,
12811281
81FC4CBB1D0674F4003F3A46 /* PublishPermission.swift in Sources */,
1282-
810192B51D01305400B9E881 /* ApplicationDelegate.swift in Sources */,
1282+
810192B51D01305400B9E881 /* SDKApplicationDelegate.swift in Sources */,
12831283
810192C81D01380600B9E881 /* GraphRequestConnection.swift in Sources */,
12841284
810192C41D0130C500B9E881 /* GraphRequest.swift in Sources */,
12851285
810192B01D01305400B9E881 /* AppEventName.swift in Sources */,

Samples/Catalog/Sources/AppDelegate.swift

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,16 +28,16 @@ final class AppDelegate: UIResponder {
2828

2929
extension AppDelegate: UIApplicationDelegate {
3030
func application(application: UIApplication, didFinishLaunchingWithOptions launchOptions: [NSObject: AnyObject]?) -> Bool {
31-
ApplicationDelegate.shared.application(application, didFinishLaunchingWithOptions: launchOptions)
31+
SDKApplicationDelegate.shared.application(application, didFinishLaunchingWithOptions: launchOptions)
3232

3333
return true
3434
}
3535

3636
func application(application: UIApplication, openURL url: NSURL, sourceApplication: String?, annotation: AnyObject) -> Bool {
37-
return ApplicationDelegate.shared.application(application,
38-
openURL: url,
39-
sourceApplication: sourceApplication,
40-
annotation: annotation)
37+
return SDKApplicationDelegate.shared.application(application,
38+
openURL: url,
39+
sourceApplication: sourceApplication,
40+
annotation: annotation)
4141
}
4242

4343
func applicationDidBecomeActive(application: UIApplication) {

Sources/Core/Common/ApplicationDelegate.swift renamed to Sources/Core/Common/SDKApplicationDelegate.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,22 +21,22 @@ import UIKit
2121
import FBSDKCoreKit
2222

2323
/**
24-
The ApplicationDelegate is designed to post process the results from Facebook Login or Facebook Dialogs
24+
The `SDKApplicationDelegate` is designed to post process the results from Facebook Login or Facebook Dialogs
2525
(or any action that requires switching over to the native Facebook app or Safari).
2626

2727
The methods in this class are designed to mirror those in UIApplicationDelegate, and you
2828
should call them in the respective methods in your AppDelegate implementation.
2929
*/
30-
public final class ApplicationDelegate {
30+
public final class SDKApplicationDelegate {
3131
private let delegate: FBSDKApplicationDelegate = FBSDKApplicationDelegate.sharedInstance()
3232

3333
/// Returns the singleton instance of an application delegate.
34-
public static let shared = ApplicationDelegate()
34+
public static let shared = SDKApplicationDelegate()
3535

3636
private init() { }
3737
}
3838

39-
extension ApplicationDelegate {
39+
extension SDKApplicationDelegate {
4040
/**
4141
Call this function from the `UIApplicationDelegate.application(application:didFinishLaunchingWithOptions:)` function
4242
of the AppDelegate of your app It should be invoked for the proper initialization of the Facebook SDK.

0 commit comments

Comments
 (0)