Skip to content

Commit

Permalink
fixes for Swift 3
Browse files Browse the repository at this point in the history
  • Loading branch information
Prioregroup.com committed Sep 19, 2016
1 parent b3b53d0 commit 08e5e34
Show file tree
Hide file tree
Showing 26 changed files with 59 additions and 478 deletions.
6 changes: 5 additions & 1 deletion CHANGELOG.txt
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
1.29, Sep 19, 2016
- fix properties declarations for Swift 3.
- various optimizations.

1.28, Aug 11, 2016
- header property now support NSString and NSDictionary types.
- optimizations for NSDate objects.
- fix bitcode for AppleTv.
- fixes bitcode for AppleTv.

1.27, Apr 7, 2016
- added a new property named soapNamespace to able to setting the default name of namespace for the tag Envelope.
Expand Down
2 changes: 1 addition & 1 deletion SOAPEngine.podspec
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = 'SOAPEngine'
s.version = '1.28'
s.version = '1.29'
s.summary = 'This generic SOAP client allows you to access web services using a your iOS and Mac OS X app.'
s.license = { :type => 'Shareware', :file => 'LICENSE.txt' }
s.authors = { 'Danilo Priore' => '[email protected]' }
Expand Down
29 changes: 15 additions & 14 deletions SOAPEngine64.framework/Headers/SOAPEngine.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,19 @@
// SOAPEngine.h
//
// Created by Danilo Priore on 21/11/12.
// Copyright (c) 2012-2015 Centro Studi Informatica di Danilo Priore. All rights reserved.
// Copyright (c) 2012-2016 Centro Studi Informatica di Danilo Priore. All rights reserved.
//
// http://www.prioregroup.com
// https://github.com/priore
// https://twitter.com/DaniloPriore
//
// email support: [email protected]
//
// Version : 1.27
// Version : 1.29
// Changelog : https://github.com/priore/SOAPEngine/blob/master/CHANGELOG.txt
// Updates : https://github.com/priore/SOAPEngine
//
#define SOAPEngineFrameworkVersion @"1.27" DEPRECATED_ATTRIBUTE
#define SOAPEngineFrameworkVersion @"1.29" DEPRECATED_MSG_ATTRIBUTE("SOAPEngineFrameworkVersion as deprecated please use SOAPEngine64VersionString")

#import <Foundation/Foundation.h>

Expand Down Expand Up @@ -50,10 +50,10 @@ FOUNDATION_EXPORT const NSString *SOAPEngineErrorKey; // errors
FOUNDATION_EXPORT const NSString *SOAPEngineDataSizeKey; // send/receive data size
FOUNDATION_EXPORT const NSString *SOAPEngineTotalDataSizeKey; // send/receive total data size

typedef void(^SOAPEngineCompleteBlock)(NSInteger statusCode, NSString *stringXML) DEPRECATED_ATTRIBUTE;
typedef void(^SOAPEngineCompleteBlock)(NSInteger statusCode, NSString *stringXML) DEPRECATED_MSG_ATTRIBUTE("SOAPEngineCompleteBlock as deprecated please use SOAPEngineCompleteBlockWithDictionary");
typedef void(^SOAPEngineCompleteBlockWithDictionary)(NSInteger statusCode, NSDictionary *dict);
typedef void(^SOAPEngineFailBlock)(NSError *error);
typedef void(^SOAPEngineReceiveDataSizeBlock)(NSUInteger current, NSUInteger total);
typedef void(^SOAPEngineReceiveDataSizeBlock)(NSUInteger current, long long total);
typedef void(^SOAPEngineSendDataSizeBlock)(NSUInteger current, NSUInteger total);
typedef void(^SOAPEngineReceivedProgressBlock)(NSProgress *progress);
typedef void(^SOAPEngineSendedProgressBlock)(NSProgress *progress);
Expand Down Expand Up @@ -90,7 +90,8 @@ typedef NS_ENUM(NSInteger, SOAPEnryption)
@interface SOAPEngine : NSObject

// return the current request URL
@property (nonatomic, strong, readonly) NSURL *requestURL;
@property (nonatomic, strong, readonly, getter=currentRequestURL) NSURL *requestURL DEPRECATED_MSG_ATTRIBUTE("requestURL property as deprecated please use currentRequestURL");
@property (nonatomic, strong, readonly) NSURL *currentRequestURL;

