Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
f5ebe9b
update all the frameworks
sabrineElbahri Sep 26, 2016
c3df602
migration to swift 3
sabrineElbahri Sep 26, 2016
0994a13
update xcode version
sabrineElbahri Sep 26, 2016
18a4271
update carthage version
sabrineElbahri Sep 26, 2016
9f9b478
fix travis.yml
sabrineElbahri Sep 26, 2016
79708e0
try with 10.0 iOS
sabrineElbahri Sep 26, 2016
8b12f0e
travis test to fix buid
sabrineElbahri Sep 26, 2016
af673a1
fix on travis.yml
sabrineElbahri Sep 26, 2016
ba71838
try to fix travis
sabrineElbahri Sep 26, 2016
2e6587e
fix
sabrineElbahri Sep 26, 2016
c26926e
fix
sabrineElbahri Sep 26, 2016
cf92d76
fix
sabrineElbahri Sep 26, 2016
f3ca4ad
fix compile
sabrineElbahri Sep 27, 2016
d0cbaf4
fix compile
sabrineElbahri Sep 27, 2016
a0625f4
fix compile
sabrineElbahri Sep 28, 2016
174ef6f
fix compile
sabrineElbahri Sep 28, 2016
47956cd
fix compile
sabrineElbahri Sep 28, 2016
a82edab
minimum deployment targe iOS 9.0
sabrineElbahri Sep 28, 2016
9e19b1d
fix compile
sabrineElbahri Sep 28, 2016
5e4116c
fix compile
sabrineElbahri Sep 28, 2016
69d470e
fix compile
sabrineElbahri Sep 28, 2016
64626de
fix compile
sabrineElbahri Sep 30, 2016
6b1a523
Add social Network framework
sabrineElbahri Oct 3, 2016
2aa05ae
Setup an exemple of facebook login utilsation
sabrineElbahri Oct 3, 2016
940eed2
Facebook connection exemple
sabrineElbahri Oct 6, 2016
acdfc23
change the code sign identity
sabrineElbahri Oct 6, 2016
5c3e57e
treat warnings as errors
sabrineElbahri Oct 7, 2016
bb52fab
VVDocumenter-Xcode obsolete with Xcode 8
sabrineElbahri Oct 7, 2016
494c4dc
Merge branch 'develop' of https://github.com/3IE/SwiftStarter into fe…
sabrineElbahri Oct 17, 2016
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 48 additions & 0 deletions App.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,16 @@
A79825201B18A6FC00F8E795 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = A798251F1B18A6FC00F8E795 /* Images.xcassets */; };
A79825231B18A6FC00F8E795 /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = A79825211B18A6FC00F8E795 /* LaunchScreen.xib */; };
A798252F1B18A6FC00F8E795 /* AppTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = A798252E1B18A6FC00F8E795 /* AppTests.swift */; };
CC30F6FE1DA2924D000146B4 /* FacebookInfoVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = CC30F6FD1DA2924D000146B4 /* FacebookInfoVC.swift */; };
CC30F7001DA297E4000146B4 /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = CC30F6FF1DA297E4000146B4 /* Default-568h@2x.png */; };
CC30F70B1DA2ABAA000146B4 /* socialNetwork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CC30F70A1DA2ABAA000146B4 /* socialNetwork.framework */; };
CC34EA301DA2853900255715 /* FacebookConnectVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = CC34EA2F1DA2853900255715 /* FacebookConnectVC.swift */; };
CC6645911DA2B45D008360E7 /* FacebookCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CC66458B1DA2B45D008360E7 /* FacebookCore.framework */; };
CC6645921DA2B45D008360E7 /* FacebookLogin.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CC66458C1DA2B45D008360E7 /* FacebookLogin.framework */; };
CC6645931DA2B45D008360E7 /* FacebookShare.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CC66458D1DA2B45D008360E7 /* FacebookShare.framework */; };
CC6645941DA2B45D008360E7 /* FBSDKCoreKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CC66458E1DA2B45D008360E7 /* FBSDKCoreKit.framework */; };
CC6645951DA2B45D008360E7 /* FBSDKLoginKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CC66458F1DA2B45D008360E7 /* FBSDKLoginKit.framework */; };
CC6645961DA2B45D008360E7 /* FBSDKShareKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CC6645901DA2B45D008360E7 /* FBSDKShareKit.framework */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
Expand Down Expand Up @@ -113,13 +123,30 @@
A79825281B18A6FC00F8E795 /* AppTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = AppTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
A798252D1B18A6FC00F8E795 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
A798252E1B18A6FC00F8E795 /* AppTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppTests.swift; sourceTree = "<group>"; };
CC30F6FD1DA2924D000146B4 /* FacebookInfoVC.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = FacebookInfoVC.swift; path = App/FacebookInfoVC.swift; sourceTree = "<group>"; };
CC30F6FF1DA297E4000146B4 /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = "<group>"; };
CC30F70A1DA2ABAA000146B4 /* socialNetwork.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = socialNetwork.framework; path = Carthage/Build/iOS/socialNetwork.framework; sourceTree = "<group>"; };
CC34EA2F1DA2853900255715 /* FacebookConnectVC.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = FacebookConnectVC.swift; path = App/FacebookConnectVC.swift; sourceTree = "<group>"; };
CC66458B1DA2B45D008360E7 /* FacebookCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = FacebookCore.framework; path = Carthage/Build/iOS/FacebookCore.framework; sourceTree = "<group>"; };
CC66458C1DA2B45D008360E7 /* FacebookLogin.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = FacebookLogin.framework; path = Carthage/Build/iOS/FacebookLogin.framework; sourceTree = "<group>"; };
CC66458D1DA2B45D008360E7 /* FacebookShare.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = FacebookShare.framework; path = Carthage/Build/iOS/FacebookShare.framework; sourceTree = "<group>"; };
CC66458E1DA2B45D008360E7 /* FBSDKCoreKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = FBSDKCoreKit.framework; path = Carthage/Build/iOS/FBSDKCoreKit.framework; sourceTree = "<group>"; };
CC66458F1DA2B45D008360E7 /* FBSDKLoginKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = FBSDKLoginKit.framework; path = Carthage/Build/iOS/FBSDKLoginKit.framework; sourceTree = "<group>"; };
CC6645901DA2B45D008360E7 /* FBSDKShareKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = FBSDKShareKit.framework; path = Carthage/Build/iOS/FBSDKShareKit.framework; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
A79825101B18A6FC00F8E795 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
CC6645911DA2B45D008360E7 /* FacebookCore.framework in Frameworks */,
CC6645921DA2B45D008360E7 /* FacebookLogin.framework in Frameworks */,
CC6645931DA2B45D008360E7 /* FacebookShare.framework in Frameworks */,
CC6645941DA2B45D008360E7 /* FBSDKCoreKit.framework in Frameworks */,
CC6645951DA2B45D008360E7 /* FBSDKLoginKit.framework in Frameworks */,
CC6645961DA2B45D008360E7 /* FBSDKShareKit.framework in Frameworks */,
CC30F70B1DA2ABAA000146B4 /* socialNetwork.framework in Frameworks */,
172F50451C68E6D0000A9D78 /* AlamofireObjectMapper.framework in Frameworks */,
172F50461C68E6D0000A9D78 /* ObjectMapper.framework in Frameworks */,
177691BC1C10C13E00A3D08A /* Alamofire.framework in Frameworks */,
Expand Down Expand Up @@ -191,6 +218,7 @@
A798250A1B18A6FC00F8E795 = {
isa = PBXGroup;
children = (
CC30F6FF1DA297E4000146B4 /* Default-568h@2x.png */,
A79825381B18A70C00F8E795 /* Core */,
A79825151B18A6FC00F8E795 /* App */,
A798252B1B18A6FC00F8E795 /* AppTests */,
Expand Down Expand Up @@ -258,6 +286,13 @@
A79825391B18A71000F8E795 /* Frameworks */ = {
isa = PBXGroup;
children = (
CC66458B1DA2B45D008360E7 /* FacebookCore.framework */,
CC66458C1DA2B45D008360E7 /* FacebookLogin.framework */,
CC66458D1DA2B45D008360E7 /* FacebookShare.framework */,
CC66458E1DA2B45D008360E7 /* FBSDKCoreKit.framework */,
CC66458F1DA2B45D008360E7 /* FBSDKLoginKit.framework */,
CC6645901DA2B45D008360E7 /* FBSDKShareKit.framework */,
CC30F70A1DA2ABAA000146B4 /* socialNetwork.framework */,
17965D541C561B0C0013D390 /* Internal */,
17965D531C561B030013D390 /* External */,
);
Expand All @@ -269,6 +304,8 @@
children = (
17EE77441C6C7C65009638A6 /* MailgunVC.swift */,
172F06811C6B2C3600B711B2 /* WeatherVC.swift */,
CC34EA2F1DA2853900255715 /* FacebookConnectVC.swift */,
CC30F6FD1DA2924D000146B4 /* FacebookInfoVC.swift */,
);
name = Controllers;
sourceTree = "<group>";
Expand Down Expand Up @@ -425,6 +462,7 @@
buildActionMask = 2147483647;
files = (
A798251E1B18A6FC00F8E795 /* Main.storyboard in Resources */,
CC30F7001DA297E4000146B4 /* Default-568h@2x.png in Resources */,
A79825231B18A6FC00F8E795 /* LaunchScreen.xib in Resources */,
A79825201B18A6FC00F8E795 /* Images.xcassets in Resources */,
);
Expand All @@ -451,6 +489,14 @@
"$(SRCROOT)/Carthage/Build/iOS/AlamofireObjectMapper.framework",
"$(SRCROOT)/Carthage/Build/iOS/ObjectMapper.framework",
"$(SRCROOT)/Carthage/Build/iOS/SVProgressHUD.framework",
"$(SRCROOT)/Carthage/Build/iOS/socialNetwork.framework",
"$(SRCROOT)/Carthage/Build/iOS/FacebookCore.framework",
"$(SRCROOT)/Carthage/Build/iOS/FacebookLogin.framework",
"$(SRCROOT)/Carthage/Build/iOS/FacebookShare.framework",
"$(SRCROOT)/Carthage/Build/iOS/Bolts.framework",
"$(SRCROOT)/Carthage/Build/iOS/FBSDKShareKit.framework",
"$(SRCROOT)/Carthage/Build/iOS/FBSDKCoreKit.framework",
"$(SRCROOT)/Carthage/Build/iOS/FBSDKLoginKit.framework",
);
outputPaths = (
);
Expand All @@ -468,6 +514,7 @@
17EE77621C6CCC9A009638A6 /* MailgunResponse.swift in Sources */,
172F06821C6B2C3600B711B2 /* WeatherVC.swift in Sources */,
17EE77451C6C7C65009638A6 /* MailgunVC.swift in Sources */,
CC34EA301DA2853900255715 /* FacebookConnectVC.swift in Sources */,
172FE3431C69F0FA00496519 /* CurrentWeatherResponse.swift in Sources */,
A765CDF61B25E191004CD54A /* NSBundle+Root.swift in Sources */,
172F06881C6B2C6F00B711B2 /* WeatherData.swift in Sources */,
Expand All @@ -481,6 +528,7 @@
173B57DF1C6B45FE00FEB036 /* NSURLRequest+Body.swift in Sources */,
172F06851C6B2C5F00B711B2 /* IntTransform.swift in Sources */,
8D503B681BA059AD00C84F58 /* AppError.swift in Sources */,
CC30F6FE1DA2924D000146B4 /* FacebookInfoVC.swift in Sources */,
17EE77581C6C891E009638A6 /* TownWithWoeid.swift in Sources */,
172F068E1C6B2C8A00B711B2 /* WeatherCondition.swift in Sources */,
17EE77561C6C891E009638A6 /* ForecastResponse.swift in Sources */,
Expand Down
12 changes: 11 additions & 1 deletion App/AppDelegate.swift
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

import UIKit
import ObjectMapper
import socialNetwork

import Alamofire
import AlamofireObjectMapper
Expand All @@ -16,12 +17,19 @@ import AlamofireObjectMapper
class AppDelegate: UIResponder, UIApplicationDelegate {

var window: UIWindow?
var facebookAppDelegate: FacebookAppDelegate = FacebookAppDelegate.init()

func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
// Override point for customization after application launch.

facebookAppDelegate.launch(application, launchOptions: launchOptions)

return true
}

func application(_ app: UIApplication, open url: URL, options: [UIApplicationOpenURLOptionsKey : Any] = [:]) -> Bool {
return facebookAppDelegate.openUrl(app, open: url, options: options)
}

func applicationWillResignActive(_ application: UIApplication) {
// Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state.
Expand All @@ -39,6 +47,8 @@ class AppDelegate: UIResponder, UIApplicationDelegate {

func applicationDidBecomeActive(_ application: UIApplication) {
// Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface.

facebookAppDelegate.didBecomeActive(application)
}

func applicationWillTerminate(_ application: UIApplication) {
Expand Down
Loading