diff --git a/Framework/DataCompression.xcframework/Info.plist b/Framework/DataCompression.xcframework/Info.plist index 507f8f0..0668989 100644 --- a/Framework/DataCompression.xcframework/Info.plist +++ b/Framework/DataCompression.xcframework/Info.plist @@ -6,32 +6,32 @@ LibraryIdentifier - ios-arm64_i386_x86_64-simulator + ios-arm64_armv7 LibraryPath DataCompression.framework SupportedArchitectures arm64 - i386 - x86_64 + armv7 SupportedPlatform ios - SupportedPlatformVariant - simulator LibraryIdentifier - ios-arm64_armv7 + ios-arm64_i386_x86_64-simulator LibraryPath DataCompression.framework SupportedArchitectures arm64 - armv7 + i386 + x86_64 SupportedPlatform ios + SupportedPlatformVariant + simulator CFBundlePackageType diff --git a/Framework/DataCompression.xcframework/ios-arm64_armv7/DataCompression.framework/DataCompression b/Framework/DataCompression.xcframework/ios-arm64_armv7/DataCompression.framework/DataCompression index f2369c2..d976bee 100755 Binary files a/Framework/DataCompression.xcframework/ios-arm64_armv7/DataCompression.framework/DataCompression and b/Framework/DataCompression.xcframework/ios-arm64_armv7/DataCompression.framework/DataCompression differ diff --git a/Framework/DataCompression.xcframework/ios-arm64_i386_x86_64-simulator/DataCompression.framework/DataCompression b/Framework/DataCompression.xcframework/ios-arm64_i386_x86_64-simulator/DataCompression.framework/DataCompression index d4f337e..4c8c237 100755 Binary files a/Framework/DataCompression.xcframework/ios-arm64_i386_x86_64-simulator/DataCompression.framework/DataCompression and b/Framework/DataCompression.xcframework/ios-arm64_i386_x86_64-simulator/DataCompression.framework/DataCompression differ diff --git a/Framework/Socket.xcframework/Info.plist b/Framework/Socket.xcframework/Info.plist index 3db8ab1..c72ca63 100644 --- a/Framework/Socket.xcframework/Info.plist +++ b/Framework/Socket.xcframework/Info.plist @@ -6,32 +6,32 @@ LibraryIdentifier - ios-arm64_armv7 + ios-arm64_i386_x86_64-simulator LibraryPath Socket.framework SupportedArchitectures arm64 - armv7 + i386 + x86_64 SupportedPlatform ios + SupportedPlatformVariant + simulator LibraryIdentifier - ios-arm64_i386_x86_64-simulator + ios-arm64_armv7 LibraryPath Socket.framework SupportedArchitectures arm64 - i386 - x86_64 + armv7 SupportedPlatform ios - SupportedPlatformVariant - simulator CFBundlePackageType diff --git a/Framework/Socket.xcframework/ios-arm64_armv7/Socket.framework/Socket b/Framework/Socket.xcframework/ios-arm64_armv7/Socket.framework/Socket index 93ffec6..8b50572 100755 Binary files a/Framework/Socket.xcframework/ios-arm64_armv7/Socket.framework/Socket and b/Framework/Socket.xcframework/ios-arm64_armv7/Socket.framework/Socket differ diff --git a/Framework/Socket.xcframework/ios-arm64_i386_x86_64-simulator/Socket.framework/Socket b/Framework/Socket.xcframework/ios-arm64_i386_x86_64-simulator/Socket.framework/Socket index 54fef2c..1a578a8 100755 Binary files a/Framework/Socket.xcframework/ios-arm64_i386_x86_64-simulator/Socket.framework/Socket and b/Framework/Socket.xcframework/ios-arm64_i386_x86_64-simulator/Socket.framework/Socket differ diff --git a/Framework/SpeedcheckerReportSDK.xcframework/Info.plist b/Framework/SpeedcheckerReportSDK.xcframework/Info.plist index 094e7a3..2b2bd8e 100644 --- a/Framework/SpeedcheckerReportSDK.xcframework/Info.plist +++ b/Framework/SpeedcheckerReportSDK.xcframework/Info.plist @@ -6,30 +6,30 @@ LibraryIdentifier - ios-arm64 + ios-arm64_x86_64-simulator LibraryPath SpeedcheckerReportSDK.framework SupportedArchitectures arm64 + x86_64 SupportedPlatform ios + SupportedPlatformVariant + simulator LibraryIdentifier - ios-arm64_x86_64-simulator + ios-arm64 LibraryPath SpeedcheckerReportSDK.framework SupportedArchitectures arm64 - x86_64 SupportedPlatform ios - SupportedPlatformVariant - simulator CFBundlePackageType diff --git a/Framework/SpeedcheckerReportSDK.xcframework/ios-arm64/SpeedcheckerReportSDK.framework/Info.plist b/Framework/SpeedcheckerReportSDK.xcframework/ios-arm64/SpeedcheckerReportSDK.framework/Info.plist index ecaa08d..c9b3a9f 100644 Binary files a/Framework/SpeedcheckerReportSDK.xcframework/ios-arm64/SpeedcheckerReportSDK.framework/Info.plist and b/Framework/SpeedcheckerReportSDK.xcframework/ios-arm64/SpeedcheckerReportSDK.framework/Info.plist differ diff --git a/Framework/SpeedcheckerReportSDK.xcframework/ios-arm64/SpeedcheckerReportSDK.framework/Modules/SpeedcheckerReportSDK.swiftmodule/arm64-apple-ios.swiftinterface b/Framework/SpeedcheckerReportSDK.xcframework/ios-arm64/SpeedcheckerReportSDK.framework/Modules/SpeedcheckerReportSDK.swiftmodule/arm64-apple-ios.swiftinterface index 426d355..4cfe2d7 100644 --- a/Framework/SpeedcheckerReportSDK.xcframework/ios-arm64/SpeedcheckerReportSDK.framework/Modules/SpeedcheckerReportSDK.swiftmodule/arm64-apple-ios.swiftinterface +++ b/Framework/SpeedcheckerReportSDK.xcframework/ios-arm64/SpeedcheckerReportSDK.framework/Modules/SpeedcheckerReportSDK.swiftmodule/arm64-apple-ios.swiftinterface @@ -22,7 +22,7 @@ public enum ReportCompletionResult { public typealias ReportCompletionHandler = (SpeedcheckerReportSDK.ReportCompletionResult) -> Swift.Void @objc @_inheritsConvenienceInitializers @_hasMissingDesignatedInitializers public class SpeedcheckerReport : ObjectiveC.NSObject { public static let shared: SpeedcheckerReportSDK.SpeedcheckerReport - public func initialize() + public func initialize(licenseKey: Swift.String) public func reportConnectionIssue(type: SpeedcheckerReportSDK.SRIssueType, phoneNumber: Swift.String, comment: Swift.String?, userValue: Swift.String?, completion: @escaping SpeedcheckerReportSDK.ReportCompletionHandler) public func speedTest(delegate: SpeedcheckerSDK.InternetSpeedTestDelegate, completion: @escaping (SpeedcheckerSDK.SpeedTestError?) -> Swift.Void) public func speedTestStop(completion: @escaping (SpeedcheckerSDK.SpeedTestError?) -> Swift.Void) diff --git a/Framework/SpeedcheckerReportSDK.xcframework/ios-arm64/SpeedcheckerReportSDK.framework/SpeedcheckerReportSDK b/Framework/SpeedcheckerReportSDK.xcframework/ios-arm64/SpeedcheckerReportSDK.framework/SpeedcheckerReportSDK index f02d3ee..7d8e4c5 100755 Binary files a/Framework/SpeedcheckerReportSDK.xcframework/ios-arm64/SpeedcheckerReportSDK.framework/SpeedcheckerReportSDK and b/Framework/SpeedcheckerReportSDK.xcframework/ios-arm64/SpeedcheckerReportSDK.framework/SpeedcheckerReportSDK differ diff --git a/Framework/SpeedcheckerReportSDK.xcframework/ios-arm64_x86_64-simulator/SpeedcheckerReportSDK.framework/Info.plist b/Framework/SpeedcheckerReportSDK.xcframework/ios-arm64_x86_64-simulator/SpeedcheckerReportSDK.framework/Info.plist index 0216ae7..96f0f5b 100644 Binary files a/Framework/SpeedcheckerReportSDK.xcframework/ios-arm64_x86_64-simulator/SpeedcheckerReportSDK.framework/Info.plist and b/Framework/SpeedcheckerReportSDK.xcframework/ios-arm64_x86_64-simulator/SpeedcheckerReportSDK.framework/Info.plist differ diff --git a/Framework/SpeedcheckerReportSDK.xcframework/ios-arm64_x86_64-simulator/SpeedcheckerReportSDK.framework/Modules/SpeedcheckerReportSDK.swiftmodule/arm64-apple-ios-simulator.swiftinterface b/Framework/SpeedcheckerReportSDK.xcframework/ios-arm64_x86_64-simulator/SpeedcheckerReportSDK.framework/Modules/SpeedcheckerReportSDK.swiftmodule/arm64-apple-ios-simulator.swiftinterface index 90118f7..6609791 100644 --- a/Framework/SpeedcheckerReportSDK.xcframework/ios-arm64_x86_64-simulator/SpeedcheckerReportSDK.framework/Modules/SpeedcheckerReportSDK.swiftmodule/arm64-apple-ios-simulator.swiftinterface +++ b/Framework/SpeedcheckerReportSDK.xcframework/ios-arm64_x86_64-simulator/SpeedcheckerReportSDK.framework/Modules/SpeedcheckerReportSDK.swiftmodule/arm64-apple-ios-simulator.swiftinterface @@ -22,7 +22,7 @@ public enum ReportCompletionResult { public typealias ReportCompletionHandler = (SpeedcheckerReportSDK.ReportCompletionResult) -> Swift.Void @objc @_inheritsConvenienceInitializers @_hasMissingDesignatedInitializers public class SpeedcheckerReport : ObjectiveC.NSObject { public static let shared: SpeedcheckerReportSDK.SpeedcheckerReport - public func initialize() + public func initialize(licenseKey: Swift.String) public func reportConnectionIssue(type: SpeedcheckerReportSDK.SRIssueType, phoneNumber: Swift.String, comment: Swift.String?, userValue: Swift.String?, completion: @escaping SpeedcheckerReportSDK.ReportCompletionHandler) public func speedTest(delegate: SpeedcheckerSDK.InternetSpeedTestDelegate, completion: @escaping (SpeedcheckerSDK.SpeedTestError?) -> Swift.Void) public func speedTestStop(completion: @escaping (SpeedcheckerSDK.SpeedTestError?) -> Swift.Void) diff --git a/Framework/SpeedcheckerReportSDK.xcframework/ios-arm64_x86_64-simulator/SpeedcheckerReportSDK.framework/Modules/SpeedcheckerReportSDK.swiftmodule/x86_64-apple-ios-simulator.swiftinterface b/Framework/SpeedcheckerReportSDK.xcframework/ios-arm64_x86_64-simulator/SpeedcheckerReportSDK.framework/Modules/SpeedcheckerReportSDK.swiftmodule/x86_64-apple-ios-simulator.swiftinterface index 4629827..ef293fa 100644 --- a/Framework/SpeedcheckerReportSDK.xcframework/ios-arm64_x86_64-simulator/SpeedcheckerReportSDK.framework/Modules/SpeedcheckerReportSDK.swiftmodule/x86_64-apple-ios-simulator.swiftinterface +++ b/Framework/SpeedcheckerReportSDK.xcframework/ios-arm64_x86_64-simulator/SpeedcheckerReportSDK.framework/Modules/SpeedcheckerReportSDK.swiftmodule/x86_64-apple-ios-simulator.swiftinterface @@ -22,7 +22,7 @@ public enum ReportCompletionResult { public typealias ReportCompletionHandler = (SpeedcheckerReportSDK.ReportCompletionResult) -> Swift.Void @objc @_inheritsConvenienceInitializers @_hasMissingDesignatedInitializers public class SpeedcheckerReport : ObjectiveC.NSObject { public static let shared: SpeedcheckerReportSDK.SpeedcheckerReport - public func initialize() + public func initialize(licenseKey: Swift.String) public func reportConnectionIssue(type: SpeedcheckerReportSDK.SRIssueType, phoneNumber: Swift.String, comment: Swift.String?, userValue: Swift.String?, completion: @escaping SpeedcheckerReportSDK.ReportCompletionHandler) public func speedTest(delegate: SpeedcheckerSDK.InternetSpeedTestDelegate, completion: @escaping (SpeedcheckerSDK.SpeedTestError?) -> Swift.Void) public func speedTestStop(completion: @escaping (SpeedcheckerSDK.SpeedTestError?) -> Swift.Void) diff --git a/Framework/SpeedcheckerReportSDK.xcframework/ios-arm64_x86_64-simulator/SpeedcheckerReportSDK.framework/SpeedcheckerReportSDK b/Framework/SpeedcheckerReportSDK.xcframework/ios-arm64_x86_64-simulator/SpeedcheckerReportSDK.framework/SpeedcheckerReportSDK index a08d164..f833780 100755 Binary files a/Framework/SpeedcheckerReportSDK.xcframework/ios-arm64_x86_64-simulator/SpeedcheckerReportSDK.framework/SpeedcheckerReportSDK and b/Framework/SpeedcheckerReportSDK.xcframework/ios-arm64_x86_64-simulator/SpeedcheckerReportSDK.framework/SpeedcheckerReportSDK differ diff --git a/Framework/SpeedcheckerReportSDK.xcframework/ios-arm64_x86_64-simulator/SpeedcheckerReportSDK.framework/_CodeSignature/CodeResources b/Framework/SpeedcheckerReportSDK.xcframework/ios-arm64_x86_64-simulator/SpeedcheckerReportSDK.framework/_CodeSignature/CodeResources index b83517d..5c675e1 100644 --- a/Framework/SpeedcheckerReportSDK.xcframework/ios-arm64_x86_64-simulator/SpeedcheckerReportSDK.framework/_CodeSignature/CodeResources +++ b/Framework/SpeedcheckerReportSDK.xcframework/ios-arm64_x86_64-simulator/SpeedcheckerReportSDK.framework/_CodeSignature/CodeResources @@ -10,7 +10,7 @@ Info.plist - tsC03dYDK9eD5lP449dhl1cq25k= + IYYqfNBm7N0naWACItnY9NbdRjo= Modules/SpeedcheckerReportSDK.swiftmodule/arm64-apple-ios-simulator.swiftdoc @@ -18,11 +18,11 @@ Modules/SpeedcheckerReportSDK.swiftmodule/arm64-apple-ios-simulator.swiftinterface - qeZxKDaqrX4WEqSmtuUQwUA3/RI= + ckIGi+roXJ1ipe7krHJB9ycPWjA= Modules/SpeedcheckerReportSDK.swiftmodule/arm64-apple-ios-simulator.swiftmodule - wffMp8JWad4HhjOYC77FbjhVHfU= + 5mJ+EwWC7qVcck/TxIJ6ryGvyp8= Modules/SpeedcheckerReportSDK.swiftmodule/x86_64-apple-ios-simulator.swiftdoc @@ -30,11 +30,11 @@ Modules/SpeedcheckerReportSDK.swiftmodule/x86_64-apple-ios-simulator.swiftinterface - U337XWt77e7eK2CAAPJRm5TINq8= + /c4bKnkJkIVIc2ZnCrFDOgM919M= Modules/SpeedcheckerReportSDK.swiftmodule/x86_64-apple-ios-simulator.swiftmodule - oIxvUQ+tT0tnQbw3BsMsbVJEIHk= + UNrdkLhT7DeS6y3frOOy6pGSRuE= Modules/module.modulemap @@ -61,14 +61,14 @@ hash2 - A+4n6UQblDNKCYI6vf9q1RmJ12jAEFe9+8m44zIxA30= + D+ngdGlNBRsMGGNfQCJTecfLDMW0uQIKaw5erPvqZ/c= Modules/SpeedcheckerReportSDK.swiftmodule/arm64-apple-ios-simulator.swiftmodule hash2 - F78rUyOgpCSX2aqjXvzfR+o4XDqRtcTnxGB5JXI+M50= + XeNBuERdNroqiFwY/TE/CRE+DWGJy3krpQCIy3tO6SM= Modules/SpeedcheckerReportSDK.swiftmodule/x86_64-apple-ios-simulator.swiftdoc @@ -82,14 +82,14 @@ hash2 - VJohdWi4qjNmm6uvy49BDhYs1MCE2MIoJTj9UEtDtVM= + 8p4yk4Og/TGVB/XZHmn9p7JiXLEyDW9DYOrAqEFJbEI= Modules/SpeedcheckerReportSDK.swiftmodule/x86_64-apple-ios-simulator.swiftmodule hash2 - kmnU5b1dUMdR2GLAqaEM6EFLzv9TI0RbmGyzGcKOYt8= + NovZADcnV5bAbsQWaMmQeXsK/WtY02LbtEyloEQYJXg= Modules/module.modulemap diff --git a/Framework/SpeedcheckerSDK.xcframework/ios-arm64/SpeedcheckerSDK.framework/Headers/SpeedcheckerSDK-Swift.h b/Framework/SpeedcheckerSDK.xcframework/ios-arm64/SpeedcheckerSDK.framework/Headers/SpeedcheckerSDK-Swift.h index 32196af..360beaf 100644 --- a/Framework/SpeedcheckerSDK.xcframework/ios-arm64/SpeedcheckerSDK.framework/Headers/SpeedcheckerSDK-Swift.h +++ b/Framework/SpeedcheckerSDK.xcframework/ios-arm64/SpeedcheckerSDK.framework/Headers/SpeedcheckerSDK-Swift.h @@ -222,13 +222,13 @@ typedef unsigned int swift_uint4 __attribute__((__ext_vector_type__(4))); SWIFT_CLASS_NAMED("BackgroundTest") @interface BackgroundTest : NSObject /// Initiate BackgroundTest -/// \param clientID Int id value +/// \param licenseKey Used to enable paid functionality /// /// \param url Value used for background test configuration /// /// \param testsEnabled value which tells if test is enabled on init /// -- (nonnull instancetype)initWithClientID:(NSInteger)clientID url:(NSString * _Nullable)url testsEnabled:(BOOL)testsEnabled OBJC_DESIGNATED_INITIALIZER; +- (nonnull instancetype)initWithLicenseKey:(NSString * _Nullable)licenseKey url:(NSString * _Nullable)url testsEnabled:(BOOL)testsEnabled OBJC_DESIGNATED_INITIALIZER; - (void)setBackgroundNetworkTestingWithTestsEnabled:(BOOL)testsEnabled; - (BOOL)getBackgroundNetworkTestingEnabled SWIFT_WARN_UNUSED_RESULT; - (void)prepareLocationManagerWithLocationManager:(CLLocationManager * _Nullable)locationManager; @@ -240,6 +240,7 @@ SWIFT_CLASS_NAMED("BackgroundTest") + @class CLLocation; @interface BackgroundTest (SWIFT_EXTENSION(SpeedcheckerSDK)) @@ -309,13 +310,15 @@ SWIFT_PROTOCOL_NAMED("InternetSpeedTestDelegate") /// The controller manages the speed test process. See also InternetSpeedTestDelegate SWIFT_CLASS_NAMED("InternetSpeedTest") @interface InternetSpeedTest : NSObject -- (nonnull instancetype)initWithClientID:(NSInteger)clientID userID:(NSInteger)userID isBackground:(BOOL)isBackground delegate:(id _Nonnull)delegate OBJC_DESIGNATED_INITIALIZER; +- (nonnull instancetype)initWithLicenseKey:(NSString * _Nullable)licenseKey delegate:(id _Nonnull)delegate; /// The function starts a new speed test process. Optinally with a specified list of servers. - (void)start:(NSArray * _Nonnull)servers completion:(SWIFT_NOESCAPE void (^ _Nonnull)(enum SpeedTestError))completion; /// The function starts a new speed test process. - (void)start:(SWIFT_NOESCAPE void (^ _Nonnull)(enum SpeedTestError))completion; /// The function starts a free test if geolocation is enabled -- (void)startTest:(void (^ _Nonnull)(enum SpeedTestError))completion; +- (void)startTest:(void (^ _Nonnull)(enum SpeedTestError))completion SWIFT_UNAVAILABLE_MSG("'startTest' has been renamed to 'startFreeTest:'"); +/// The function starts a free test if geolocation is enabled +- (void)startFreeTest:(void (^ _Nonnull)(enum SpeedTestError))completion; /// The function finishes the current speed test process. - (void)forceFinish:(SWIFT_NOESCAPE void (^ _Nonnull)(enum SpeedTestError))completion; - (SpeedTestNetwork * _Nonnull)currentNetwork SWIFT_WARN_UNUSED_RESULT; @@ -392,6 +395,8 @@ typedef SWIFT_ENUM_NAMED(NSInteger, SpeedTestError, "SpeedTestError", open) { SpeedTestErrorNotSaved = 5, SpeedTestErrorCancelled = 6, SpeedTestErrorLocationUndefined = 7, + SpeedTestErrorAppISPMismatch = 8, + SpeedTestErrorInvalidlicenseKey = 9, }; typedef SWIFT_ENUM_NAMED(NSInteger, SpeedTestLatencyType, "SpeedTestLatencyType", open) { diff --git a/Framework/SpeedcheckerSDK.xcframework/ios-arm64/SpeedcheckerSDK.framework/Info.plist b/Framework/SpeedcheckerSDK.xcframework/ios-arm64/SpeedcheckerSDK.framework/Info.plist index a5b98f8..4352354 100644 Binary files a/Framework/SpeedcheckerSDK.xcframework/ios-arm64/SpeedcheckerSDK.framework/Info.plist and b/Framework/SpeedcheckerSDK.xcframework/ios-arm64/SpeedcheckerSDK.framework/Info.plist differ diff --git a/Framework/SpeedcheckerSDK.xcframework/ios-arm64/SpeedcheckerSDK.framework/Modules/SpeedcheckerSDK.swiftmodule/arm64-apple-ios.swiftdoc b/Framework/SpeedcheckerSDK.xcframework/ios-arm64/SpeedcheckerSDK.framework/Modules/SpeedcheckerSDK.swiftmodule/arm64-apple-ios.swiftdoc index 320dddf..378bddb 100644 Binary files a/Framework/SpeedcheckerSDK.xcframework/ios-arm64/SpeedcheckerSDK.framework/Modules/SpeedcheckerSDK.swiftmodule/arm64-apple-ios.swiftdoc and b/Framework/SpeedcheckerSDK.xcframework/ios-arm64/SpeedcheckerSDK.framework/Modules/SpeedcheckerSDK.swiftmodule/arm64-apple-ios.swiftdoc differ diff --git a/Framework/SpeedcheckerSDK.xcframework/ios-arm64/SpeedcheckerSDK.framework/Modules/SpeedcheckerSDK.swiftmodule/arm64-apple-ios.swiftinterface b/Framework/SpeedcheckerSDK.xcframework/ios-arm64/SpeedcheckerSDK.framework/Modules/SpeedcheckerSDK.swiftmodule/arm64-apple-ios.swiftinterface index 9399945..d86cdff 100644 --- a/Framework/SpeedcheckerSDK.xcframework/ios-arm64/SpeedcheckerSDK.framework/Modules/SpeedcheckerSDK.swiftmodule/arm64-apple-ios.swiftinterface +++ b/Framework/SpeedcheckerSDK.xcframework/ios-arm64/SpeedcheckerSDK.framework/Modules/SpeedcheckerSDK.swiftmodule/arm64-apple-ios.swiftinterface @@ -3,6 +3,7 @@ // swift-module-flags: -target arm64-apple-ios11.0 -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name SpeedcheckerSDK import BackgroundTasks import SystemConfiguration.CaptiveNetwork +import CommonCrypto import CoreLocation import CoreTelephony import Darwin @@ -46,7 +47,7 @@ public class SCSignalHelper { public func getSignalStrengh() -> (cellStrength: SpeedcheckerSDK.SCIssueSignalMeasurementStrength?, wiFiStrength: SpeedcheckerSDK.SCIssueSignalMeasurementStrength?) @objc deinit } -public enum SCError : Swift.Error { +public enum SCError : Foundation.LocalizedError { case invalidSettings case invalidEnvironment case invalidArgument @@ -54,6 +55,10 @@ public enum SCError : Swift.Error { case requestFailed case invalidResponse case responseFailed + case appISPMismatch + public var errorDescription: Swift.String? { + get + } public static func == (a: SpeedcheckerSDK.SCError, b: SpeedcheckerSDK.SCError) -> Swift.Bool public func hash(into hasher: inout Swift.Hasher) public var hashValue: Swift.Int { @@ -276,19 +281,19 @@ public enum ConnectionIssue : Swift.Int { get } } -@objc(InternetSpeedTest) public class InternetSpeedTest : ObjectiveC.NSObject { - final public let userID: Swift.Int - final public let clientID: Swift.Int +@_hasMissingDesignatedInitializers @objc(InternetSpeedTest) public class InternetSpeedTest : ObjectiveC.NSObject { + final public let licenseKey: Swift.String? public var delegate: SpeedcheckerSDK.InternetSpeedTestDelegate? public static var testInProgress: Swift.Bool { get } - @objc public init(clientID: Swift.Int = 0, userID: Swift.Int = 0, isBackground: Swift.Bool = false, delegate: SpeedcheckerSDK.InternetSpeedTestDelegate) - public init(clientID: Swift.Int = 0, userID: Swift.Int = 0, isBackground: Swift.Bool = false, bgdlTimeMs: Swift.Int? = nil, bgulTimeMs: Swift.Int? = nil, bgskipTimeMs: Swift.Int? = nil, delegate: SpeedcheckerSDK.InternetSpeedTestDelegate?) + @objc convenience public init(licenseKey: Swift.String? = nil, delegate: SpeedcheckerSDK.InternetSpeedTestDelegate) @objc open func start(_ servers: [SpeedcheckerSDK.SpeedTestServer], completion: (SpeedcheckerSDK.SpeedTestError) -> Swift.Void) open func start(_ servers: [SpeedcheckerSDK.SCServer], completion: (SpeedcheckerSDK.SpeedTestError) -> Swift.Void) @objc open func start(_ completion: (SpeedcheckerSDK.SpeedTestError) -> Swift.Void) + @available(*, unavailable, renamed: "startFreeTest") @objc open func startTest(_ completion: @escaping (SpeedcheckerSDK.SpeedTestError) -> Swift.Void) + @objc open func startFreeTest(_ completion: @escaping (SpeedcheckerSDK.SpeedTestError) -> Swift.Void) open func startWithOptions(_ options: SpeedcheckerSDK.SpeedTestOptions, _ completion: (SpeedcheckerSDK.SpeedTestError?) -> Swift.Void) open func startWithOptions(_ options: SpeedcheckerSDK.SpeedTestOptions, servers: [SpeedcheckerSDK.SpeedTestServer], _ completion: (SpeedcheckerSDK.SpeedTestError?) -> Swift.Void) public func startWithOptions(_ options: SpeedcheckerSDK.SpeedTestOptions, servers: [SpeedcheckerSDK.SCServer], _ completion: (SpeedcheckerSDK.SpeedTestError?) -> Swift.Void) @@ -323,9 +328,6 @@ extension SpeedcheckerSDK.InternetSpeedTest { @objc func internetTestUploadFinish() @objc func internetTestUpload(progress: Swift.Double, speed: SpeedcheckerSDK.SpeedTestSpeed) } -public struct SCClient { - public init(ID: Swift.Int?, applicationHash: Swift.String? = nil, name: Swift.String? = nil) -} @_hasMissingDesignatedInitializers public class SCDataController { @objc deinit } @@ -431,7 +433,7 @@ public struct SCServer : Swift.Equatable { } public func == (lhs: SpeedcheckerSDK.SCServer, rhs: SpeedcheckerSDK.SCServer) -> Swift.Bool @_inheritsConvenienceInitializers @_hasMissingDesignatedInitializers public class SCServerDataController : SpeedcheckerSDK.SCDataController { - public static func getServers(for client: SpeedcheckerSDK.SCClient? = nil, completion: @escaping ([SpeedcheckerSDK.SCServer]?, SpeedcheckerSDK.SCError?) -> Swift.Void) + public static func getServers(completion: @escaping ([SpeedcheckerSDK.SCServer]?, SpeedcheckerSDK.SCError?) -> Swift.Void) public static func getAllServers(_ completion: @escaping ([SpeedcheckerSDK.SCServer]?, SpeedcheckerSDK.SCError?) -> Swift.Void) public static func getCustomServers(from link: Swift.String, completion: @escaping ([SpeedcheckerSDK.SCServer]?, SpeedcheckerSDK.SCError?) -> Swift.Void) public static func getOoklaServers(_ completion: @escaping ([SpeedcheckerSDK.SCServer]?, SpeedcheckerSDK.SCError?) -> Swift.Void) @@ -479,6 +481,8 @@ public enum SCTestStatus { case notSaved case cancelled case locationUndefined + case appISPMismatch + case invalidlicenseKey public init?(rawValue: Swift.Int) public typealias RawValue = Swift.Int public var rawValue: Swift.Int { @@ -668,7 +672,7 @@ public struct SCConfigFileSettings : Swift.Codable { public init(from decoder: Swift.Decoder) throws } @objc(BackgroundTest) public class BackgroundTest : ObjectiveC.NSObject { - @objc public init(clientID: Swift.Int, url: Swift.String? = nil, testsEnabled: Swift.Bool = true) + @objc public init(licenseKey: Swift.String? = nil, url: Swift.String? = nil, testsEnabled: Swift.Bool = true) @objc deinit @objc public func setBackgroundNetworkTesting(testsEnabled: Swift.Bool) @objc public func getBackgroundNetworkTestingEnabled() -> Swift.Bool diff --git a/Framework/SpeedcheckerSDK.xcframework/ios-arm64/SpeedcheckerSDK.framework/SpeedcheckerSDK b/Framework/SpeedcheckerSDK.xcframework/ios-arm64/SpeedcheckerSDK.framework/SpeedcheckerSDK index f4a5276..f460134 100755 Binary files a/Framework/SpeedcheckerSDK.xcframework/ios-arm64/SpeedcheckerSDK.framework/SpeedcheckerSDK and b/Framework/SpeedcheckerSDK.xcframework/ios-arm64/SpeedcheckerSDK.framework/SpeedcheckerSDK differ diff --git a/Framework/SpeedcheckerSDK.xcframework/ios-arm64_x86_64-simulator/SpeedcheckerSDK.framework/Headers/SpeedcheckerSDK-Swift.h b/Framework/SpeedcheckerSDK.xcframework/ios-arm64_x86_64-simulator/SpeedcheckerSDK.framework/Headers/SpeedcheckerSDK-Swift.h index 147f4ef..1880978 100644 --- a/Framework/SpeedcheckerSDK.xcframework/ios-arm64_x86_64-simulator/SpeedcheckerSDK.framework/Headers/SpeedcheckerSDK-Swift.h +++ b/Framework/SpeedcheckerSDK.xcframework/ios-arm64_x86_64-simulator/SpeedcheckerSDK.framework/Headers/SpeedcheckerSDK-Swift.h @@ -224,13 +224,13 @@ typedef unsigned int swift_uint4 __attribute__((__ext_vector_type__(4))); SWIFT_CLASS_NAMED("BackgroundTest") @interface BackgroundTest : NSObject /// Initiate BackgroundTest -/// \param clientID Int id value +/// \param licenseKey Used to enable paid functionality /// /// \param url Value used for background test configuration /// /// \param testsEnabled value which tells if test is enabled on init /// -- (nonnull instancetype)initWithClientID:(NSInteger)clientID url:(NSString * _Nullable)url testsEnabled:(BOOL)testsEnabled OBJC_DESIGNATED_INITIALIZER; +- (nonnull instancetype)initWithLicenseKey:(NSString * _Nullable)licenseKey url:(NSString * _Nullable)url testsEnabled:(BOOL)testsEnabled OBJC_DESIGNATED_INITIALIZER; - (void)setBackgroundNetworkTestingWithTestsEnabled:(BOOL)testsEnabled; - (BOOL)getBackgroundNetworkTestingEnabled SWIFT_WARN_UNUSED_RESULT; - (void)prepareLocationManagerWithLocationManager:(CLLocationManager * _Nullable)locationManager; @@ -242,6 +242,7 @@ SWIFT_CLASS_NAMED("BackgroundTest") + @class CLLocation; @interface BackgroundTest (SWIFT_EXTENSION(SpeedcheckerSDK)) @@ -311,13 +312,15 @@ SWIFT_PROTOCOL_NAMED("InternetSpeedTestDelegate") /// The controller manages the speed test process. See also InternetSpeedTestDelegate SWIFT_CLASS_NAMED("InternetSpeedTest") @interface InternetSpeedTest : NSObject -- (nonnull instancetype)initWithClientID:(NSInteger)clientID userID:(NSInteger)userID isBackground:(BOOL)isBackground delegate:(id _Nonnull)delegate OBJC_DESIGNATED_INITIALIZER; +- (nonnull instancetype)initWithLicenseKey:(NSString * _Nullable)licenseKey delegate:(id _Nonnull)delegate; /// The function starts a new speed test process. Optinally with a specified list of servers. - (void)start:(NSArray * _Nonnull)servers completion:(SWIFT_NOESCAPE void (^ _Nonnull)(enum SpeedTestError))completion; /// The function starts a new speed test process. - (void)start:(SWIFT_NOESCAPE void (^ _Nonnull)(enum SpeedTestError))completion; /// The function starts a free test if geolocation is enabled -- (void)startTest:(void (^ _Nonnull)(enum SpeedTestError))completion; +- (void)startTest:(void (^ _Nonnull)(enum SpeedTestError))completion SWIFT_UNAVAILABLE_MSG("'startTest' has been renamed to 'startFreeTest:'"); +/// The function starts a free test if geolocation is enabled +- (void)startFreeTest:(void (^ _Nonnull)(enum SpeedTestError))completion; /// The function finishes the current speed test process. - (void)forceFinish:(SWIFT_NOESCAPE void (^ _Nonnull)(enum SpeedTestError))completion; - (SpeedTestNetwork * _Nonnull)currentNetwork SWIFT_WARN_UNUSED_RESULT; @@ -394,6 +397,8 @@ typedef SWIFT_ENUM_NAMED(NSInteger, SpeedTestError, "SpeedTestError", open) { SpeedTestErrorNotSaved = 5, SpeedTestErrorCancelled = 6, SpeedTestErrorLocationUndefined = 7, + SpeedTestErrorAppISPMismatch = 8, + SpeedTestErrorInvalidlicenseKey = 9, }; typedef SWIFT_ENUM_NAMED(NSInteger, SpeedTestLatencyType, "SpeedTestLatencyType", open) { @@ -729,13 +734,13 @@ typedef unsigned int swift_uint4 __attribute__((__ext_vector_type__(4))); SWIFT_CLASS_NAMED("BackgroundTest") @interface BackgroundTest : NSObject /// Initiate BackgroundTest -/// \param clientID Int id value +/// \param licenseKey Used to enable paid functionality /// /// \param url Value used for background test configuration /// /// \param testsEnabled value which tells if test is enabled on init /// -- (nonnull instancetype)initWithClientID:(NSInteger)clientID url:(NSString * _Nullable)url testsEnabled:(BOOL)testsEnabled OBJC_DESIGNATED_INITIALIZER; +- (nonnull instancetype)initWithLicenseKey:(NSString * _Nullable)licenseKey url:(NSString * _Nullable)url testsEnabled:(BOOL)testsEnabled OBJC_DESIGNATED_INITIALIZER; - (void)setBackgroundNetworkTestingWithTestsEnabled:(BOOL)testsEnabled; - (BOOL)getBackgroundNetworkTestingEnabled SWIFT_WARN_UNUSED_RESULT; - (void)prepareLocationManagerWithLocationManager:(CLLocationManager * _Nullable)locationManager; @@ -747,6 +752,7 @@ SWIFT_CLASS_NAMED("BackgroundTest") + @class CLLocation; @interface BackgroundTest (SWIFT_EXTENSION(SpeedcheckerSDK)) @@ -816,13 +822,15 @@ SWIFT_PROTOCOL_NAMED("InternetSpeedTestDelegate") /// The controller manages the speed test process. See also InternetSpeedTestDelegate SWIFT_CLASS_NAMED("InternetSpeedTest") @interface InternetSpeedTest : NSObject -- (nonnull instancetype)initWithClientID:(NSInteger)clientID userID:(NSInteger)userID isBackground:(BOOL)isBackground delegate:(id _Nonnull)delegate OBJC_DESIGNATED_INITIALIZER; +- (nonnull instancetype)initWithLicenseKey:(NSString * _Nullable)licenseKey delegate:(id _Nonnull)delegate; /// The function starts a new speed test process. Optinally with a specified list of servers. - (void)start:(NSArray * _Nonnull)servers completion:(SWIFT_NOESCAPE void (^ _Nonnull)(enum SpeedTestError))completion; /// The function starts a new speed test process. - (void)start:(SWIFT_NOESCAPE void (^ _Nonnull)(enum SpeedTestError))completion; /// The function starts a free test if geolocation is enabled -- (void)startTest:(void (^ _Nonnull)(enum SpeedTestError))completion; +- (void)startTest:(void (^ _Nonnull)(enum SpeedTestError))completion SWIFT_UNAVAILABLE_MSG("'startTest' has been renamed to 'startFreeTest:'"); +/// The function starts a free test if geolocation is enabled +- (void)startFreeTest:(void (^ _Nonnull)(enum SpeedTestError))completion; /// The function finishes the current speed test process. - (void)forceFinish:(SWIFT_NOESCAPE void (^ _Nonnull)(enum SpeedTestError))completion; - (SpeedTestNetwork * _Nonnull)currentNetwork SWIFT_WARN_UNUSED_RESULT; @@ -899,6 +907,8 @@ typedef SWIFT_ENUM_NAMED(NSInteger, SpeedTestError, "SpeedTestError", open) { SpeedTestErrorNotSaved = 5, SpeedTestErrorCancelled = 6, SpeedTestErrorLocationUndefined = 7, + SpeedTestErrorAppISPMismatch = 8, + SpeedTestErrorInvalidlicenseKey = 9, }; typedef SWIFT_ENUM_NAMED(NSInteger, SpeedTestLatencyType, "SpeedTestLatencyType", open) { diff --git a/Framework/SpeedcheckerSDK.xcframework/ios-arm64_x86_64-simulator/SpeedcheckerSDK.framework/Info.plist b/Framework/SpeedcheckerSDK.xcframework/ios-arm64_x86_64-simulator/SpeedcheckerSDK.framework/Info.plist index b93fa38..bee92c2 100644 Binary files a/Framework/SpeedcheckerSDK.xcframework/ios-arm64_x86_64-simulator/SpeedcheckerSDK.framework/Info.plist and b/Framework/SpeedcheckerSDK.xcframework/ios-arm64_x86_64-simulator/SpeedcheckerSDK.framework/Info.plist differ diff --git a/Framework/SpeedcheckerSDK.xcframework/ios-arm64_x86_64-simulator/SpeedcheckerSDK.framework/Modules/SpeedcheckerSDK.swiftmodule/arm64-apple-ios-simulator.swiftdoc b/Framework/SpeedcheckerSDK.xcframework/ios-arm64_x86_64-simulator/SpeedcheckerSDK.framework/Modules/SpeedcheckerSDK.swiftmodule/arm64-apple-ios-simulator.swiftdoc index 7b2b34f..69e8829 100644 Binary files a/Framework/SpeedcheckerSDK.xcframework/ios-arm64_x86_64-simulator/SpeedcheckerSDK.framework/Modules/SpeedcheckerSDK.swiftmodule/arm64-apple-ios-simulator.swiftdoc and b/Framework/SpeedcheckerSDK.xcframework/ios-arm64_x86_64-simulator/SpeedcheckerSDK.framework/Modules/SpeedcheckerSDK.swiftmodule/arm64-apple-ios-simulator.swiftdoc differ diff --git a/Framework/SpeedcheckerSDK.xcframework/ios-arm64_x86_64-simulator/SpeedcheckerSDK.framework/Modules/SpeedcheckerSDK.swiftmodule/arm64-apple-ios-simulator.swiftinterface b/Framework/SpeedcheckerSDK.xcframework/ios-arm64_x86_64-simulator/SpeedcheckerSDK.framework/Modules/SpeedcheckerSDK.swiftmodule/arm64-apple-ios-simulator.swiftinterface index e2b8c55..082a84d 100644 --- a/Framework/SpeedcheckerSDK.xcframework/ios-arm64_x86_64-simulator/SpeedcheckerSDK.framework/Modules/SpeedcheckerSDK.swiftmodule/arm64-apple-ios-simulator.swiftinterface +++ b/Framework/SpeedcheckerSDK.xcframework/ios-arm64_x86_64-simulator/SpeedcheckerSDK.framework/Modules/SpeedcheckerSDK.swiftmodule/arm64-apple-ios-simulator.swiftinterface @@ -3,6 +3,7 @@ // swift-module-flags: -target arm64-apple-ios11.0-simulator -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name SpeedcheckerSDK import BackgroundTasks import SystemConfiguration.CaptiveNetwork +import CommonCrypto import CoreLocation import CoreTelephony import Darwin @@ -46,7 +47,7 @@ public class SCSignalHelper { public func getSignalStrengh() -> (cellStrength: SpeedcheckerSDK.SCIssueSignalMeasurementStrength?, wiFiStrength: SpeedcheckerSDK.SCIssueSignalMeasurementStrength?) @objc deinit } -public enum SCError : Swift.Error { +public enum SCError : Foundation.LocalizedError { case invalidSettings case invalidEnvironment case invalidArgument @@ -54,6 +55,10 @@ public enum SCError : Swift.Error { case requestFailed case invalidResponse case responseFailed + case appISPMismatch + public var errorDescription: Swift.String? { + get + } public static func == (a: SpeedcheckerSDK.SCError, b: SpeedcheckerSDK.SCError) -> Swift.Bool public func hash(into hasher: inout Swift.Hasher) public var hashValue: Swift.Int { @@ -276,19 +281,19 @@ public enum ConnectionIssue : Swift.Int { get } } -@objc(InternetSpeedTest) public class InternetSpeedTest : ObjectiveC.NSObject { - final public let userID: Swift.Int - final public let clientID: Swift.Int +@_hasMissingDesignatedInitializers @objc(InternetSpeedTest) public class InternetSpeedTest : ObjectiveC.NSObject { + final public let licenseKey: Swift.String? public var delegate: SpeedcheckerSDK.InternetSpeedTestDelegate? public static var testInProgress: Swift.Bool { get } - @objc public init(clientID: Swift.Int = 0, userID: Swift.Int = 0, isBackground: Swift.Bool = false, delegate: SpeedcheckerSDK.InternetSpeedTestDelegate) - public init(clientID: Swift.Int = 0, userID: Swift.Int = 0, isBackground: Swift.Bool = false, bgdlTimeMs: Swift.Int? = nil, bgulTimeMs: Swift.Int? = nil, bgskipTimeMs: Swift.Int? = nil, delegate: SpeedcheckerSDK.InternetSpeedTestDelegate?) + @objc convenience public init(licenseKey: Swift.String? = nil, delegate: SpeedcheckerSDK.InternetSpeedTestDelegate) @objc open func start(_ servers: [SpeedcheckerSDK.SpeedTestServer], completion: (SpeedcheckerSDK.SpeedTestError) -> Swift.Void) open func start(_ servers: [SpeedcheckerSDK.SCServer], completion: (SpeedcheckerSDK.SpeedTestError) -> Swift.Void) @objc open func start(_ completion: (SpeedcheckerSDK.SpeedTestError) -> Swift.Void) + @available(*, unavailable, renamed: "startFreeTest") @objc open func startTest(_ completion: @escaping (SpeedcheckerSDK.SpeedTestError) -> Swift.Void) + @objc open func startFreeTest(_ completion: @escaping (SpeedcheckerSDK.SpeedTestError) -> Swift.Void) open func startWithOptions(_ options: SpeedcheckerSDK.SpeedTestOptions, _ completion: (SpeedcheckerSDK.SpeedTestError?) -> Swift.Void) open func startWithOptions(_ options: SpeedcheckerSDK.SpeedTestOptions, servers: [SpeedcheckerSDK.SpeedTestServer], _ completion: (SpeedcheckerSDK.SpeedTestError?) -> Swift.Void) public func startWithOptions(_ options: SpeedcheckerSDK.SpeedTestOptions, servers: [SpeedcheckerSDK.SCServer], _ completion: (SpeedcheckerSDK.SpeedTestError?) -> Swift.Void) @@ -323,9 +328,6 @@ extension SpeedcheckerSDK.InternetSpeedTest { @objc func internetTestUploadFinish() @objc func internetTestUpload(progress: Swift.Double, speed: SpeedcheckerSDK.SpeedTestSpeed) } -public struct SCClient { - public init(ID: Swift.Int?, applicationHash: Swift.String? = nil, name: Swift.String? = nil) -} @_hasMissingDesignatedInitializers public class SCDataController { @objc deinit } @@ -431,7 +433,7 @@ public struct SCServer : Swift.Equatable { } public func == (lhs: SpeedcheckerSDK.SCServer, rhs: SpeedcheckerSDK.SCServer) -> Swift.Bool @_inheritsConvenienceInitializers @_hasMissingDesignatedInitializers public class SCServerDataController : SpeedcheckerSDK.SCDataController { - public static func getServers(for client: SpeedcheckerSDK.SCClient? = nil, completion: @escaping ([SpeedcheckerSDK.SCServer]?, SpeedcheckerSDK.SCError?) -> Swift.Void) + public static func getServers(completion: @escaping ([SpeedcheckerSDK.SCServer]?, SpeedcheckerSDK.SCError?) -> Swift.Void) public static func getAllServers(_ completion: @escaping ([SpeedcheckerSDK.SCServer]?, SpeedcheckerSDK.SCError?) -> Swift.Void) public static func getCustomServers(from link: Swift.String, completion: @escaping ([SpeedcheckerSDK.SCServer]?, SpeedcheckerSDK.SCError?) -> Swift.Void) public static func getOoklaServers(_ completion: @escaping ([SpeedcheckerSDK.SCServer]?, SpeedcheckerSDK.SCError?) -> Swift.Void) @@ -479,6 +481,8 @@ public enum SCTestStatus { case notSaved case cancelled case locationUndefined + case appISPMismatch + case invalidlicenseKey public init?(rawValue: Swift.Int) public typealias RawValue = Swift.Int public var rawValue: Swift.Int { @@ -668,7 +672,7 @@ public struct SCConfigFileSettings : Swift.Codable { public init(from decoder: Swift.Decoder) throws } @objc(BackgroundTest) public class BackgroundTest : ObjectiveC.NSObject { - @objc public init(clientID: Swift.Int, url: Swift.String? = nil, testsEnabled: Swift.Bool = true) + @objc public init(licenseKey: Swift.String? = nil, url: Swift.String? = nil, testsEnabled: Swift.Bool = true) @objc deinit @objc public func setBackgroundNetworkTesting(testsEnabled: Swift.Bool) @objc public func getBackgroundNetworkTestingEnabled() -> Swift.Bool diff --git a/Framework/SpeedcheckerSDK.xcframework/ios-arm64_x86_64-simulator/SpeedcheckerSDK.framework/Modules/SpeedcheckerSDK.swiftmodule/x86_64-apple-ios-simulator.swiftdoc b/Framework/SpeedcheckerSDK.xcframework/ios-arm64_x86_64-simulator/SpeedcheckerSDK.framework/Modules/SpeedcheckerSDK.swiftmodule/x86_64-apple-ios-simulator.swiftdoc index e812537..8c0dcd1 100644 Binary files a/Framework/SpeedcheckerSDK.xcframework/ios-arm64_x86_64-simulator/SpeedcheckerSDK.framework/Modules/SpeedcheckerSDK.swiftmodule/x86_64-apple-ios-simulator.swiftdoc and b/Framework/SpeedcheckerSDK.xcframework/ios-arm64_x86_64-simulator/SpeedcheckerSDK.framework/Modules/SpeedcheckerSDK.swiftmodule/x86_64-apple-ios-simulator.swiftdoc differ diff --git a/Framework/SpeedcheckerSDK.xcframework/ios-arm64_x86_64-simulator/SpeedcheckerSDK.framework/Modules/SpeedcheckerSDK.swiftmodule/x86_64-apple-ios-simulator.swiftinterface b/Framework/SpeedcheckerSDK.xcframework/ios-arm64_x86_64-simulator/SpeedcheckerSDK.framework/Modules/SpeedcheckerSDK.swiftmodule/x86_64-apple-ios-simulator.swiftinterface index c29ea96..426f3ff 100644 --- a/Framework/SpeedcheckerSDK.xcframework/ios-arm64_x86_64-simulator/SpeedcheckerSDK.framework/Modules/SpeedcheckerSDK.swiftmodule/x86_64-apple-ios-simulator.swiftinterface +++ b/Framework/SpeedcheckerSDK.xcframework/ios-arm64_x86_64-simulator/SpeedcheckerSDK.framework/Modules/SpeedcheckerSDK.swiftmodule/x86_64-apple-ios-simulator.swiftinterface @@ -3,6 +3,7 @@ // swift-module-flags: -target x86_64-apple-ios11.0-simulator -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name SpeedcheckerSDK import BackgroundTasks import SystemConfiguration.CaptiveNetwork +import CommonCrypto import CoreLocation import CoreTelephony import Darwin @@ -46,7 +47,7 @@ public class SCSignalHelper { public func getSignalStrengh() -> (cellStrength: SpeedcheckerSDK.SCIssueSignalMeasurementStrength?, wiFiStrength: SpeedcheckerSDK.SCIssueSignalMeasurementStrength?) @objc deinit } -public enum SCError : Swift.Error { +public enum SCError : Foundation.LocalizedError { case invalidSettings case invalidEnvironment case invalidArgument @@ -54,6 +55,10 @@ public enum SCError : Swift.Error { case requestFailed case invalidResponse case responseFailed + case appISPMismatch + public var errorDescription: Swift.String? { + get + } public static func == (a: SpeedcheckerSDK.SCError, b: SpeedcheckerSDK.SCError) -> Swift.Bool public func hash(into hasher: inout Swift.Hasher) public var hashValue: Swift.Int { @@ -276,19 +281,19 @@ public enum ConnectionIssue : Swift.Int { get } } -@objc(InternetSpeedTest) public class InternetSpeedTest : ObjectiveC.NSObject { - final public let userID: Swift.Int - final public let clientID: Swift.Int +@_hasMissingDesignatedInitializers @objc(InternetSpeedTest) public class InternetSpeedTest : ObjectiveC.NSObject { + final public let licenseKey: Swift.String? public var delegate: SpeedcheckerSDK.InternetSpeedTestDelegate? public static var testInProgress: Swift.Bool { get } - @objc public init(clientID: Swift.Int = 0, userID: Swift.Int = 0, isBackground: Swift.Bool = false, delegate: SpeedcheckerSDK.InternetSpeedTestDelegate) - public init(clientID: Swift.Int = 0, userID: Swift.Int = 0, isBackground: Swift.Bool = false, bgdlTimeMs: Swift.Int? = nil, bgulTimeMs: Swift.Int? = nil, bgskipTimeMs: Swift.Int? = nil, delegate: SpeedcheckerSDK.InternetSpeedTestDelegate?) + @objc convenience public init(licenseKey: Swift.String? = nil, delegate: SpeedcheckerSDK.InternetSpeedTestDelegate) @objc open func start(_ servers: [SpeedcheckerSDK.SpeedTestServer], completion: (SpeedcheckerSDK.SpeedTestError) -> Swift.Void) open func start(_ servers: [SpeedcheckerSDK.SCServer], completion: (SpeedcheckerSDK.SpeedTestError) -> Swift.Void) @objc open func start(_ completion: (SpeedcheckerSDK.SpeedTestError) -> Swift.Void) + @available(*, unavailable, renamed: "startFreeTest") @objc open func startTest(_ completion: @escaping (SpeedcheckerSDK.SpeedTestError) -> Swift.Void) + @objc open func startFreeTest(_ completion: @escaping (SpeedcheckerSDK.SpeedTestError) -> Swift.Void) open func startWithOptions(_ options: SpeedcheckerSDK.SpeedTestOptions, _ completion: (SpeedcheckerSDK.SpeedTestError?) -> Swift.Void) open func startWithOptions(_ options: SpeedcheckerSDK.SpeedTestOptions, servers: [SpeedcheckerSDK.SpeedTestServer], _ completion: (SpeedcheckerSDK.SpeedTestError?) -> Swift.Void) public func startWithOptions(_ options: SpeedcheckerSDK.SpeedTestOptions, servers: [SpeedcheckerSDK.SCServer], _ completion: (SpeedcheckerSDK.SpeedTestError?) -> Swift.Void) @@ -323,9 +328,6 @@ extension SpeedcheckerSDK.InternetSpeedTest { @objc func internetTestUploadFinish() @objc func internetTestUpload(progress: Swift.Double, speed: SpeedcheckerSDK.SpeedTestSpeed) } -public struct SCClient { - public init(ID: Swift.Int?, applicationHash: Swift.String? = nil, name: Swift.String? = nil) -} @_hasMissingDesignatedInitializers public class SCDataController { @objc deinit } @@ -431,7 +433,7 @@ public struct SCServer : Swift.Equatable { } public func == (lhs: SpeedcheckerSDK.SCServer, rhs: SpeedcheckerSDK.SCServer) -> Swift.Bool @_inheritsConvenienceInitializers @_hasMissingDesignatedInitializers public class SCServerDataController : SpeedcheckerSDK.SCDataController { - public static func getServers(for client: SpeedcheckerSDK.SCClient? = nil, completion: @escaping ([SpeedcheckerSDK.SCServer]?, SpeedcheckerSDK.SCError?) -> Swift.Void) + public static func getServers(completion: @escaping ([SpeedcheckerSDK.SCServer]?, SpeedcheckerSDK.SCError?) -> Swift.Void) public static func getAllServers(_ completion: @escaping ([SpeedcheckerSDK.SCServer]?, SpeedcheckerSDK.SCError?) -> Swift.Void) public static func getCustomServers(from link: Swift.String, completion: @escaping ([SpeedcheckerSDK.SCServer]?, SpeedcheckerSDK.SCError?) -> Swift.Void) public static func getOoklaServers(_ completion: @escaping ([SpeedcheckerSDK.SCServer]?, SpeedcheckerSDK.SCError?) -> Swift.Void) @@ -479,6 +481,8 @@ public enum SCTestStatus { case notSaved case cancelled case locationUndefined + case appISPMismatch + case invalidlicenseKey public init?(rawValue: Swift.Int) public typealias RawValue = Swift.Int public var rawValue: Swift.Int { @@ -668,7 +672,7 @@ public struct SCConfigFileSettings : Swift.Codable { public init(from decoder: Swift.Decoder) throws } @objc(BackgroundTest) public class BackgroundTest : ObjectiveC.NSObject { - @objc public init(clientID: Swift.Int, url: Swift.String? = nil, testsEnabled: Swift.Bool = true) + @objc public init(licenseKey: Swift.String? = nil, url: Swift.String? = nil, testsEnabled: Swift.Bool = true) @objc deinit @objc public func setBackgroundNetworkTesting(testsEnabled: Swift.Bool) @objc public func getBackgroundNetworkTestingEnabled() -> Swift.Bool diff --git a/Framework/SpeedcheckerSDK.xcframework/ios-arm64_x86_64-simulator/SpeedcheckerSDK.framework/SpeedcheckerSDK b/Framework/SpeedcheckerSDK.xcframework/ios-arm64_x86_64-simulator/SpeedcheckerSDK.framework/SpeedcheckerSDK index 9bab43c..6b5832a 100755 Binary files a/Framework/SpeedcheckerSDK.xcframework/ios-arm64_x86_64-simulator/SpeedcheckerSDK.framework/SpeedcheckerSDK and b/Framework/SpeedcheckerSDK.xcframework/ios-arm64_x86_64-simulator/SpeedcheckerSDK.framework/SpeedcheckerSDK differ diff --git a/Framework/SpeedcheckerSDK.xcframework/ios-arm64_x86_64-simulator/SpeedcheckerSDK.framework/_CodeSignature/CodeResources b/Framework/SpeedcheckerSDK.xcframework/ios-arm64_x86_64-simulator/SpeedcheckerSDK.framework/_CodeSignature/CodeResources index d535d83..5ca0cbc 100644 --- a/Framework/SpeedcheckerSDK.xcframework/ios-arm64_x86_64-simulator/SpeedcheckerSDK.framework/_CodeSignature/CodeResources +++ b/Framework/SpeedcheckerSDK.xcframework/ios-arm64_x86_64-simulator/SpeedcheckerSDK.framework/_CodeSignature/CodeResources @@ -6,35 +6,35 @@ Headers/SpeedcheckerSDK-Swift.h - mDGD+3jkrKS+eRdp5w9821yX0f8= + QqJ9k9KgTc1QYDttbgHZaezO2Es= Info.plist - 0tpciAXdD5ayvXpdHdivOtPwe5w= + ZorXpuaD1SB4VGqrzf0uYm35i5Y= Modules/SpeedcheckerSDK.swiftmodule/arm64-apple-ios-simulator.swiftdoc - dFcFmIEnwtulat4JuG4VdmKDwLk= + zP5tmpYocuvX2fLEuke6wSQ6a40= Modules/SpeedcheckerSDK.swiftmodule/arm64-apple-ios-simulator.swiftinterface - y4pm/I53JvAY+pJvtuPfAKIV8M8= + IPL+gj51o7v53gzamzcXsPDb1dk= Modules/SpeedcheckerSDK.swiftmodule/arm64-apple-ios-simulator.swiftmodule - YoHag2vVDpTuDTmS6vuDJrb6uYA= + 4UmqnqTGinExwy+hKGvcFKBKR1s= Modules/SpeedcheckerSDK.swiftmodule/x86_64-apple-ios-simulator.swiftdoc - LE0aNkWS4+aasQcy73cWtXZFLV4= + 25syZ+oFwWfco+803WXD4ecAOF0= Modules/SpeedcheckerSDK.swiftmodule/x86_64-apple-ios-simulator.swiftinterface - WprgVCnc9Q4U0TRHm2Wal3wMPQI= + 6MfU5vtBYaVL+dzJb9thPq7SctA= Modules/SpeedcheckerSDK.swiftmodule/x86_64-apple-ios-simulator.swiftmodule - eMVk5REIVduCjSyP9/RyUiuDyVY= + vQTOYz79qEcWcLwOBwWl8GuTRoY= Modules/module.modulemap @@ -47,49 +47,49 @@ hash2 - X5Me/BF2n48zQ5LFMhknbbqNLMdrxlVwUup9VpIeaOE= + /IkDR9c1TpnJOH0/SaJjSllfVkr6OLgznDa8o02WwpI= Modules/SpeedcheckerSDK.swiftmodule/arm64-apple-ios-simulator.swiftdoc hash2 - uVIe0gTlZypiiYxUto0sgw4FXf2fI5XiGxVqlAFFQrc= + zGiS3AjgxuBtaSPSRQ4VmOY5kN9B/jWSLJ40IheAOmQ= Modules/SpeedcheckerSDK.swiftmodule/arm64-apple-ios-simulator.swiftinterface hash2 - 3l0Qu1ih1Db1GrKtYtDXi92uRjNNLm9rGknL1stw0eI= + NgVy3uy7Ns15RG8AC8IVwQ1bjbW+hSfHgWuP4Lxp57I= Modules/SpeedcheckerSDK.swiftmodule/arm64-apple-ios-simulator.swiftmodule hash2 - fjecJSTEPjJvtsdbwkhN0tK0Rs7Kpm4iBZq2R5kHJok= + YsgXvpIFogWx2g++OaePQRViX3Tjm8D2Mo87FZZChfE= Modules/SpeedcheckerSDK.swiftmodule/x86_64-apple-ios-simulator.swiftdoc hash2 - 5G3yZD1h81XrLB96jGyt8GJXJJpS3uUMg2bM7g6aOKY= + 2zieKCcfWhFHH/Zdl5KU3WoyTBhwDEsG373ybt0oXUI= Modules/SpeedcheckerSDK.swiftmodule/x86_64-apple-ios-simulator.swiftinterface hash2 - uveAHX4yTWhNhCz9AeCgTjsNL00lKR8zMlPwUVXqrDY= + iaWIUgOgd3e5bLYnWtAMDlNVQj7JC02dACHbcAsQ1gs= Modules/SpeedcheckerSDK.swiftmodule/x86_64-apple-ios-simulator.swiftmodule hash2 - BBab59bmzwMF3pJHI1uYKr29opA/1nm+bqkdE1vuECM= + 4UxxazFJm8wFx2KDDuDNb8WasGfGN835ntksuhc0iO0= Modules/module.modulemap diff --git a/Framework/XMLParsing.xcframework/ios-arm64/XMLParsing.framework/XMLParsing b/Framework/XMLParsing.xcframework/ios-arm64/XMLParsing.framework/XMLParsing index 12dafcf..f0a00fc 100755 Binary files a/Framework/XMLParsing.xcframework/ios-arm64/XMLParsing.framework/XMLParsing and b/Framework/XMLParsing.xcframework/ios-arm64/XMLParsing.framework/XMLParsing differ diff --git a/Framework/XMLParsing.xcframework/ios-arm64_x86_64-simulator/XMLParsing.framework/XMLParsing b/Framework/XMLParsing.xcframework/ios-arm64_x86_64-simulator/XMLParsing.framework/XMLParsing index c410625..92609c5 100755 Binary files a/Framework/XMLParsing.xcframework/ios-arm64_x86_64-simulator/XMLParsing.framework/XMLParsing and b/Framework/XMLParsing.xcframework/ios-arm64_x86_64-simulator/XMLParsing.framework/XMLParsing differ diff --git a/README.md b/README.md index 4f2ed9f..4df6cf3 100755 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Speedchecker SDK for iOS, version 1.8.13 - Free speed test for your own app. +# Speedchecker SDK for iOS, version 2.0.2 - Free speed test for your own app. The embedded framework version of the Speedchecker Speed Test supports its own API which allows you to access various methods and events easily from the your iOS application code. You can also try our [Speedchecker on App Store](https://itunes.apple.com/app/id658790195), it's powered by the latest Speedchecker SDK version. More information about [SpeedChecker SDKs](https://www.speedchecker.com/speed-test-tools/mobile-apps-and-sdks.html) @@ -21,7 +21,7 @@ The embedded framework version of the Speedchecker Speed Test supports its own A 1. File > Add Packages... 2. Add `https://github.com/speedchecker/speedchecker-sdk-ios` -3. Select "Up to Next Major" with "1.5.61" +3. Select "Up to Next Major" with "2.0.2" ### CocoaPods diff --git a/Sample in Swift/BackgroundTests Sample/AppDelegate.swift b/Sample in Swift/BackgroundTests Sample/AppDelegate.swift index b4a46da..a1f4935 100644 --- a/Sample in Swift/BackgroundTests Sample/AppDelegate.swift +++ b/Sample in Swift/BackgroundTests Sample/AppDelegate.swift @@ -17,9 +17,10 @@ class AppDelegate: UIResponder, UIApplicationDelegate { var locationManager: CLLocationManager? = CLLocationManager() func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool { - // Init BackgroundTest with your clientID + // Init BackgroundTest with your license key and config URL if backgroundTest == nil { - backgroundTest = BackgroundTest(clientID: 0) + let configURL = "" // use your config URL + backgroundTest = BackgroundTest(licenseKey: "Your license key", url: configURL) } // Load your configuration diff --git a/Sample in Swift/SpeedcheckerSDK Sample/ViewController.swift b/Sample in Swift/SpeedcheckerSDK Sample/ViewController.swift index 03e5f5b..59652cc 100755 --- a/Sample in Swift/SpeedcheckerSDK Sample/ViewController.swift +++ b/Sample in Swift/SpeedcheckerSDK Sample/ViewController.swift @@ -22,17 +22,17 @@ class ViewController: UIViewController { @IBAction func runSpeedTestTouched(_ sender: UIButton) { // to use free version, your app should have location access internetTest = InternetSpeedTest(delegate: self) - internetTest?.startTest() { (error) in + internetTest?.startFreeTest() { (error) in if error != .ok { - print(error) + print("Error: \(error.rawValue)") } } // to use paid version, your app does not need location access -// internetTest = InternetSpeedTest(clientID: 0, userID: 0, delegate: self) +// internetTest = InternetSpeedTest(licenseKey: "Your license key", delegate: self) // internetTest?.start() { (error) in // if error != .ok { -// print(error) +// print("Error: \(error.rawValue)") // } // } } @@ -54,7 +54,7 @@ class ViewController: UIViewController { extension ViewController: InternetSpeedTestDelegate { func internetTestError(error: SpeedTestError) { - print(error) + print("Error: \(error.rawValue)") } func internetTestFinish(result: SpeedTestResult) { @@ -96,10 +96,7 @@ extension ViewController: InternetSpeedTestDelegate { func internetTestUpload(progress: Double, speed: SpeedTestSpeed) { print("Upload: \(speed.descriptionInMbps)") } - - } extension ViewController: CLLocationManagerDelegate { - } diff --git a/SpeedcheckerSDK.podspec b/SpeedcheckerSDK.podspec index b0d03c3..17e9a41 100644 --- a/SpeedcheckerSDK.podspec +++ b/SpeedcheckerSDK.podspec @@ -1,7 +1,7 @@ Pod::Spec.new do |spec| spec.name = "SpeedcheckerSDK" - spec.version = "1.8.13" + spec.version = "2.0.2" spec.summary = "Free speed test for your own app." spec.description = <<-DESC @@ -22,7 +22,7 @@ Pod::Spec.new do |spec| spec.platform = :ios, "11.0" spec.swift_version = "5.0" - spec.source = { :git => "https://github.com/speedchecker/speedchecker-sdk-ios.git", :tag => "1.8.13" } + spec.source = { :git => "https://github.com/speedchecker/speedchecker-sdk-ios.git", :tag => "2.0.2" } spec.vendored_frameworks = "Framework/DataCompression.xcframework", "Framework/Socket.xcframework", "Framework/SpeedcheckerReportSDK.xcframework", "Framework/SpeedcheckerSDK.xcframework", "Framework/XMLParsing.xcframework"