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

dynabic-billing-team · dynabic-billing-team · commit 4c7147c47bec · 2025-02-14T14:07:17.000-06:00
diff --git a/AsposeWordsCloud.podspec b/AsposeWordsCloud.podspec
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -68,6 +68,7 @@ node('words-linux') {
             else if (needToBuild) {
                 docker.image('swift:5.0').inside{
                     stage('build'){
+                        sh "cp ./PackageInternalTesting.swift ./Package.swift"
                         sh "swift build"
                     }
                 
diff --git a/Package.swift b/Package.swift
@@ -1,28 +1,18 @@
-// swift-tools-version:4.2
-// The swift-tools-version declares the minimum version of Swift required to build this package.
+// swift-tools-version:5.0
 
 import PackageDescription
 
 let package = Package(
     name: "AsposeWordsCloud",
     products: [
-        // Products define the executables and libraries produced by a package, and make them visible to other packages.
         .library(
             name: "AsposeWordsCloud",
             targets: ["AsposeWordsCloud"]),
     ],
-    dependencies: [
-        // Dependencies declare other packages that this package depends on.
-        .package(url: "https://github.com/allegro/swift-junit.git", from: "1.0.0")
-    ],
+    dependencies: [],
     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: "AsposeWordsCloud",
             dependencies: []),
-        .testTarget(
-            name: "AsposeWordsCloudTests",
-            dependencies: ["AsposeWordsCloud", "SwiftTestReporter"]),
     ]
 )
diff --git a/PackageHealthProdCheck.swift b/PackageHealthProdCheck.swift
@@ -1,29 +1,29 @@
-// swift-tools-version:4.2
-// The swift-tools-version declares the minimum version of Swift required to build this package.
+// swift-tools-version:5.0
 
 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"]),
+            dependencies: [
+                "AsposeWordsCloudHealthProdCheck",
+                .product(name: "SwiftTestReporter", package: "swift-junit"),
+                .product(name: "AsposeWordsCloud", package: "aspose-words-cloud-swift"),
+            ],
+        ),
     ]
 )
diff --git a/PackageInternalTesting.swift b/PackageInternalTesting.swift
@@ -0,0 +1,27 @@
+// swift-tools-version:5.0
+
+import PackageDescription
+
+let package = Package(
+    name: "AsposeWordsCloud",
+    products: [
+        .library(
+            name: "AsposeWordsCloud",
+            targets: ["AsposeWordsCloud"]),
+    ],
+    dependencies: [
+        .package(url: "https://github.com/allegro/swift-junit.git", from: "1.0.0")
+    ],
+    targets: [
+        .target(
+            name: "AsposeWordsCloud",
+            dependencies: []),
+        .testTarget(
+            name: "AsposeWordsCloudTests",
+            dependencies: [
+                "AsposeWordsCloud",
+                .product(name: "SwiftTestReporter", package: "swift-junit"),
+            ]),
+    ]
+)
+
diff --git a/Podfile b/Podfile
diff --git a/README.md b/README.md
@@ -13,6 +13,11 @@ 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 25.2
+
+- Added 'IdPrefix' property for HtmlFixedSaveOptionsData and SvgSaveOptionsData class.
+
+
 ## Enhancements in Version 24.12
 
 - Added 'RenderChoiceFormFieldBorder' property for PdfSaveOptionsData class.
