Merge remote-tracking branch 'origin/master' into release

Author: dynabic-billing-team

.gitattributes

@@ -0,0 +1,18 @@
+# default behavior
+* text=auto
+
+# code files
+*.swift text eol=lf
+
+# test files
+*.xml text eol=lf
+*.json text eol=lf
+
+# scripts
+*.bat text eol=crlf
+*.ps1 text eol=crlf
+*.sh text eol=lf
+
+
+
+

Jenkinsfile

@@ -1,7 +1,15 @@
-parameters {
-        string(name: 'branch', defaultValue: 'master', description: 'branch to test')		
-		string(name: 'apiUrl', defaultValue: 'https://api-qa.aspose.cloud', description: 'server url')		
-}
+properties([
+	gitLabConnection('gitlab'),
+	[$class: 'ParametersDefinitionProperty', 
+		parameterDefinitions: [
+			[$class: 'StringParameterDefinition', name: 'branch', defaultValue: 'master', description: 'the branch to build'],
+			[$class: 'StringParameterDefinition', name: 'apiUrl', defaultValue: 'https://api-qa.aspose.cloud', description: 'api url'],
+            [$class: 'BooleanParameterDefinition', name: 'ignoreCiSkip', defaultValue: false, description: 'ignore CI Skip'],
+		]
+	]
+])
+
+def needToBuild = false
 
 node('words-linux') {
 	cleanWs()
@@ -10,30 +18,41 @@ node('words-linux') {
             try {
                 stage('checkout'){
                     checkout([$class: 'GitSCM', branches: [[name: params.branch]], doGenerateSubmoduleConfigurations: false, extensions: [[$class: 'LocalBranch', localBranch: "**"]], submoduleCfg: [], userRemoteConfigs: [[credentialsId: '361885ba-9425-4230-950e-0af201d90547', url: 'https://git.auckland.dynabic.com/words-cloud/words-cloud-sdk-swift.git']]])
-                    withCredentials([usernamePassword(credentialsId: '6839cbe8-39fa-40c0-86ce-90706f0bae5d', passwordVariable: 'AppKey', usernameVariable: 'AppSid')]) {
-                        sh 'mkdir -p Settings'
-                        sh 'echo "{\\"AppSid\\": \\"$AppSid\\",\\"AppKey\\": \\"$AppKey\\", \\"BaseUrl\\": \\"$apiUrl\\"}" > Settings/servercreds.json'
+                    
+                    sh 'git show -s HEAD > gitMessage'
+                    def commitMessage = readFile('gitMessage').trim()
+                    echo commitMessage
+                    needToBuild = params.ignoreCiSkip || !commitMessage.contains('[ci skip]')               
+                    sh 'git clean -fdx'
+                    
+                    if (needToBuild) {
+                        withCredentials([usernamePassword(credentialsId: '6839cbe8-39fa-40c0-86ce-90706f0bae5d', passwordVariable: 'AppKey', usernameVariable: 'AppSid')]) {
+                            sh 'mkdir -p Settings'
+                            sh 'echo "{\\"AppSid\\": \\"$AppSid\\",\\"AppKey\\": \\"$AppKey\\", \\"BaseUrl\\": \\"$apiUrl\\"}" > Settings/servercreds.json'
+                        }
                     }
                 }
 
-                docker.image('swift:5.0').inside{
-                    stage('build'){
-                        sh "swift build"
-                    }
-                
-                    stage('tests'){
-                        try{
-                            sh "chmod +x ./Scripts/runTests.sh"
-                            sh "./Scripts/runTests.sh"
-                        } finally{
-                            junit 'tests.xml'
+                if (needToBuild) {
+                    docker.image('swift:5.0').inside{
+                        stage('build'){
+                            sh "swift build"
                         }
-                    }
 
-                    stage('clean-compiled'){
-                        sh "rm -rf %s"
-                    }
-                }        
+                        stage('tests'){
+                            try{
+                                sh "chmod +x ./Scripts/runTests.sh"
+                                sh "./Scripts/runTests.sh"
+                            } finally{
+                                junit 'tests.xml'
+                            }
+                        }
+                        
+                        stage('clean-compiled'){
+                            sh "rm -rf %s"
+                        }
+                    } 
+                }
             } finally {
                 deleteDir()
             }

README.md

@@ -1,8 +1,8 @@
 # Aspose.Words Cloud SDK for Swift
 This repository contains Aspose.Words Cloud SDK for Swift source code. This SDK allows you to work with Aspose.Words Cloud REST APIs in your Swift applications quickly and easily, with zero initial cost.
 
-[Aspose.Words Cloud](https://products.aspose.cloud/words/family "Aspose.Words Cloud")  
-[API Reference](https://apireference.aspose.cloud/words/)  
+[Aspose.Words Cloud](https://products.aspose.cloud/words/family "Aspose.Words for Cloud")
+[API Reference](https://apireference.aspose.cloud/words/)
 
 ## Key Features
 * Conversion between various document-related formats (20+ formats supported), including PDF<->Word conversion
@@ -26,7 +26,7 @@ Add link to this repository as dependency to your Package.swift:
 
 dependencies: [
     // Dependencies declare other packages that this package depends on.
-    .package(url: "https://github.com/aspose-words-cloud/aspose-words-cloud-swift", from: "20.6"),
+    .package(url: "https://github.com/aspose-words-cloud/aspose-words-cloud-swift", from: "20.7"),
 ],
 targets: [
     // Targets are the basic building blocks of a package. A target can define a module or a test suite.
@@ -61,21 +61,21 @@ Please put your credentials into "Settings/servercreds.json" for run tests.
 - referenced packages (see [here](Package.swift) for more details)
 
 ## Licensing
- 
+
 All Aspose.Words Cloud SDKs, helper scripts and templates are licensed under [MIT License](https://github.com/aspose-words-cloud/aspose-words-cloud-swift/blob/master/LICENSE). 
 
 ## Contact Us
 Your feedback is very important to us. Please feel free to contact us using our [Support Forums](https://forum.aspose.cloud/c/words).
 
 ## Resources
- 
+
 [Website](https://www.aspose.cloud/)  
 [Product Home](https://products.aspose.cloud/words/family)  
 [API Reference](https://apireference.aspose.cloud/words/)  
 [Documentation](https://docs.aspose.cloud/display/wordscloud/Home)  
 [Blog](https://blog.aspose.cloud/category/words/)  
- 
+
 ## Other languages
 We generate our SDKs in different languages so you may check if yours is available in our [list](https://github.com/aspose-words-cloud).
- 
+
 If you don't find your language in the list, feel free to request it from us, or use raw REST API requests as you can find it [here](https://products.aspose.cloud/words/curl).

Sources/AsposeWordsCloud/Api/ApiInvoker.swift

@@ -10,10 +10,10 @@
  *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  *  copies of the Software, and to permit persons to whom the Software is
  *  furnished to do so, subject to the following conditions:
- *
+ * 
  *  The above copyright notice and this permission notice shall be included in all
  *  copies or substantial portions of the Software.
- *
+ * 
  *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -31,45 +31,45 @@ import Foundation
 public class ApiInvoker {
     // An object containing the configuration for executing API requests 
     private let configuration : Configuration;
-    
+
     // Cached value of oauth2 authorization tokeт. 
     // It is filled after the first call to the API. 
     // Mutex is used to synchronize updates in a multi-threaded environment.
     private let mutex : NSLock;
     private var accessTokenCache : String?;
-    
+
     // Maximum size of printing body content in debug mode
     private let maxDebugPrintingContentSize = 1024 * 1024; // 1Mb
-    
+
     // Status codes for HTTP request
     private let httpStatusCodeOK = 200;
     private let httpStatusCodeBadRequest = 400;
     private let httpStatusCodeUnauthorized = 401;
     private let httpStatusCodeTimeout = 408;
-    
+
     // Initialize ApiInvoker object with specific configuration
     public init(configuration : Configuration) {
         self.configuration = configuration;
         self.mutex = NSLock();
         self.accessTokenCache = nil;
     }
-    
+
     // Internal class for represent API response
     private class InvokeResponse {
         public var data : Data?;
         public var errorCode : Int;
         public var errorMessage : String?;
-        
+
         public init(errorCode : Int) {
             self.errorCode = errorCode;
         }
     }
-    
+
     // Internal struct for represent oauth2 authorization response
     private struct AccessTokenResult : Decodable {
         public var access_token : String?;
     }
-    
+
     // Invoke request to the API with the specified set of arguments and execute callback after the request is completed
     public func invoke(
         url: URL,
@@ -90,7 +90,7 @@ public class ApiInvoker {
                 request.setValue(value, forHTTPHeaderField: key);
             }
         }
-        
+
         // Process the request body
         if (body != nil) {
             request.httpBody = body;
@@ -110,7 +110,7 @@ public class ApiInvoker {
                         formBody.append("\r\n".data(using: .utf8)!);
                     }
                     needsClrf = true;
-                
+
                     formBody.append("--\(boundaryPrefix)\r\nContent-Disposition: form-data; name=\"\(formParam.getName())\"\r\n\r\n".data(using: .utf8)!);
                     formBody.append(formParam.getBody());
                 }
@@ -120,12 +120,12 @@ public class ApiInvoker {
                 request.setValue("multipart/form-data; boundary=\(boundaryPrefix)", forHTTPHeaderField: "Content-Type");
             }
         }
-        
+
         // Set content length header
         if (request.httpBody != nil) {
             request.setValue(String(request.httpBody!.count), forHTTPHeaderField: "Content-Length");
         }
-        
+
         // Request or get from cache authorization token
         invokeAuthToken(forceTokenRequest: false, callback: { accessToken, statusCode in
             if (statusCode == self.httpStatusCodeOK) {
@@ -165,18 +165,18 @@ public class ApiInvoker {
             }
         });
     }
-    
+
     // Invokes prepared request to the API. Callback returns a response from the API call
     private func invokeRequest(urlRequest : inout URLRequest, accessToken : String?, callback : @escaping (_ response: InvokeResponse) -> ()) {
         // Set access token to request headers
         if (accessToken != nil) {
             urlRequest.setValue(accessToken!, forHTTPHeaderField: "Authorization");
         }
-        
+
         // Set statistic headers
         urlRequest.setValue(self.configuration.getSdkName(), forHTTPHeaderField: "x-aspose-client");
         urlRequest.setValue(self.configuration.getSdkVersion(), forHTTPHeaderField: "x-aspose-client-version");
-        
+
         // Print request when debug mode is enabled
         if (configuration.isDebugMode()) {
             print("REQUEST BEGIN");
@@ -217,7 +217,7 @@ public class ApiInvoker {
             else {
                 invokeResponse.errorCode = self.httpStatusCodeBadRequest;
             }
-            
+
             // Print response when debug mode is enabled
             if (self.configuration.isDebugMode()) {
                 print("RESPONSE BEGIN");
@@ -242,12 +242,12 @@ public class ApiInvoker {
                 }
                 print("RESPONSE END");
             }
-            
+
             callback(invokeResponse);
         });
         result.resume();
     }
-    
+
     // Requests authorization token from server. After the first call, the token is cached and the cached value is used for future calls.
     private func invokeAuthToken(forceTokenRequest: Bool, callback : @escaping (_ accessToken: String?, _ statusCode: Int) -> ()) {
         var accessToken : String? = nil;
@@ -258,7 +258,7 @@ public class ApiInvoker {
             }
             mutex.unlock();
         }
-        
+
         if (accessToken == nil) {
             let urlPath = URL(string: self.configuration.getBaseUrl())!.appendingPathComponent("connect/token");
             var request = URLRequest(url: urlPath);