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          = '21.10'
+  s.version          = '21.11'
   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

@@ -17,7 +17,7 @@ node('words-linux') {
     dir('swift') {
         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']]])
+                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-swift.git']]])
 
                 sh 'git show -s HEAD > gitMessage'
                 def commitMessage = readFile('gitMessage').trim()

JenkinsfileRelease

@@ -8,7 +8,7 @@ def runtests(version)
     dir(version){
         try {
             stage('checkout_' + version){
-                checkout([$class: 'GitSCM', branches: [[name: '*/master']], 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']]])
+                checkout([$class: 'GitSCM', branches: [[name: '*/master']], doGenerateSubmoduleConfigurations: false, extensions: [[$class: 'LocalBranch', localBranch: "**"]], submoduleCfg: [], userRemoteConfigs: [[credentialsId: '361885ba-9425-4230-950e-0af201d90547', url: 'https://git.auckland.dynabic.com/words-cloud/words-cloud-swift.git']]])
                 withCredentials([usernamePassword(credentialsId: '6839cbe8-39fa-40c0-86ce-90706f0bae5d', passwordVariable: 'ClientSecret', usernameVariable: 'ClientId')]) {
                     sh 'mkdir -p Settings'
                     sh 'echo "{\\"ClientId\\": \\"$ClientId\\",\\"ClientSecret\\": \\"$ClientSecret\\", \\"BaseUrl\\": \\"$testServerUrl\\"}" > Settings/servercreds.json'
@@ -41,7 +41,7 @@ def runtests(version)
 def makerelease() {
     try {	    
         stage('Merge master to release'){
-            checkout([$class: 'GitSCM', branches: [[name: '*/release']], 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']]])
+            checkout([$class: 'GitSCM', branches: [[name: '*/release']], doGenerateSubmoduleConfigurations: false, extensions: [[$class: 'LocalBranch', localBranch: "**"]], submoduleCfg: [], userRemoteConfigs: [[credentialsId: '361885ba-9425-4230-950e-0af201d90547', url: 'https://git.auckland.dynabic.com/words-cloud/words-cloud-swift.git']]])
             sh "git config user.email '[email protected]'"
             sh "git config user.name 'jenkins'"
             sh "git checkout --merge release"
@@ -50,19 +50,19 @@ def makerelease() {
             sh "git diff --name-status"			
             sh 'git commit -am "Merged master branch to release" || exit 0'
             withCredentials([usernamePassword(credentialsId: '361885ba-9425-4230-950e-0af201d90547', passwordVariable: 'gitPass', usernameVariable: 'gitUsername')]) {
-                sh "git push https://$gitUsername:[email protected]/words-cloud/words-cloud-sdk-swift.git release"
+                sh "git push https://$gitUsername:[email protected]/words-cloud/words-cloud-swift.git release"
             }
         }
 
         stage('Add version tag'){
-			checkout([$class: 'GitSCM', branches: [[name: '*/release']], 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']]])
+			checkout([$class: 'GitSCM', branches: [[name: '*/release']], doGenerateSubmoduleConfigurations: false, extensions: [[$class: 'LocalBranch', localBranch: "**"]], submoduleCfg: [], userRemoteConfigs: [[credentialsId: '361885ba-9425-4230-950e-0af201d90547', url: 'https://git.auckland.dynabic.com/words-cloud/words-cloud-swift.git']]])
 
 				sh "git config user.email \"[email protected]\""
 				sh "git config user.name \"jenkins\""
 				sh "git tag -a ${tagVersion} -m 'version ${tagVersion}' | exit 0"
 
 				withCredentials([usernamePassword(credentialsId: '361885ba-9425-4230-950e-0af201d90547', passwordVariable: 'gitPass', usernameVariable: 'gitUsername')]) {
-					sh "git push https://$gitUsername:[email protected]/words-cloud/words-cloud-sdk-swift.git ${tagVersion}"
+					sh "git push https://$gitUsername:[email protected]/words-cloud/words-cloud-swift.git ${tagVersion}"
 				}
         }           
     } finally {                       

README.md

@@ -13,6 +13,10 @@ 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 21.11
+
+- Support encryption of 'CommonRequest.Password'. Automatic encryption of all passwords sent to the API server as request parameters.
+
 ## Enhancements in Version 21.10
 
 - Removed 'GraphicsQualityOptions' image save option as it no longer supported.
@@ -165,7 +169,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: "21.10"),
+    .package(url: "https://github.com/aspose-words-cloud/aspose-words-cloud-swift", from: "21.11"),
 ],
 targets: [
     // Targets are the basic building blocks of a package. A target can define a module or a test suite.
@@ -183,7 +187,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 => '21.10'
+pod 'AsposeWordsCloud', :git => 'https://github.com/aspose-words-cloud/aspose-words-cloud-swift.git', :tag => '21.11'
 ```
 
 ## Getting Started

Sources/AsposeWordsCloud/Api/Configuration.swift

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

Sources/AsposeWordsCloud/Model/Font.swift

@@ -1149,6 +1149,18 @@ public class Font : LinkElement {
         // Enum value "smartLink"
         case smartLink = "SmartLink"
 
+        // Enum value "mention"
+        case mention = "Mention"
+
+        // Enum value "smartHyperlink"
+        case smartHyperlink = "SmartHyperlink"
+
+        // Enum value "hashtag"
+        case hashtag = "Hashtag"
+
+        // Enum value "unresolvedMention"
+        case unresolvedMention = "UnresolvedMention"
+
         // Enum value "user"
         case user = "User"
 

Sources/AsposeWordsCloud/Model/ParagraphFormatBase.swift

@@ -1240,6 +1240,18 @@ public class ParagraphFormatBase : LinkElement {
         // Enum value "smartLink"
         case smartLink = "SmartLink"
 
+        // Enum value "mention"
+        case mention = "Mention"
+
+        // Enum value "smartHyperlink"
+        case smartHyperlink = "SmartHyperlink"
+
+        // Enum value "hashtag"
+        case hashtag = "Hashtag"
+
+        // Enum value "unresolvedMention"
+        case unresolvedMention = "UnresolvedMention"
+
         // Enum value "user"
         case user = "User"
 

Sources/AsposeWordsCloud/Model/Style.swift

@@ -1149,6 +1149,18 @@ public class Style : LinkElement {
         // Enum value "smartLink"
         case smartLink = "SmartLink"
 
+        // Enum value "mention"
+        case mention = "Mention"
+
+        // Enum value "smartHyperlink"
+        case smartHyperlink = "SmartHyperlink"
+
+        // Enum value "hashtag"
+        case hashtag = "Hashtag"
+
+        // Enum value "unresolvedMention"
+        case unresolvedMention = "UnresolvedMention"
+
         // Enum value "user"
         case user = "User"
 

Sources/AsposeWordsCloud/Model/TableProperties.swift

@@ -1162,6 +1162,18 @@ public class TableProperties : LinkElement {
         // Enum value "smartLink"
         case smartLink = "SmartLink"
 
+        // Enum value "mention"
+        case mention = "Mention"
+
+        // Enum value "smartHyperlink"
+        case smartHyperlink = "SmartHyperlink"
+
+        // Enum value "hashtag"
+        case hashtag = "Hashtag"
+
+        // Enum value "unresolvedMention"
+        case unresolvedMention = "UnresolvedMention"
+
         // Enum value "user"
         case user = "User"