@@ -373,7 +378,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: "25.1"),
+    .package(url: "https://github.com/aspose-words-cloud/aspose-words-cloud-swift.git", from: "25.2")
 ],
 targets: [
     // Targets are the basic building blocks of a package. A target can define a module or a test suite.
@@ -391,7 +396,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 => '25.1'
+pod 'AsposeWordsCloud', :git => 'https://github.com/aspose-words-cloud/aspose-words-cloud-swift.git', :tag => '25.2'
 ```
 
 ## Getting Started
diff --git a/Sources/AsposeWordsCloud/Api/ApiInvoker.swift b/Sources/AsposeWordsCloud/Api/ApiInvoker.swift
@@ -27,6 +27,10 @@
 
 import Foundation
 
+#if canImport(FoundationNetworking)
+    import FoundationNetworking
+#endif
+
 // Utility class for executing and processing requests to Cloud API
 public class ApiInvoker {
     // An object containing the configuration for executing API requests 
diff --git a/Sources/AsposeWordsCloud/Api/Configuration.swift b/Sources/AsposeWordsCloud/Api/Configuration.swift
@@ -187,6 +187,6 @@ public class Configuration : Codable {
 
     // Returns SDK version for using in statistics headers
     public func getSdkVersion() -> String {
-        return "25.1";
+        return "25.2";
     }
 }
diff --git a/Sources/AsposeWordsCloud/Model/HtmlFixedSaveOptionsData.swift b/Sources/AsposeWordsCloud/Model/HtmlFixedSaveOptionsData.swift
@@ -137,6 +137,18 @@ public class HtmlFixedSaveOptionsData : FixedPageSaveOptionsData {
         }
     }
 
+    // Field of idPrefix. Container class for fixed html save options.
+    private var _idPrefix : String? = nil;
+
+    public var idPrefix : String? {
+        get {
+            return self._idPrefix;
+        }
+        set {
+            self._idPrefix = newValue;
+        }
+    }
+
     // Field of pageHorizontalAlignment. Container class for fixed html save options.
     private var _pageHorizontalAlignment : PageHorizontalAlignment? = nil;
 
@@ -238,6 +250,7 @@ public class HtmlFixedSaveOptionsData : FixedPageSaveOptionsData {
         case exportEmbeddedImages = "ExportEmbeddedImages";
         case exportFormFields = "ExportFormFields";
         case fontFormat = "FontFormat";
+        case idPrefix = "IdPrefix";
         case pageHorizontalAlignment = "PageHorizontalAlignment";
         case pageMargins = "PageMargins";
         case resourcesFolder = "ResourcesFolder";
@@ -264,6 +277,7 @@ public class HtmlFixedSaveOptionsData : FixedPageSaveOptionsData {
             self.fontFormat = FontFormat(rawValue: raw_fontFormat);
         }
 
+        self.idPrefix = json["IdPrefix"] as? String;
         if let raw_pageHorizontalAlignment = json["PageHorizontalAlignment"] as? String {
             self.pageHorizontalAlignment = PageHorizontalAlignment(rawValue: raw_pageHorizontalAlignment);
         }
@@ -286,6 +300,7 @@ public class HtmlFixedSaveOptionsData : FixedPageSaveOptionsData {
         self.exportEmbeddedImages = try container.decodeIfPresent(Bool.self, forKey: .exportEmbeddedImages);
         self.exportFormFields = try container.decodeIfPresent(Bool.self, forKey: .exportFormFields);
         self.fontFormat = try container.decodeIfPresent(FontFormat.self, forKey: .fontFormat);
+        self.idPrefix = try container.decodeIfPresent(String.self, forKey: .idPrefix);
         self.pageHorizontalAlignment = try container.decodeIfPresent(PageHorizontalAlignment.self, forKey: .pageHorizontalAlignment);
         self.pageMargins = try container.decodeIfPresent(Double.self, forKey: .pageMargins);
         self.resourcesFolder = try container.decodeIfPresent(String.self, forKey: .resourcesFolder);
@@ -319,6 +334,9 @@ public class HtmlFixedSaveOptionsData : FixedPageSaveOptionsData {
         if (self.fontFormat != nil) {
             try container.encode(self.fontFormat, forKey: .fontFormat);
         }
+        if (self.idPrefix != nil) {
+            try container.encode(self.idPrefix, forKey: .idPrefix);
+        }
         if (self.pageHorizontalAlignment != nil) {
             try container.encode(self.pageHorizontalAlignment, forKey: .pageHorizontalAlignment);
         }
@@ -433,6 +451,18 @@ public class HtmlFixedSaveOptionsData : FixedPageSaveOptionsData {
     }
 
 
+    // Sets idPrefix. Gets or sets a prefix that is prepended to all generated element IDs in the output document. Default value is null and no prefix is prepended. If the prefix is specified, it can contain only letters, digits, underscores, and hyphens, and must start with a letter.
+    public func setIdPrefix(idPrefix : String?) -> HtmlFixedSaveOptionsData {
+        self.idPrefix = idPrefix;
+        return self;
+    }
+
+    // Gets idPrefix. Gets or sets a prefix that is prepended to all generated element IDs in the output document. Default value is null and no prefix is prepended. If the prefix is specified, it can contain only letters, digits, underscores, and hyphens, and must start with a letter.
+    public func getIdPrefix() -> String? {
+        return self.idPrefix;
+    }
+
+
     // Sets pageHorizontalAlignment. Gets or sets the horizontal alignment of pages in the HTML document. The default value is HtmlFixedHorizontalPageAlignment.Center.
     public func setPageHorizontalAlignment(pageHorizontalAlignment : PageHorizontalAlignment?) -> HtmlFixedSaveOptionsData {
         self.pageHorizontalAlignment = pageHorizontalAlignment;
diff --git a/Sources/AsposeWordsCloud/Model/SvgSaveOptionsData.swift b/Sources/AsposeWordsCloud/Model/SvgSaveOptionsData.swift
@@ -66,6 +66,18 @@ public class SvgSaveOptionsData : FixedPageSaveOptionsData {
         }
     }
 
+    // Field of idPrefix. Container class for svg save options.
+    private var _idPrefix : String? = nil;
+
+    public var idPrefix : String? {
+        get {
+            return self._idPrefix;
+        }
+        set {
+            self._idPrefix = newValue;
+        }
+    }
+
     // Field of maxImageResolution. Container class for svg save options.
     private var _maxImageResolution : Int? = nil;
 
@@ -138,6 +150,7 @@ public class SvgSaveOptionsData : FixedPageSaveOptionsData {
     private enum CodingKeys: String, CodingKey {
         case exportEmbeddedImages = "ExportEmbeddedImages";
         case fitToViewPort = "FitToViewPort";
+        case idPrefix = "IdPrefix";
         case maxImageResolution = "MaxImageResolution";
         case resourcesFolder = "ResourcesFolder";
         case resourcesFolderAlias = "ResourcesFolderAlias";
@@ -154,6 +167,7 @@ public class SvgSaveOptionsData : FixedPageSaveOptionsData {
         try super.init(from: json);
         self.exportEmbeddedImages = json["ExportEmbeddedImages"] as? Bool;
         self.fitToViewPort = json["FitToViewPort"] as? Bool;
+        self.idPrefix = json["IdPrefix"] as? String;
         self.maxImageResolution = json["MaxImageResolution"] as? Int;
         self.resourcesFolder = json["ResourcesFolder"] as? String;
         self.resourcesFolderAlias = json["ResourcesFolderAlias"] as? String;
@@ -169,6 +183,7 @@ public class SvgSaveOptionsData : FixedPageSaveOptionsData {
         let container = try decoder.container(keyedBy: CodingKeys.self);
         self.exportEmbeddedImages = try container.decodeIfPresent(Bool.self, forKey: .exportEmbeddedImages);
         self.fitToViewPort = try container.decodeIfPresent(Bool.self, forKey: .fitToViewPort);
+        self.idPrefix = try container.decodeIfPresent(String.self, forKey: .idPrefix);
         self.maxImageResolution = try container.decodeIfPresent(Int.self, forKey: .maxImageResolution);
         self.resourcesFolder = try container.decodeIfPresent(String.self, forKey: .resourcesFolder);
         self.resourcesFolderAlias = try container.decodeIfPresent(String.self, forKey: .resourcesFolderAlias);
@@ -185,6 +200,9 @@ public class SvgSaveOptionsData : FixedPageSaveOptionsData {
         if (self.fitToViewPort != nil) {
             try container.encode(self.fitToViewPort, forKey: .fitToViewPort);
         }
+        if (self.idPrefix != nil) {
+            try container.encode(self.idPrefix, forKey: .idPrefix);
+        }
         if (self.maxImageResolution != nil) {
             try container.encode(self.maxImageResolution, forKey: .maxImageResolution);
         }
@@ -233,6 +251,18 @@ public class SvgSaveOptionsData : FixedPageSaveOptionsData {
     }
 
 
+    // Sets idPrefix. Gets or sets specifies a prefix that is prepended to all generated element IDs in the output document. Default value is null and no prefix is prepended. If the prefix is specified, it can contain only letters, digits, underscores, and hyphens, and must start with a letter.
+    public func setIdPrefix(idPrefix : String?) -> SvgSaveOptionsData {
+        self.idPrefix = idPrefix;
+        return self;
+    }
+
+    // Gets idPrefix. Gets or sets specifies a prefix that is prepended to all generated element IDs in the output document. Default value is null and no prefix is prepended. If the prefix is specified, it can contain only letters, digits, underscores, and hyphens, and must start with a letter.
+    public func getIdPrefix() -> String? {
+        return self.idPrefix;
+    }
+
+
     // Sets maxImageResolution. Gets or sets a value in pixels per inch that limits resolution of exported raster images. If the value of this property is non-zero, it limits resolution of exported raster images. That is, higher-resolution images are resampled down to the limit and lower-resolution images are exported as is.
     public func setMaxImageResolution(maxImageResolution : Int?) -> SvgSaveOptionsData {
         self.maxImageResolution = maxImageResolution;

Original file line number	Diff line number	Diff line change
`@@ -68,6 +68,7 @@ node('words-linux') {`
`68`	`68`	`else if (needToBuild) {`
`69`	`69`	`docker.image('swift:5.0').inside{`
`70`	`70`	`stage('build'){`
	`71`	`+ sh "cp ./PackageInternalTesting.swift ./Package.swift"`
`71`	`72`	`sh "swift build"`
`72`	`73`	`}`
`73`	`74`
Original file line number	Diff line number	Diff line change
`@@ -187,6 +187,6 @@ public class Configuration : Codable {`
`187`	`187`
`188`	`188`	`// Returns SDK version for using in statistics headers`
`189`	`189`	`public func getSdkVersion() -> String {`
`190`		`- return "25.1";`
	`190`	`+ return "25.2";`
`191`	`191`	`}`
`192`	`192`	`}`