// return the current SOAP Action
@property (nonatomic, strong, readonly) NSString *soapAction;
Expand Down Expand Up @@ -263,28 +264,28 @@ typedef NS_ENUM(NSInteger, SOAPEnryption)
- (void)requestURL:(id)asmxURL
soapAction:(NSString *)soapAction
complete:(SOAPEngineCompleteBlock)complete
failWithError:(SOAPEngineFailBlock)fail DEPRECATED_ATTRIBUTE;
failWithError:(SOAPEngineFailBlock)fail DEPRECATED_MSG_ATTRIBUTE("requestURL:soapAction:complete:failWithError: as deprecated please use requestURL:soapAction:completeWithDictionary:failWithError:");

- (void)requestURL:(id)asmxURL
soapAction:(NSString *)soapAction
value:(id)value
complete:(SOAPEngineCompleteBlock)complete
failWithError:(SOAPEngineFailBlock)fail DEPRECATED_ATTRIBUTE;
failWithError:(SOAPEngineFailBlock)fail DEPRECATED_MSG_ATTRIBUTE("requestURL:soapAction:value:complete:failWithError: as deprecated please use requestURL:soapAction:value:completeWithDictionary:failWithError:");

- (void)requestURL:(id)asmxURL
soapAction:(NSString *)soapAction
value:(id)value
forKey:(NSString*)key
complete:(SOAPEngineCompleteBlock)complete
failWithError:(SOAPEngineFailBlock)fail DEPRECATED_ATTRIBUTE;
failWithError:(SOAPEngineFailBlock)fail DEPRECATED_MSG_ATTRIBUTE("requestURL:soapAction:value:forKey:complete:failWithError: as deprecated please use requestURL:soapAction:value:forKey:completeWithDictionary:failWithError:");

- (void)requestURL:(id)asmxURL
soapAction:(NSString *)soapAction
value:(id)value
forKey:(NSString*)key
complete:(SOAPEngineCompleteBlock)complete
failWithError:(SOAPEngineFailBlock)fail
receivedDataSize:(SOAPEngineReceiveDataSizeBlock)receive DEPRECATED_ATTRIBUTE;
receivedDataSize:(SOAPEngineReceiveDataSizeBlock)receive DEPRECATED_MSG_ATTRIBUTE("requestURL:soapAction:value:forKey:complete:failWithError:receivedDataSize: as deprecated please use requestURL:soapAction:value:forKey:completeWithDictionary:failWithError:receivedDataSize:");

- (void)requestURL:(id)asmxURL
soapAction:(NSString *)soapAction
Expand All @@ -293,7 +294,7 @@ typedef NS_ENUM(NSInteger, SOAPEnryption)
complete:(SOAPEngineCompleteBlock)complete
failWithError:(SOAPEngineFailBlock)fail
receivedDataSize:(SOAPEngineReceiveDataSizeBlock)receive
sendedDataSize:(SOAPEngineSendDataSizeBlock)sended DEPRECATED_ATTRIBUTE;
sendedDataSize:(SOAPEngineSendDataSizeBlock)sended DEPRECATED_MSG_ATTRIBUTE("requestURL:soapAction:value:forKey:complete:failWithError:receivedDataSize:sendedDataSize: as deprecated please use requestURL:soapAction:value:forKey:completeWithDictionary:failWithError:receivedDataSize:sendedDataSize:");

// webservice request with block and dictionary
- (void)requestURL:(id)asmxURL
Expand Down Expand Up @@ -393,13 +394,13 @@ authorization:(SOAPAuthorization)authorization;

@optional

- (void)soapEngine:(SOAPEngine*)soapEngine didFinishLoading:(NSString*)stringXML DEPRECATED_ATTRIBUTE;
- (void)soapEngine:(SOAPEngine*)soapEngine didFinishLoading:(NSString*)stringXML DEPRECATED_MSG_ATTRIBUTE("soapEngine:didFinishLoading: as deprecated please use soapEngine:didFinishLoading:dictionary:");
- (void)soapEngine:(SOAPEngine*)soapEngine didFinishLoading:(NSString*)stringXML dictionary:(NSDictionary*)dict;
- (void)soapEngine:(SOAPEngine*)soapEngine didFailWithError:(NSError*)error;
- (void)soapEngine:(SOAPEngine*)soapEngine didReceiveDataSize:(NSUInteger)current total:(NSUInteger)total;
- (void)soapEngine:(SOAPEngine*)soapEngine didReceiveDataSize:(NSUInteger)current total:(long long)total;
- (void)soapEngine:(SOAPEngine*)soapEngine didSendDataSize:(NSUInteger)current total:(NSUInteger)total;
- (BOOL)soapEngine:(SOAPEngine*)soapEngine didReceiveResponseCode:(NSInteger)statusCode;
- (NSMutableURLRequest*)soapEngine:(SOAPEngine*)soapEngine didBeforeSendingURLRequest:(NSMutableURLRequest*)request;
- (NSString*)soapEngine:(SOAPEngine*)soapEngine didBeforeParsingResponseString:(NSString*)stringXML;

