From b0a3c4eeed573eaf78941fd5f1474f1cb7742386 Mon Sep 17 00:00:00 2001 From: Martin Walsh Date: Mon, 30 Apr 2018 09:24:58 +0100 Subject: [PATCH] Update Settings, Xcode 9.3 Tweaks --- Auth0.xcodeproj/project.pbxproj | 8 +++++++- Auth0.xcodeproj/xcshareddata/xcschemes/Auth0.iOS.xcscheme | 4 +--- .../xcshareddata/xcschemes/Auth0.macOS.xcscheme | 4 +--- .../xcshareddata/xcschemes/Auth0.tvOS.xcscheme | 4 +--- Auth0/SafariWebAuth.swift | 5 +++-- Cartfile.private | 6 +++--- Cartfile.resolved | 6 +++--- circle.yml | 2 +- 8 files changed, 20 insertions(+), 19 deletions(-) diff --git a/Auth0.xcodeproj/project.pbxproj b/Auth0.xcodeproj/project.pbxproj index 908f870b..409e2195 100644 --- a/Auth0.xcodeproj/project.pbxproj +++ b/Auth0.xcodeproj/project.pbxproj @@ -331,6 +331,7 @@ 5B9262BF1ECF0CA800F4F6D3 /* BioAuthentication.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BioAuthentication.swift; sourceTree = ""; }; 5B9262C11ECF0CBA00F4F6D3 /* BioAuthenticationSpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = BioAuthenticationSpec.swift; path = Auth0Tests/BioAuthenticationSpec.swift; sourceTree = SOURCE_ROOT; }; 5B9A54411E49E3AE004B5454 /* Auth0.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Auth0.plist; sourceTree = SOURCE_ROOT; }; + 5BA58D33209081A700782DD1 /* Cartfile */ = {isa = PBXFileReference; lastKnownFileType = text; path = Cartfile; sourceTree = ""; }; 5BD4A9CD1DEC6EFA00D6D7AE /* ResponseType.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ResponseType.swift; path = Auth0/ResponseType.swift; sourceTree = SOURCE_ROOT; }; 5BEDE1561EC1FBBE0007300D /* SilentSafariViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = SilentSafariViewController.swift; path = Auth0/SilentSafariViewController.swift; sourceTree = SOURCE_ROOT; }; 5BEDE15B1EC202960007300D /* SimpleKeychain.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SimpleKeychain.framework; path = Carthage/Build/iOS/SimpleKeychain.framework; sourceTree = ""; }; @@ -728,6 +729,7 @@ 5FAE9C861D8872E900A871CE /* Supporting Files */ = { isa = PBXGroup; children = ( + 5BA58D33209081A700782DD1 /* Cartfile */, 5F049B6C1CB42C29006F6C05 /* Auth0.h */, 5F049B6E1CB42C29006F6C05 /* Info.plist */, 5F23E6FA1D4B87F000C3F2D9 /* Info-tvOS.plist */, @@ -1096,7 +1098,7 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0730; - LastUpgradeCheck = 0900; + LastUpgradeCheck = 0930; ORGANIZATIONNAME = Auth0; TargetAttributes = { 5F06DD771CC448B10011842B = { @@ -1623,12 +1625,14 @@ CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; @@ -1680,12 +1684,14 @@ CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; diff --git a/Auth0.xcodeproj/xcshareddata/xcschemes/Auth0.iOS.xcscheme b/Auth0.xcodeproj/xcshareddata/xcschemes/Auth0.iOS.xcscheme index 383c4174..b9e9ec5e 100644 --- a/Auth0.xcodeproj/xcshareddata/xcschemes/Auth0.iOS.xcscheme +++ b/Auth0.xcodeproj/xcshareddata/xcschemes/Auth0.iOS.xcscheme @@ -1,6 +1,6 @@ String? { var data = Data(count: 32) + var tempData = data - let result = data.withUnsafeMutableBytes { (bytes: UnsafeMutablePointer) -> Int in + let result = tempData.withUnsafeMutableBytes { (bytes: UnsafeMutablePointer) -> Int in return Int(SecRandomCopyBytes(kSecRandomDefault, data.count, bytes)) } guard result == 0 else { return nil } - return data.a0_encodeBase64URLSafe() + return tempData.a0_encodeBase64URLSafe() } diff --git a/Cartfile.private b/Cartfile.private index 182648af..ce03509a 100644 --- a/Cartfile.private +++ b/Cartfile.private @@ -1,3 +1,3 @@ -github "Quick/Quick" ~> 1.2 -github "Quick/Nimble" ~> 7.0 -github "AliSoftware/OHHTTPStubs" ~> 6.0 +github "Quick/Quick" ~> 1.3 +github "Quick/Nimble" ~> 7.1 +github "AliSoftware/OHHTTPStubs" ~> 6.1 diff --git a/Cartfile.resolved b/Cartfile.resolved index d00f0b9c..36ffd97a 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1,4 +1,4 @@ -github "AliSoftware/OHHTTPStubs" "6.0.0" -github "Quick/Nimble" "v7.0.2" -github "Quick/Quick" "v1.2.0" +github "AliSoftware/OHHTTPStubs" "6.1.0" +github "Quick/Nimble" "v7.1.1" +github "Quick/Quick" "v1.3.0" github "auth0/SimpleKeychain" "0.8.0" diff --git a/circle.yml b/circle.yml index e24deed6..b9c64345 100644 --- a/circle.yml +++ b/circle.yml @@ -1,6 +1,6 @@ machine: xcode: - version: 9.2 + version: 9.2.0 environment: SCHEME: "Auth0.iOS" DEVICE: "iPhone 8"