Skip to content

Commit

Permalink
Drop support for iOS 12, tvOS 12, macOS 10.15, watch0S < 7, and Xcode…
Browse files Browse the repository at this point in the history 
… 13 (#775)
  • Loading branch information
@Widcket
Widcket committed Jun 14, 2023
1 parent 07f32e5 commit b8e2bf5
Show file tree
Hide file tree
Showing 20 changed files with 398 additions and 648 deletions.
10 changes: 5 additions & 5 deletions Auth0.podspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,22 +41,22 @@ Pod::Spec.new do |s|
s.source = { :git => 'https://github.com/auth0/Auth0.swift.git', :tag => s.version.to_s }
s.social_media_url = 'https://twitter.com/auth0'
s.source_files = 'Auth0/*.swift'
s.swift_versions = ['5.5', '5.6', '5.7']
s.swift_versions = ['5.7', '5.8']

s.dependency 'SimpleKeychain', '~> 1.0'
s.dependency 'JWTDecode', '~> 3.0'

s.ios.deployment_target = '12.0'
s.ios.deployment_target = '13.0'
s.ios.exclude_files = macos_files
s.ios.pod_target_xcconfig = { 'SWIFT_ACTIVE_COMPILATION_CONDITIONS' => 'WEB_AUTH_PLATFORM' }

s.osx.deployment_target = '10.15'
s.osx.deployment_target = '11.0'
s.osx.exclude_files = ios_files
s.osx.pod_target_xcconfig = { 'SWIFT_ACTIVE_COMPILATION_CONDITIONS' => 'WEB_AUTH_PLATFORM' }

s.tvos.deployment_target = '12.0'
s.tvos.deployment_target = '13.0'
s.tvos.exclude_files = excluded_files

s.watchos.deployment_target = '6.2'
s.watchos.deployment_target = '7.0'
s.watchos.exclude_files = excluded_files
end
48 changes: 24 additions & 24 deletions Auth0.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2039,7 +2039,7 @@
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = 3;
TVOS_DEPLOYMENT_TARGET = 12.0;
TVOS_DEPLOYMENT_TARGET = 13.0;
};
name = Debug;
};
Expand Down Expand Up @@ -2071,7 +2071,7 @@
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = 3;
TVOS_DEPLOYMENT_TARGET = 12.0;
TVOS_DEPLOYMENT_TARGET = 13.0;
};
name = Release;
};
Expand All @@ -2098,7 +2098,7 @@
"$(inherited)",
"@executable_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 10.15;
MACOSX_DEPLOYMENT_TARGET = 11.0;
PRODUCT_BUNDLE_IDENTIFIER = com.auth0.OAuth2Mac;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
Expand Down Expand Up @@ -2132,7 +2132,7 @@
"$(inherited)",
"@executable_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 10.15;
MACOSX_DEPLOYMENT_TARGET = 11.0;
PRODUCT_BUNDLE_IDENTIFIER = com.auth0.OAuth2Mac;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
Expand Down Expand Up @@ -2187,8 +2187,8 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
MACOSX_DEPLOYMENT_TARGET = 10.15;
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
MACOSX_DEPLOYMENT_TARGET = 11.0;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
Expand Down Expand Up @@ -2243,8 +2243,8 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
MACOSX_DEPLOYMENT_TARGET = 10.15;
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
MACOSX_DEPLOYMENT_TARGET = 11.0;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
SWIFT_COMPILATION_MODE = wholemodule;
Expand All @@ -2271,7 +2271,7 @@
FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/Carthage/Build";
INFOPLIST_FILE = Auth0/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand Down Expand Up @@ -2302,7 +2302,7 @@
FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/Carthage/Build";
INFOPLIST_FILE = Auth0/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand Down Expand Up @@ -2340,7 +2340,7 @@
"@executable_path/../Frameworks",
"@loader_path/Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 10.15;
MACOSX_DEPLOYMENT_TARGET = 11.0;
OTHER_SWIFT_FLAGS = "-DDEBUG";
PRODUCT_BUNDLE_IDENTIFIER = com.auth0.Auth0;
PRODUCT_NAME = Auth0;
Expand Down Expand Up @@ -2376,7 +2376,7 @@
"@executable_path/../Frameworks",
"@loader_path/Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 10.15;
MACOSX_DEPLOYMENT_TARGET = 11.0;
PRODUCT_BUNDLE_IDENTIFIER = com.auth0.Auth0;
PRODUCT_NAME = Auth0;
SDKROOT = macosx;
Expand All @@ -2396,7 +2396,7 @@
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = "";
INFOPLIST_FILE = Auth0Tests/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand All @@ -2422,7 +2422,7 @@
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = "";
INFOPLIST_FILE = Auth0Tests/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand Down Expand Up @@ -2453,7 +2453,7 @@
"@executable_path/../Frameworks",
"@loader_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 10.15;
MACOSX_DEPLOYMENT_TARGET = 11.0;
OTHER_SWIFT_FLAGS = "";
PRODUCT_BUNDLE_IDENTIFIER = com.auth0.Auth0Tests;
PRODUCT_NAME = Auth0Tests;
Expand Down Expand Up @@ -2481,7 +2481,7 @@
"@executable_path/../Frameworks",
"@loader_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 10.15;
MACOSX_DEPLOYMENT_TARGET = 11.0;
OTHER_SWIFT_FLAGS = "";
PRODUCT_BUNDLE_IDENTIFIER = com.auth0.Auth0Tests;
PRODUCT_NAME = Auth0Tests;
Expand Down Expand Up @@ -2519,7 +2519,7 @@
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = 4;
WATCHOS_DEPLOYMENT_TARGET = 6.2;
WATCHOS_DEPLOYMENT_TARGET = 7.0;
};
name = Debug;
};
Expand Down Expand Up @@ -2548,7 +2548,7 @@
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = 4;
WATCHOS_DEPLOYMENT_TARGET = 6.2;
WATCHOS_DEPLOYMENT_TARGET = 7.0;
};
name = Release;
};
Expand Down Expand Up @@ -2578,7 +2578,7 @@
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = 3;
TVOS_DEPLOYMENT_TARGET = 12.0;
TVOS_DEPLOYMENT_TARGET = 13.0;
};
name = Debug;
};
Expand Down Expand Up @@ -2607,7 +2607,7 @@
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = 3;
TVOS_DEPLOYMENT_TARGET = 12.0;
TVOS_DEPLOYMENT_TARGET = 13.0;
};
name = Release;
};
Expand All @@ -2631,7 +2631,7 @@
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2,3";
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/OAuth2TV.app/OAuth2TV";
TVOS_DEPLOYMENT_TARGET = 12.0;
TVOS_DEPLOYMENT_TARGET = 13.0;
};
name = Debug;
};
Expand All @@ -2655,7 +2655,7 @@
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2,3";
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/OAuth2TV.app/OAuth2TV";
TVOS_DEPLOYMENT_TARGET = 12.0;
TVOS_DEPLOYMENT_TARGET = 13.0;
};
name = Release;
};
Expand All @@ -2670,7 +2670,7 @@
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = "";
INFOPLIST_FILE = App/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand All @@ -2694,7 +2694,7 @@
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = "";
INFOPLIST_FILE = App/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand Down
8 changes: 2 additions & 6 deletions Auth0/ASProvider.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,7 @@ extension WebAuthentication {
_ = TransactionStore.shared.resume(callbackURL)
}