@end
@end
Binary file modified SOAPEngine64.framework/Info.plist
View file
Binary file not shown.
Binary file modified SOAPEngine64.framework/SOAPEngine64
View file
Binary file not shown.
Binary file removed SOAPEngine64.framework/_CodeSignature/CodeDirectory
View file
Binary file not shown.
Binary file removed SOAPEngine64.framework/_CodeSignature/CodeRequirements
View file
Binary file not shown.
Binary file removed SOAPEngine64.framework/_CodeSignature/CodeRequirements-1
View file
Binary file not shown.
141 changes: 0 additions & 141 deletions SOAPEngine64.framework/_CodeSignature/CodeResources
View file

This file was deleted.

Binary file removed SOAPEngine64.framework/_CodeSignature/CodeSignature
View file
Binary file not shown.
29 changes: 15 additions & 14 deletions SOAPEngineOSX.framework/Versions/A/Headers/SOAPEngine.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,19 @@
// SOAPEngine.h
//
// Created by Danilo Priore on 21/11/12.
// Copyright (c) 2012-2015 Centro Studi Informatica di Danilo Priore. All rights reserved.
// Copyright (c) 2012-2016 Centro Studi Informatica di Danilo Priore. All rights reserved.
//
// http://www.prioregroup.com
// https://github.com/priore
// https://twitter.com/DaniloPriore
//
// email support: [email protected]
//
// Version : 1.27
// Version : 1.29
// Changelog : https://github.com/priore/SOAPEngine/blob/master/CHANGELOG.txt
// Updates : https://github.com/priore/SOAPEngine
//
#define SOAPEngineFrameworkVersion @"1.27" DEPRECATED_ATTRIBUTE
#define SOAPEngineFrameworkVersion @"1.29" DEPRECATED_MSG_ATTRIBUTE("SOAPEngineFrameworkVersion as deprecated please use SOAPEngine64VersionString")

#import <Foundation/Foundation.h>

Expand Down Expand Up @@ -50,10 +50,10 @@ FOUNDATION_EXPORT const NSString *SOAPEngineErrorKey; // errors
FOUNDATION_EXPORT const NSString *SOAPEngineDataSizeKey; // send/receive data size
FOUNDATION_EXPORT const NSString *SOAPEngineTotalDataSizeKey; // send/receive total data size

typedef void(^SOAPEngineCompleteBlock)(NSInteger statusCode, NSString *stringXML) DEPRECATED_ATTRIBUTE;
typedef void(^SOAPEngineCompleteBlock)(NSInteger statusCode, NSString *stringXML) DEPRECATED_MSG_ATTRIBUTE("SOAPEngineCompleteBlock as deprecated please use SOAPEngineCompleteBlockWithDictionary");
typedef void(^SOAPEngineCompleteBlockWithDictionary)(NSInteger statusCode, NSDictionary *dict);
typedef void(^SOAPEngineFailBlock)(NSError *error);
typedef void(^SOAPEngineReceiveDataSizeBlock)(NSUInteger current, NSUInteger total);
typedef void(^SOAPEngineReceiveDataSizeBlock)(NSUInteger current, long long total);
typedef void(^SOAPEngineSendDataSizeBlock)(NSUInteger current, NSUInteger total);
typedef void(^SOAPEngineReceivedProgressBlock)(NSProgress *progress);
typedef void(^SOAPEngineSendedProgressBlock)(NSProgress *progress);
Expand Down Expand Up @@ -90,7 +90,8 @@ typedef NS_ENUM(NSInteger, SOAPEnryption)
@interface SOAPEngine : NSObject

// return the current request URL
@property (nonatomic, strong, readonly) NSURL *requestURL;
@property (nonatomic, strong, readonly, getter=currentRequestURL) NSURL *requestURL DEPRECATED_MSG_ATTRIBUTE("requestURL property as deprecated please use currentRequestURL");
@property (nonatomic, strong, readonly) NSURL *currentRequestURL;

// return the current SOAP Action
@property (nonatomic, strong, readonly) NSString *soapAction;
Expand Down Expand Up @@ -263,28 +264,28 @@ typedef NS_ENUM(NSInteger, SOAPEnryption)
- (void)requestURL:(id)asmxURL
soapAction:(NSString *)soapAction
complete:(SOAPEngineCompleteBlock)complete
failWithError:(SOAPEngineFailBlock)fail DEPRECATED_ATTRIBUTE;
failWithError:(SOAPEngineFailBlock)fail DEPRECATED_MSG_ATTRIBUTE("requestURL:soapAction:complete:failWithError: as deprecated please use requestURL:soapAction:completeWithDictionary:failWithError:");

