Skip to content

Commit 859350a

Browse files
Merge remote-tracking branch 'origin/master' into release
2 parents 9aa06ea + 4b809d3 commit 859350a

File tree

297 files changed

+3428
-949
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

297 files changed

+3428
-949
lines changed

AsposeWordsCloud.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = 'AsposeWordsCloud'
3-
s.version = '22.4'
3+
s.version = '22.5'
44
s.summary = 'Aspose Words for Cloud.'
55
s.homepage = 'https://github.com/aspose-words-cloud/aspose-words-cloud-swift.git'
66
s.license = { :type => 'MIT', :file => 'LICENSE' }

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ Add link to this repository as dependency to your Package.swift:
204204

205205
dependencies: [
206206
// Dependencies declare other packages that this package depends on.
207-
.package(url: "https://github.com/aspose-words-cloud/aspose-words-cloud-swift", from: "22.4"),
207+
.package(url: "https://github.com/aspose-words-cloud/aspose-words-cloud-swift", from: "22.5"),
208208
],
209209
targets: [
210210
// Targets are the basic building blocks of a package. A target can define a module or a test suite.
@@ -222,7 +222,7 @@ targets: [
222222
Add link to git repository as dependency to your Podfile:
223223

224224
```ruby
225-
pod 'AsposeWordsCloud', :git => 'https://github.com/aspose-words-cloud/aspose-words-cloud-swift.git', :tag => '22.4'
225+
pod 'AsposeWordsCloud', :git => 'https://github.com/aspose-words-cloud/aspose-words-cloud-swift.git', :tag => '22.5'
226226
```
227227

228228
## Getting Started

Sources/AsposeWordsCloud/Api/ApiInvoker.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public class ApiInvoker {
6666
self.configuration = configuration;
6767
self.mutex = NSLock();
6868
self.accessTokenCache = nil;
69-
this.encryptor = encryptor;
69+
self.encryptor = encryptor;
7070
}
7171
#endif
7272

@@ -274,7 +274,7 @@ public class ApiInvoker {
274274
}
275275
}
276276

277-
private func lengthField(of valueField: [UInt8]) -> [UInt8] {
277+
public func lengthField(of valueField: [UInt8]) -> [UInt8] {
278278
var count = valueField.count;
279279

280280
if (count < 128) {
@@ -306,8 +306,8 @@ public class ApiInvoker {
306306
#if os(Linux)
307307
// Encryption of passwords in query params not supported on linux
308308
#else
309-
public func encryptString(data : String) throws -> String {
310-
return encryptor.encrypt(data);
309+
public func encryptString(value : String) throws -> String {
310+
return try encryptor.encrypt(data: value);
311311
}
312312
#endif
313313
}

Sources/AsposeWordsCloud/Api/Configuration.swift

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,10 @@ public class Configuration : Codable {
4949
// Encryption of passwords in query params not supported on linux
5050
#else
5151
// Specify RSA exponent
52-
private var rsaExponent: String;
52+
private var rsaExponent: String?;
5353

5454
// Specify RSA modulus
55-
private var rsaModulus: String;
55+
private var rsaModulus: String?;
5656
#endif
5757

5858

@@ -81,7 +81,7 @@ public class Configuration : Codable {
8181
self.timeout = timeout;
8282
}
8383
#else
84-
public init(clientId: String, clientSecret: String, baseUrl: String = "https://api.aspose.cloud", debugMode: Bool = false, timeout: TimeInterval = 300, rsaExponent: String = nil, rsaModulus: String = nil) {
84+
public init(clientId: String, clientSecret: String, baseUrl: String = "https://api.aspose.cloud", debugMode: Bool = false, timeout: TimeInterval = 300, rsaExponent: String? = nil, rsaModulus: String? = nil) {
8585
self.clientId = clientId;
8686
self.clientSecret = clientSecret;
8787
self.baseUrl = baseUrl;
@@ -156,12 +156,12 @@ public class Configuration : Codable {
156156
#if os(Linux)
157157
#else
158158
// Returns RSA exponent
159-
public func getRsaExponent() -> String {
159+
public func getRsaExponent() -> String? {
160160
return self.rsaExponent;
161161
}
162162

163163
// Returns RSA modulus
164-
public func getRsaModulus() -> String {
164+
public func getRsaModulus() -> String? {
165165
return self.rsaModulus;
166166
}
167167
#endif
@@ -188,6 +188,6 @@ public class Configuration : Codable {
188188

189189
// Returns SDK version for using in statistics headers
190190
public func getSdkVersion() -> String {
191-
return "22.4";
191+
return "22.5";
192192
}
193193
}

0 commit comments

Comments
 (0)