Skip to content

Commit 93a2228

Browse files
committed
Project settings update
1 parent bbe7594 commit 93a2228

File tree

5 files changed

+14
-24
lines changed

5 files changed

+14
-24
lines changed

OAuth2.xcodeproj/project.pbxproj

Lines changed: 9 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,6 @@
168168
6598543F1C5B3B4000237D39 /* OAuth2Authorizer+tvOS.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = "OAuth2Authorizer+tvOS.swift"; path = "Sources/tvOS/OAuth2Authorizer+tvOS.swift"; sourceTree = SOURCE_ROOT; };
169169
659854461C5B3BEA00237D39 /* OAuth2.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = OAuth2.framework; sourceTree = BUILT_PRODUCTS_DIR; };
170170
65EC05DF1C9050CB00DE9186 /* OAuth2KeychainAccount.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OAuth2KeychainAccount.swift; sourceTree = "<group>"; };
171-
B4EE6D0922FF07D6004BC0D4 /* OAuth2Module.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OAuth2Module.swift; sourceTree = "<group>"; };
172171
CCCE4C8DC3CB7713E59BC1EE /* OAuth2CustomAuthorizer+iOS.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "OAuth2CustomAuthorizer+iOS.swift"; sourceTree = "<group>"; };
173172
DD0CCBAC1C4DC83A0044C4E3 /* OAuth2WebViewController+macOS.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "OAuth2WebViewController+macOS.swift"; sourceTree = "<group>"; };
174173
EA9758171B222CEA007744B1 /* OAuth2PasswordGrant.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = OAuth2PasswordGrant.swift; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.swift; };
@@ -269,14 +268,6 @@
269268
path = tvOS;
270269
sourceTree = "<group>";
271270
};
272-
B4EE6D0822FF07D6004BC0D4 /* OAuth */ = {
273-
isa = PBXGroup;
274-
children = (
275-
B4EE6D0922FF07D6004BC0D4 /* OAuth2Module.swift */,
276-
);
277-
path = OAuth;
278-
sourceTree = "<group>";
279-
};
280271
EE2486281AC85DD4002B31AF /* iOS */ = {
281272
isa = PBXGroup;
282273
children = (
@@ -421,7 +412,6 @@
421412
EEDB8626193FAAE500C4EEA1 /* OAuth2 */ = {
422413
isa = PBXGroup;
423414
children = (
424-
B4EE6D0822FF07D6004BC0D4 /* OAuth */,
425415
EE2983731D40BC8900933CDD /* Base */,
426416
EE79F65C1BFBDFFF00746243 /* Flows */,
427417
EE9EBF111D775A21003263FC /* DataLoader */,
@@ -576,7 +566,7 @@
576566
attributes = {
577567
LastSwiftMigration = 0700;
578568
LastSwiftUpdateCheck = 0700;
579-
LastUpgradeCheck = 1100;
569+
LastUpgradeCheck = 1230;
580570
ORGANIZATIONNAME = "Pascal Pfiffner";
581571
TargetAttributes = {
582572
659854451C5B3BEA00237D39 = {
@@ -844,7 +834,7 @@
844834
SKIP_INSTALL = YES;
845835
SWIFT_VERSION = 4.2;
846836
TARGETED_DEVICE_FAMILY = 3;
847-
TVOS_DEPLOYMENT_TARGET = 9.0;
837+
TVOS_DEPLOYMENT_TARGET = 12.0;
848838
};
849839
name = Debug;
850840
};
@@ -872,7 +862,7 @@
872862
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
873863
SWIFT_VERSION = 4.2;
874864
TARGETED_DEVICE_FAMILY = 3;
875-
TVOS_DEPLOYMENT_TARGET = 9.0;
865+
TVOS_DEPLOYMENT_TARGET = 12.0;
876866
};
877867
name = Release;
878868
};
@@ -899,6 +889,7 @@
899889
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
900890
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
901891
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
892+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
902893
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
903894
CLANG_WARN_STRICT_PROTOTYPES = YES;
904895
CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -924,8 +915,8 @@
924915
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
925916
GCC_WARN_UNUSED_FUNCTION = YES;
926917
GCC_WARN_UNUSED_VARIABLE = YES;
927-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
928-
MACOSX_DEPLOYMENT_TARGET = 10.11;
918+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
919+
MACOSX_DEPLOYMENT_TARGET = 10.13;
929920
METAL_ENABLE_DEBUG_INFO = YES;
930921
ONLY_ACTIVE_ARCH = YES;
931922
SDKROOT = iphoneos;
@@ -960,6 +951,7 @@
960951
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
961952
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
962953
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
954+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
963955
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
964956
CLANG_WARN_STRICT_PROTOTYPES = YES;
965957
CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -978,8 +970,8 @@
978970
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
979971
GCC_WARN_UNUSED_FUNCTION = YES;
980972
GCC_WARN_UNUSED_VARIABLE = YES;
981-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
982-
MACOSX_DEPLOYMENT_TARGET = 10.11;
973+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
974+
MACOSX_DEPLOYMENT_TARGET = 10.13;
983975
METAL_ENABLE_DEBUG_INFO = NO;
984976
SDKROOT = iphoneos;
985977
SWIFT_VERSION = 4.0;

OAuth2.xcodeproj/xcshareddata/xcschemes/OAuth2iOS.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1100"
3+
LastUpgradeVersion = "1230"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

OAuth2.xcodeproj/xcshareddata/xcschemes/OAuth2macOS.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1100"
3+
LastUpgradeVersion = "1230"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

OAuth2.xcodeproj/xcshareddata/xcschemes/OAuth2tvOS.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1100"
3+
LastUpgradeVersion = "1230"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

Sources/iOS/OAuth2Authorizer+iOS.swift

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -178,17 +178,16 @@ open class OAuth2Authorizer: OAuth2AuthorizerUI {
178178
- parameter at: The authorize URL to open
179179
- returns: SFSafariViewController, being already presented automatically
180180
*/
181-
@available(iOS 9.0, *)
182181
@discardableResult
183182
public func authorizeSafariEmbedded(from controller: UIViewController, at url: URL) throws -> SFSafariViewController {
184183
safariViewDelegate = OAuth2SFViewControllerDelegate(authorizer: self)
185184
let web = SFSafariViewController(url: url)
186185
web.title = oauth2.authConfig.ui.title
187186
web.delegate = safariViewDelegate as! OAuth2SFViewControllerDelegate
188-
if #available(iOS 10.0, *), let barTint = oauth2.authConfig.ui.barTintColor {
187+
if let barTint = oauth2.authConfig.ui.barTintColor {
189188
web.preferredBarTintColor = barTint
190189
}
191-
if #available(iOS 10.0, *), let tint = oauth2.authConfig.ui.controlTintColor {
190+
if let tint = oauth2.authConfig.ui.controlTintColor {
192191
web.preferredControlTintColor = tint
193192
}
194193
web.modalPresentationStyle = oauth2.authConfig.ui.modalPresentationStyle
@@ -204,7 +203,6 @@ open class OAuth2Authorizer: OAuth2AuthorizerUI {
204203
Called from our delegate, which reacts to users pressing "Done". We can assume this is always a cancel as nomally the Safari view
205204
controller is dismissed automatically.
206205
*/
207-
@available(iOS 9.0, *)
208206
func safariViewControllerDidCancel(_ safari: SFSafariViewController) {
209207
safariViewDelegate = nil
210208
oauth2.didFail(with: nil)

0 commit comments

Comments
 (0)