- (void)requestURL:(id)asmxURL
soapAction:(NSString *)soapAction
value:(id)value
complete:(SOAPEngineCompleteBlock)complete
failWithError:(SOAPEngineFailBlock)fail DEPRECATED_ATTRIBUTE;
failWithError:(SOAPEngineFailBlock)fail DEPRECATED_MSG_ATTRIBUTE("requestURL:soapAction:value:complete:failWithError: as deprecated please use requestURL:soapAction:value:completeWithDictionary:failWithError:");

- (void)requestURL:(id)asmxURL
soapAction:(NSString *)soapAction
value:(id)value
forKey:(NSString*)key
complete:(SOAPEngineCompleteBlock)complete
failWithError:(SOAPEngineFailBlock)fail DEPRECATED_ATTRIBUTE;
failWithError:(SOAPEngineFailBlock)fail DEPRECATED_MSG_ATTRIBUTE("requestURL:soapAction:value:forKey:complete:failWithError: as deprecated please use requestURL:soapAction:value:forKey:completeWithDictionary:failWithError:");

- (void)requestURL:(id)asmxURL
soapAction:(NSString *)soapAction
value:(id)value
forKey:(NSString*)key
complete:(SOAPEngineCompleteBlock)complete
failWithError:(SOAPEngineFailBlock)fail
receivedDataSize:(SOAPEngineReceiveDataSizeBlock)receive DEPRECATED_ATTRIBUTE;
receivedDataSize:(SOAPEngineReceiveDataSizeBlock)receive DEPRECATED_MSG_ATTRIBUTE("requestURL:soapAction:value:forKey:complete:failWithError:receivedDataSize: as deprecated please use requestURL:soapAction:value:forKey:completeWithDictionary:failWithError:receivedDataSize:");

- (void)requestURL:(id)asmxURL
soapAction:(NSString *)soapAction
Expand All @@ -293,7 +294,7 @@ typedef NS_ENUM(NSInteger, SOAPEnryption)
complete:(SOAPEngineCompleteBlock)complete
failWithError:(SOAPEngineFailBlock)fail
receivedDataSize:(SOAPEngineReceiveDataSizeBlock)receive
sendedDataSize:(SOAPEngineSendDataSizeBlock)sended DEPRECATED_ATTRIBUTE;
sendedDataSize:(SOAPEngineSendDataSizeBlock)sended DEPRECATED_MSG_ATTRIBUTE("requestURL:soapAction:value:forKey:complete:failWithError:receivedDataSize:sendedDataSize: as deprecated please use requestURL:soapAction:value:forKey:completeWithDictionary:failWithError:receivedDataSize:sendedDataSize:");

// webservice request with block and dictionary
- (void)requestURL:(id)asmxURL
Expand Down Expand Up @@ -393,13 +394,13 @@ authorization:(SOAPAuthorization)authorization;

@optional

- (void)soapEngine:(SOAPEngine*)soapEngine didFinishLoading:(NSString*)stringXML DEPRECATED_ATTRIBUTE;
- (void)soapEngine:(SOAPEngine*)soapEngine didFinishLoading:(NSString*)stringXML DEPRECATED_MSG_ATTRIBUTE("soapEngine:didFinishLoading: as deprecated please use soapEngine:didFinishLoading:dictionary:");
- (void)soapEngine:(SOAPEngine*)soapEngine didFinishLoading:(NSString*)stringXML dictionary:(NSDictionary*)dict;
- (void)soapEngine:(SOAPEngine*)soapEngine didFailWithError:(NSError*)error;
- (void)soapEngine:(SOAPEngine*)soapEngine didReceiveDataSize:(NSUInteger)current total:(NSUInteger)total;
- (void)soapEngine:(SOAPEngine*)soapEngine didReceiveDataSize:(NSUInteger)current total:(long long)total;
- (void)soapEngine:(SOAPEngine*)soapEngine didSendDataSize:(NSUInteger)current total:(NSUInteger)total;
- (BOOL)soapEngine:(SOAPEngine*)soapEngine didReceiveResponseCode:(NSInteger)statusCode;
- (NSMutableURLRequest*)soapEngine:(SOAPEngine*)soapEngine didBeforeSendingURLRequest:(NSMutableURLRequest*)request;
- (NSString*)soapEngine:(SOAPEngine*)soapEngine didBeforeParsingResponseString:(NSString*)stringXML;

@end
@end
Loading

0 comments on commit 08e5e34

Please sign in to comment.