Skip to content

Commit 7b168a8

Browse files
dynabic-billing-teamdynabic-billing-team
committed
Merge remote-tracking branch 'origin/master' into release
2 parents 1582889 + 8d82fba commit 7b168a8

File tree

9 files changed

+62
-10
lines changed

9 files changed

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

‎Jenkinsfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ node('words-linux') {
1717
dir('swift') {
1818
try {
1919
stage('checkout'){
20-
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']]])
20+
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']]])
2121

2222
sh 'git show -s HEAD > gitMessage'
2323
def commitMessage = readFile('gitMessage').trim()

‎JenkinsfileRelease‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ def runtests(version)
88
dir(version){
99
try {
1010
stage('checkout_' + version){
11-
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']]])
11+
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']]])
1212
withCredentials([usernamePassword(credentialsId: '6839cbe8-39fa-40c0-86ce-90706f0bae5d', passwordVariable: 'ClientSecret', usernameVariable: 'ClientId')]) {
1313
sh 'mkdir -p Settings'
1414
sh 'echo "{\\"ClientId\\": \\"$ClientId\\",\\"ClientSecret\\": \\"$ClientSecret\\", \\"BaseUrl\\": \\"$testServerUrl\\"}" > Settings/servercreds.json'
@@ -41,7 +41,7 @@ def runtests(version)
4141
def makerelease() {
4242
try {
4343
stage('Merge master to release'){
44-
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']]])
44+
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']]])
4545
sh "git config user.email 'jenkins.aspose@gmail.com'"
4646
sh "git config user.name 'jenkins'"
4747
sh "git checkout --merge release"
@@ -50,19 +50,19 @@ def makerelease() {
5050
sh "git diff --name-status"
5151
sh 'git commit -am "Merged master branch to release" || exit 0'
5252
withCredentials([usernamePassword(credentialsId: '361885ba-9425-4230-950e-0af201d90547', passwordVariable: 'gitPass', usernameVariable: 'gitUsername')]) {
53-
sh "git push https://$gitUsername:$gitPass@git.auckland.dynabic.com/words-cloud/words-cloud-sdk-swift.git release"
53+
sh "git push https://$gitUsername:$gitPass@git.auckland.dynabic.com/words-cloud/words-cloud-swift.git release"
5454
}
5555
}
5656

5757
stage('Add version tag'){
58-
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']]])
58+
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']]])
5959

6060
sh "git config user.email \"jenkins.aspose@gmail.com\""
6161
sh "git config user.name \"jenkins\""
6262
sh "git tag -a ${tagVersion} -m 'version ${tagVersion}' | exit 0"
6363

6464
withCredentials([usernamePassword(credentialsId: '361885ba-9425-4230-950e-0af201d90547', passwordVariable: 'gitPass', usernameVariable: 'gitUsername')]) {
65-
sh "git push https://$gitUsername:$gitPass@git.auckland.dynabic.com/words-cloud/words-cloud-sdk-swift.git ${tagVersion}"
65+
sh "git push https://$gitUsername:$gitPass@git.auckland.dynabic.com/words-cloud/words-cloud-swift.git ${tagVersion}"
6666
}
6767
}
6868
} finally {

‎README.md‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@ This repository contains Aspose.Words Cloud SDK for Swift source code. This SDK
1313
* Watermarks and protection
1414
* Full read & write access to Document Object Model, including sections, paragraphs, text, images, tables, headers/footers and many others
1515

16+
## Enhancements in Version 21.11
17+
18+
- Support encryption of 'CommonRequest.Password'. Automatic encryption of all passwords sent to the API server as request parameters.
19+
1620
## Enhancements in Version 21.10
1721

1822
- 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:
165169

166170
dependencies: [
167171
// Dependencies declare other packages that this package depends on.
168-
.package(url: "https://github.com/aspose-words-cloud/aspose-words-cloud-swift", from: "21.10"),
172+
.package(url: "https://github.com/aspose-words-cloud/aspose-words-cloud-swift", from: "21.11"),
169173
],
170174
targets: [
171175
// Targets are the basic building blocks of a package. A target can define a module or a test suite.
@@ -183,7 +187,7 @@ targets: [
183187
Add link to git repository as dependency to your Podfile:
184188

185189
```ruby
186-
pod 'AsposeWordsCloud', :git => 'https://github.com/aspose-words-cloud/aspose-words-cloud-swift.git', :tag => '21.10'
190+
pod 'AsposeWordsCloud', :git => 'https://github.com/aspose-words-cloud/aspose-words-cloud-swift.git', :tag => '21.11'
187191
```
188192

189193
## Getting Started

‎Sources/AsposeWordsCloud/Api/Configuration.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,6 @@ public class Configuration : Codable {
118118

119119
// Returns SDK version for using in statistics headers
120120
public func getSdkVersion() -> String {
121-
return "21.10";
121+
return "21.11";
122122
}
123123
}

‎Sources/AsposeWordsCloud/Model/Font.swift‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1149,6 +1149,18 @@ public class Font : LinkElement {
11491149
// Enum value "smartLink"
11501150
case smartLink = "SmartLink"
11511151

1152+
// Enum value "mention"
1153+
case mention = "Mention"
1154+
1155+
// Enum value "smartHyperlink"
1156+
case smartHyperlink = "SmartHyperlink"
1157+
1158+
// Enum value "hashtag"
1159+
case hashtag = "Hashtag"
1160+
1161+
// Enum value "unresolvedMention"
1162+
case unresolvedMention = "UnresolvedMention"
1163+
11521164
// Enum value "user"
11531165
case user = "User"
11541166

‎Sources/AsposeWordsCloud/Model/ParagraphFormatBase.swift‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1240,6 +1240,18 @@ public class ParagraphFormatBase : LinkElement {
12401240
// Enum value "smartLink"
12411241
case smartLink = "SmartLink"
12421242

1243+
// Enum value "mention"
1244+
case mention = "Mention"
1245+
1246+
// Enum value "smartHyperlink"
1247+
case smartHyperlink = "SmartHyperlink"
1248+
1249+
// Enum value "hashtag"
1250+
case hashtag = "Hashtag"
1251+
1252+
// Enum value "unresolvedMention"
1253+
case unresolvedMention = "UnresolvedMention"
1254+
12431255
// Enum value "user"
12441256
case user = "User"
12451257

‎Sources/AsposeWordsCloud/Model/Style.swift‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1149,6 +1149,18 @@ public class Style : LinkElement {
11491149
// Enum value "smartLink"
11501150
case smartLink = "SmartLink"
11511151

1152+
// Enum value "mention"
1153+
case mention = "Mention"
1154+
1155+
// Enum value "smartHyperlink"
1156+
case smartHyperlink = "SmartHyperlink"
1157+
1158+
// Enum value "hashtag"
1159+
case hashtag = "Hashtag"
1160+
1161+
// Enum value "unresolvedMention"
1162+
case unresolvedMention = "UnresolvedMention"
1163+
11521164
// Enum value "user"
11531165
case user = "User"
11541166

‎Sources/AsposeWordsCloud/Model/TableProperties.swift‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1162,6 +1162,18 @@ public class TableProperties : LinkElement {
11621162
// Enum value "smartLink"
11631163
case smartLink = "SmartLink"
11641164

1165+
// Enum value "mention"
1166+
case mention = "Mention"
1167+
1168+
// Enum value "smartHyperlink"
1169+
case smartHyperlink = "SmartHyperlink"
1170+
1171+
// Enum value "hashtag"
1172+
case hashtag = "Hashtag"
1173+
1174+
// Enum value "unresolvedMention"
1175+
case unresolvedMention = "UnresolvedMention"
1176+
11651177
// Enum value "user"
11661178
case user = "User"
11671179

0 commit comments

Comments
 (0)