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

Author: dynabic-billing-team

AsposeWordsCloud.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'AsposeWordsCloud'
-  s.version          = '22.1'
+  s.version          = '22.2'
   s.summary          = 'Aspose Words for Cloud.'
   s.homepage         = 'https://github.com/aspose-words-cloud/aspose-words-cloud-swift.git'
   s.license          = { :type => 'MIT', :file => 'LICENSE' }

Jenkinsfile

@@ -6,11 +6,13 @@ properties([
 			[$class: 'StringParameterDefinition', name: 'apiUrl', defaultValue: 'https://api-qa.aspose.cloud', description: 'api url'],
             [$class: 'BooleanParameterDefinition', name: 'ignoreCiSkip', defaultValue: false, description: 'ignore CI Skip'],
             [$class: 'StringParameterDefinition', name: 'credentialsId', defaultValue: '6839cbe8-39fa-40c0-86ce-90706f0bae5d', description: 'credentials id'],
+            [$class: 'BooleanParameterDefinition', name: 'packageTesting', defaultValue: false, description: 'Testing package from repository without local sources. Used for prodhealthcheck'],
 		]
 	]
 ])
 
 def needToBuild = false
+def packageTesting = false
 
 node('words-linux') {
 	cleanWs()
@@ -22,7 +24,8 @@ node('words-linux') {
                 sh 'git show -s HEAD > gitMessage'
                 def commitMessage = readFile('gitMessage').trim()
                 echo commitMessage
-                needToBuild = params.ignoreCiSkip || !commitMessage.contains('[ci skip]')               
+                needToBuild = params.ignoreCiSkip || !commitMessage.contains('[ci skip]')
+                packageTesting = params.packageTesting
                 sh 'git clean -fdx'
 
                 if (needToBuild) {
@@ -33,7 +36,32 @@ node('words-linux') {
                 }
             }
 
-            if (needToBuild) {
+            if (packageTesting) {
+                docker.image('swift:5.0').inside{
+                    stage('build'){
+                        sh "rm -rf ./Sources/AsposeWordsCloud"
+                        sh "mkdir ./Sources/AsposeWordsCloudHealthProdCheck"
+                        sh "cp ./Scripts/AsposeWordsCloudHealthProdCheck.swift ./Sources/AsposeWordsCloudHealthProdCheck/AsposeWordsCloudHealthProdCheck.swift"
+                        sh "cp ./PackageHealthProdCheck.swift ./Package.swift"
+                        sh "mv ./Tests/AsposeWordsCloudTests ./Tests/AsposeWordsCloudHealthProdCheckTests"
+                        sh "cp ./Scripts/AsposeWordsCloudHealthProdCheckLinuxMain.swift ./Tests/LinuxMain.swift"
+                        sh "swift build"
+                    }
+                
+                    stage('tests'){
+                        try{
+                            sh "swift test --enable-code-coverage"
+                        } finally{
+                            junit 'tests.xml'
+                        }
+                    }
+                    
+                    stage('clean-compiled'){
+                        sh "rm -rf %s"
+                    }
+                }
+            }
+            else if (needToBuild) {
                 docker.image('swift:5.0').inside{
                     stage('build'){
                         sh "swift build"

PackageHealthProdCheck.swift

@@ -0,0 +1,29 @@
+// swift-tools-version:4.2
+// The swift-tools-version declares the minimum version of Swift required to build this package.
+
+import PackageDescription
+
+let package = Package(
+    name: "AsposeWordsCloudHealthProdCheck",
+    products: [
+        // Products define the executables and libraries produced by a package, and make them visible to other packages.
+        .library(
+            name: "AsposeWordsCloudHealthProdCheck",
+            targets: ["AsposeWordsCloudHealthProdCheck"]),
+    ],
+    dependencies: [
+        // Dependencies declare other packages that this package depends on.
+        .package(url: "https://github.com/allegro/swift-junit.git", from: "1.0.0"),
+        .package(url: "https://github.com/aspose-words-cloud/aspose-words-cloud-swift.git", .branch("release"))
+    ],
+    targets: [
+        // Targets are the basic building blocks of a package. A target can define a module or a test suite.
+        // Targets can depend on other targets in this package, and on products in packages which this package depends on.
+        .target(
+            name: "AsposeWordsCloudHealthProdCheck",
+            dependencies: []),
+        .testTarget(
+            name: "AsposeWordsCloudHealthProdCheckTests",
+            dependencies: ["AsposeWordsCloud", "AsposeWordsCloudHealthProdCheck", "SwiftTestReporter"]),
+    ]
+)

README.md

@@ -13,6 +13,13 @@ This repository contains Aspose.Words Cloud SDK for Swift source code. This SDK
 * Watermarks and protection
 * Full read & write access to Document Object Model, including sections, paragraphs, text, images, tables, headers/footers and many others
 
+## Enhancements in Version 22.2
+
+- Made 'SaveOprionsData.SaveFormat' property readonly with default value.
+- Added subclasses for all formats of SaveOprionsData with specified SaveFormat.
+- 'SaveOptionsData', 'FixedPageSaveOptionsData', 'ImageSaveOptionsData', 'OoxmlSaveOptionsData', 'TxtSaveOptionsBaseData' classes now is abstract.
+
+
 ## Enhancements in Version 22.1
 
 - Added 'FieldOptions.FieldUpdateCultureName' to set Culture for fields
@@ -182,7 +189,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: "22.1"),
+    .package(url: "https://github.com/aspose-words-cloud/aspose-words-cloud-swift", from: "22.2"),
 ],
 targets: [
     // Targets are the basic building blocks of a package. A target can define a module or a test suite.
@@ -200,7 +207,7 @@ targets: [
 Add link to git repository as dependency to your Podfile:
 
 ```ruby
-pod 'AsposeWordsCloud', :git => 'https://github.com/aspose-words-cloud/aspose-words-cloud-swift.git', :tag => '22.1'
+pod 'AsposeWordsCloud', :git => 'https://github.com/aspose-words-cloud/aspose-words-cloud-swift.git', :tag => '22.2'
 ```
 
 ## Getting Started

Scripts/AsposeWordsCloudHealthProdCheck.swift

@@ -0,0 +1,8 @@
+import Foundation
+
+@available(macOS 10.12, iOS 10.3, watchOS 3.3, tvOS 12.0, *)
+public class AsposeWordsCloudHealthProdCheck {
+    public func getSomeValue() -> String {
+        return "Aspose.Words.Healthcheck";
+    }
+}

Scripts/AsposeWordsCloudHealthProdCheckLinuxMain.swift

@@ -0,0 +1,9 @@
+import XCTest
+import SwiftTestReporter
+import AsposeWordsCloudHealthProdCheckTests
+
+_ = TestObserver();
+
+var tests = [XCTestCaseEntry]()
+tests += AsposeWordsCloudHealthProdCheckTests.allTests()
+XCTMain(tests)

Sources/AsposeWordsCloud/Api/Configuration.swift

@@ -130,6 +130,6 @@ public class Configuration : Codable {
 
     // Returns SDK version for using in statistics headers
     public func getSdkVersion() -> String {
-        return "22.1";
+        return "22.2";
     }
 }

Sources/AsposeWordsCloud/Api/WordsAPI.swift

@@ -13863,7 +13863,7 @@ public class WordsAPI {
 
                             var result = [Any?]();
                             for partData in parts {
-                                var requestId = partData.getHeaders()["RequestId"];
+                                let requestId = partData.getHeaders()["RequestId"];
                                 if (requestId == nil || sortedRequests[requestId!] == nil) {
                                     throw WordsApiError.invalidMultipartResponse(message: "Failed to parse batch response.");
                                 }

Sources/AsposeWordsCloud/Model/ApiError.swift

@@ -31,19 +31,64 @@ import Foundation
 @available(macOS 10.12, iOS 10.3, watchOS 3.3, tvOS 12.0, *)
 public class ApiError : Codable, WordsApiModel {
     // Field of code. Api error.
-    public var code : String?;
+    private var _code : String? = nil;
+
+    public var code : String? {
+        get {
+            return self._code;
+        }
+        set {
+            self._code = newValue;
+        }
+    }
 
     // Field of dateTime. Api error.
-    public var dateTime : Date?;
+    private var _dateTime : Date? = nil;
+
+    public var dateTime : Date? {
+        get {
+            return self._dateTime;
+        }
+        set {
+            self._dateTime = newValue;
+        }
+    }
 
     // Field of description. Api error.
-    public var description : String?;
+    private var _description : String? = nil;
+
+    public var description : String? {
+        get {
+            return self._description;
+        }
+        set {
+            self._description = newValue;
+        }
+    }
 
     // Field of innerError. Api error.
-    public var innerError : ApiError?;
+    private var _innerError : ApiError? = nil;
+
+    public var innerError : ApiError? {
+        get {
+            return self._innerError;
+        }
+        set {
+            self._innerError = newValue;
+        }
+    }
 
     // Field of message. Api error.
-    public var message : String?;
+    private var _message : String? = nil;
+
+    public var message : String? {
+        get {
+            return self._message;
+        }
+        set {
+            self._message = newValue;
+        }
+    }
 
     private enum CodingKeys: String, CodingKey {
         case code = "Code";
@@ -101,6 +146,7 @@ public class ApiError : Codable, WordsApiModel {
         return self.code;
     }
 
+
     // Sets dateTime. Gets or sets the server DateTime.
     public func setDateTime(dateTime : Date?) -> ApiError {
         self.dateTime = dateTime;
@@ -112,6 +158,7 @@ public class ApiError : Codable, WordsApiModel {
         return self.dateTime;
     }
 
+
     // Sets description. Gets or sets the error description.
     public func setDescription(description : String?) -> ApiError {
         self.description = description;
@@ -123,6 +170,7 @@ public class ApiError : Codable, WordsApiModel {
         return self.description;
     }
 
+
     // Sets innerError. Gets or sets the inner error.
     public func setInnerError(innerError : ApiError?) -> ApiError {
         self.innerError = innerError;
@@ -134,6 +182,7 @@ public class ApiError : Codable, WordsApiModel {
         return self.innerError;
     }
 
+
     // Sets message. Gets or sets the error message.
     public func setMessage(message : String?) -> ApiError {
         self.message = message;

Sources/AsposeWordsCloud/Model/AvailableFontsResponse.swift

@@ -31,13 +31,40 @@ import Foundation
 @available(macOS 10.12, iOS 10.3, watchOS 3.3, tvOS 12.0, *)
 public class AvailableFontsResponse : WordsResponse {
     // Field of additionalFonts. The REST response with data on system, additional and custom fonts, available for document processing.
-    public var additionalFonts : [FontInfo]?;
+    private var _additionalFonts : [FontInfo]? = nil;
+
+    public var additionalFonts : [FontInfo]? {
+        get {
+            return self._additionalFonts;
+        }
+        set {
+            self._additionalFonts = newValue;
+        }
+    }
 
     // Field of customFonts. The REST response with data on system, additional and custom fonts, available for document processing.
-    public var customFonts : [FontInfo]?;
+    private var _customFonts : [FontInfo]? = nil;
+
+    public var customFonts : [FontInfo]? {
+        get {
+            return self._customFonts;
+        }
+        set {
+            self._customFonts = newValue;
+        }
+    }
 
     // Field of systemFonts. The REST response with data on system, additional and custom fonts, available for document processing.
-    public var systemFonts : [FontInfo]?;
+    private var _systemFonts : [FontInfo]? = nil;
+
+    public var systemFonts : [FontInfo]? {
+        get {
+            return self._systemFonts;
+        }
+        set {
+            self._systemFonts = newValue;
+        }
+    }
 
     private enum CodingKeys: String, CodingKey {
         case additionalFonts = "AdditionalFonts";
@@ -83,6 +110,7 @@ public class AvailableFontsResponse : WordsResponse {
         return self.additionalFonts;
     }
 
+
     // Sets customFonts. Gets or sets the list of custom user fonts from user cloud storage. To use them, you should specify "fontsLocation" parameter in any request.
     public func setCustomFonts(customFonts : [FontInfo]?) -> AvailableFontsResponse {
         self.customFonts = customFonts;
@@ -94,6 +122,7 @@ public class AvailableFontsResponse : WordsResponse {
         return self.customFonts;
     }
 
+
     // Sets systemFonts. Gets or sets the list of system fonts, available on the server.
     public func setSystemFonts(systemFonts : [FontInfo]?) -> AvailableFontsResponse {
         self.systemFonts = systemFonts;