if #available(iOS 13.0, *) {
session.prefersEphemeralWebBrowserSession = ephemeralSession
}
session.prefersEphemeralWebBrowserSession = ephemeralSession

return ASUserAgent(session: session, callback: callback)
}
Expand All @@ -39,9 +37,7 @@ class ASUserAgent: NSObject, WebAuthUserAgent {
self.callback = callback
super.init()

if #available(iOS 13.0, *) {
session.presentationContextProvider = self
}
session.presentationContextProvider = self
}

func start() {
Expand Down
29 changes: 0 additions & 29 deletions Auth0/Auth0WebAuth.swift
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
#if WEB_AUTH_PLATFORM
import Foundation
#if canImport(Combine)
import Combine
#endif

final class Auth0WebAuth: WebAuth {

Expand Down Expand Up @@ -279,7 +277,6 @@ final class Auth0WebAuth: WebAuth {

// MARK: - Combine

@available(iOS 13.0, macOS 10.15, tvOS 13.0, watchOS 6.2, *)
extension Auth0WebAuth {

public func start() -> AnyPublisher<Credentials, WebAuthError> {
Expand All @@ -303,28 +300,14 @@ extension Auth0WebAuth {
#if canImport(_Concurrency)
extension Auth0WebAuth {

#if compiler(>=5.5.2)
@available(iOS 13.0, macOS 10.15, tvOS 13.0, watchOS 6.2, *)
func start() async throws -> Credentials {
return try await withCheckedThrowingContinuation { continuation in
DispatchQueue.main.async {
self.start(continuation.resume)
}
}
}
#else
@available(iOS 15.0, macOS 12.0, tvOS 15.0, watchOS 8.0, *)
func start() async throws -> Credentials {
return try await withCheckedThrowingContinuation { continuation in
DispatchQueue.main.async {
self.start(continuation.resume)
}
}
}
#endif

#if compiler(>=5.5.2)
@available(iOS 13.0, macOS 10.15, tvOS 13.0, watchOS 6.2, *)
func clearSession(federated: Bool) async throws {
return try await withCheckedThrowingContinuation { continuation in
DispatchQueue.main.async {
Expand All @@ -334,18 +317,6 @@ extension Auth0WebAuth {
}
}
}
#else
@available(iOS 15.0, macOS 12.0, tvOS 15.0, watchOS 8.0, *)
func clearSession(federated: Bool) async throws {
return try await withCheckedThrowingContinuation { continuation in
DispatchQueue.main.async {
self.clearSession(federated: federated) { result in
continuation.resume(with: result)
}
}
}
}
#endif

}
#endif
Expand Down
2 changes: 1 addition & 1 deletion Auth0/BioAuthentication.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ struct BioAuthentication {
func validateBiometric(callback: @escaping (Error?) -> Void) {
self.authContext.evaluatePolicy(evaluationPolicy, localizedReason: self.title) {
guard $1 == nil else { return callback($1) }
callback($0 ? nil : LAError(LAError.authenticationFailed))
callback($0 ? nil : LAError(.authenticationFailed))
}
}

Expand Down
Loading

0 comments on commit b8e2bf5

Please sign in to comment.